From b7e39b59fd0fc7b5610ebff29035bf622079e0d8 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Wed, 5 Oct 2022 20:45:21 +0800 Subject: refactor: Change file structure --- apps/kit/src/routes/(main)/(app)/+layout.svelte | 297 --------------------- apps/kit/src/routes/(main)/(app)/home/+page.svelte | 1 - apps/kit/src/routes/(main)/(app)/org/+page.svelte | 4 - .../src/routes/(main)/(app)/profile/+page.svelte | 4 - .../src/routes/(main)/(app)/projects/+page.svelte | 4 - .../src/routes/(main)/(app)/settings/+page.svelte | 4 - .../src/routes/(main)/(app)/tickets/+page.svelte | 4 - apps/kit/src/routes/(main)/(app)/todo/+page.svelte | 4 - apps/kit/src/routes/(main)/(app)/wiki/+page.svelte | 4 - apps/kit/src/routes/(main)/(public)/+layout.svelte | 18 -- .../(main)/(public)/reset-password/+page.svelte | 82 ------ .../(public)/reset-password/[id]/+page.server.ts | 11 - .../(public)/reset-password/[id]/+page.svelte | 132 --------- .../routes/(main)/(public)/sign-in/+page.svelte | 153 ----------- .../kit/src/routes/(main)/(public)/sign-in/test.ts | 12 - .../routes/(main)/(public)/sign-up/+page.svelte | 82 ------ apps/kit/src/routes/(main)/+layout.server.ts | 34 --- apps/kit/src/routes/(main)/+layout.svelte | 29 -- apps/kit/src/routes/(main)/+layout.ts | 15 -- apps/kit/src/routes/(main)/+page.svelte | 1 - 20 files changed, 895 deletions(-) delete mode 100644 apps/kit/src/routes/(main)/(app)/+layout.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/home/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/org/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/profile/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/projects/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/settings/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/tickets/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/todo/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(app)/wiki/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(public)/+layout.svelte delete mode 100644 apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.server.ts delete mode 100644 apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/(public)/sign-in/test.ts delete mode 100644 apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte delete mode 100644 apps/kit/src/routes/(main)/+layout.server.ts delete mode 100644 apps/kit/src/routes/(main)/+layout.svelte delete mode 100644 apps/kit/src/routes/(main)/+layout.ts delete 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 deleted file mode 100644 index 0be6ff3..0000000 --- a/apps/kit/src/routes/(main)/(app)/+layout.svelte +++ /dev/null @@ -1,297 +0,0 @@ - - -
- - - (sidebarOpen = false)}> - -
- - -
- - - -
- -
-
- -
-
- -
-
-
- - - - - -
- -
- -
-
-
- -
- -
-
-
-
- - -
- - Open user menu - -
- - -
- - View profile - - - Settings - -
- - sign_out()} class="text-gray-700 block px-4 py-2 text-sm"> Sign out - -
-
-
-
-
-
-
-
-
- -
-
-
diff --git a/apps/kit/src/routes/(main)/(app)/home/+page.svelte b/apps/kit/src/routes/(main)/(app)/home/+page.svelte deleted file mode 100644 index 247ee47..0000000 --- a/apps/kit/src/routes/(main)/(app)/home/+page.svelte +++ /dev/null @@ -1 +0,0 @@ -

Welcome Home

\ No newline at end of file diff --git a/apps/kit/src/routes/(main)/(app)/org/+page.svelte b/apps/kit/src/routes/(main)/(app)/org/+page.svelte deleted file mode 100644 index 429ec25..0000000 --- a/apps/kit/src/routes/(main)/(app)/org/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

$ORGNAME

diff --git a/apps/kit/src/routes/(main)/(app)/profile/+page.svelte b/apps/kit/src/routes/(main)/(app)/profile/+page.svelte deleted file mode 100644 index 7c6eb3e..0000000 --- a/apps/kit/src/routes/(main)/(app)/profile/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

Hi, Ivar

diff --git a/apps/kit/src/routes/(main)/(app)/projects/+page.svelte b/apps/kit/src/routes/(main)/(app)/projects/+page.svelte deleted file mode 100644 index 6413e1d..0000000 --- a/apps/kit/src/routes/(main)/(app)/projects/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

Projects

diff --git a/apps/kit/src/routes/(main)/(app)/settings/+page.svelte b/apps/kit/src/routes/(main)/(app)/settings/+page.svelte deleted file mode 100644 index ae6d403..0000000 --- a/apps/kit/src/routes/(main)/(app)/settings/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

Settings

diff --git a/apps/kit/src/routes/(main)/(app)/tickets/+page.svelte b/apps/kit/src/routes/(main)/(app)/tickets/+page.svelte deleted file mode 100644 index 2a4792b..0000000 --- a/apps/kit/src/routes/(main)/(app)/tickets/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

Tickets

diff --git a/apps/kit/src/routes/(main)/(app)/todo/+page.svelte b/apps/kit/src/routes/(main)/(app)/todo/+page.svelte deleted file mode 100644 index e29f263..0000000 --- a/apps/kit/src/routes/(main)/(app)/todo/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

Todo

diff --git a/apps/kit/src/routes/(main)/(app)/wiki/+page.svelte b/apps/kit/src/routes/(main)/(app)/wiki/+page.svelte deleted file mode 100644 index 1762d43..0000000 --- a/apps/kit/src/routes/(main)/(app)/wiki/+page.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -

Wiki

diff --git a/apps/kit/src/routes/(main)/(public)/+layout.svelte b/apps/kit/src/routes/(main)/(public)/+layout.svelte deleted file mode 100644 index 69c29c5..0000000 --- a/apps/kit/src/routes/(main)/(public)/+layout.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte b/apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte deleted file mode 100644 index aa26892..0000000 --- a/apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - -
-
-

- {$LL.resetPasswordPage.requestAPasswordReset()} -

-

- {$LL.or().toLowerCase()} - - {$LL.signIntoYourAccount().toLowerCase()} - -

-
- -
-
-
- - - - - -
-
-
diff --git a/apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.server.ts b/apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.server.ts deleted file mode 100644 index 389d04c..0000000 --- a/apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.server.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { is_guid } from '$lib/helpers'; -import { redirect } from '@sveltejs/kit'; -import type { PageServerLoad } from './$types'; - -export const load: PageServerLoad = async ({ params }) => { - const resetRequestId = params.id ?? ""; - if (!is_guid(resetRequestId)) throw redirect(302, "/reset-password"); - return { - resetRequestId - }; -}; \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.svelte b/apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.svelte deleted file mode 100644 index 562d902..0000000 --- a/apps/kit/src/routes/(main)/(public)/reset-password/[id]/+page.svelte +++ /dev/null @@ -1,132 +0,0 @@ - - -
- {#if finishedPreliminaryLoading} -
-

- {$LL.resetPasswordPage.setANewPassword()} -

-

- {$LL.or().toLowerCase()} - - {$LL.signIntoYourAccount().toLowerCase()} - -

-
- -
-
-
- {#if errorState === "404"} - - {:else if errorState === "expired"} - - {:else if errorState === "unknown"} - - {/if} - - - -
-
- {:else} -

Checking your request...

- {/if} -
diff --git a/apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte b/apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte deleted file mode 100644 index 101b49d..0000000 --- a/apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte +++ /dev/null @@ -1,153 +0,0 @@ - - - - -
- {#if messageType} -
- {#if messageType === "after-password-reset"} - - {:else if messageType === "user-disabled"} - - {:else if messageType === "user-inactivity"} - - {/if} -
- {/if} -
-

- {$LL.signInPage.signIn()} -

-

- {$LL.or().toLowerCase()} - {$LL.createANewAccount().toLowerCase()} -

-
-
-
- {#if showErrorAlert} - - {/if} -
- - - - - - -
-
-
diff --git a/apps/kit/src/routes/(main)/(public)/sign-in/test.ts b/apps/kit/src/routes/(main)/(public)/sign-in/test.ts deleted file mode 100644 index 27af2ea..0000000 --- a/apps/kit/src/routes/(main)/(public)/sign-in/test.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { get_test_context } from "$lib/configuration"; -import { get_element_by_pw_key } from "$lib/helpers"; -import { test, expect } from "@playwright/test"; -import { signInPageTestKeys } from "./+page.svelte"; - -const context = get_test_context(); - -test("form loads", async ({ page }) => { - await page.goto("/sign-up"); - const formElement = get_element_by_pw_key(signInPageTestKeys.signUpForm); - expect(formElement).toBeTruthy(); -}); \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte b/apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte deleted file mode 100644 index 0dfa41a..0000000 --- a/apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - -
-
-

- {$LL.signUpPage.createYourNewAccount()} -

-

- {$LL.or().toLowerCase()} - - {$LL.signIntoYourAccount().toLowerCase()} - -

-
- -
-
- -
- - - -
-
-
diff --git a/apps/kit/src/routes/(main)/+layout.server.ts b/apps/kit/src/routes/(main)/+layout.server.ts deleted file mode 100644 index d2eb2eb..0000000 --- a/apps/kit/src/routes/(main)/+layout.server.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { api_base, CookieNames } from "$lib/configuration"; -import { logError } from "$lib/logger"; -import { error, redirect } from "@sveltejs/kit"; -import type { LayoutServerLoad } from "./$types"; - -export const load: LayoutServerLoad = async ({ routeId, cookies, locals }) => { - const isPublicRoute = (routeId?.startsWith("(main)/(public)") || routeId === "(main)") ?? true; - - let sessionIsValid = (await fetch(api_base("_/valid-session"), { - headers: { - Cookie: CookieNames.session + "=" + cookies.get(CookieNames.session) - } - }).catch((e) => { - logError(e); - throw error(503, { - message: "We are experiencing a service distruption! Have patience while we resolve the issue." - }) - })).ok; - - console.log("Base Layout loaded", { - sessionIsValid, - isPublicRoute, - routeId - }); - - if (sessionIsValid && isPublicRoute) { - throw redirect(302, "/home"); - } else if (!sessionIsValid && !isPublicRoute) { - throw redirect(302, "/sign-in"); - } - return { - locale: locals.locale - } -}; \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/+layout.svelte b/apps/kit/src/routes/(main)/+layout.svelte deleted file mode 100644 index 1a870bb..0000000 --- a/apps/kit/src/routes/(main)/+layout.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - - - -{#if !online} -
-
-
- -
-
-

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

-
-
-
-{/if} - - - diff --git a/apps/kit/src/routes/(main)/+layout.ts b/apps/kit/src/routes/(main)/+layout.ts deleted file mode 100644 index 5d0e005..0000000 --- a/apps/kit/src/routes/(main)/+layout.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { LayoutLoad } from './$types' -import type { Locales } from '$lib/i18n/i18n-types' -import { loadLocaleAsync } from '$lib/i18n/i18n-util.async' -import { setLocale } from '$lib/i18n/i18n-svelte' - -export const load: LayoutLoad<{ locale: Locales }> = async ({ data: { locale } }) => { - // load dictionary into memory - await loadLocaleAsync(locale) - - // if you need to output a localized string in a `load` function, - // you always need to call `setLocale` right before you access the `LL` store - setLocale(locale) - // pass locale to the "rendering context" - return { locale } -} \ No newline at end of file diff --git a/apps/kit/src/routes/(main)/+page.svelte b/apps/kit/src/routes/(main)/+page.svelte deleted file mode 100644 index e507a19..0000000 --- a/apps/kit/src/routes/(main)/+page.svelte +++ /dev/null @@ -1 +0,0 @@ -

Hold on...

-- cgit v1.3