diff --git a/[esx]/esx_identity/README.md b/[esx]/esx_identity/README.md index c73c4330..f4053cad 100644 --- a/[esx]/esx_identity/README.md +++ b/[esx]/esx_identity/README.md @@ -2,13 +2,13 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, Height and Date-of-birth. -![Preview](https://cdn.discordapp.com/attachments/714118962568364106/997871502798094426/Screenshot_51.png) +![Preview](./preview.png) # Infomation ## Requirements - [esx_skin](./../esx_skin/README.md) +[esx_skin](./../esx_skin/README.md) ## Commands diff --git a/[esx]/esx_identity/client/main.lua b/[esx]/esx_identity/client/main.lua index 13e3d532..9b7dd31a 100644 --- a/[esx]/esx_identity/client/main.lua +++ b/[esx]/esx_identity/client/main.lua @@ -10,12 +10,12 @@ end) RegisterNetEvent('esx_identity:setPlayerData', function(data) SetTimeout(1, function() - ESX.SetPlayerData("name", ('%s %s'):format(data.firstName, data.lastName)) - ESX.SetPlayerData('firstName', data.firstName) - ESX.SetPlayerData('lastName', data.lastName) - ESX.SetPlayerData('dateofbirth', data.dateOfBirth) - ESX.SetPlayerData('sex', data.sex) - ESX.SetPlayerData('height', data.height) + ESX.SetPlayerData("name", ('%s %s'):format(data.firstName, data.lastName)) + ESX.SetPlayerData('firstName', data.firstName) + ESX.SetPlayerData('lastName', data.lastName) + ESX.SetPlayerData('dateofbirth', data.dateOfBirth) + ESX.SetPlayerData('sex', data.sex) + ESX.SetPlayerData('height', data.height) end) end) diff --git a/[esx]/esx_identity/esx_identity.sql b/[esx]/esx_identity/esx_identity.sql index 026ba5da..15f55f6c 100644 --- a/[esx]/esx_identity/esx_identity.sql +++ b/[esx]/esx_identity/esx_identity.sql @@ -1,9 +1,7 @@ - - ALTER TABLE `users` ADD COLUMN `firstname` VARCHAR(16) NULL DEFAULT NULL, ADD COLUMN `lastname` VARCHAR(16) NULL DEFAULT NULL, ADD COLUMN `dateofbirth` VARCHAR(10) NULL DEFAULT NULL, ADD COLUMN `sex` VARCHAR(1) NULL DEFAULT NULL, ADD COLUMN `height` INT NULL DEFAULT NULL -; +; \ No newline at end of file diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua index 7d3db1c9..2295a063 100644 --- a/[esx]/esx_identity/fxmanifest.lua +++ b/[esx]/esx_identity/fxmanifest.lua @@ -6,10 +6,12 @@ description 'ESX Identity' lua54 'yes' version '1.8.5' -shared_script '@es_extended/imports.lua' +shared_scripts { + '@es_extended/imports.lua', + '@es_extended/locale.lua', +} server_scripts { - '@es_extended/locale.lua', '@oxmysql/lib/MySQL.lua', 'locales/*.lua', 'config.lua', @@ -17,7 +19,6 @@ server_scripts { } client_scripts { - '@es_extended/locale.lua', 'locales/*.lua', 'config.lua', 'client/main.lua' @@ -31,4 +32,4 @@ files { 'html/css/style.css', } -dependency 'es_extended' +dependency 'es_extended' \ No newline at end of file diff --git a/[esx]/esx_identity/html/index.html b/[esx]/esx_identity/html/index.html index 4960eee5..d9ca6d93 100644 --- a/[esx]/esx_identity/html/index.html +++ b/[esx]/esx_identity/html/index.html @@ -1,23 +1,24 @@ - + + - - + - + + + ESX Identity
IDENTITY
-
-
First Name
-
-
Last Name
-
-
Date of Birth (MM/DD/YYYY)
-
-
Height
+
First Name
+
+
Last Name
+
+
Date of Birth (MM/DD/YYYY)
+
+
Height

@@ -32,74 +33,13 @@
If the submit button doesn't work, please ensure that you've entered the fields correctly.
- - + diff --git a/[esx]/esx_identity/html/js/script.js b/[esx]/esx_identity/html/js/script.js index 85102cb4..936c164d 100644 --- a/[esx]/esx_identity/html/js/script.js +++ b/[esx]/esx_identity/html/js/script.js @@ -1,35 +1,38 @@ -$(function() { - $.post('http://esx_identity/ready', JSON.stringify({})) +$(document).ready(function () { + $.post("http://esx_identity/ready", JSON.stringify({})); - window.addEventListener('message', function(event) { - if (event.data.type === "enableui") { - document.body.style.display = event.data.enable ? "block" : "none" - } - }) + window.addEventListener("message", function (event) { + if (event.data.type === "enableui") { + event.data.enable ? $(document.body).show() : $(document.body).hide(); + } + }); - $("#register").submit(function(event) { - event.preventDefault() // Prevent form from submitting - - // Verify date - var date = $("#dateofbirth").val() - var dateCheck = new Date($("#dateofbirth").val()) - - if (dateCheck == "Invalid Date") { - date == "invalid" - } else { - const ye = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(dateCheck) - const mo = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(dateCheck) - const da = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(dateCheck) - - var formattedDate = `${da}/${mo}/${ye}` - - $.post('http://esx_identity/register', JSON.stringify({ - firstname: $("#firstname").val(), - lastname: $("#lastname").val(), - dateofbirth: formattedDate, - sex: $("input[type='radio'][name='sex']:checked").val(), - height: $("#height").val() - })) - } - }) -}) + $("#register").submit(function (event) { + event.preventDefault(); + + const dateCheck = new Date($("#dateofbirth").val()); + + const year = new Intl.DateTimeFormat("en", { year: "numeric" }).format( + dateCheck + ); + const month = new Intl.DateTimeFormat("en", { month: "2-digit" }).format( + dateCheck + ); + const day = new Intl.DateTimeFormat("en", { day: "2-digit" }).format( + dateCheck + ); + + const formattedDate = `${day}/${month}/${year}`; + + $.post( + "http://esx_identity/register", + JSON.stringify({ + firstname: $("#firstname").val(), + lastname: $("#lastname").val(), + dateofbirth: formattedDate, + sex: $("input[type='radio'][name='sex']:checked").val(), + height: $("#height").val(), + }) + ); + }); +}); diff --git a/[esx]/esx_identity/preview.png b/[esx]/esx_identity/preview.png new file mode 100644 index 00000000..39dd41fa Binary files /dev/null and b/[esx]/esx_identity/preview.png differ diff --git a/[esx]/esx_textui/TextUI.lua b/[esx]/esx_textui/TextUI.lua index 467f6e81..2cc04528 100644 --- a/[esx]/esx_textui/TextUI.lua +++ b/[esx]/esx_textui/TextUI.lua @@ -5,8 +5,8 @@ Debug = ESX.GetConfig().EnableDebug local function TextUI(message, type) SendNUIMessage({ action = 'show', - message = message or 'ESX-TextUI', - type = type or 'info' + message = message and message or 'ESX-TextUI', + type = type ~= 0 and type or 'info' }) end