From f5016aeb1acc9400e0786e0f771e51e5c2b576a9 Mon Sep 17 00:00:00 2001 From: rykuno Date: Thu, 12 Sep 2024 17:30:04 -0500 Subject: [PATCH] fixed api path error --- .vscode/settings.json | 3 ++ docker-compose.yaml | 1 - render.yaml | 44 +++++++++++----------- src/hooks.server.ts | 4 +- src/lib/server/api/emails/welcome.email.ts | 3 +- 5 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e76b3ee --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "vitest.disableWorkspaceWarning": true +} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 9f891c5..8e5300d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -32,7 +32,6 @@ services: mailpit: image: axllent/mailpit container_name: mailpit - restart: unless-stopped volumes: - mailpit_data:/data ports: diff --git a/render.yaml b/render.yaml index 5dcf25f..c032a45 100644 --- a/render.yaml +++ b/render.yaml @@ -60,16 +60,16 @@ services: name: data mountPath: /data envVars: - - key: MINIO_ROOT_USER - generateValue: true - - key: MINIO_ROOT_PASSWORD - generateValue: true - - key: HOST - value: "0.0.0.0" - - key: PORT - value: 9000 - - key: CONSOLE_PORT - value: 9090 + - key: MINIO_ROOT_USER + generateValue: true + - key: MINIO_ROOT_PASSWORD + generateValue: true + - key: HOST + value: "0.0.0.0" + - key: PORT + value: 9000 + - key: CONSOLE_PORT + value: 9090 # Uncomment the following key/value pair if you are removing the # 'minio-console' web service # - key: MINIO_BROWSER @@ -82,18 +82,18 @@ services: dockerfilePath: ./Dockerfile.minio autoDeploy: false envVars: - - key: PORT - value: 10000 - - key: MINIO_HOST - fromService: - name: minio-server - type: web - property: host - - key: MINIO_CONSOLE_PORT - fromService: - name: minio-server - type: web - envVarKey: CONSOLE_PORT + - key: PORT + value: 10000 + - key: MINIO_HOST + fromService: + name: minio-server + type: web + property: host + - key: MINIO_CONSOLE_PORT + fromService: + name: minio-server + type: web + envVarKey: CONSOLE_PORT databases: - name: db diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 5db84b1..c0de2e1 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -18,12 +18,12 @@ const apiClient: Handle = async ({ event, resolve }) => { /* ----------------------------- Auth functions ----------------------------- */ async function getAuthedUser() { - const { data } = await api.users.me.$get().then(parseApiResponse) + const { data } = await api.iam.me.$get().then(parseApiResponse) return data && data.user; } async function getAuthedUserOrThrow(redirectTo = '/') { - const { data } = await api.users.me.$get().then(parseApiResponse); + const { data } = await api.iam.me.$get().then(parseApiResponse); if (!data || !data.user) throw redirect(StatusCodes.TEMPORARY_REDIRECT, redirectTo); return data?.user; } diff --git a/src/lib/server/api/emails/welcome.email.ts b/src/lib/server/api/emails/welcome.email.ts index ef54489..bc973d3 100644 --- a/src/lib/server/api/emails/welcome.email.ts +++ b/src/lib/server/api/emails/welcome.email.ts @@ -31,5 +31,4 @@ export class WelcomeEmail implements Email { `; } -} - +} \ No newline at end of file