A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
new form composable
aminnausinb6de19d0b89f
diff --git a/package-lock.json b/package-lock.jsonindex 6ddfc39b..3456db5d 100644--- a/package-lock.json+++ b/package-lock.json@@ -8,6 +8,8 @@"@headlessui/vue": "^1.7.22","@tailwindcss/aspect-ratio": "^0.4.2","@tailwindcss/forms": "^0.5.7",+ "lodash.clonedeep": "^4.5.0",+ "lodash.isequal": "^4.5.0","pinia": "^2.1.7","vue": "^3.4.29","vue-loader": "^17.4.2",@@ -2829,6 +2831,16 @@"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==","dev": true},+ "node_modules/lodash.clonedeep": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",+ "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="+ },+ "node_modules/lodash.isequal": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",+ "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="+ },"node_modules/lodash.merge": {"version": "4.6.2","resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",diff --git a/package.json b/package.jsonindex a7b093bb..35bb0b70 100644--- a/package.json+++ b/package.json@@ -26,6 +26,8 @@"@headlessui/vue": "^1.7.22","@tailwindcss/aspect-ratio": "^0.4.2","@tailwindcss/forms": "^0.5.7",+ "lodash.clonedeep": "^4.5.0",+ "lodash.isequal": "^4.5.0","pinia": "^2.1.7","vue": "^3.4.29","vue-loader": "^17.4.2",diff --git a/resources/js/composables/useForm.js b/resources/js/composables/useForm.jsnew file mode 100644index 00000000..25824470--- /dev/null+++ b/resources/js/composables/useForm.js@@ -0,0 +1,111 @@+import cloneDeep from "lodash.clonedeep";+import isEqual from "lodash.isequal";+import { reactive, watch } from "vue";++export default function useForm(fields) {+ let defaults = fields;+ let recentlySuccessfulTimeoutId;+ const form = reactive({+ fields: cloneDeep(fields),+ errors: {},+ dirty: false,+ hasErrors: false,+ processing: false,+ wasSuccessful: false,+ recentlySuccessful: false,++ async submit(submitFn, hooks = {}) {+ if(this.processing) return;++ const _hooks = {+ onBefore: async () => {+ this.processing = true;+ this.wasSuccessful = false;+ this.recentlySuccessful = false;+ clearTimeout(recentlySuccessfulTimeoutId);++ if(hooks.onBefore) await hooks.onBefore();+ },+ onSuccess: async (response) => {+ this.clearErrors();+ this.wasSuccessful = true;+ this.recentlySuccessful = true;+++ recentlySuccessfulTimeoutId = setTimeout(() => {+ this.recentlySuccessful = false;+ }, 2000);++ if(hooks.onSuccess) await hooks.onSuccess(response);+++ defaults = cloneDeep(this.fields);+ },+ onError: async (error) => {+ console.log(error.response.data.message);+ this.hasErrors = true;++ if(error?.response.status === 422 || error?.response.status === 401){+ this.clearErrors();+ this.setErrors({message: error?.response?.data.message, ...error?.response?.data?.errors});+ }++ if(hooks.onError) await hooks.onError(error);+ },+ onFinish: async () => {+ this.processing = false;++ if(hooks.onFinish) await hooks.onFinish();+ },+ }++ await _hooks.onBefore();++ try {+ const response = await(submitFn(this.fields));+ await _hooks.onSuccess(response);+ } catch(error){+ await _hooks.onError(error);+ } finally {+ await _hooks.onFinish();+ }++ },+ reset(...fields) {+ const clonedDefaults = cloneDeep(defaults);++ if(fields.length === 0){+ this.field = cloneDeep;+ } else {+ fields.forEach((field) => {+ if(clonedDefaults[field] !== undefined){+ this.fields[field] = clonedDefaults[field];+ }+ });+ }+ },+ clearErrors(...fields) {+ if(fields.length === 0){+ this.errors = {};+ } else {+ fields.forEach((field) => delete this.errors[field]);+ }++ this.hasErrors = Object.keys(this.errors).length > 0;+ },+ setErrors(errors) {+ this.errors = {...this.errors, ...errors}+ console.log(errors);+ this.hasErrors = Object.keys(this.errors).length > 0;+ },+ })++ watch(+ () => form.fields,+ () => {+ form.dirty = !isEqual(form.fields, defaults);+ },+ { immediate: true, deep: true }+ )+ return form;+}\ No newline at end of filediff --git a/resources/js/service/api.js b/resources/js/service/api.jsindex 8c186efb..b64911ef 100644--- a/resources/js/service/api.js+++ b/resources/js/service/api.js@@ -6,11 +6,15 @@ const handleResponse = (response) => {const handleError = (error) => {// if the server throws an error (404, 500 etc.)- console.log(error);if(error.response.status === 403 | error.response.status === 500){window.location.href = `/${error.response.status}?message=${error?.message}`return;}++ if(error.response.status === 401 || error.response.status == 422) throw(error);++ console.log(error);+return error.response;}diff --git a/resources/js/service/authAPI.js b/resources/js/service/authAPI.jsindex cd1c8d41..a5492d28 100644--- a/resources/js/service/authAPI.js+++ b/resources/js/service/authAPI.js@@ -8,22 +8,19 @@ export const getCSRF = async () => {export const login = async (credentials) => {try {await WEB.get(`/sanctum/csrf-cookie`);-- const response = await API.post('/login', credentials);- const { data } = response;- return Promise.resolve({response: data});+ const response = await API.post('/login', credentials)+ return Promise.resolve(response);} catch (error) {- return Promise.reject({error});+ return Promise.reject(error);}};export const register = async (credentials) => {try {const response = await API.post('/register', credentials)- const { data } = response;- return Promise.resolve({response: data});+ return Promise.resolve(response);} catch (error) {- return Promise.reject({error});+ return Promise.reject(error);}}diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vueindex 86d32701..8368fc10 100644--- a/resources/js/views/LoginView.vue+++ b/resources/js/views/LoginView.vue@@ -7,6 +7,7 @@import { storeToRefs } from 'pinia';import { login } from '../service/authAPI';import { ref } from 'vue';+import useForm from '../composables/useForm';const router = useRouter();@@ -14,31 +15,32 @@const authStore = useAuthStore();const { userData } = storeToRefs(authStore);- const loginError = ref('')- const credentials = ref({email: '', password: '', remember: false});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 form = useForm({+ email: '',+ password: '',+ remember: false,+ })+const handleLogin = async () => {- loginError.value = '';-- // await axios.get(`/sanctum/csrf-cookie`);- // axios.post('/api/login', credentials.value)--- let { response, error } = await login(credentials.value);-- if(error || !response.success){- loginError.value = error ? error.message : response.message;- return;- }-- localStorage.setItem('auth-token', response.data.token);- userData.value = response.data.user;- router.replace(route.query.redirect || '/');+ form.submit(+ async (fields) => {+ return await login(fields);+ },+ {+ onSuccess: (response) => {+ localStorage.setItem('auth-token', response.data.data.token);+ userData.value = response.data.data.user;+ router.replace(route.query.redirect || '/');+ },+ onError: () => form.reset('password'),+ }+ )}</script>@@ -54,20 +56,20 @@<form class="flex flex-col gap-2" @submit.prevent="handleLogin"><div v-for="(field, index) in fields" :key="index"><FormInputLabel :name="field.name" :text="field.text" />- <FormInput v-model="credentials[field.name]" :type="field.type" :name="field.name" :required="field.required" :autocomplete="field.autocomplete"/>+ <FormInput v-model="form.fields[field.name]" :type="field.type" :name="field.name" :required="field.required" :autocomplete="field.autocomplete"/></div><!-- Remember Me --><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">+ <input v-model="form.fields.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>+ <li v-for="(error, index) in form.errors" :key="index">{{ error }}</li></ul></div>@@ -76,7 +78,10 @@Not Registered?</RouterLink>- <button 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">+ <button 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"+ :class="{ 'opacity-25': form.processing }"+ :disabled="form.processing">Log in</button></div>diff --git a/resources/js/views/RegisterView.vue b/resources/js/views/RegisterView.vueindex df5bbab0..8597e7a0 100644--- a/resources/js/views/RegisterView.vue+++ b/resources/js/views/RegisterView.vue@@ -1,6 +1,7 @@<script setup>import FormInputLabel from '../components/labels/FormInputLabel.vue';import FormInput from '../components/inputs/FormInput.vue';+ import useForm from '../composables/useForm';import { register } from '../service/authAPI';import { useRouter, RouterLink} from 'vue-router'@@ -13,8 +14,6 @@const authStore = useAuthStore();const { userData } = storeToRefs(authStore);- const registerErrors = ref({});- const credentials = ref({ name: '', email: '', password: '', password_confirmation: ''});const fields = ref([{name: 'name', text: 'Name', type:'text', required:true, autocomplete: 'name'},{name: 'email', text: 'Email', type:'text', required:true, autocomplete: 'username email'},@@ -22,20 +21,30 @@{name: 'password_confirmation', text: 'Confirm Password', type:'password', required:true, autocomplete: 'new-password'},]);+ const form = useForm({+ name: '',+ email: '',+ password: '',+ password_confirmation: '',+ })+const handleRegister = async () => {- registerErrors.value = {};-- let { response, error } = await register(credentials.value);-- if(error || !response.success){- registerErrors.value = { general: error?.message, ...response.errors };- return;- }-- localStorage.setItem('auth-token', response.data.token);- userData.value = response.data.user;- router.push({name: 'root'});+ 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>@@ -50,15 +59,9 @@<form class="flex flex-col gap-4" @submit.prevent="handleRegister"><div v-for="(field, index) in fields" :key="index"><FormInputLabel :name="field.name" :text="field.text" />- <FormInput v-model="credentials[field.name]" :type="field.type" :name="field.name" :required="field.required" :autocomplete="field.autocomplete"/>- <ul class="text-sm text-red-600 dark:text-red-400">- <li v-for="(item, index) in registerErrors[field.name]" :key="index">{{item}}</li>- </ul>- </div>-- <div class="flex w-full justify-end">+ <FormInput v-model="form.fields[field.name]" :type="field.type" :name="field.name" :required="field.required" :autocomplete="field.autocomplete"/><ul class="text-sm text-red-600 dark:text-red-400">- <li>{{registerErrors?.general}}</li>+ <li v-for="(item, index) in form.errors[field.name]" :key="index">{{item}}</li></ul></div>