Merge branch 'main' of https://github.com/beat-forge/clients into main

beat-forge · Aug 12, 2023 · dae558f · dae558f
2 parents a561efa + 05b694d
commit dae558f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/apps/web/README.md b/apps/web/README.md
@@ -1,2 +1,2 @@
 # web
-b
+cc
diff --git a/apps/web/src/lib/components/layout/NavBar.svelte b/apps/web/src/lib/components/layout/NavBar.svelte
@@ -9,7 +9,6 @@
 	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 @@
 	<Link customClasses="flex-shrink-0" variant="ghost" focusRing={false} href="/">
 		<img src="/images/logo.svg" draggable="false" alt="logo" class="h-12 p-3 flex" />
 	</Link>
-	
+
 	<div class="ml-auto mr-4 flex flex-row gap-8 items-center">
 		<div class="flex md:hidden">
 			<Dropdown >
@@ -51,11 +50,11 @@
 				<img alt="user icon" src={$user.user.avatar} draggable="false" class="flex flex-shrink-0 w-8 h-8 min-w-[32px] min-h-[32px] md:w-10 md:h-10 rounded-full">
 			</Link>
 		{:else}
-			<Link variant="secondary" href={PUBLIC_GITHUB_CALL_URL}>
+			<Link variant="secondary" href={env.PUBLIC_GITHUB_CALL_URL}>
 				Login
-			</Link>
+			</a>
 		{/if}
 	</div>
 
-	
+
 </div>
diff --git 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 { PUBLIC_API_URL } from '$env/static/public';
 
-export const load = (async ({ params }) => {
+export const load = (async ({ params, fetch }) => {
     const slug = params.mod;
     try {
         const response = await fetch(`${PUBLIC_API_URL}/graphql`, {

diff --git 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 { PUBLIC_API_URL } from '$env/static/public';
 
-export const load = (async ({ params }) => {
+export const load = (async ({ params, fetch }) => {
     const id = params.id;
     try {
         const response = await fetch(`${PUBLIC_API_URL}/graphql`, {
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
     # web
-    b
+    cc