From a2ee954bced10676edd7d9e8d97c00ad1da20eff Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sat, 15 Jun 2024 20:44:16 -1000
Subject: [PATCH] feat: :recycle: Redesign password reset page

---
 components/LoginInput.vue | 23 ----------------
 pages/oauth/authorize.vue | 36 -------------------------
 pages/oauth/reset.vue     | 57 ++++++++++++++++++++++-----------------
 3 files changed, 33 insertions(+), 83 deletions(-)
 delete mode 100644 components/LoginInput.vue

diff --git a/components/LoginInput.vue b/components/LoginInput.vue
deleted file mode 100644
index 637753d..0000000
--- a/components/LoginInput.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-    <div class="flex items-center justify-between">
-        <label class="block text-sm font-medium leading-6 text-gray-50">{{ label }}</label>
-    </div>
-    <div class="mt-2">
-        <input v-bind="$attrs" :class="['block disabled:opacity-70 disabled:hover:cursor-wait w-full bg-dark-500 rounded-md border-0 py-1.5 text-gray-50 shadow-sm ring-1 ring-inset ring-white/10 placeholder:text-gray-500 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6',
-            isInvalid && '!ring-red-600 ring-2']">
-    </div>
-</template>
-
-<script setup lang="ts">
-import type { InputHTMLAttributes } from "vue";
-
-interface Props extends /* @vue-ignore */ InputHTMLAttributes {
-    isInvalid?: boolean;
-    label: string;
-}
-
-defineOptions({
-    inheritAttrs: false,
-});
-defineProps<Props>();
-</script>
\ No newline at end of file
diff --git a/pages/oauth/authorize.vue b/pages/oauth/authorize.vue
index 27cce42..11fb06b 100644
--- a/pages/oauth/authorize.vue
+++ b/pages/oauth/authorize.vue
@@ -3,42 +3,6 @@
         <img crossorigin="anonymous" src="https://cdn.lysand.org/logo.webp" alt="Lysand logo"
             class="mx-auto hidden md:inline-block h-20 ring-1 ring-white/20 rounded" />
         <div v-if="validUrlParameters" class="mx-auto w-full max-w-md">
-            <!--
-                <VeeForm class="flex flex-col gap-y-6" @submit="s => register((s as any))" :validation-schema="schema">
-                <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Passwords</h1>
-
-                <VeeField name="password" as="div" v-slot="{ errorMessage, field }" validate-on-change>
-                    <InputsField>
-                        <InputsLabelAndError>
-                            <InputsLabel for="password">Password</InputsLabel>
-                            <InputsError v-if="errorMessage">{{ errorMessage }}</InputsError>
-                        </InputsLabelAndError>
-                        <InputsPassword id="password" placeholder="hunter2" required v-bind="field"
-                            :disabled="isLoading" :is-invalid="!!errorMessage" />
-                    </InputsField>
-                </VeeField>
-
-                <VeeField name="password-confirm" as="div" v-slot="{ errorMessage, field }" validate-on-change>
-                    <InputsField>
-                        <InputsLabelAndError>
-                            <InputsLabel for="password-confirm">Confirm password</InputsLabel>
-                            <InputsError v-if="errorMessage">{{ errorMessage }}</InputsError>
-                        </InputsLabelAndError>
-                        <InputsPassword id="password-confirm" placeholder="hunter2" required v-bind="field"
-                            :disabled="isLoading" :is-invalid="!!errorMessage" />
-                    </InputsField>
-                </VeeField>
-
-                <p class="text-xs font-semibold text-gray-300">
-                    Passwords are stored securely and hashed. We do not store your password in plain text.
-                    Administrators
-                    cannot see your password.
-                </p>
-
-                <ButtonsPrimary type="submit" class="w-full" :disabled="isLoading">{{ isLoading ? "Registering..." :
-                    "Register" }}</ButtonsPrimary>
-            </VeeForm>
-            -->
             <VeeForm class="flex flex-col gap-y-6" method="POST" :validation-schema="schema"
                 :action="`/api/auth/login?redirect_uri=${redirect_uri}&response_type=${response_type}&client_id=${client_id}&scope=${scope}`">
                 <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Login to your account</h1>
diff --git a/pages/oauth/reset.vue b/pages/oauth/reset.vue
index 2191462..5f7416c 100644
--- a/pages/oauth/reset.vue
+++ b/pages/oauth/reset.vue
@@ -1,36 +1,46 @@
 <template>
-    <div class="flex min-h-screen relative flex-col justify-center py-12 px-8">
-        <img crossorigin="anonymous" src="https://cdn.lysand.org/logo-long-dark.webp" alt="Lysand logo"
-            class="mx-auto h-24 hidden md:block mb-10" />
-        <div v-if="validUrlParameters"
-            class="sm:mx-auto w-full sm:max-w-md px-10 py-10 rounded md:ring-1 md:ring-white/10">
+    <div class="flex min-h-screen relative flex-col gap-10 justify-center py-12 px-8">
+        <img crossorigin="anonymous" src="https://cdn.lysand.org/logo.webp" alt="Lysand logo"
+            class="mx-auto hidden md:inline-block h-20 ring-1 ring-white/20 rounded" />
+        <div v-if="validUrlParameters" class="mx-auto w-full max-w-md">
             <div v-if="error" class="ring-1 ring-white/10 rounded p-4 bg-red-500 text-white mb-10">
                 <h2 class="font-bold text-lg">An error occured</h2>
                 <span class="text-sm">{{ error_description }}</span>
             </div>
-            <VeeForm class="space-y-6" method="POST" :validation-schema="schema" action="/api/auth/reset">
+            <VeeForm class="flex flex-col gap-y-6" method="POST" :validation-schema="schema" action="/api/auth/reset">
                 <input type="hidden" name="token" :value="token" />
 
                 <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Reset your password</h1>
 
-                <VeeField name="password" as="div" v-slot="{ errors, field }" validate-on-change>
-                    <LoginInput label="Password" placeholder="Password here" type="password"
-                        autocomplete="current-password" required :is-invalid="errors.length > 0" v-bind="field" />
-                    <VeeErrorMessage name="password" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
-                        {{ message }}
-                    </VeeErrorMessage>
+                <div v-if="error" class="ring-1 ring-white/10 rounded p-4 bg-red-500 text-white">
+                    <h2 class="font-bold text-lg">An error occured</h2>
+                    <span class="text-sm">{{ error_description }}</span>
+                </div>
+
+                <VeeField name="password" v-slot="{ errorMessage, field }" validate-on-change>
+                    <InputsField>
+                        <InputsLabelAndError>
+                            <InputsLabel for="password">New password</InputsLabel>
+                            <InputsError v-if="errorMessage">{{ errorMessage }}</InputsError>
+                        </InputsLabelAndError>
+                        <InputsPassword id="password" placeholder="hunter2" autocomplete="new-password" required
+                            v-bind="field" :is-invalid="!!errorMessage" :show-strength="true" />
+                    </InputsField>
                 </VeeField>
 
-                <VeeField name="password2" as="div" v-slot="{ errors, field }" validate-on-change>
-                    <LoginInput label="Confirm password" placeholder="Confirm password" type="password"
-                        autocomplete="current-password" required :is-invalid="errors.length > 0" v-bind="field" />
-                    <VeeErrorMessage name="password2" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
-                        {{ message }}
-                    </VeeErrorMessage>
+                <VeeField name="password-confirm" as="div" v-slot="{ errors, field }" validate-on-change>
+                    <InputsField>
+                        <InputsLabelAndError>
+                            <InputsLabel for="password-confirm">Confirm password</InputsLabel>
+                            <InputsError v-if="errors.length > 0">{{ errors[0] }}</InputsError>
+                        </InputsLabelAndError>
+                        <InputsPassword id="password-confirm" placeholder="hunter2" autocomplete="new-password" required
+                            v-bind="field" :is-invalid="errors.length > 0" />
+                    </InputsField>
                 </VeeField>
 
-                <p class="mt-6 text-sm leading-8 font-semibold text-red-300">This will reset your
-                    password. Be sure to put it in a password manager.
+                <p class="text-xs font-semibold text-red-300">This will reset your
+                    password. Make sure to put it in a password manager.
                 </p>
 
                 <ButtonsPrimary type="submit" class="w-full">Reset</ButtonsPrimary>
@@ -63,7 +73,6 @@
 <script setup lang="ts">
 import { toTypedSchema } from "@vee-validate/zod";
 import { z } from "zod";
-import LoginInput from "../../components/LoginInput.vue";
 
 const identity = useCurrentIdentity();
 identity.value = null;
@@ -72,12 +81,12 @@ const schema = toTypedSchema(
     z
         .object({
             password: z.string().min(3).max(100),
-            password2: z.string().min(3).max(100),
+            "password-confirm": z.string().min(3).max(100),
         })
         .superRefine((data, ctx) => {
-            if (data.password !== data.password2) {
+            if (data.password !== data["password-confirm"]) {
                 ctx.addIssue({
-                    path: [...ctx.path, "password2"],
+                    path: [...ctx.path, "password-confirm"],
                     code: "custom",
                     message: "Passwords do not match",
                 });