From e712d51d0d00cdf7c83dc3dc36b0ae4144ed92f6 Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Wed, 28 Sep 2022 23:39:25 +0800
Subject: refactor: Streamline public route names

---
 .../(main)/(public)/reset-password/+page.svelte    | 104 ++++++++++++++++++++
 .../src/routes/(main)/(public)/reset/+page.svelte  | 104 --------------------
 .../routes/(main)/(public)/sign-in/+page.svelte    | 107 +++++++++++++++++++++
 .../routes/(main)/(public)/sign-up/+page.svelte    |  38 ++++++++
 .../src/routes/(main)/(public)/signin/+page.svelte | 107 ---------------------
 .../src/routes/(main)/(public)/signup/+page.svelte |  38 --------
 apps/kit/src/routes/(main)/+layout.svelte          |   2 +-
 7 files changed, 250 insertions(+), 250 deletions(-)
 create mode 100644 apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte
 delete mode 100644 apps/kit/src/routes/(main)/(public)/reset/+page.svelte
 create mode 100644 apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte
 create mode 100644 apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte
 delete mode 100644 apps/kit/src/routes/(main)/(public)/signin/+page.svelte
 delete mode 100644 apps/kit/src/routes/(main)/(public)/signup/+page.svelte

diff --git a/apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte b/apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte
new file mode 100644
index 0000000..b951153
--- /dev/null
+++ b/apps/kit/src/routes/(main)/(public)/reset-password/+page.svelte
@@ -0,0 +1,104 @@
+<script lang="ts">
+    import { create_forgot_password_request } from "$lib/api/user";
+    import Alert from "$lib/components/alert.svelte";
+    import LL from "$lib/i18n/i18n-svelte";
+    import type { ErrorResult } from "$lib/models/ErrorResult";
+    import { get } from "svelte/store";
+
+    const formData = {
+        email: "",
+    };
+
+    $: showErrorAlert =
+        (errorData?.text.length ?? 0 + errorData?.title.length ?? 0) > 0 &&
+        !showSuccessAlert;
+
+    const errorData = {
+        text: "",
+        title: "",
+    } as ErrorResult;
+
+    let showSuccessAlert = false;
+
+    async function submit() {
+        errorData.text = "";
+        errorData.title = "";
+        showSuccessAlert = false;
+        const request = await create_forgot_password_request(formData.email);
+        if (!request.ok) {
+            errorData.text = request.data.text ?? $LL.common.tryAgainSoon();
+            errorData.title = request.data.title ?? $LL.common.unexpectedError();
+            return;
+        }
+        showSuccessAlert = true;
+    }
+</script>
+
+<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
+    <div class="sm:mx-auto sm:w-full sm:max-w-md">
+        <h2
+            class="mt-6 text-center text-3xl tracking-tight font-bold text-gray-900"
+        >
+            {$LL.reset.resetPassword()}
+        </h2>
+        <p class="mt-2 text-center text-sm text-gray-600">
+            {$LL.common.or()}
+            <a
+                href="/sign-in"
+                class="font-medium text-indigo-600 hover:text-indigo-500"
+                >{$LL.reset.gotoLoginPage().toLowerCase()}</a
+            >
+        </p>
+    </div>
+
+    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
+        <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
+            <form
+                class="space-y-6"
+                on:submit|preventDefault={submit}
+                method="POST"
+            >
+                <Alert
+                    title={errorData.title}
+                    message={errorData.text}
+                    type="error"
+                    visible={showErrorAlert}
+                />
+
+                <Alert
+                    type="success"
+                    title={$LL.common.success()}
+                    message={$LL.reset.requestSentMessage()}
+                    visible={showSuccessAlert}
+                />
+                <div>
+                    <label
+                        for="email"
+                        class="block text-sm font-medium text-gray-700"
+                    >
+                        {$LL.common.emailAddress()}</label
+                    >
+                    <div class="mt-1">
+                        <input
+                            id="email"
+                            name="email"
+                            type="email"
+                            autocomplete="email"
+                            required
+                            bind:value={formData.email}
+                            class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm"
+                        />
+                    </div>
+                </div>
+                <div>
+                    <button
+                        type="submit"
+                        class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+                    >
+                        {$LL.common.send($LL.common.request().toLowerCase())}
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/apps/kit/src/routes/(main)/(public)/reset/+page.svelte b/apps/kit/src/routes/(main)/(public)/reset/+page.svelte
deleted file mode 100644
index 5092b4b..0000000
--- a/apps/kit/src/routes/(main)/(public)/reset/+page.svelte
+++ /dev/null
@@ -1,104 +0,0 @@
-<script lang="ts">
-    import { create_forgot_password_request } from "$lib/api/user";
-    import Alert from "$lib/components/alert.svelte";
-    import LL from "$lib/i18n/i18n-svelte";
-    import type { ErrorResult } from "$lib/models/ErrorResult";
-    import { get } from "svelte/store";
-
-    const formData = {
-        email: "",
-    };
-
-    $: showErrorAlert =
-        (errorData?.text.length ?? 0 + errorData?.title.length ?? 0) > 0 &&
-        !showSuccessAlert;
-
-    const errorData = {
-        text: "",
-        title: "",
-    } as ErrorResult;
-
-    let showSuccessAlert = false;
-
-    async function submit() {
-        errorData.text = "";
-        errorData.title = "";
-        showSuccessAlert = false;
-        const request = await create_forgot_password_request(formData.email);
-        if (!request.ok) {
-            errorData.text = request.data.text ?? $LL.common.tryAgainSoon();
-            errorData.title = request.data.title ?? $LL.common.unexpectedError();
-            return;
-        }
-        showSuccessAlert = true;
-    }
-</script>
-
-<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
-    <div class="sm:mx-auto sm:w-full sm:max-w-md">
-        <h2
-            class="mt-6 text-center text-3xl tracking-tight font-bold text-gray-900"
-        >
-            {$LL.reset.resetPassword()}
-        </h2>
-        <p class="mt-2 text-center text-sm text-gray-600">
-            {$LL.common.or()}
-            <a
-                href="/login"
-                class="font-medium text-indigo-600 hover:text-indigo-500"
-                >{$LL.reset.gotoLoginPage().toLowerCase()}</a
-            >
-        </p>
-    </div>
-
-    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-        <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
-            <form
-                class="space-y-6"
-                on:submit|preventDefault={submit}
-                method="POST"
-            >
-                <Alert
-                    title={errorData.title}
-                    message={errorData.text}
-                    type="error"
-                    visible={showErrorAlert}
-                />
-
-                <Alert
-                    type="success"
-                    title={$LL.common.success()}
-                    message={$LL.reset.requestSentMessage()}
-                    visible={showSuccessAlert}
-                />
-                <div>
-                    <label
-                        for="email"
-                        class="block text-sm font-medium text-gray-700"
-                    >
-                        {$LL.common.emailAddress()}</label
-                    >
-                    <div class="mt-1">
-                        <input
-                            id="email"
-                            name="email"
-                            type="email"
-                            autocomplete="email"
-                            required
-                            bind:value={formData.email}
-                            class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm"
-                        />
-                    </div>
-                </div>
-                <div>
-                    <button
-                        type="submit"
-                        class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
-                    >
-                        {$LL.common.send($LL.common.request().toLowerCase())}
-                    </button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte b/apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte
new file mode 100644
index 0000000..3802722
--- /dev/null
+++ b/apps/kit/src/routes/(main)/(public)/sign-in/+page.svelte
@@ -0,0 +1,107 @@
+<script lang="ts">
+    import { goto } from "$app/navigation";
+    import { login } from "$lib/api/user";
+    import Button from "$lib/components/button.svelte";
+    import Checkbox from "$lib/components/checkbox.svelte";
+    import Input from "$lib/components/input.svelte";
+    import LL from "$lib/i18n/i18n-svelte";
+    import type { ErrorResult } from "$lib/models/ErrorResult";
+    import type { LoginPayload } from "$lib/models/LoginPayload";
+
+    let loading = false;
+
+    const data = {
+        username: "",
+        password: "",
+    } as LoginPayload;
+
+    let error = {
+        text: "",
+        title: "",
+    } as ErrorResult;
+
+    async function submitFormAsync() {
+        error = { text: "", title: "" };
+        loading = true;
+        const loginResponse = await login(data);
+        if (loginResponse.ok) {
+            await goto("/home");
+        } else {
+            error.title = loginResponse.data.title;
+            error.text = loginResponse.data.text;
+        }
+        loading = false;
+    }
+</script>
+
+<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
+    <div class="sm:mx-auto sm:w-full sm:max-w-md">
+        <h2
+            class="mt-6 text-center text-3xl tracking-tight font-bold text-gray-900"
+        >
+            {$LL.login.loginToYourAccount()}
+        </h2>
+        <p class="mt-2 text-center text-sm text-gray-600">
+            {$LL.common.or()}
+            <a href="/sign-up" class="link">{$LL.login.createANewAccount()}</a>
+        </p>
+    </div>
+    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
+        <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
+            {#if error.text || error.title}
+                <div class="rounded-md bg-red-50 p-3 mb-3">
+                    {#if error.title}
+                        <h3 class="text-sm font-medium text-red-600">
+                            {error.title}
+                        </h3>
+                    {/if}
+                    {#if error.text}
+                        <div class="mt-2 text-sm text-red-500">
+                            {error.text}
+                        </div>
+                    {/if}
+                </div>
+            {/if}
+            <form class="space-y-6" on:submit|preventDefault={submitFormAsync}>
+                <Input
+                    id="email"
+                    name="email"
+                    type="email"
+                    label={$LL.common.emailAddress()}
+                    required
+                    value={data.username}
+                />
+
+                <Input
+                    id="password"
+                    name="password"
+                    type="password"
+                    label={$LL.login.password()}
+                    autocomplete="current-password"
+                    required
+                    value={data.password}
+                />
+
+                <div class="flex items-center justify-between">
+                    <Checkbox
+                        id="remember-me"
+                        name="remember-me"
+                        label={$LL.login.notMyComputer()}
+                    />
+                    <div class="text-sm">
+                        <a href="/reset-password" class="link">
+                            {$LL.login.forgotPassword()}
+                        </a>
+                    </div>
+                </div>
+
+                <Button
+                    text={$LL.common.logIn()}
+                    fullWidth
+                    type="submit"
+                    {loading}
+                />
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte b/apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte
new file mode 100644
index 0000000..92ebfbd
--- /dev/null
+++ b/apps/kit/src/routes/(main)/(public)/sign-up/+page.svelte
@@ -0,0 +1,38 @@
+<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
+    <div class="sm:mx-auto sm:w-full sm:max-w-md">
+        <h2 class="mt-6 text-center text-3xl tracking-tight font-bold text-gray-900">Create your new account</h2>
+        <p class="mt-2 text-center text-sm text-gray-600">
+            Or
+            <a href="/sign-in" class="font-medium text-indigo-600 hover:text-indigo-500">sign into an existing one</a>
+        </p>
+    </div>
+
+    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
+        <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
+            <form class="space-y-6" action="#" method="POST">
+                <div>
+                    <label for="email" class="block text-sm font-medium text-gray-700"> Email address </label>
+                    <div class="mt-1">
+                        <input id="email" name="email" type="email" autocomplete="email" required
+                               class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+                    </div>
+                </div>
+
+                <div>
+                    <label for="password" class="block text-sm font-medium text-gray-700"> Password </label>
+                    <div class="mt-1">
+                        <input id="password" name="password" type="password" autocomplete="current-password" required
+                               class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+                    </div>
+                </div>
+
+                <div>
+                    <button type="submit"
+                            class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+                        Create account
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/apps/kit/src/routes/(main)/(public)/signin/+page.svelte b/apps/kit/src/routes/(main)/(public)/signin/+page.svelte
deleted file mode 100644
index 46b9f7f..0000000
--- a/apps/kit/src/routes/(main)/(public)/signin/+page.svelte
+++ /dev/null
@@ -1,107 +0,0 @@
-<script lang="ts">
-    import { goto } from "$app/navigation";
-    import { login } from "$lib/api/user";
-    import Button from "$lib/components/button.svelte";
-    import Checkbox from "$lib/components/checkbox.svelte";
-    import Input from "$lib/components/input.svelte";
-    import LL from "$lib/i18n/i18n-svelte";
-    import type { ErrorResult } from "$lib/models/ErrorResult";
-    import type { LoginPayload } from "$lib/models/LoginPayload";
-
-    let loading = false;
-
-    const data = {
-        username: "",
-        password: "",
-    } as LoginPayload;
-
-    let error = {
-        text: "",
-        title: "",
-    } as ErrorResult;
-
-    async function submitFormAsync() {
-        error = { text: "", title: "" };
-        loading = true;
-        const loginResponse = await login(data);
-        if (loginResponse.ok) {
-            await goto("/home");
-        } else {
-            error.title = loginResponse.data.title;
-            error.text = loginResponse.data.text;
-        }
-        loading = false;
-    }
-</script>
-
-<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
-    <div class="sm:mx-auto sm:w-full sm:max-w-md">
-        <h2
-            class="mt-6 text-center text-3xl tracking-tight font-bold text-gray-900"
-        >
-            {$LL.login.loginToYourAccount()}
-        </h2>
-        <p class="mt-2 text-center text-sm text-gray-600">
-            {$LL.common.or()}
-            <a href="/signup" class="link">{$LL.login.createANewAccount()}</a>
-        </p>
-    </div>
-    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-        <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
-            {#if error.text || error.title}
-                <div class="rounded-md bg-red-50 p-3 mb-3">
-                    {#if error.title}
-                        <h3 class="text-sm font-medium text-red-600">
-                            {error.title}
-                        </h3>
-                    {/if}
-                    {#if error.text}
-                        <div class="mt-2 text-sm text-red-500">
-                            {error.text}
-                        </div>
-                    {/if}
-                </div>
-            {/if}
-            <form class="space-y-6" on:submit|preventDefault={submitFormAsync}>
-                <Input
-                    id="email"
-                    name="email"
-                    type="email"
-                    label={$LL.common.emailAddress()}
-                    required
-                    value={data.username}
-                />
-
-                <Input
-                    id="password"
-                    name="password"
-                    type="password"
-                    label={$LL.login.password()}
-                    autocomplete="current-password"
-                    required
-                    value={data.password}
-                />
-
-                <div class="flex items-center justify-between">
-                    <Checkbox
-                        id="remember-me"
-                        name="remember-me"
-                        label={$LL.login.notMyComputer()}
-                    />
-                    <div class="text-sm">
-                        <a href="/reset" class="link">
-                            {$LL.login.forgotPassword()}
-                        </a>
-                    </div>
-                </div>
-
-                <Button
-                    text={$LL.common.logIn()}
-                    fullWidth
-                    type="submit"
-                    {loading}
-                />
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/apps/kit/src/routes/(main)/(public)/signup/+page.svelte b/apps/kit/src/routes/(main)/(public)/signup/+page.svelte
deleted file mode 100644
index d4a1bda..0000000
--- a/apps/kit/src/routes/(main)/(public)/signup/+page.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
-    <div class="sm:mx-auto sm:w-full sm:max-w-md">
-        <h2 class="mt-6 text-center text-3xl tracking-tight font-bold text-gray-900">Create your new account</h2>
-        <p class="mt-2 text-center text-sm text-gray-600">
-            Or
-            <a href="/login" class="font-medium text-indigo-600 hover:text-indigo-500">go to login page</a>
-        </p>
-    </div>
-
-    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-        <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
-            <form class="space-y-6" action="#" method="POST">
-                <div>
-                    <label for="email" class="block text-sm font-medium text-gray-700"> Email address </label>
-                    <div class="mt-1">
-                        <input id="email" name="email" type="email" autocomplete="email" required
-                               class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-                    </div>
-                </div>
-
-                <div>
-                    <label for="password" class="block text-sm font-medium text-gray-700"> Password </label>
-                    <div class="mt-1">
-                        <input id="password" name="password" type="password" autocomplete="current-password" required
-                               class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-                    </div>
-                </div>
-
-                <div>
-                    <button type="submit"
-                            class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
-                        Create account
-                    </button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/apps/kit/src/routes/(main)/+layout.svelte b/apps/kit/src/routes/(main)/+layout.svelte
index 7b0aad1..ec50c4b 100644
--- a/apps/kit/src/routes/(main)/+layout.svelte
+++ b/apps/kit/src/routes/(main)/+layout.svelte
@@ -24,7 +24,7 @@
         if (sessionIsValid && isPublicRoute) {
             await goto("/home");
         } else if (!sessionIsValid && !isPublicRoute) {
-            await goto("/signin");
+            await goto("/sign-in");
         }
     }
 
-- 
cgit v1.3