Merge pull request #1485 from Arctos2win/1.11.2-hotfix

chore(esx_identity): clone dev version into hotfix branch
esx-framework · Nov 18, 2024 · 86a0678 · 86a0678
2 parents 1a3e8e4 + 5f295f6
commit 86a0678
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 19 deletions.
diff --git a/[core]/esx_identity/dist/assets/index-B6T-7u2-.css b/[core]/esx_identity/dist/assets/index-B6T-7u2-.css
diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -24,10 +24,10 @@ client_scripts {
 }
 
 files ({
-	'dist/assets/**',
-	'dist/**',
+	'web/dist/assets/**',
+	'web/dist/**',
 })
 
-ui_page 'dist/index.html'
+ui_page 'web/dist/index.html'
 
 dependency 'es_extended'
diff --git a/[core]/esx_identity/server/main.lua b/[core]/esx_identity/server/main.lua
@@ -243,6 +243,8 @@ end
 
     ESX.RegisterServerCallback("esx_identity:registerIdentity", function(source, cb, data)
         local xPlayer = ESX.GetPlayerFromId(source)
+        data.dateofbirth = formatDate(data.dateofbirth)
+
         if not checkNameFormat(data.firstname) then
             TriggerClientEvent("esx:showNotification", source, TranslateCap("invalid_firstname_format"), "error")
             return cb(false)
@@ -272,7 +274,7 @@ end
             playerIdentity[xPlayer.identifier] = {
                 firstName = formatName(data.firstname),
                 lastName = formatName(data.lastname),
-                dateOfBirth = formatDate(data.dateofbirth),
+                dateOfBirth = data.dateofbirth,
                 sex = data.sex,
                 height = data.height,
             }

diff --git a/[core]/esx_identity/web/.yarn.installed b/[core]/esx_identity/web/.yarn.installed
diff --git a/...sx_identity/dist/assets/index-CaT4lk_v.js → ...dentity/web/dist/assets/index-BR-kw549.js b/...sx_identity/dist/assets/index-CaT4lk_v.js → ...dentity/web/dist/assets/index-BR-kw549.js
diff --git a/[core]/esx_identity/web/dist/assets/index-CBKwBtku.css b/[core]/esx_identity/web/dist/assets/index-CBKwBtku.css
diff --git a/[core]/esx_identity/dist/index.html → [core]/esx_identity/web/dist/index.html b/[core]/esx_identity/dist/index.html → [core]/esx_identity/web/dist/index.html
@@ -11,8 +11,8 @@
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
     integrity="sha512-Kc323vGBEqzTmouAECnVceyQqyqdsSiqLQISBL29aUW4U/M7pSPA/gEUZQqv1cwx4OnYxTxve5UMg5GT6L4JJg=="
     crossorigin="anonymous" referrerpolicy="no-referrer" />
-  <script type="module" crossorigin src="./assets/index-CaT4lk_v.js"></script>
-  <link rel="stylesheet" crossorigin href="./assets/index-B6T-7u2-.css">
+  <script type="module" crossorigin src="./assets/index-BR-kw549.js"></script>
+  <link rel="stylesheet" crossorigin href="./assets/index-CBKwBtku.css">
 </head>
 
 <body class="none">

diff --git a/[core]/esx_identity/dist/vite.svg → [core]/esx_identity/web/dist/vite.svg b/[core]/esx_identity/dist/vite.svg → [core]/esx_identity/web/dist/vite.svg
diff --git a/[core]/esx_identity/index.html → [core]/esx_identity/web/index.html b/[core]/esx_identity/index.html → [core]/esx_identity/web/index.html
diff --git a/[core]/esx_identity/package-lock.json → [core]/esx_identity/web/package-lock.json b/[core]/esx_identity/package-lock.json → [core]/esx_identity/web/package-lock.json
diff --git a/[core]/esx_identity/package.json → [core]/esx_identity/web/package.json b/[core]/esx_identity/package.json → [core]/esx_identity/web/package.json
diff --git a/[core]/esx_identity/public/vite.svg → [core]/esx_identity/web/public/vite.svg b/[core]/esx_identity/public/vite.svg → [core]/esx_identity/web/public/vite.svg
diff --git a/[core]/esx_identity/src/App.vue → [core]/esx_identity/web/src/App.vue b/[core]/esx_identity/src/App.vue → [core]/esx_identity/web/src/App.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted } from 'vue';
-import HelloWorld from './components/HelloWorld.vue'
+import Identity from './components/Identity.vue'
 
 onMounted(() => {
   fetch("http://esx_identity/ready", {
@@ -18,7 +18,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <HelloWorld/>
+  <Identity/>
 </template>
 
 <style scoped>

diff --git a/[core]/esx_identity/src/assets/vue.svg → [core]/esx_identity/web/src/assets/vue.svg b/[core]/esx_identity/src/assets/vue.svg → [core]/esx_identity/web/src/assets/vue.svg
diff --git a/...sx_identity/src/components/HelloWorld.vue → ..._identity/web/src/components/Identity.vue b/...sx_identity/src/components/HelloWorld.vue → ..._identity/web/src/components/Identity.vue
@@ -10,7 +10,7 @@ const onSubmit = (values) => {
             body: JSON.stringify({
                 firstname: values.firstname,
                 lastname: values.lastname,
-                dateofbirth: values.dob,
+                dateofbirth: moment(values.dob).format("DD/MM/YYYY"),
                 sex: values.gender,
                 height: values.height,
             }),
@@ -20,10 +20,10 @@ const onSubmit = (values) => {
 const schema = yup.object({
     firstname: yup.string().required('Firstname is required').min(3, 'Firstname must be at least 3 characters'),
     lastname: yup.string().required('Lastname is required').min(3, 'Lastname must be at least 3 characters'),
-    dob: yup.date().required('Date of Birth is required').transform((value, originalValue) => {
-        const parsedDate = moment(originalValue, 'DD/MM/YYYY', true);
-        return parsedDate.isValid() ? parsedDate.toDate() : new Date('');
-    }).typeError('Date must be in mm/dd/yyyy format'),
+    dob: yup.date()
+    .required('Date of Birth is required')
+    .min(new Date("1900-01-01"), "Date is too early")
+    .max(moment().subtract(1, 'years').toDate(), "You need to be atleast 1 year old"),
     gender: yup.string().required('Gender is required'),
     height: yup.number().required('Height is required').min(120, 'Minimum height is 120cm').max(220, 'Maximum height is 220cm').typeError('Amount must be a number'),
 })
@@ -42,21 +42,19 @@ const schema = yup.object({
                     <label for="firstname">Firstname</label>
                     <div class="dialog__form-validation">
                         <Field id="firstname" type="text" name="firstname" placeholder="Firstname" validateOnInput />
-                        <!-- <i class="fas fa-check-circle" style="color: #478444;"></i> -->
                     </div>
                     <ErrorMessage name="firstname" class="dialog__form-message dialog__form-message--error" />
                 </div>
                 <div class="dialog__form-group">
                     <label for="lastname">Lastname</label>
                     <div class="dialog__form-validation">
                         <Field id="lastname" type="text" name="lastname" placeholder="Lastname" validateOnInput />
-                        <!-- <i class="fas fa-times-circle" style="color: #733838;"></i> -->
                     </div>
                     <ErrorMessage name="lastname" class="dialog__form-message dialog__form-message--error" />
                 </div>
                 <div class="dialog__form-group">
                     <label for="dob">Date of birth</label>
-                    <Field id="dob" type="text" name="dob" placeholder="mm/dd/yyyy" validateOnInput />
+                    <Field id="dob" type="date" name="dob" placeholder="dd/mm/yyyy" validateOnInput />
                     <ErrorMessage name="dob" class="dialog__form-message dialog__form-message--error" />
                 </div>
                 <div class="dialog__form-group">

diff --git a/[core]/esx_identity/src/main.js → [core]/esx_identity/web/src/main.js b/[core]/esx_identity/src/main.js → [core]/esx_identity/web/src/main.js
diff --git a/[core]/esx_identity/src/style.css → [core]/esx_identity/web/src/style.css b/[core]/esx_identity/src/style.css → [core]/esx_identity/web/src/style.css
@@ -96,7 +96,6 @@ body {
 }
 
 .dialog__form-group label {
-    text-align: center;
     flex-grow: 1; /* Label will expand to fill available space */
     flex-shrink: 1; /* Allows the label to shrink if necessary */
     padding-inline: 20px; /* Horizontal padding */
@@ -187,4 +186,10 @@ body {
 ::placeholder {
     color: #242424;
     font-weight: 600;
+}
+
+input[type="date"]::-webkit-inner-spin-button,
+input[type="date"]::-webkit-calendar-picker-indicator {
+    display: none;
+    -webkit-appearance: none;
 }
diff --git a/[core]/esx_identity/vite.config.js → [core]/esx_identity/web/vite.config.js b/[core]/esx_identity/vite.config.js → [core]/esx_identity/web/vite.config.js