Skip to content

Commit e13d030

Browse files
committed
Cleanup postgres
1 parent e10d67e commit e13d030

File tree

5 files changed

+21
-24
lines changed

5 files changed

+21
-24
lines changed

src/components/EnvVarsInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export const EnvVarsInput = ({ data }) => {
225225
tabindex={0}
226226
onClick={() => {
227227
const value = createSignal("");
228-
const secretName = createSignal("");
228+
const secretName = createSignal(dbSecrets()?.[0]?.name);
229229
const secretKey = createSignal("");
230230

231231
createEffect(() => {

src/components/cloud/CreateDatabaseForm.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { schemaDatabse } from "~/lib/types";
66

77
const createDatabaseFromForm = async (form: FormData) => {
88
"use server";
9-
console.log(form);
109
try {
1110
const database = await schemaDatabse.parseAsync({
1211
name: form.get("name"),

src/components/cloud/service/SourceInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const getPackages = cache(async () => {
3434
);
3535
return packagesWithVersions;
3636
} catch (e) {
37-
console.log(e);
37+
console.error(e);
3838
}
3939
}, "user-gh-packages");
4040

src/routes/cloud/cnpg/[name]/index.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,11 @@ import {
66
type RouteDefinition,
77
} from "@solidjs/router";
88
import { getUser } from "~/lib/auth";
9-
import humanizeDuration from "humanize-duration";
109
import { For } from "solid-js";
11-
import { StatusBadge } from "~/components/cloud/service/StatusBadge";
1210
import { k8sCore } from "~/lib/k8s";
1311

14-
// const getService = cache(async (app: string) => {
15-
// "use server";
16-
// const user = await getUser();
17-
// return await knative.getService(app, user.name);
18-
// }, "service");
19-
2012
const getDatabaseSecret = cache(async (db: string) => {
2113
"use server";
22-
console.log(db);
2314
const user = await getUser();
2415
const secrets = await k8sCore.listNamespacedSecret(
2516
user.name,
@@ -38,7 +29,6 @@ const getDatabaseSecret = cache(async (db: string) => {
3829

3930
export const route = {
4031
load: ({ params }) => {
41-
// getService(params.app);
4232
getDatabaseSecret(params.name);
4333
},
4434
} satisfies RouteDefinition;

src/routes/cloud/index.tsx

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
1-
import { knative } from "~/lib/k8s";
1+
import { cnpg, knative } from "~/lib/k8s";
22
import { getUser } from "~/lib/auth";
33
import { A, cache, createAsync, type RouteDefinition } from "@solidjs/router";
4-
import { getSession } from "@solid-mediakit/auth";
5-
import { getWebRequest } from "vinxi/http";
6-
import { authOptions } from "~/lib/auth";
74

8-
const getServices = cache(async () => {
5+
const getOverview = cache(async () => {
96
"use server";
10-
const user = await getUser()
11-
return await knative.getServices(user.name);
12-
}, "services2");
7+
const user = await getUser();
8+
const apps = await knative.getServices(user.name);
9+
const dbs = await cnpg.getDatabases(user.name);
10+
return { apps, dbs };
11+
}, "overview");
1312

1413
export const route = {
1514
load: () => {
16-
getServices();
15+
getOverview();
1716
},
1817
} satisfies RouteDefinition;
1918

2019
export default () => {
21-
const services = createAsync(() => getServices());
20+
const overview = createAsync(() => getOverview());
2221

2322
return (
2423
<section class="grid 2xl:grid-cols-3 gap-2 w-full p-2">
2524
<figure class="card relative basis-64 bg-base-200 shadow grow">
2625
<div class="card-body">
2726
<div class="card-title">Apps</div>
28-
<p>{services()?.services.length} Apps runnging</p>
27+
<p>{overview()?.apps.services.length} Apps runnging</p>
2928
<A href="/cloud/apps" class="btn btn-primary">
3029
View Apps
3130
</A>
3231
</div>
3332
</figure>
33+
<figure class="card relative basis-64 bg-base-200 shadow grow">
34+
<div class="card-body">
35+
<div class="card-title">Postgres</div>
36+
<p>{overview()?.dbs.length} Databases runnging</p>
37+
<A href="/cloud/cnpg" class="btn btn-primary">
38+
View Postgres
39+
</A>
40+
</div>
41+
</figure>
3442
</section>
3543
);
3644
};

0 commit comments

Comments
 (0)