Skip to content

A self-hosted media server and file management system

feat: move auth forms to form components

aminnausin202fede3e441
diff --git a/resources/js/components/forms/LoginForm.vue b/resources/js/components/forms/LoginForm.vue
new file mode 100644
index 00000000..0ef5fddc
--- /dev/null
+++ b/resources/js/components/forms/LoginForm.vue
@@ -0,0 +1,95 @@
+<script setup lang="ts">
+import type { FormField } from '@/types/types';
+
+import { useRouter, useRoute, RouterLink } from 'vue-router';
+import { useAuthStore } from '@/stores/AuthStore';
+import { storeToRefs } from 'pinia';
+import { login } from '@/service/authAPI';
+import { ref } from 'vue';
+
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import FormErrorList from '@/components/labels/FormErrorList.vue';
+import ButtonForm from '@/components/inputs/ButtonForm.vue';
+import FormInput from '@/components/inputs/FormInput.vue';
+import BaseForm from '@/components/forms/BaseForm.vue';
+import FormItem from '@/components/forms/FormItem.vue';
+import useForm from '@/composables/useForm';
+
+const { userData } = storeToRefs(useAuthStore());
+const router = useRouter();
+const route = useRoute();
+
+const fields = ref<FormField[]>([
+ { name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'username email' },
+ { name: 'password', text: 'Password', type: 'password', required: true, autocomplete: 'password' },
+]);
+
+const form = useForm({
+ email: '',
+ password: '',
+ remember: false,
+});
+
+const handleLogin = async () => {
+ form.submit(
+ async (fields: any) => {
+ return await login(fields);
+ },
+ {
+ onSuccess: (response: { data: { data: { token: string; user: null } } }) => {
+ localStorage.setItem('auth-token', response.data.data.token);
+ userData.value = response.data.data.user;
+ router.push(route.query.redirect ? route.query.redirect.toString() : '/');
+ },
+ onError: (errors: any) => form.reset('password'),
+ },
+ );
+};
+</script>
+<template>
+ <BaseForm @submit.prevent="handleLogin">
+ <FormItem v-for="(field, index) in fields" :key="index">
+ <span v-if="field.name === 'password'" class="flex flex-wrap">
+ <FormInputLabel :field="field" class="me-auto" />
+ <RouterLink
+ to="/recovery"
+ class="underline text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+ >
+ Forgot password?
+ </RouterLink>
+ </span>
+ <FormInputLabel v-else :field="field" />
+ <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />
+ <FormErrorList :errors="form.errors" :field-name="field.name" />
+ </FormItem>
+
+ <!-- Remember Me -->
+
+ <div class="flex flex-wrap gap-2 gap-x-4 items-center justify-center sm:justify-end text-center">
+ <label for="remember-me" class="w-full flex items-center gap-2">
+ <input
+ v-model="form.fields.remember"
+ id="remember-me"
+ type="checkbox"
+ class=""
+ :class="[
+ 'rounded dark:bg-neutral-900 border-neutral-300 dark:border-neutral-700 shadow-sm',
+ 'appearance-none',
+ 'focus:ring-indigo-500 focus:!ring-[0.125rem] !ring-offset-0',
+ 'checked:text-indigo-600',
+ ]"
+ name="remember_me"
+ />
+ <span class="text-sm text-gray-600 dark:text-gray-400">Remember me</span>
+ </label>
+
+ <RouterLink
+ class="underline text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+ to="/register"
+ >
+ Not Registered?
+ </RouterLink>
+ <ButtonForm variant="auth" type="button" @click="handleLogin" :disabled="form.processing"> Log in </ButtonForm>
+ </div>
+ </BaseForm>
+</template>
diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vue
new file mode 100644
index 00000000..4e84a463
--- /dev/null
+++ b/resources/js/components/forms/RecoveryForm.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import type { FormField } from '@/types/types';
+
+import { recoverAccount } from '@/service/authAPI';
+import { RouterLink } from 'vue-router';
+import { toast } from '@/service/toaster/toastService';
+import { ref } from 'vue';
+
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import FormErrorList from '@/components/labels/FormErrorList.vue';
+import ButtonForm from '@/components/inputs/ButtonForm.vue';
+import FormInput from '@/components/inputs/FormInput.vue';
+import BaseForm from '@/components/forms/BaseForm.vue';
+import FormItem from '@/components/forms/FormItem.vue';
+import useForm from '@/composables/useForm';
+
+const fields = ref<FormField[]>([{ name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'email', placeholder: '[email protected]' }]);
+
+const form = useForm<{ email: string }>({
+ email: '',
+});
+
+const handleSubmit = async () => {
+ form.submit(
+ async (fields) => {
+ return recoverAccount(fields);
+ },
+ {
+ onSuccess: (response) => {
+ toast.success('A reset link will be sent if the account exists.', { description: 'This is not yet implemented.' });
+ form.reset('email');
+ },
+ onError() {
+ form.reset('email');
+ },
+ },
+ );
+};
+</script>
+<template>
+ <BaseForm @submit.prevent="handleSubmit">
+ <FormItem v-for="(field, index) in fields" :key="index">
+ <FormInputLabel :field="field" />
+ <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />
+ <FormErrorList :errors="form.errors" :field-name="field.name" />
+ </FormItem>
+
+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="!justify-center !capitalize"> Email password reset link </ButtonForm>
+ </BaseForm>
+ <span class="mx-auto text-gray-600 dark:text-gray-400">
+ Or, return to
+ <RouterLink
+ class="underline hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+ to="/login"
+ >
+ log in
+ </RouterLink>
+ </span>
+</template>
diff --git a/resources/js/components/forms/RegisterForm.vue b/resources/js/components/forms/RegisterForm.vue
new file mode 100644
index 00000000..4cb57563
--- /dev/null
+++ b/resources/js/components/forms/RegisterForm.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import type { FormField } from '@/types/types';
+
+import { useRouter, RouterLink } from 'vue-router';
+import { useAuthStore } from '@/stores/AuthStore';
+import { storeToRefs } from 'pinia';
+import { register } from '@/service/authAPI';
+import { ref } from 'vue';
+
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import FormErrorList from '@/components/labels/FormErrorList.vue';
+import ButtonForm from '@/components/inputs/ButtonForm.vue';
+import FormInput from '@/components/inputs/FormInput.vue';
+import BaseForm from '@/components/forms/BaseForm.vue';
+import FormItem from '@/components/forms/FormItem.vue';
+import useForm from '@/composables/useForm';
+
+const { userData } = storeToRefs(useAuthStore());
+
+const router = useRouter();
+
+const fields = ref<FormField[]>([
+ { name: 'name', text: 'Name', type: 'text', required: true, autocomplete: 'name' },
+ { name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'username email' },
+ { name: 'password', text: 'Password', type: 'password', required: true, autocomplete: 'new-password' },
+ { name: 'password_confirmation', text: 'Confirm Password', type: 'password', required: true, autocomplete: 'new-password' },
+]);
+
+const form = useForm({
+ name: '',
+ email: '',
+ password: '',
+ password_confirmation: '',
+});
+
+const handleRegister = async () => {
+ form.submit(
+ async (fields) => {
+ return await register(fields);
+ },
+ {
+ onSuccess: (response) => {
+ localStorage.setItem('auth-token', response.data.token);
+ userData.value = response.data.user;
+ router.push({ name: 'root' });
+ },
+ onError: () => {
+ form.reset('password', 'password_confirmation');
+ },
+ },
+ );
+};
+</script>
+
+<template>
+ <BaseForm @submit.prevent="handleRegister">
+ <FormItem v-for="(field, index) in fields" :key="index">
+ <FormInputLabel :field="field" />
+ <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />
+ <FormErrorList :errors="form.errors" :field-name="field.name" />
+ </FormItem>
+ <div class="flex flex-wrap gap-2 gap-x-4 items-center justify-center sm:justify-end text-center">
+ <RouterLink
+ class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+ to="/login"
+ >
+ Already registered?
+ </RouterLink>
+
+ <ButtonForm variant="auth" type="submit" :disabled="form.processing">Register</ButtonForm>
+ </div>
+ </BaseForm>
+</template>
diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vue
index f23232d4..7551e2aa 100755
--- a/resources/js/views/LoginView.vue
+++ b/resources/js/views/LoginView.vue
@@ -1,105 +1,15 @@
<script setup lang="ts">
-import type { FormField } from '@/types/types';
-
-import { useRouter, useRoute, RouterLink } from 'vue-router';
-import { useAuthStore } from '@/stores/AuthStore';
-import { storeToRefs } from 'pinia';
-import { login } from '@/service/authAPI';
-import { ref } from 'vue';
-
-import FormInputLabel from '@/components/labels/FormInputLabel.vue';
-import FormErrorList from '@/components/labels/FormErrorList.vue';
import AuthHeader from '@/components/headers/AuthHeader.vue';
import LayoutAuth from '@/layouts/LayoutAuth.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
+import LoginForm from '@/components/forms/LoginForm.vue';
import AuthCard from '@/components/cards/AuthCard.vue';
-import useForm from '@/composables/useForm';
-import BaseForm from '@/components/forms/BaseForm.vue';
-import FormItem from '@/components/forms/FormItem.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
-
-const { userData } = storeToRefs(useAuthStore());
-const router = useRouter();
-const route = useRoute();
-
-const fields = ref<FormField[]>([
- { name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'username email' },
- { name: 'password', text: 'Password', type: 'password', required: true, autocomplete: 'password' },
-]);
-
-const form = useForm({
- email: '',
- password: '',
- remember: false,
-});
-
-const handleLogin = async () => {
- form.submit(
- async (fields: any) => {
- return await login(fields);
- },
- {
- onSuccess: (response: { data: { data: { token: string; user: null } } }) => {
- localStorage.setItem('auth-token', response.data.data.token);
- userData.value = response.data.data.user;
- router.push(route.query.redirect ? route.query.redirect.toString() : '/');
- },
- onError: (errors: any) => form.reset('password'),
- },
- );
-};
</script>
<template>
<LayoutAuth>
<AuthHeader>Enter your email and password below to log in</AuthHeader>
<AuthCard>
- <!-- Session Status -->
- <BaseForm @submit.prevent="handleLogin">
- <FormItem v-for="(field, index) in fields" :key="index">
- <span v-if="field.name === 'password'" class="flex flex-wrap">
- <FormInputLabel :field="field" class="me-auto" />
- <RouterLink
- to="/recovery"
- class="underline text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
- >
- Forgot password?
- </RouterLink>
- </span>
- <FormInputLabel v-else :field="field" />
- <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />
- <FormErrorList :errors="form.errors" :field-name="field.name" />
- </FormItem>
-
- <!-- Remember Me -->
-
- <div class="flex flex-wrap gap-2 gap-x-4 items-center justify-center sm:justify-end text-center">
- <label for="remember-me" class="w-full flex items-center gap-2">
- <input
- v-model="form.fields.remember"
- id="remember-me"
- type="checkbox"
- class=""
- :class="[
- 'rounded dark:bg-neutral-900 border-neutral-300 dark:border-neutral-700 shadow-sm',
- 'appearance-none',
- 'focus:ring-indigo-500 focus:!ring-[0.125rem] !ring-offset-0',
- 'checked:text-indigo-600',
- ]"
- name="remember_me"
- />
- <span class="text-sm text-gray-600 dark:text-gray-400">Remember me</span>
- </label>
-
- <RouterLink
- class="underline text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
- to="/register"
- >
- Not Registered?
- </RouterLink>
- <ButtonForm variant="auth" type="button" @click="handleLogin" :disabled="form.processing"> Log in </ButtonForm>
- </div>
- </BaseForm>
+ <LoginForm />
</AuthCard>
</LayoutAuth>
</template>
diff --git a/resources/js/views/RecoveryView.vue b/resources/js/views/RecoveryView.vue
index b09e6151..82be64c8 100644
--- a/resources/js/views/RecoveryView.vue
+++ b/resources/js/views/RecoveryView.vue
@@ -1,70 +1,15 @@
<script setup lang="ts">
-import type { FormField } from '@/types/types';
-
-import { recoverAccount } from '@/service/authAPI';
-import { RouterLink } from 'vue-router';
-import { toast } from '@/service/toaster/toastService';
-import { ref } from 'vue';
-
-import FormInputLabel from '@/components/labels/FormInputLabel.vue';
-import FormErrorList from '@/components/labels/FormErrorList.vue';
+import RecoveryForm from '@/components/forms/RecoveryForm.vue';
import AuthHeader from '@/components/headers/AuthHeader.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import LayoutAuth from '@/layouts/LayoutAuth.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import AuthCard from '@/components/cards/AuthCard.vue';
-import useForm from '@/composables/useForm';
-import BaseForm from '@/components/forms/BaseForm.vue';
-import FormItem from '@/components/forms/FormItem.vue';
-
-const fields = ref<FormField[]>([{ name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'email', placeholder: '[email protected]' }]);
-
-const form = useForm<{ email: string }>({
- email: '',
-});
-
-const handleSubmit = async () => {
- form.submit(
- async (fields) => {
- return recoverAccount(fields);
- },
- {
- onSuccess: (response) => {
- toast.success('A reset link will be sent if the account exists.', { description: 'This is not yet implemented.' });
- form.reset('email');
- },
- onError() {
- form.reset('email');
- },
- },
- );
-};
</script>
<template>
<LayoutAuth>
<AuthHeader> Enter your email to receive a password reset link </AuthHeader>
<AuthCard>
- <BaseForm @submit.prevent="handleSubmit">
- <FormItem v-for="(field, index) in fields" :key="index">
- <FormInputLabel :field="field" />
- <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />
- <FormErrorList :errors="form.errors" :field-name="field.name" />
- </FormItem>
-
- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="!justify-center !capitalize">
- Email password reset link
- </ButtonForm>
- </BaseForm>
- <span class="mx-auto text-gray-600 dark:text-gray-400">
- Or, return to
- <RouterLink
- class="underline hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
- to="/login"
- >
- log in
- </RouterLink>
- </span>
+ <RecoveryForm />
</AuthCard>
</LayoutAuth>
</template>
diff --git a/resources/js/views/RegisterView.vue b/resources/js/views/RegisterView.vue
index 5934fb09..d5a8b62f 100755
--- a/resources/js/views/RegisterView.vue
+++ b/resources/js/views/RegisterView.vue
@@ -1,79 +1,15 @@
-<script setup>
-import { useRouter, RouterLink } from 'vue-router';
-import { useAuthStore } from '@/stores/AuthStore';
-import { storeToRefs } from 'pinia';
-import { register } from '@/service/authAPI';
-import { ref } from 'vue';
-
-import FormInputLabel from '@/components/labels/FormInputLabel.vue';
-import FormErrorList from '@/components/labels/FormErrorList.vue';
+<script setup lang="ts">
+import RegisterForm from '@/components/forms/RegisterForm.vue';
import AuthHeader from '@/components/headers/AuthHeader.vue';
import LayoutAuth from '@/layouts/LayoutAuth.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import AuthCard from '@/components/cards/AuthCard.vue';
-import useForm from '@/composables/useForm';
-import BaseForm from '@/components/forms/BaseForm.vue';
-import FormItem from '@/components/forms/FormItem.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
-
-const { userData } = storeToRefs(useAuthStore());
-
-const router = useRouter();
-
-const fields = ref([
- { name: 'name', text: 'Name', type: 'text', required: true, autocomplete: 'name' },
- { name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'username email' },
- { name: 'password', text: 'Password', type: 'password', required: true, autocomplete: 'new-password' },
- { name: 'password_confirmation', text: 'Confirm Password', type: 'password', required: true, autocomplete: 'new-password' },
-]);
-
-const form = useForm({
- name: '',
- email: '',
- password: '',
- password_confirmation: '',
-});
-
-const handleRegister = async () => {
- form.submit(
- async (fields) => {
- return await register(fields);
- },
- {
- onSuccess: (response) => {
- localStorage.setItem('auth-token', response.data.token);
- userData.value = response.data.user;
- router.push({ name: 'root' });
- },
- onError: () => {
- form.reset('password', 'password_confirmation');
- },
- },
- );
-};
</script>
<template>
<LayoutAuth>
<AuthHeader>Enter your details below to create your account</AuthHeader>
<AuthCard>
- <BaseForm @submit.prevent="handleRegister">
- <FormItem v-for="(field, index) in fields" :key="index">
- <FormInputLabel :field="field" />
- <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />
- <FormErrorList :errors="form.errors" :field-name="field.name" />
- </FormItem>
- <div class="flex flex-wrap gap-2 gap-x-4 items-center justify-center sm:justify-end text-center">
- <RouterLink
- class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
- to="/login"
- >
- Already registered?
- </RouterLink>
-
- <ButtonForm variant="auth" type="submit" :disabled="form.processing">Register</ButtonForm>
- </div>
- </BaseForm>
+ <RegisterForm />
</AuthCard>
</LayoutAuth>
</template>