From 4c2767e6bae642c689eced2387c81ea190752416 Mon Sep 17 00:00:00 2001 From: Checksum Date: Fri, 11 Aug 2023 19:14:53 -0500 Subject: [PATCH 1/4] build(web): nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin --- apps/web/README.md | 2 +- web.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/README.md b/apps/web/README.md index 9113ac9..1cab745 100644 --- a/apps/web/README.md +++ b/apps/web/README.md @@ -1,2 +1,2 @@ # web -b \ No newline at end of file +c \ No newline at end of file diff --git a/web.Dockerfile b/web.Dockerfile index 013f0b3..1dff4d8 100644 --- a/web.Dockerfile +++ b/web.Dockerfile @@ -4,7 +4,7 @@ FROM alpine:latest RUN apk add --update npm # Install pnpm -RUN npm install -g pnpm +RUN npm install -g pnpm dotenv # Create the beatforge user RUN addgroup -S beatforge && adduser -S beatforge -G beatforge @@ -23,4 +23,4 @@ WORKDIR /app/apps/web/ # Expose the port EXPOSE 3000 -CMD ["node", "build"] +CMD ["node", "-r", "dotenv/config", "build"] From 231ba93292a2003b6502103ffea660e47a6574c6 Mon Sep 17 00:00:00 2001 From: Evan / Fero Date: Fri, 11 Aug 2023 19:27:06 -0700 Subject: [PATCH 2/4] Revert "build(web): nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin nightmare eramthgin" This reverts commit 4c2767e6bae642c689eced2387c81ea190752416. --- apps/web/README.md | 2 +- web.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/README.md b/apps/web/README.md index 1cab745..9113ac9 100644 --- a/apps/web/README.md +++ b/apps/web/README.md @@ -1,2 +1,2 @@ # web -c \ No newline at end of file +b \ No newline at end of file diff --git a/web.Dockerfile b/web.Dockerfile index 1dff4d8..013f0b3 100644 --- a/web.Dockerfile +++ b/web.Dockerfile @@ -4,7 +4,7 @@ FROM alpine:latest RUN apk add --update npm # Install pnpm -RUN npm install -g pnpm dotenv +RUN npm install -g pnpm # Create the beatforge user RUN addgroup -S beatforge && adduser -S beatforge -G beatforge @@ -23,4 +23,4 @@ WORKDIR /app/apps/web/ # Expose the port EXPOSE 3000 -CMD ["node", "-r", "dotenv/config", "build"] +CMD ["node", "build"] From 22800bcad797c4cbdb52e8208ac34c45d044ed56 Mon Sep 17 00:00:00 2001 From: Evan / Fero Date: Fri, 11 Aug 2023 19:33:55 -0700 Subject: [PATCH 3/4] feat(web): login href --- apps/web/src/lib/components/layout/NavBar.svelte | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/web/src/lib/components/layout/NavBar.svelte b/apps/web/src/lib/components/layout/NavBar.svelte index 82e9dcb..71d2f13 100644 --- a/apps/web/src/lib/components/layout/NavBar.svelte +++ b/apps/web/src/lib/components/layout/NavBar.svelte @@ -3,13 +3,12 @@ import { Button } from 'ui/button'; import { Dropdown } from 'ui/dropdown'; import { BarsThree } from 'ui/icons'; - + import { env } from '$env/dynamic/public'; import { isAuthenticated, user } from '$lib/stores/user'; import { onMount } from 'svelte'; import jwt_decode from 'jwt-decode'; - onMount(() => { const cookie = document.cookie.split(';').find((cookie) => cookie.startsWith('auth='))?.split('=')[1] if (cookie) { @@ -23,7 +22,7 @@ logo - +
@@ -51,11 +50,14 @@ user icon {:else} - + + + Login + {/if}
- +
From 05b694df0e33e92b46d4dd795afe95a4f3e72320 Mon Sep 17 00:00:00 2001 From: Evan / Fero Date: Fri, 11 Aug 2023 19:47:37 -0700 Subject: [PATCH 4/4] fix(web): use sveltekit fetch rather than window.fetch --- apps/web/README.md | 2 +- apps/web/src/routes/mod/[mod]/+page.ts | 2 +- apps/web/src/routes/profile/[id]/+page.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/README.md b/apps/web/README.md index 9113ac9..7306bcd 100644 --- a/apps/web/README.md +++ b/apps/web/README.md @@ -1,2 +1,2 @@ # web -b \ No newline at end of file +cc \ No newline at end of file diff --git a/apps/web/src/routes/mod/[mod]/+page.ts b/apps/web/src/routes/mod/[mod]/+page.ts index 51cdfb0..bc60d9f 100644 --- a/apps/web/src/routes/mod/[mod]/+page.ts +++ b/apps/web/src/routes/mod/[mod]/+page.ts @@ -1,7 +1,7 @@ import type { PageLoad } from './$types'; import { env } from '$env/dynamic/public'; -export const load = (async ({ params }) => { +export const load = (async ({ params, fetch }) => { const slug = params.mod; try { const response = await fetch(`${env.PUBLIC_API_URL}/graphql`, { diff --git a/apps/web/src/routes/profile/[id]/+page.ts b/apps/web/src/routes/profile/[id]/+page.ts index 99a4fe0..44d398a 100644 --- a/apps/web/src/routes/profile/[id]/+page.ts +++ b/apps/web/src/routes/profile/[id]/+page.ts @@ -1,7 +1,7 @@ import type { PageLoad } from './$types'; import { env } from '$env/dynamic/public'; -export const load = (async ({ params }) => { +export const load = (async ({ params, fetch }) => { const id = params.id; try { const response = await fetch(`${env.PUBLIC_API_URL}/graphql`, {