From 9961aba1609e612d7898eff9fa28101fe123da44 Mon Sep 17 00:00:00 2001 From: James Collins Date: Mon, 20 Feb 2023 10:19:51 +1000 Subject: [PATCH] removed --- resources/js/axios.js.old | 44 --- resources/js/helpers/fontawesome.ts | 9 - resources/js/helpers/validation.old.js | 360 ------------------------- 3 files changed, 413 deletions(-) delete mode 100644 resources/js/axios.js.old delete mode 100644 resources/js/helpers/fontawesome.ts delete mode 100644 resources/js/helpers/validation.old.js diff --git a/resources/js/axios.js.old b/resources/js/axios.js.old deleted file mode 100644 index 795f0fb..0000000 --- a/resources/js/axios.js.old +++ /dev/null @@ -1,44 +0,0 @@ -import axios from "axios"; -import { useUserStore } from "./store/UserStore"; -import { useRouter } from "vue-router"; - -axios.defaults.baseURL = import.meta.env.APP_URL_API; -axios.defaults.withCredentials = true; -axios.defaults.headers.common["Accept"] = "application/json"; - -axios.interceptors.request.use((request) => { - const userStore = useUserStore(); - if (userStore.id) { - request.headers["Authorization"] = `Bearer ${userStore.token}`; - } - - return request; -}); - -axios.interceptors.response.use( - (response) => { - return response; - }, - (error) => { - if (error.config.redirect !== false && error.response.status === 401) { - const userStore = useUserStore(); - const router = useRouter(); - userStore.clearUser(); - - const url = new URL(error.request.responseURL); - router.push({ name: "login", query: { redirect: url.pathname } }); - } - - // if(error.config.redirect === true) { - // if(error.response.status === 403) { - // router.push({ name: 'error-forbidden' }) - // } else if(error.response.status === 404) { - // router.push({ name: 'error-notfound' }) - // } else if(error.response.status >= 500) { - // router.push({name: 'error-internal'}) - // } - // } - - return Promise.reject(error); - } -); diff --git a/resources/js/helpers/fontawesome.ts b/resources/js/helpers/fontawesome.ts deleted file mode 100644 index 933d6c7..0000000 --- a/resources/js/helpers/fontawesome.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; -import { library } from "@fortawesome/fontawesome-svg-core"; -import { fas } from '@fortawesome/free-solid-svg-icons' -import { fab } from '@fortawesome/free-brands-svg-icons'; -import { far } from '@fortawesome/free-regular-svg-icons'; - -library.add(far, fas, fab); - -export default FontAwesomeIcon; \ No newline at end of file diff --git a/resources/js/helpers/validation.old.js b/resources/js/helpers/validation.old.js deleted file mode 100644 index 377bfc9..0000000 --- a/resources/js/helpers/validation.old.js +++ /dev/null @@ -1,360 +0,0 @@ -import { watch } from "vue"; - -let oldFormData = {}; - -const bytesReadable = (bytes) => { - if (Math.abs(bytes) < 1024) { - return bytes + "B"; - } - - const units = ["kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]; - let u = -1; - const r = 10 ** 1; - - do { - bytes /= 1024; - ++u; - } while ( - Math.round(Math.abs(bytes) * r) / r >= 1024 && - u < units.length - 1 - ); - - return bytes.toFixed(1) + "" + units[u]; -}; - -const validateMessage = (ruleData, rule, defMessage) => { - let msg = - ruleData[rule + "_message"] !== undefined - ? ruleData[rule + "_message"] - : defMessage; - return msg - .replaceAll("%d", ruleData[rule]) - .replaceAll("%b", bytesReadable(ruleData[rule])); -}; - -const validateSingle = (fieldData) => { - let error = ""; - - if ( - fieldData.rules && - (fieldData.enabled == undefined || fieldData.enabled == true) - ) { - // Fill in the type declaration - if (Object.keys(fieldData.rules).includes("type")) { - if (typeof fieldData.rules.type === "string") { - fieldData.rules[fieldData.rules.type] = true; - } else if ( - typeof fieldData.rules.type === "object" && - "type" in fieldData.rules.type - ) { - fieldData.rules[fieldData.rules.type.type] = true; - } - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("required") && - (fieldData.rules.required == true || - (typeof fieldData.rules.required == "function" && - fieldData.rules.required() == true)) && - (fieldData.value == null || fieldData.value.length == 0) - ) { - error = validateMessage( - fieldData.rules, - "required", - "This item is required" - ); - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("min") && - (fieldData.value == null || - fieldData.value.length < fieldData.rules.min) - ) { - error = validateMessage( - fieldData.rules, - "min", - "This item is required to be at least %d characters" - ); - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("max") && - fieldData.value != null && - fieldData.value.length > fieldData.rules.max - ) { - error = validateMessage( - fieldData.rules, - "max", - "This item is required to be at no longer than %d characters" - ); - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("email") && - /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test( - fieldData.value - ) == false - ) { - error = validateMessage( - fieldData.rules, - "email", - "This item is required to be a valid email address" - ); - } - - if (error.length == 0 && Object.keys(fieldData.rules).includes("url")) { - try { - new URL(fieldData.value); - } catch (e) { - error = validateMessage( - fieldData.rules, - "url", - "This item is required to be a valid URL" - ); - } - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("password") - ) { - if ( - (fieldData.rules.password == true || - fieldData.rules.password == "basic") && - /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{1,}$/.test( - fieldData.value - ) == false - ) { - error = validateMessage( - fieldData.rules, - "password", - "Your password needs to have at least 1 letter and 1 number" - ); - } else if ( - fieldData.rules.password == "special" && - /(?=.*[A-Za-z])(?=.*\d)(?=.*[.@$!%*#?&])[A-Za-z\d.@$!%*#?&]{1,}$/.test( - fieldData.value - ) == false - ) { - error = validateMessage( - fieldData.rules, - "password", - "Your password needs to have at least a letter, a number and a special character" - ); - } else if ( - fieldData.rules.password == "uppercase_special" && - /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{1,}$/.test( - fieldData.value - ) == false - ) { - error = validateMessage( - fieldData.rules, - "password", - "Your password needs to have at least a lowercase and uppercase letter, 1 number and 1 special character" - ); - } - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("phone") && - fieldData.value != null && - fieldData.value.length > 0 && - /^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/.test(fieldData.value) == false - ) { - error = validateMessage( - fieldData.rules, - "phone", - "This item is required to be a valid phone number" - ); - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("datetime") && - fieldData.value != null && - fieldData.value.length > 0 - ) { - try { - new Date(fieldData.value); - } catch (e) { - error = validateMessage( - fieldData.rules, - "datetime", - "A valid date/time is required" - ); - } - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("afterdate") && - fieldData.value != null && - fieldData.value.length > 0 - ) { - let failed = false; - - try { - let after = fieldData.rules.afterdate; - if (typeof after == "function") { - after = after(); - } - - if ( - after.length > 0 && - new Date(fieldData.value) <= new Date(after) - ) { - failed = true; - } - } catch (e) { - failed = true; - } - - if (failed) { - error = validateMessage( - fieldData.rules, - "afterdate", - "Date is required to be after the beginning date." - ); - } - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("fileSize") && - fieldData.value != null && - fieldData.value.size > fieldData.rules.fileSize - ) { - error = validateMessage( - fieldData.rules, - "fileSize", - "The file size larger than the allowed size" - ); - } - - if ( - error.length == 0 && - Object.keys(fieldData.rules).includes("custom") - ) { - error = fieldData.rules.custom(fieldData.value); - } - - fieldData.error = error; - } -}; - -const validateRules = ( - formData, - force = false, - pageRef = null, - showMessages = false -) => { - Object.keys(oldFormData).forEach((key) => { - if ( - key in formData && - (oldFormData[key].value != parseValue(formData[key].value) || - force == true) && - formData[key].rules !== undefined && - (pageRef == null || formData[key].page == pageRef.value) - ) { - oldFormData[key].value = parseValue(formData[key].value); - if (showMessages == true) { - validateSingle(formData[key]); - } else { - formData[key].error = ""; - } - } - }); -}; - -const parseValue = (val) => { - if (val instanceof File) { - return JSON.stringify({ - name: val.name, - size: val.size, - lastModified: val.lastModified, - lastModifiedDate: val.lastModifiedDate, - type: val.type, - }); - } - - return val; -}; - -export const useValidation = ( - formData, - pageRef = null, - showMessages = false -) => { - watch(formData, (newFormData) => { - if (newFormData) { - validateRules(newFormData, false, pageRef, showMessages); - } - }); -}; - -export const isValidated = (formData, pageRef = null) => { - let result = true; - - oldFormData = JSON.parse(JSON.stringify(formData)); - validateRules(formData, true, pageRef, true); - - Object.keys(formData).forEach((key) => { - if ( - formData[key].error !== undefined && - formData[key].error.length > 0 && - (pageRef == null || pageRef.value == formData[key].page) - ) { - result = false; - } - }); - - return result; -}; - -export const fieldValidate = (fieldData) => { - validateSingle(fieldData); -}; - -export const restParseErrors = (formData, formErrorRef, response) => { - let foundKeys = false; - - if (response.response?.data?.errors) { - Object.keys(response.response.data.errors).forEach((key) => { - if (formData[key] !== undefined) { - foundKeys = true; - if (Array.isArray(response.response.data.errors[key])) { - formData[key].error = response.response.data.errors[key][0]; - } else { - formData[key].error = response.response.data.errors[key]; - } - } - }); - } - - if (foundKeys == false) { - const msg = response.response?.data?.message - ? response.response?.data?.message - : "An unknown server error occurred. Please try again later"; - if (Array.isArray(formErrorRef)) { - formErrorRef[0][formErrorRef[1]] = msg; - } else if (formErrorRef.value !== undefined) { - formErrorRef.value = msg; - } - } -}; - -export const clearFormData = (formData) => { - Object.keys(formData).forEach((key) => { - if ("value" in formData[key]) { - formData[key]["value"] = ""; - } - if ("error" in formData[key]) { - formData[key]["error"] = ""; - } - }); -};