moved landing page to root and moved app to /dashboard

frontend/src/hooks.server.ts

@@ -6,30 +6,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 
 	const pathname = event.url.pathname
 
-	if (pathname.startsWith('/landing')) {
+	if (pathname.startsWith('/dashboard')) {
-		const response = await resolve(event)
-
-		return response
-	}
-
-	const allowedPath = ['/login', '/signup']
-
-	if (allowedPath.includes(pathname)) {
-		if (sessionId) {
-			redirect(303, '/')
-		}
-		event.locals.session = null
-		const response = await resolve(event)
-
-		return response
-	}
-
-	if (pathname.startsWith('/api')) {
-		const response = await resolve(event)
-
-		return response
-	}
-
 		if (!sessionId) {
 			redirect(303, '/login')
 		}
@@ -61,5 +38,22 @@ export const handle: Handle = async ({ event, resolve }) => {
 
 		const response = await resolve(event)
 
+		return response
+	}
+
+	const authPaths = ['/login', '/signup']
+
+	if (authPaths.includes(pathname)) {
+		if (sessionId) {
+			redirect(303, '/dashboard')
+		}
+		event.locals.session = null
+		const response = await resolve(event)
+
+		return response
+	}
+
+	const response = await resolve(event)
+
 	return response
 }

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 @@
 				</Tooltip.Root>
 
 				<div
-					class="flex items-center gap-2 text-sm text-muted-foreground">
+					class="text-muted-foreground flex items-center gap-2 text-sm">
 					<a
 						href={'https://' + shortenerUrl + '/' + shortener.code}
 						target="_blank"
@@ -131,7 +131,7 @@
 				<DropdownMenu.Content>
 					<DropdownMenu.Group>
 						<a
-							href={`/links/${shortener.code}/edit`}
+							href={`/dashboard/links/${shortener.code}/edit`}
 							on:click|preventDefault={() =>
 								showEditModal(shortener.code)}>
 							<DropdownMenu.Item class="flex items-center gap-2">
@@ -140,7 +140,7 @@
 						</a>
 						<DropdownMenu.Item
 							on:click={() => 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">
 							<TrashIcon size={16} />
 							Delete
 						</DropdownMenu.Item>
@@ -153,8 +153,8 @@
 		<div class="flex items-center justify-between">
 			<div class="flex gap-2">
 				<Button
-					href={`/links/${shortener.code}`}
+					href={`/dashboard/links/${shortener.code}`}
-					class="flex h-8 items-center justify-center gap-1 rounded bg-secondary text-sm">
+					class="bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm">
 					<BarChart size={20} />
 					<div>
 						{shortener.visitorCount} visits
@@ -163,7 +163,7 @@
 				<a
 					class={cn(
 						buttonVariants({ variant: 'default' }),
-						'flex h-8 items-center justify-center gap-1 rounded bg-secondary text-sm',
+						'bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm',
 					)}
 					href={`${getUrl()}/links/${shortener.code}/qr`}
 					on:click|preventDefault={showQRModal}>

frontend/src/lib/components/UserIcon.svelte

@@ -38,7 +38,7 @@
 			<DropdownMenu.Separator />
 			<DropdownMenu.Item
 				on:click={() => {
-					goto('/settings')
+					goto('/dashboard/settings')
 					onClick()
 				}}>
 				Settings
@@ -61,8 +61,9 @@
 			</AlertDialog.Description>
 		</AlertDialog.Header>
 		<AlertDialog.Footer>
-			<AlertDialog.Cancel disabled={isLoading}
+			<AlertDialog.Cancel disabled={isLoading}>
-				>Cancel</AlertDialog.Cancel>
+				Cancel
+			</AlertDialog.Cancel>
 			<Button
 				on:click={logout}
 				class="flex gap-2"

frontend/src/lib/components/sidebar.svelte

@@ -10,38 +10,42 @@
 
 	const routes = [
 		{
-			href: '/',
+			href: '/dashboard',
 			name: 'Home',
-			regex: createRegExp(exactly('/').notBefore(word)),
+			regex: createRegExp(exactly('/dashboard/').notBefore(word)),
 			icon: Home,
 		},
 		{
-			href: '/links',
+			href: '/dashboard/links',
 			name: 'Links',
 			regex: createRegExp(
-				exactly('/links')
+				exactly('/dashboard/links')
 					.at.lineStart()
-					.or(exactly('/links/').notBefore(word).and(word)),
+					.or(exactly('/dashboard/links/').notBefore(word).and(word)),
 			),
 			icon: Link,
 		},
 		{
-			href: '/projects',
+			href: '/dashboard/projects',
 			name: 'Projects',
 			regex: createRegExp(
-				exactly('/projects')
+				exactly('/dashboard/projects')
 					.at.lineStart()
-					.or(exactly('/projects/').notBefore(word).and(word)),
+					.or(
+						exactly('/dashboard/projects/').notBefore(word).and(word),
+					),
 			),
 			icon: Blocks,
 		},
 		{
-			href: '/settings/account',
+			href: '/dashboard/settings/account',
 			name: 'Settings',
 			regex: createRegExp(
-				exactly('/settings')
+				exactly('/dashboard/settings')
 					.at.lineStart()
-					.or(exactly('/settings/').notBefore(word).and(word)),
+					.or(
+						exactly('/dashboard/settings/').notBefore(word).and(word),
+					),
 			),
 			icon: Settings,
 		},
@@ -61,7 +65,7 @@
 						? 'secondary'
 						: 'ghost'}
 					href={route.href}
-					class="flex items-center justify-start gap-4 text-base hover:bg-secondary/50">
+					class="hover:bg-secondary/50 flex items-center justify-start gap-4 text-base">
 					<svelte:component this={route.icon} class="h-4 w-4" />
 					<div class="hidden lg:flex">
 						{route.name}

frontend/src/routes/(app)/dashboard/+layout.server.ts

@@ -4,7 +4,7 @@ import type { LayoutServerLoad } from './$types'
 export const load = (async (event) => {
 	const user = event.locals.user
 
-	const breadcrumbs = [{ name: 'Home', path: '/' }]
+	const breadcrumbs = [{ name: 'Home', path: '/dashboard' }]
 
 	const page_title = 'Home'
 

frontend/src/routes/(app)/dashboard/+page.svelte

@@ -8,31 +8,31 @@
 	export let data: PageData
 </script>
 
-<div class="flex flex-col gap-4 py-8 px-10">
+<div class="flex flex-col gap-4 px-10 py-8">
 	<h2 class="text-2xl font-bold tracking-tight">Projects</h2>
 	<Separator class="" />
 </div>
 
-<div class="flex flex-wrap gap-2 items-stretch px-6 w-full">
+<div class="flex w-full flex-wrap items-stretch gap-2 px-6">
 	{#each data.projects as project}
-		<a href={'/projects/' + project.uuid}>
+		<a href={'/dashboard/projects/' + project.uuid}>
 			<Card.Root
-				class="hover:cursor-pointer w-[500px] hover:bg-secondary">
+				class="hover:bg-secondary w-[500px] hover:cursor-pointer">
 				<Card.Header>
-					<Card.Title class="flex gap-2 items-center">
+					<Card.Title class="flex items-center gap-2">
 						{project.name}
 					</Card.Title>
 				</Card.Header>
 				<Card.Content>
-					<div class="flex gap-4 w-full">
+					<div class="flex w-full gap-4">
 						<Button
-							class="flex gap-1 justify-center items-center h-8 text-sm rounded bg-secondary">
+							class="bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm">
 							<ExternalLink size={20} />
 							{project.shortener.length}
 							Shorteners
 						</Button>
 						<Button
-							class="flex gap-1 justify-center items-center h-8 text-sm rounded bg-secondary">
+							class="bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm">
 							<BarChart size={20} />
 							{project.shortener.reduce(
 								(curr, shortener) => shortener.visitor.length + curr,

frontend/src/routes/(app)/dashboard/[...catchall]/+page.svelte

@@ -3,13 +3,14 @@
 	import Button from '$lib/components/ui/button/button.svelte'
 </script>
 
-<div class="flex justify-center items-center w-full h-full">
+<div class="flex h-full w-full items-center justify-center">
-	<div class="flex flex-col gap-12 items-center">
+	<div class="flex flex-col items-center gap-12">
-		<div class="flex flex-col gap-4 items-center">
+		<div class="flex flex-col items-center gap-4">
 			<div class="text-4xl font-bold">404</div>
 			<div class="text-4xl font-bold">Page Not Found</div>
 		</div>
-		<Button on:click={() => goto('/landing')} class="w-fit"
+		<Button on:click={() => goto('/dashboard')} class="w-fit">
-			>Return</Button>
+			Return Home
+		</Button>
 	</div>
 </div>

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'

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}
 
 <Dialog.Root

frontend/src/routes/(app)/dashboard/links/[id]/edit/+page.server.ts

@@ -28,7 +28,7 @@ export const load = (async (event) => {
 	})
 
 	if (!shortener) {
-		redirect(300, `/links`)
+		redirect(300, `/dashboard/links`)
 	}
 
 	const projects = await db.query.project.findMany({

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({

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 }

frontend/src/routes/(app)/dashboard/projects/+page.svelte

@@ -69,9 +69,9 @@
 {#if data.projects.length > 0}
 	<div class="flex flex-wrap gap-4 overflow-scroll p-4">
 		{#each data.projects as project}
-			<a href={'/projects/' + project.uuid}>
+			<a href={'/dashboard/projects/' + project.uuid}>
 				<Card.Root
-					class="w-[500px] hover:cursor-pointer hover:bg-secondary">
+					class="hover:bg-secondary w-[500px] hover:cursor-pointer">
 					<Card.Header>
 						<Card.Title class="flex items-center gap-2">
 							{project.name}
@@ -80,7 +80,7 @@
 					<Card.Content>
 						<div class="flex w-full justify-between">
 							<Button
-								class="flex h-8 items-center justify-center gap-1 rounded bg-secondary text-sm">
+								class="bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm">
 								<ExternalLink size={20} />
 								{project.shortener.length}
 								Shorteners

frontend/src/routes/(app)/dashboard/projects/[id]/(components)/ShortenerCard.svelte

@@ -40,7 +40,7 @@
 	let editData: typeof $page.state.editProjectLink
 
 	const showEditModal = async (projectUuid: string, code: string) => {
-		const href = `/projects/${projectUuid}/links/${code}/edit`
+		const href = `/dashboard/projects/${projectUuid}/links/${code}/edit`
 		const result = await preloadData(href)
 
 		if (result.type === 'loaded' && result.status === 200) {
@@ -98,7 +98,7 @@
 				</Tooltip.Root>
 
 				<div
-					class="flex items-center gap-2 text-sm text-muted-foreground">
+					class="text-muted-foreground flex items-center gap-2 text-sm">
 					<a
 						href={'https://' + shortenerUrl + '/' + shortener.code}
 						target="_blank"
@@ -116,7 +116,7 @@
 				<DropdownMenu.Content>
 					<DropdownMenu.Group>
 						<a
-							href={`/projects/${selected_project.uuid}/links/${shortener.code}/edit`}
+							href={`/dashboard/projects/${selected_project.uuid}/links/${shortener.code}/edit`}
 							on:click|preventDefault={() =>
 								showEditModal(
 									selected_project.uuid || '',
@@ -128,7 +128,7 @@
 						</a>
 						<DropdownMenu.Item
 							on:click={() => 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">
 							<TrashIcon size={16} />
 							Delete
 						</DropdownMenu.Item>
@@ -141,8 +141,8 @@
 		<div class="flex items-center justify-between">
 			<div class="flex gap-2">
 				<Button
-					href={`/links/${shortener.code}`}
+					href={`/dashboard/links/${shortener.code}`}
-					class="flex h-8 items-center justify-center gap-1 rounded bg-secondary text-sm">
+					class="bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm">
 					<BarChart size={20} />
 					<div>
 						{shortener.visitorCount} visits
@@ -151,9 +151,9 @@
 				<a
 					class={cn(
 						buttonVariants({ variant: 'default' }),
-						'flex h-8 items-center justify-center gap-1 rounded bg-secondary text-sm',
+						'bg-secondary flex h-8 items-center justify-center gap-1 rounded text-sm',
 					)}
-					href={`/projects/${selected_project.uuid}/links/${shortener.code}/qr`}
+					href={`/dashboard/projects/${selected_project.uuid}/links/${shortener.code}/qr`}
 					on:click|preventDefault={showQRModal}>
 					<QrCode size={20} />
 				</a>

frontend/src/routes/(app)/dashboard/projects/[id]/+layout.server.ts

@@ -12,16 +12,19 @@ export const load = (async (event) => {
 		})
 
 		if (!project) {
-			redirect(300, '/projects')
+			redirect(300, '/dashboard/projects')
 		}
 
 		const { breadcrumbs: parentBreadcrumbs } = await event.parent()
 		const breadcrumbs = [
 			...parentBreadcrumbs,
-			{ name: project.name, path: `/projects/${project.uuid}` },
+			{
+				name: project.name,
+				path: `/dashboard/projects/${project.uuid}`,
+			},
 		]
 		return { breadcrumbs, project }
 	} catch (e) {
-		redirect(300, '/projects')
+		redirect(300, '/dashboard/projects')
 	}
 }) satisfies LayoutServerLoad

frontend/src/routes/(app)/dashboard/projects/[id]/+layout.svelte

@@ -18,23 +18,17 @@
 			<ScrollArea orientation="horizontal">
 				<div class="flex items-center gap-4">
 					<Button
-						href={`/projects/${data.project.uuid}`}
+						href={`/dashboard/projects/${data.project.uuid}`}
 						variant={$page.url.pathname ===
-						`/projects/${data.project.uuid}`
+						`/dashboard/projects/${data.project.uuid}`
 							? 'secondary'
 							: 'ghost'}>
 						Shorteners
 					</Button>
-					<!-- <Button -->
-					<!-- 	href={`/projects/${data.project.uuid}/members`} -->
-					<!-- 	variant={$page.url.pathname === -->
-					<!-- 	`/projects/${data.project.uuid}/members` -->
-					<!-- 		? 'secondary' -->
-					<!-- 		: 'ghost'}>Members</Button> -->
 					<Button
-						href={`/projects/${data.project.uuid}/settings`}
+						href={`/dashboard/projects/${data.project.uuid}/settings`}
 						variant={$page.url.pathname ===
-						`/projects/${data.project.uuid}/settings`
+						`/dashboard/projects/${data.project.uuid}/settings`
 							? 'secondary'
 							: 'ghost'}>
 						Settings

frontend/src/routes/(app)/dashboard/projects/[id]/+page.svelte

@@ -51,9 +51,12 @@
 		})
 		const searchParams = urlParams.toString()
 		if (searchParams) {
-			return `/projects/${data.selectedProject.uuid}?` + searchParams
+			return (
+				`/dashboard/projects/${data.selectedProject.uuid}?` +
+				searchParams
+			)
 		} else {
-			return '/projects/' + data.selectedProject.uuid
+			return '/dashboard/projects/' + data.selectedProject.uuid
 		}
 	}
 
@@ -216,7 +219,7 @@
 		perPage={data.perPage}
 		page={data.page}
 		total={pagination[0].total}
-		path={'/projects/' + data.selectedProject.uuid} />
+		path={'/dashboard/projects/' + data.selectedProject.uuid} />
 {/await}
 
 <Dialog.Root

frontend/src/routes/(app)/dashboard/projects/[id]/links/[linkid]/edit/+page.server.ts

@@ -30,7 +30,7 @@ export const load = (async (event) => {
 	})
 
 	if (!shortener) {
-		redirect(300, `/projects/${selectedProject.id}`)
+		redirect(300, `/dashboard/projects/${selectedProject.id}`)
 	}
 
 	return {

frontend/src/routes/(app)/dashboard/projects/[id]/links/[linkid]/qr/+page.server.ts

@@ -18,7 +18,7 @@ export const load = (async (event) => {
 	})
 
 	if (!shortener) {
-		redirect(300, `/projects/${selectedProject.id}`)
+		redirect(300, `/dashboard/projects/${selectedProject.id}`)
 	}
 
 	return { shortener, project: selectedProject }

frontend/src/routes/(app)/dashboard/settings/(components)/sidebar-nav.svelte

@@ -8,11 +8,11 @@
 	const items = [
 		{
 			title: 'Account',
-			href: '/settings/account',
+			href: '/dashboard/settings/account',
 		},
 		{
 			title: 'QR',
-			href: '/settings/qr',
+			href: '/dashboard/settings/qr',
 		},
 	] as const
 </script>
@@ -28,7 +28,7 @@
 			variant={$page.url.pathname == item.href
 				? 'secondary'
 				: 'ghost'}
-			class="justify-start hover:bg-secondary/50">
+			class="hover:bg-secondary/50 justify-start">
 			{item.title}
 		</Button>
 	{/each}

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'

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

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.
-				<!-- <a href="/landing/docs" class="text-orange-400 underline">
+				<!-- <a href="/docs" class="text-orange-400 underline">
 					Learn More
 				</a> -->
 			</p>

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

frontend/src/routes/(landing)/[...catchall]/+page.svelte

@@ -9,7 +9,6 @@
 			<div class="text-4xl font-bold">404</div>
 			<div class="text-4xl font-bold">Page Not Found</div>
 		</div>
-		<Button on:click={() => goto('/')} class="w-fit"
+		<Button on:click={() => goto('/')} class="w-fit">Return</Button>
-			>Return Home</Button>
 	</div>
 </div>

frontend/static/robots.txt

@@ -1,5 +1,5 @@
 User-agent: *
-Disallow: /
+Allow: /
 
 User-agent: *
-Allow: /landing
+Disallow: /dashboard

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'))