diff --git a/frontend/src/hooks.server.ts b/frontend/src/hooks.server.ts index 84e02e2..5493e17 100644 --- a/frontend/src/hooks.server.ts +++ b/frontend/src/hooks.server.ts @@ -6,59 +6,53 @@ export const handle: Handle = async ({ event, resolve }) => { const pathname = event.url.pathname - if (pathname.startsWith('/landing')) { - const response = await resolve(event) - - return response - } + if (pathname.startsWith('/dashboard')) { + if (!sessionId) { + redirect(303, '/login') + } + const { session, user } = await lucia.validateSession(sessionId) - const allowedPath = ['/login', '/signup'] + if (!user) { + redirect(303, '/login') + } - if (allowedPath.includes(pathname)) { - if (sessionId) { - redirect(303, '/') + if (session && session.fresh) { + const sessionCookie = lucia.createSessionCookie(session.id) + // sveltekit types deviates from the de-facto standard + // you can use 'as any' too + event.cookies.set(sessionCookie.name, sessionCookie.value, { + path: '.', + ...sessionCookie.attributes, + }) + } + if (!session) { + const sessionCookie = lucia.createBlankSessionCookie() + event.cookies.set(sessionCookie.name, sessionCookie.value, { + path: '/', + ...sessionCookie.attributes, + }) } - event.locals.session = null - const response = await resolve(event) - return response - } + event.locals.user = user + event.locals.session = session - if (pathname.startsWith('/api')) { const response = await resolve(event) return response } - if (!sessionId) { - redirect(303, '/login') - } - const { session, user } = await lucia.validateSession(sessionId) + const authPaths = ['/login', '/signup'] - if (!user) { - redirect(303, '/login') - } + if (authPaths.includes(pathname)) { + if (sessionId) { + redirect(303, '/dashboard') + } + event.locals.session = null + const response = await resolve(event) - if (session && session.fresh) { - const sessionCookie = lucia.createSessionCookie(session.id) - // sveltekit types deviates from the de-facto standard - // you can use 'as any' too - event.cookies.set(sessionCookie.name, sessionCookie.value, { - path: '.', - ...sessionCookie.attributes, - }) - } - if (!session) { - const sessionCookie = lucia.createBlankSessionCookie() - event.cookies.set(sessionCookie.name, sessionCookie.value, { - path: '/', - ...sessionCookie.attributes, - }) + return response } - event.locals.user = user - event.locals.session = session - const response = await resolve(event) return response diff --git a/frontend/src/lib/components/ShortenerCard.svelte b/frontend/src/lib/components/ShortenerCard.svelte index 1e463c7..2d3b925 100644 --- a/frontend/src/lib/components/ShortenerCard.svelte +++ b/frontend/src/lib/components/ShortenerCard.svelte @@ -18,7 +18,7 @@ TrashIcon, } from 'lucide-svelte' import DeleteShortenerDialog from './DeleteShortenerDialog.svelte' - import EditLinkPage from '$lib/../routes/(app)/links/[id]/edit/+page.svelte' + import EditLinkPage from '$lib/../routes/(app)/dashboard/links/[id]/edit/+page.svelte' import { goto, preloadData, pushState } from '$app/navigation' import { cn } from '$lib/utils' @@ -41,16 +41,16 @@ const getUrl = () => { if (shortener.projectUuid) { - return `/projects/${shortener.projectUuid}` + return `/dashboard/projects/${shortener.projectUuid}` } - return '' + return '/dashboard' } let editProjectLinkOpen = false let editData: typeof $page.state.editLink const showEditModal = async (code: string) => { - const href = `/links/${code}/edit` + const href = `/dashboard/links/${code}/edit` const result = await preloadData(href) if (result.type === 'loaded' && result.status === 200) { @@ -70,7 +70,7 @@ const result = await preloadData(href) if (result.type === 'loaded' && result.status === 200) { - if (getUrl().startsWith('/projects')) { + if (getUrl().startsWith('/dashboard/projects')) { pushState(href, { projectLinkQR: result.data }) } else { pushState(href, { linkQR: result.data }) @@ -113,7 +113,7 @@
+ class="text-muted-foreground flex items-center gap-2 text-sm"> showEditModal(shortener.code)}> @@ -140,7 +140,7 @@ openDeleteDialog(shortener.code)} - class="flex items-center gap-2 text-destructive data-[highlighted]:bg-destructive"> + class="text-destructive data-[highlighted]:bg-destructive flex items-center gap-2"> Delete @@ -153,8 +153,8 @@
+
diff --git a/frontend/src/routes/(app)/links/(components)/form.svelte b/frontend/src/routes/(app)/dashboard/links/(components)/form.svelte similarity index 100% rename from frontend/src/routes/(app)/links/(components)/form.svelte rename to frontend/src/routes/(app)/dashboard/links/(components)/form.svelte diff --git a/frontend/src/routes/(app)/links/+layout.server.ts b/frontend/src/routes/(app)/dashboard/links/+layout.server.ts similarity index 86% rename from frontend/src/routes/(app)/links/+layout.server.ts rename to frontend/src/routes/(app)/dashboard/links/+layout.server.ts index 298417d..631f315 100644 --- a/frontend/src/routes/(app)/links/+layout.server.ts +++ b/frontend/src/routes/(app)/dashboard/links/+layout.server.ts @@ -5,7 +5,7 @@ export const load = (async (event) => { const breadcrumbs = [ ...parentBreadcrumbs, - { name: 'Links', path: '/links' }, + { name: 'Links', path: '/dashboard/links' }, ] const page_title = 'Links' diff --git a/frontend/src/routes/(app)/links/+page.server.ts b/frontend/src/routes/(app)/dashboard/links/+page.server.ts similarity index 100% rename from frontend/src/routes/(app)/links/+page.server.ts rename to frontend/src/routes/(app)/dashboard/links/+page.server.ts diff --git a/frontend/src/routes/(app)/links/+page.svelte b/frontend/src/routes/(app)/dashboard/links/+page.svelte similarity index 99% rename from frontend/src/routes/(app)/links/+page.svelte rename to frontend/src/routes/(app)/dashboard/links/+page.svelte index 5d5decf..aefec09 100644 --- a/frontend/src/routes/(app)/links/+page.svelte +++ b/frontend/src/routes/(app)/dashboard/links/+page.svelte @@ -67,9 +67,9 @@ }) const searchParams = urlParams.toString() if (searchParams) { - return '/links?' + searchParams + return '/dashboard/links?' + searchParams } else { - return '/links' + return '/dashboard/links' } } @@ -373,7 +373,7 @@ perPage={data.perPage} page={data.page} total={pagination[0].total} - path={'/links'} /> + path={'/dashboard/links'} /> {/await} { }) if (!shortener) { - redirect(300, `/links`) + redirect(300, `/dashboard/links`) } const projects = await db.query.project.findMany({ diff --git a/frontend/src/routes/(app)/links/[id]/edit/+page.svelte b/frontend/src/routes/(app)/dashboard/links/[id]/edit/+page.svelte similarity index 100% rename from frontend/src/routes/(app)/links/[id]/edit/+page.svelte rename to frontend/src/routes/(app)/dashboard/links/[id]/edit/+page.svelte diff --git a/frontend/src/routes/(app)/links/[id]/edit/schema.ts b/frontend/src/routes/(app)/dashboard/links/[id]/edit/schema.ts similarity index 100% rename from frontend/src/routes/(app)/links/[id]/edit/schema.ts rename to frontend/src/routes/(app)/dashboard/links/[id]/edit/schema.ts diff --git a/frontend/src/routes/(app)/links/[id]/qr/(components)/qr.svelte b/frontend/src/routes/(app)/dashboard/links/[id]/qr/(components)/qr.svelte similarity index 100% rename from frontend/src/routes/(app)/links/[id]/qr/(components)/qr.svelte rename to frontend/src/routes/(app)/dashboard/links/[id]/qr/(components)/qr.svelte diff --git a/frontend/src/routes/(app)/links/[id]/qr/+page.server.ts b/frontend/src/routes/(app)/dashboard/links/[id]/qr/+page.server.ts similarity index 94% rename from frontend/src/routes/(app)/links/[id]/qr/+page.server.ts rename to frontend/src/routes/(app)/dashboard/links/[id]/qr/+page.server.ts index 2a757db..a2a9375 100644 --- a/frontend/src/routes/(app)/links/[id]/qr/+page.server.ts +++ b/frontend/src/routes/(app)/dashboard/links/[id]/qr/+page.server.ts @@ -15,7 +15,7 @@ export const load = (async (event) => { }) if (!shortener) { - redirect(300, `/links`) + redirect(300, `/dashboard/links`) } const settings = await db.query.setting.findFirst({ diff --git a/frontend/src/routes/(app)/links/[id]/qr/+page.svelte b/frontend/src/routes/(app)/dashboard/links/[id]/qr/+page.svelte similarity index 100% rename from frontend/src/routes/(app)/links/[id]/qr/+page.svelte rename to frontend/src/routes/(app)/dashboard/links/[id]/qr/+page.svelte diff --git a/frontend/src/routes/(app)/links/schema.ts b/frontend/src/routes/(app)/dashboard/links/schema.ts similarity index 100% rename from frontend/src/routes/(app)/links/schema.ts rename to frontend/src/routes/(app)/dashboard/links/schema.ts diff --git a/frontend/src/routes/(app)/projects/+layout.server.ts b/frontend/src/routes/(app)/dashboard/projects/+layout.server.ts similarity index 85% rename from frontend/src/routes/(app)/projects/+layout.server.ts rename to frontend/src/routes/(app)/dashboard/projects/+layout.server.ts index fd55a7d..cbc3f7c 100644 --- a/frontend/src/routes/(app)/projects/+layout.server.ts +++ b/frontend/src/routes/(app)/dashboard/projects/+layout.server.ts @@ -4,7 +4,7 @@ export const load = (async (event) => { const { breadcrumbs: parentBreadcrumbs } = await event.parent() const breadcrumbs = [ ...parentBreadcrumbs, - { name: 'Projects', path: '/projects' }, + { name: 'Projects', path: '/dashboard/projects' }, ] const page_title = 'Projects' return { breadcrumbs, page_title } diff --git a/frontend/src/routes/(app)/projects/+page.server.ts b/frontend/src/routes/(app)/dashboard/projects/+page.server.ts similarity index 100% rename from frontend/src/routes/(app)/projects/+page.server.ts rename to frontend/src/routes/(app)/dashboard/projects/+page.server.ts diff --git a/frontend/src/routes/(app)/projects/+page.svelte b/frontend/src/routes/(app)/dashboard/projects/+page.svelte similarity index 93% rename from frontend/src/routes/(app)/projects/+page.svelte rename to frontend/src/routes/(app)/dashboard/projects/+page.svelte index f065daa..28be9f5 100644 --- a/frontend/src/routes/(app)/projects/+page.svelte +++ b/frontend/src/routes/(app)/dashboard/projects/+page.svelte @@ -69,9 +69,9 @@ {#if data.projects.length > 0}
{#each data.projects as project} - + + class="hover:bg-secondary w-[500px] hover:cursor-pointer"> {project.name} @@ -80,7 +80,7 @@
- - - - - - {/each} diff --git a/frontend/src/routes/(app)/settings/+layout.server.ts b/frontend/src/routes/(app)/dashboard/settings/+layout.server.ts similarity index 85% rename from frontend/src/routes/(app)/settings/+layout.server.ts rename to frontend/src/routes/(app)/dashboard/settings/+layout.server.ts index 2e59663..2e331d8 100644 --- a/frontend/src/routes/(app)/settings/+layout.server.ts +++ b/frontend/src/routes/(app)/dashboard/settings/+layout.server.ts @@ -5,7 +5,7 @@ export const load = (async (event) => { const breadcrumbs = [ ...parentBreadcrumbs, - { name: 'Settings', path: '/settings' }, + { name: 'Settings', path: '/dashboard/settings' }, ] const page_title = 'Settings' diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/dashboard/settings/+layout.svelte similarity index 100% rename from frontend/src/routes/(app)/settings/+layout.svelte rename to frontend/src/routes/(app)/dashboard/settings/+layout.svelte diff --git a/frontend/src/routes/(app)/settings/+page.server.ts b/frontend/src/routes/(app)/dashboard/settings/+page.server.ts similarity index 76% rename from frontend/src/routes/(app)/settings/+page.server.ts rename to frontend/src/routes/(app)/dashboard/settings/+page.server.ts index 80f0002..76567ad 100644 --- a/frontend/src/routes/(app)/settings/+page.server.ts +++ b/frontend/src/routes/(app)/dashboard/settings/+page.server.ts @@ -2,5 +2,5 @@ import { redirect } from '@sveltejs/kit' import type { PageServerLoad } from './$types' export const load = (async () => { - redirect(300, '/settings/account'); + redirect(300, '/dashboard/settings/account') }) satisfies PageServerLoad diff --git a/frontend/src/routes/(app)/settings/account/(components)/form.svelte b/frontend/src/routes/(app)/dashboard/settings/account/(components)/form.svelte similarity index 100% rename from frontend/src/routes/(app)/settings/account/(components)/form.svelte rename to frontend/src/routes/(app)/dashboard/settings/account/(components)/form.svelte diff --git a/frontend/src/routes/(app)/settings/account/+page.server.ts b/frontend/src/routes/(app)/dashboard/settings/account/+page.server.ts similarity index 100% rename from frontend/src/routes/(app)/settings/account/+page.server.ts rename to frontend/src/routes/(app)/dashboard/settings/account/+page.server.ts diff --git a/frontend/src/routes/(app)/settings/account/+page.svelte b/frontend/src/routes/(app)/dashboard/settings/account/+page.svelte similarity index 100% rename from frontend/src/routes/(app)/settings/account/+page.svelte rename to frontend/src/routes/(app)/dashboard/settings/account/+page.svelte diff --git a/frontend/src/routes/(app)/settings/account/schema.ts b/frontend/src/routes/(app)/dashboard/settings/account/schema.ts similarity index 100% rename from frontend/src/routes/(app)/settings/account/schema.ts rename to frontend/src/routes/(app)/dashboard/settings/account/schema.ts diff --git a/frontend/src/routes/(app)/settings/qr/(components)/DemoQR.svelte b/frontend/src/routes/(app)/dashboard/settings/qr/(components)/DemoQR.svelte similarity index 100% rename from frontend/src/routes/(app)/settings/qr/(components)/DemoQR.svelte rename to frontend/src/routes/(app)/dashboard/settings/qr/(components)/DemoQR.svelte diff --git a/frontend/src/routes/(app)/settings/qr/+page.server.ts b/frontend/src/routes/(app)/dashboard/settings/qr/+page.server.ts similarity index 100% rename from frontend/src/routes/(app)/settings/qr/+page.server.ts rename to frontend/src/routes/(app)/dashboard/settings/qr/+page.server.ts diff --git a/frontend/src/routes/(app)/settings/qr/+page.svelte b/frontend/src/routes/(app)/dashboard/settings/qr/+page.svelte similarity index 100% rename from frontend/src/routes/(app)/settings/qr/+page.svelte rename to frontend/src/routes/(app)/dashboard/settings/qr/+page.svelte diff --git a/frontend/src/routes/(app)/settings/qr/schema.ts b/frontend/src/routes/(app)/dashboard/settings/qr/schema.ts similarity index 100% rename from frontend/src/routes/(app)/settings/qr/schema.ts rename to frontend/src/routes/(app)/dashboard/settings/qr/schema.ts diff --git a/frontend/src/routes/(landing)/landing/+page.svelte b/frontend/src/routes/(landing)/+page.svelte similarity index 98% rename from frontend/src/routes/(landing)/landing/+page.svelte rename to frontend/src/routes/(landing)/+page.svelte index 665119a..07d5795 100644 --- a/frontend/src/routes/(landing)/landing/+page.svelte +++ b/frontend/src/routes/(landing)/+page.svelte @@ -32,7 +32,7 @@ Kon.sh is completely self-hostable, open source, and free. No vendor lock-in, can be hosted using docker/docker compose with no limitations. -

diff --git a/frontend/src/routes/(landing)/landing/[...catchall]/+page.server.ts b/frontend/src/routes/(landing)/[...catchall]/+page.server.ts similarity index 81% rename from frontend/src/routes/(landing)/landing/[...catchall]/+page.server.ts rename to frontend/src/routes/(landing)/[...catchall]/+page.server.ts index 612734e..b6f7a86 100644 --- a/frontend/src/routes/(landing)/landing/[...catchall]/+page.server.ts +++ b/frontend/src/routes/(landing)/[...catchall]/+page.server.ts @@ -2,5 +2,5 @@ import type { PageServerLoad } from './$types' import { redirect } from '@sveltejs/kit' export const load = (async () => { - return redirect(300, '/landing') + return redirect(300, '/') }) satisfies PageServerLoad diff --git a/frontend/src/routes/(app)/[...catchall]/+page.svelte b/frontend/src/routes/(landing)/[...catchall]/+page.svelte similarity index 84% rename from frontend/src/routes/(app)/[...catchall]/+page.svelte rename to frontend/src/routes/(landing)/[...catchall]/+page.svelte index 4b3706d..55acd07 100644 --- a/frontend/src/routes/(app)/[...catchall]/+page.svelte +++ b/frontend/src/routes/(landing)/[...catchall]/+page.svelte @@ -9,7 +9,6 @@
404
Page Not Found
- +
diff --git a/frontend/static/robots.txt b/frontend/static/robots.txt index b265293..09241a6 100644 --- a/frontend/static/robots.txt +++ b/frontend/static/robots.txt @@ -1,5 +1,5 @@ User-agent: * -Disallow: / +Allow: / User-agent: * -Allow: /landing \ No newline at end of file +Disallow: /dashboard diff --git a/redirect/src/index.ts b/redirect/src/index.ts index afd35e6..99ef2b4 100644 --- a/redirect/src/index.ts +++ b/redirect/src/index.ts @@ -19,7 +19,7 @@ const clickLimiter = new LRUCache({ const app = new Elysia().use(cors()).use(rateLimit({ duration: 1000 })) -app.get('/', ({ set }) => (set.redirect = fallback_url + '/landing')) +app.get('/', ({ set }) => (set.redirect = fallback_url)) app.get('/invalid', () => 'Invalid Shortener') app.get('/robots.txt', () => Bun.file('public/robots.txt'))