diff --git a/logo.svg b/logo.svg new file mode 100644 index 0000000..a3b92a6 --- /dev/null +++ b/logo.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/src/app.html b/web/src/app.html index 16161f5..0a61570 100644 --- a/web/src/app.html +++ b/web/src/app.html @@ -2,7 +2,7 @@ - + %sveltekit.head% diff --git a/web/src/lib/components/app-sidebar.svelte b/web/src/lib/components/app-sidebar.svelte index 1aea417..5767720 100644 --- a/web/src/lib/components/app-sidebar.svelte +++ b/web/src/lib/components/app-sidebar.svelte @@ -63,6 +63,8 @@ import * as Sidebar from '$lib/components/ui/sidebar/index.js'; import Command from '@lucide/svelte/icons/command'; import type {ComponentProps} from 'svelte'; + import logo from '$lib/images/logo.svg'; + import {base} from "$app/paths"; let {ref = $bindable(null), ...restProps}: ComponentProps = $props(); @@ -73,15 +75,11 @@ {#snippet child({props})} - -
- -
+ + Media Manager Logo
- Acme Inc - Enterprise + Media Manager + version? or smth else?
{/snippet} diff --git a/web/src/lib/components/logo-side-by-side.svelte b/web/src/lib/components/logo-side-by-side.svelte new file mode 100644 index 0000000..0805381 --- /dev/null +++ b/web/src/lib/components/logo-side-by-side.svelte @@ -0,0 +1,10 @@ + + +
+ Logo + Media Manager +
\ No newline at end of file diff --git a/web/src/lib/components/nav-user.svelte b/web/src/lib/components/nav-user.svelte index 647f87d..62247df 100644 --- a/web/src/lib/components/nav-user.svelte +++ b/web/src/lib/components/nav-user.svelte @@ -51,7 +51,9 @@
- CN + + +
diff --git a/web/src/lib/images/logo.svg b/web/src/lib/images/logo.svg new file mode 100644 index 0000000..b551d03 --- /dev/null +++ b/web/src/lib/images/logo.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/src/routes/dashboard/+layout.server.ts b/web/src/routes/dashboard/+layout.server.ts index 4f4ca5f..e9c64c9 100644 --- a/web/src/routes/dashboard/+layout.server.ts +++ b/web/src/routes/dashboard/+layout.server.ts @@ -1,6 +1,7 @@ import {env} from '$env/dynamic/public'; import type {LayoutServerLoad} from './$types'; import {redirect} from '@sveltejs/kit'; +import {base} from "$app/paths"; const apiUrl = env.PUBLIC_API_URL; @@ -14,7 +15,7 @@ export const load: LayoutServerLoad = async ({fetch}) => { }); if (!response.ok) { console.log('unauthorized, redirecting to login'); - throw redirect(303, '/login'); + throw redirect(303, base + '/login'); } return {user: await response.json()}; }; diff --git a/web/src/routes/dashboard/+layout.svelte b/web/src/routes/dashboard/+layout.svelte index 2bf7e5b..d9e1ff9 100644 --- a/web/src/routes/dashboard/+layout.svelte +++ b/web/src/routes/dashboard/+layout.svelte @@ -4,11 +4,12 @@ import type {LayoutProps} from './$types'; import {setContext} from 'svelte'; import {goto} from '$app/navigation'; + import {base} from "$app/paths"; let {data, children}: LayoutProps = $props(); console.log('Received User Data: ', data.user); if (!data.user.is_verified) { - goto('/login/verify') + goto(base + '/login/verify') } setContext('user', () => data.user); diff --git a/web/src/routes/dashboard/+page.svelte b/web/src/routes/dashboard/+page.svelte index cb94f5f..9a8749b 100644 --- a/web/src/routes/dashboard/+page.svelte +++ b/web/src/routes/dashboard/+page.svelte @@ -2,6 +2,7 @@ import {Separator} from '$lib/components/ui/separator/index.js'; import * as Sidebar from '$lib/components/ui/sidebar/index.js'; import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js'; + import {base} from "$app/paths";
@@ -11,7 +12,7 @@