Skip to content

A self-hosted media server and file management system

Clean up login view and app

aminnausin8409555c09f1
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 24450108..2049d790 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,10 +1,5 @@
-<!-- <script setup>
-const props = defineProps({
- user: Object
-});
-</script> -->
<script setup>
- import { onMounted, ref } from 'vue';
+ import { onMounted } from 'vue';
import {RouterView} from 'vue-router'
import { useAuthStore } from './stores/AuthStore';
const authStore = useAuthStore();
diff --git a/resources/js/components/inputs/TextInput.vue b/resources/js/components/inputs/TextInput.vue
new file mode 100644
index 00000000..3b86ae7e
--- /dev/null
+++ b/resources/js/components/inputs/TextInput.vue
@@ -0,0 +1,17 @@
+<script setup>
+ const { name, type, required, placeholder, autoComplete } = defineProps(['name', 'type', 'required', 'placeholder', 'autocomplete']);
+ const model = defineModel();
+</script>
+
+<template>
+ <input
+ class="border-gray-300 dark:border-gray-700 dark:text-gray-300 dark:bg-gray-900 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm block mt-1 w-full"
+ :name="name"
+ :type="type"
+ :required="required ? 'required' : ''"
+ :placeholder="placeholder"
+ :autocomplete="autocomplete"
+ :aria-autocomplete="autocomplete ? 'list' : 'none'"
+ v-model="model"
+ >
+</template>
\ No newline at end of file
diff --git a/resources/js/components/labels/TextInputLabel.vue b/resources/js/components/labels/TextInputLabel.vue
new file mode 100644
index 00000000..4f1364a2
--- /dev/null
+++ b/resources/js/components/labels/TextInputLabel.vue
@@ -0,0 +1,9 @@
+<script setup>
+ const { name, text } = defineProps(['name', 'text']);
+</script>
+
+<template>
+ <label class="block font-medium text-sm text-gray-700 dark:text-gray-300" :for="name">
+ {{ text }}
+ </label>
+</template>
\ No newline at end of file
diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vue
index d660cf52..d86349c5 100644
--- a/resources/js/views/LoginView.vue
+++ b/resources/js/views/LoginView.vue
@@ -1,28 +1,32 @@
<script setup>
- import { storeToRefs } from 'pinia';
+ import TextInputLabel from '../components/labels/TextInputLabel.vue';
+ import TextInput from '../components/inputs/TextInput.vue';
+
+ import { login } from '../service/auth';
+ import { useRouter, useRoute, RouterLink } from 'vue-router'
import { useAuthStore } from '../stores/AuthStore'
+ import { storeToRefs } from 'pinia';
import { ref } from 'vue';
- import { login } from '../service/auth';
- import { useRouter, useRoute } from 'vue-router'
- const router = useRouter()
- const route = useRoute()
+ const router = useRouter();
+ const route = useRoute();
const authStore = useAuthStore();
const {csrfToken, userData} = storeToRefs(authStore);
- // const { login } = authStore;
-
-
const loginError = ref('')
const credentials = ref({email: '', password: '', remember: false, _token: csrfToken});
+ const fields = ref([
+ {name: 'email', text: 'Email', type:'text', required:true, autocomplete: 'username email'},
+ {name: 'password', text: 'Password', type:'password', required:true, autocomplete: 'password'},
+ ]);
const handleLogin = async (e) => {
e?.preventDefault();
loginError.value = '';
- let { response, error} = await login(credentials.value);
+ let { response, error } = await login(credentials.value);
- if(error || response.success === false){
+ if(error || !response.success){
loginError.value = error ? error.message : response.message;
return;
}
@@ -37,40 +41,32 @@
<main class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 m-auto bg-gray-100 dark:dark:bg-[#121216] dark:text-[#e2e0e2]">
<div class=" w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-neutral-800 shadow-md overflow-hidden sm:rounded-lg">
<!-- Session Status -->
- <form>
+ <form class="flex flex-col gap-2">
<input type="hidden" name="_token" :value="csrfToken" autocomplete="off">
- <!-- Email Address -->
- <div>
- <label class="block font-medium text-sm text-gray-700 dark:text-gray-300" for="email">
- Email
- </label>
- <input v-model="credentials.email" class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm block mt-1 w-full" id="email" type="email" name="email" required="required" autofocus="autofocus" autocomplete="username">
- <ul class="text-sm text-red-600 dark:text-red-400 space-y-1 mt-2">
- <li>{{loginError}}</li>
- </ul>
- </div>
-
- <!-- Password -->
- <div class="mt-4">
- <label class="block font-medium text-sm text-gray-700 dark:text-gray-300" for="password">
- Password
- </label>
- <input v-model="credentials.password" class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm block mt-1 w-full" id="password" type="password" name="password" required="required" autocomplete="current-password">
+ <div v-for="(field, index) in fields" :key="index">
+ <TextInputLabel :name="field.name" :text="field.text" />
+ <TextInput v-model="credentials[field.name]" :type="field.type" :name="field.name" :required="field.required" :autocomplete="field.autocomplete"/>
</div>
<!-- Remember Me -->
- <div class="block mt-4">
+ <div class="block">
<label for="remember_me" class="inline-flex items-center">
<input v-model="credentials.remember" id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember_me">
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">Remember me</span>
</label>
</div>
+ <div class="flex w-full justify-end">
+ <ul class="text-sm text-red-600 dark:text-red-400">
+ <li>{{loginError}}</li>
+ </ul>
+ </div>
+
<div class="flex items-center justify-end mt-4">
- <a 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" href="/register">
- Forgot your password?
- </a>
+ <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="/register">
+ Not Registered?
+ </RouterLink>
<button @click="handleLogin" type="submit" class="inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150 ms-3">
Log in