From 2b58ff029107b23617d8c4b246de77876b3bf053 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Wed, 28 Sep 2022 00:21:37 +0800 Subject: feat: Move frontend into layout group (main) This enables /book to load without the usual layout (app layout) --- apps/kit/src/routes/(main)/(app)/+layout.svelte | 215 +++++++++++++++++++++ apps/kit/src/routes/(main)/(app)/home/+page.svelte | 1 + apps/kit/src/routes/(main)/(public)/+layout.svelte | 1 + .../src/routes/(main)/(public)/login/+page.svelte | 136 +++++++++++++ .../src/routes/(main)/(public)/reset/+page.svelte | 104 ++++++++++ .../src/routes/(main)/(public)/signup/+page.svelte | 38 ++++ apps/kit/src/routes/(main)/+layout.server.ts | 13 ++ apps/kit/src/routes/(main)/+layout.svelte | 41 ++++ apps/kit/src/routes/(main)/+layout.ts | 9 + apps/kit/src/routes/(main)/+page.svelte | 2 + 10 files changed, 560 insertions(+) create mode 100644 apps/kit/src/routes/(main)/(app)/+layout.svelte create mode 100644 apps/kit/src/routes/(main)/(app)/home/+page.svelte create mode 100644 apps/kit/src/routes/(main)/(public)/+layout.svelte create mode 100644 apps/kit/src/routes/(main)/(public)/login/+page.svelte create mode 100644 apps/kit/src/routes/(main)/(public)/reset/+page.svelte create mode 100644 apps/kit/src/routes/(main)/(public)/signup/+page.svelte create mode 100644 apps/kit/src/routes/(main)/+layout.server.ts create mode 100644 apps/kit/src/routes/(main)/+layout.svelte create mode 100644 apps/kit/src/routes/(main)/+layout.ts create mode 100644 apps/kit/src/routes/(main)/+page.svelte (limited to 'apps/kit/src/routes/(main)') diff --git a/apps/kit/src/routes/(main)/(app)/+layout.svelte b/apps/kit/src/routes/(main)/(app)/+layout.svelte new file mode 100644 index 0000000..3f60af3 --- /dev/null +++ b/apps/kit/src/routes/(main)/(app)/+layout.svelte @@ -0,0 +1,215 @@ + + + +{#if !online} +
+
+
+ +
+
+

+ You seem to be offline, please check your internet connection. +

+
+
+
+{/if} +
+ + sidebarIsOpen = !sidebarIsOpen}> + +
+ + +
+ + + +
+ +
+ + +
+ +
+
+ +
+
+

+ {username} +

+

+ {$LL.nav.usermenu.profileTitle()} +

+
+
+ +
+ + + +
+ + + + + +
+
+
+
+ +
+
+
+
+
+ + +
+ +
+
+
\ No newline at end of file diff --git a/apps/kit/src/routes/(main)/(app)/home/+page.svelte b/apps/kit/src/routes/(main)/(app)/home/+page.svelte new file mode 100644 index 0000000..247ee47 --- /dev/null +++ b/apps/kit/src/routes/(main)/(app)/home/+page.svelte @@ -0,0 +1 @@ +

Welcome Home

\ No newline at end of file diff --git a/apps/kit/src/routes/(main)/(public)/+layout.svelte b/apps/kit/src/routes/(main)/(public)/+layout.svelte new file mode 100644 index 0000000..49aeb95 --- /dev/null +++ b/apps/kit/src/routes/(main)/(public)/+layout.svelte @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/(public)/login/+page.svelte b/apps/kit/src/routes/(main)/(public)/login/+page.svelte new file mode 100644 index 0000000..9e2f6e7 --- /dev/null +++ b/apps/kit/src/routes/(main)/(public)/login/+page.svelte @@ -0,0 +1,136 @@ + + +
+
+

+ {$LL.login.loginToYourAccount()} +

+

+ {$LL.common.or()} + {$LL.login.createANewAccount()} +

+
+
+
+ {#if error.text || error.title} +
+ {#if error.title} +

+ {error.title} +

+ {/if} + {#if error.text} +
+ {error.text} +
+ {/if} +
+ {/if} +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + +
+ +
+ {$LL.login.forgotPassword()} +
+
+ +
+ +
+
+
+
+
diff --git a/apps/kit/src/routes/(main)/(public)/reset/+page.svelte b/apps/kit/src/routes/(main)/(public)/reset/+page.svelte new file mode 100644 index 0000000..5092b4b --- /dev/null +++ b/apps/kit/src/routes/(main)/(public)/reset/+page.svelte @@ -0,0 +1,104 @@ + + +
+
+

+ {$LL.reset.resetPassword()} +

+

+ {$LL.common.or()} + {$LL.reset.gotoLoginPage().toLowerCase()} +

+
+ +
+
+
+ + + +
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/apps/kit/src/routes/(main)/(public)/signup/+page.svelte b/apps/kit/src/routes/(main)/(public)/signup/+page.svelte new file mode 100644 index 0000000..d4a1bda --- /dev/null +++ b/apps/kit/src/routes/(main)/(public)/signup/+page.svelte @@ -0,0 +1,38 @@ +
+
+

Create your new account

+

+ Or + go to login page +

+
+ +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+
diff --git a/apps/kit/src/routes/(main)/+layout.server.ts b/apps/kit/src/routes/(main)/+layout.server.ts new file mode 100644 index 0000000..01aae89 --- /dev/null +++ b/apps/kit/src/routes/(main)/+layout.server.ts @@ -0,0 +1,13 @@ +// import {is_active} from "$lib/session"; +// import {redirect} from "@sveltejs/kit"; +// import type {LayoutServerLoad} from "./$types"; +// +// export const load: LayoutServerLoad = async ({routeId}) => { +// const sessionIsValid = await is_active(); +// const isPublicRoute = routeId?.startsWith("(public)"); +// if (sessionIsValid && isPublicRoute) { +// throw redirect(302, "/home"); +// } else if (!sessionIsValid && !isPublicRoute) { +// throw redirect(302, "/login"); +// } +// }; \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/+layout.svelte b/apps/kit/src/routes/(main)/+layout.svelte new file mode 100644 index 0000000..e5b177e --- /dev/null +++ b/apps/kit/src/routes/(main)/+layout.svelte @@ -0,0 +1,41 @@ + + + + diff --git a/apps/kit/src/routes/(main)/+layout.ts b/apps/kit/src/routes/(main)/+layout.ts new file mode 100644 index 0000000..de8a5c0 --- /dev/null +++ b/apps/kit/src/routes/(main)/+layout.ts @@ -0,0 +1,9 @@ +import type {Locales} from "$lib/i18n/i18n-types"; +import {loadLocaleAsync} from "$lib/i18n/i18n-util.async"; +import type {LayoutLoad} from "./$types"; + +export const load: LayoutLoad<{ locale: Locales }> = async ({url, params}) => { + let lang = "en" as Locales; + await loadLocaleAsync(lang); + return {locale: lang}; +}; \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/+page.svelte b/apps/kit/src/routes/(main)/+page.svelte new file mode 100644 index 0000000..85a4d2d --- /dev/null +++ b/apps/kit/src/routes/(main)/+page.svelte @@ -0,0 +1,2 @@ + +

Hold on...

-- cgit v1.3