From b40bc2e81b206a57647034a26a5a53ac2a397a03 Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Sat, 24 Sep 2022 15:38:12 +0800
Subject: refactor: Update i18n calls

---
 apps/kit/src/routes/(public)/login/+page.svelte | 100 ++++++++++++++++--------
 1 file changed, 69 insertions(+), 31 deletions(-)

(limited to 'apps/kit/src/routes/(public)/login/+page.svelte')

diff --git a/apps/kit/src/routes/(public)/login/+page.svelte b/apps/kit/src/routes/(public)/login/+page.svelte
index 36230e3..9e2f6e7 100644
--- a/apps/kit/src/routes/(public)/login/+page.svelte
+++ b/apps/kit/src/routes/(public)/login/+page.svelte
@@ -1,11 +1,9 @@
 <script lang="ts">
-    import {goto} from "$app/navigation";
-    import {login} from "$lib/api/user";
+    import { goto } from "$app/navigation";
+    import { login } from "$lib/api/user";
     import LL from "$lib/i18n/i18n-svelte";
-    import {setLocale} from "$lib/i18n/i18n-svelte";
-    import {loadLocaleAsync} from "$lib/i18n/i18n-util.async";
-    import type {ErrorResult} from "$lib/models/ErrorResult";
-    import type {LoginPayload} from "$lib/models/LoginPayload";
+    import type { ErrorResult } from "$lib/models/ErrorResult";
+    import type { LoginPayload } from "$lib/models/LoginPayload";
 
     const data = {
         username: "",
@@ -18,7 +16,7 @@
     } as ErrorResult;
 
     async function submitFormAsync() {
-        error = {text: "", title: ""};
+        error = { text: "", title: "" };
         const loginResponse = await login(data);
         if (loginResponse.ok) {
             await goto("/home");
@@ -28,22 +26,31 @@
         }
     }
 </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>
+        <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.login.or()}
-            <a href="/signup"
-               class="font-medium text-indigo-600 hover:text-indigo-500">{$LL.login.createANewAccount()}</a>
+            {$LL.common.or()}
+            <a
+                href="/signup"
+                class="font-medium text-indigo-600 hover:text-indigo-500"
+                >{$LL.login.createANewAccount()}</a
+            >
         </p>
     </div>
-    <button on:click={async () => {await loadLocaleAsync("nb"); setLocale("nb")}}>Norge</button>
     <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-800">{error.title}</h3>
+                        <h3 class="text-sm font-medium text-red-800">
+                            {error.title}
+                        </h3>
                     {/if}
                     {#if error.text}
                         <div class="mt-2 text-sm text-red-700">
@@ -54,42 +61,73 @@
             {/if}
             <form class="space-y-6" on:submit|preventDefault={submitFormAsync}>
                 <div>
-                    <label for="email"
-                           class="block text-sm font-medium text-gray-700">{$LL.login.emailAddress()}</label>
+                    <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
-                               value={data.username}
-                               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">
+                        <input
+                            id="email"
+                            name="email"
+                            type="email"
+                            autocomplete="email"
+                            required
+                            value={data.username}
+                            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">{$LL.login.password()}</label>
+                    <label
+                        for="password"
+                        class="block text-sm font-medium text-gray-700"
+                        >{$LL.login.password()}</label
+                    >
                     <div class="mt-1">
-                        <input id="password" name="password" type="password" autocomplete="current-password" required
-                               value={data.password}
-                               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">
+                        <input
+                            id="password"
+                            name="password"
+                            type="password"
+                            autocomplete="current-password"
+                            required
+                            value={data.password}
+                            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 class="flex items-center justify-between">
                     <div class="flex items-center">
-                        <input id="remember-me" name="remember-me" type="checkbox"
-                               class="h-4 w-4 text-indigo-600 focus:ring-indigo-500 border-gray-300 rounded">
-                        <label for="remember-me"
-                               class="ml-2 block text-sm text-gray-900">{$LL.login.notMyComputer()}</label>
+                        <input
+                            id="remember-me"
+                            name="remember-me"
+                            type="checkbox"
+                            class="h-4 w-4 text-indigo-600 focus:ring-indigo-500 border-gray-300 rounded"
+                        />
+                        <label
+                            for="remember-me"
+                            class="ml-2 block text-sm text-gray-900"
+                            >{$LL.login.notMyComputer()}</label
+                        >
                     </div>
 
                     <div class="text-sm">
-                        <a href="/reset"
-                           class="font-medium text-indigo-600 hover:text-indigo-500">{$LL.login.forgotPassword()}</a>
+                        <a
+                            href="/reset"
+                            class="font-medium text-indigo-600 hover:text-indigo-500"
+                            >{$LL.login.forgotPassword()}</a
+                        >
                     </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.login.logIn()}
+                    <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.logIn()}
                     </button>
                 </div>
             </form>
-- 
cgit v1.3

