diff --git a/[core]/cron/server/main.lua b/[core]/cron/server/main.lua index bc8f81d0..51da085d 100644 --- a/[core]/cron/server/main.lua +++ b/[core]/cron/server/main.lua @@ -1,51 +1,75 @@ -local Jobs = {} -local LastTime = nil +---@class CronJob +---@field h number +---@field m number +---@field cb function|table +---@type CronJob[] +local cronJobs = {} +---@type number|false +local lastTimestamp = false + +---@param h number +---@param m number +---@param cb function|table function RunAt(h, m, cb) - Jobs[#Jobs + 1] = { + cronJobs[#cronJobs + 1] = { h = h, m = m, cb = cb, } end +---@return number function GetUnixTimestamp() return os.time() end -function OnTime(time) - for i = 1, #Jobs, 1 do +---@param timestamp number +function OnTime(timestamp) + for i = 1, #cronJobs, 1 do local scheduledTimestamp = os.time({ - hour = Jobs[i].h, - min = Jobs[i].m, + hour = cronJobs[i].h, + min = cronJobs[i].m, sec = 0, -- Assuming tasks run at the start of the minute - day = os.date("%d", time), - month = os.date("%m", time), - year = os.date("%Y", time), + day = os.date("%d", timestamp), + month = os.date("%m", timestamp), + year = os.date("%Y", timestamp), }) - if time >= scheduledTimestamp and (not LastTime or LastTime < scheduledTimestamp) then + if timestamp >= scheduledTimestamp and (not lastTimestamp or lastTimestamp < scheduledTimestamp) then local d = os.date('*t', scheduledTimestamp).wday - Jobs[i].cb(d, Jobs[i].h, Jobs[i].m) + cronJobs[i].cb(d, cronJobs[i].h, cronJobs[i].m) end end end +---@return nil function Tick() - local time = GetUnixTimestamp() + local timestamp = GetUnixTimestamp() - if not LastTime or os.date("%M", time) ~= os.date("%M", LastTime) then - OnTime(time) - LastTime = time + if not lastTimestamp or os.date("%M", timestamp) ~= os.date("%M", lastTimestamp) then + OnTime(timestamp) + lastTimestamp = timestamp end SetTimeout(60000, Tick) end -LastTime = GetUnixTimestamp() - +lastTimestamp = GetUnixTimestamp() Tick() +---@param h number +---@param m number +---@param cb function|table AddEventHandler("cron:runAt", function(h, m, cb) + local invokingResource = GetInvokingResource() or "Unknown" + local typeH = type(h) + local typeM = type(m) + local typeCb = type(cb) + + assert(typeH == "number", ("Expected number for h, got %s. Invoking Resource: '%s'"):format(typeH, invokingResource)) + assert(typeM == "number", ("Expected number for m, got %s. Invoking Resource: '%s'"):format(typeM, invokingResource)) + assert(typeCb == "function" or (typeCb == "table" and type(getmetatable(cb)?.__call) == "function"), ("Expected function for cb, got %s. Invoking Resource: '%s'"):format(typeCb, invokingResource)) + RunAt(h, m, cb) end) diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua index 022b3821..42569381 100644 --- a/[core]/es_extended/client/functions.lua +++ b/[core]/es_extended/client/functions.lua @@ -389,7 +389,12 @@ function ESX.UI.Menu.Close(menuType, namespace, name, cancel) if not cancel then ESX.UI.Menu.Opened[i].close() else - ESX.UI.Menu.Opened[i].cancel() + local menu = ESX.UI.Menu.Opened[i] + ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name) + + if type(menu.cancel) ~= "nil" then + menu.cancel(menu.data, menu) + end end ESX.UI.Menu.Opened[i] = nil end @@ -405,7 +410,12 @@ function ESX.UI.Menu.CloseAll(cancel) if not cancel then ESX.UI.Menu.Opened[i].close() else - ESX.UI.Menu.Opened[i].cancel() + local menu = ESX.UI.Menu.Opened[i] + ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name) + + if type(menu.cancel) ~= "nil" then + menu.cancel(menu.data, menu) + end end ESX.UI.Menu.Opened[i] = nil end diff --git a/[core]/es_extended/client/imports/class.lua b/[core]/es_extended/client/imports/class.lua new file mode 100644 index 00000000..0b21d998 --- /dev/null +++ b/[core]/es_extended/client/imports/class.lua @@ -0,0 +1,21 @@ +local class = {} +class.__index = class + +function class:new(...) + local instance = setmetatable({}, self) + if instance.constructor then + local ret = instance:constructor(...) + if type(ret) == 'table' then + return ret + end + end + return instance +end + +function Class(body, heritage) + local prototype = body or {} + prototype.__index = prototype + return setmetatable(prototype, heritage or class) +end + +return Class \ No newline at end of file diff --git a/[core]/es_extended/client/imports/point.lua b/[core]/es_extended/client/imports/point.lua new file mode 100644 index 00000000..55ec92bc --- /dev/null +++ b/[core]/es_extended/client/imports/point.lua @@ -0,0 +1,44 @@ +Point = ESX.Class() + +function Point:constructor(properties) + self.coords = properties.coords + self.hidden = properties.hidden or false + self.inside = properties.inside or function() end + self.enter = properties.enter or function() end + self.leave = properties.leave or function() end + self.handle = ESX.CreatePointInternal(properties.coords, properties.distance, properties.hidden, function() + self.nearby = true + if self.enter then + self:enter() + end + if self.inside then + CreateThread(function() + while self.nearby do + local coords = GetEntityCoords(ESX.PlayerData.ped) + self.currDistance = #(coords - self.coords) + self:inside() + Wait(0) + end + end) + end + end, function() + self.nearby = false + if self.leave then + self:leave() + end + end) +end + +function Point:delete() + ESX.RemovePointInternal(self.handle) +end + +function Point:toggle(hidden) + if hidden == nil then + hidden = not self.hidden + end + self.hidden = hidden + ESX.HidePointInternal(self.handle, hidden) +end + +return Point \ No newline at end of file diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 8599666d..b989857f 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -14,7 +14,7 @@ local function ApplyMetadata(metadata) end end -ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer, _, skin) +RegisterNetEvent("esx:playerLoaded", function(xPlayer, _, skin) ESX.PlayerData = xPlayer if not Config.Multichar then @@ -54,7 +54,7 @@ ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer, _, skin) end Actions:Init() - + StartPointsLoop() StartServerSyncLoops() end) diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua index 2e375589..23189d98 100644 --- a/[core]/es_extended/client/modules/actions.lua +++ b/[core]/es_extended/client/modules/actions.lua @@ -45,9 +45,9 @@ function Actions:TrackPed() if playerPed ~= newPed then ESX.PlayerData.ped = newPed - ESX.SetPlayerData("ped", playerPed) + ESX.SetPlayerData("ped", newPed) - TriggerEvent("esx:playerPedChanged", playerPed) + TriggerEvent("esx:playerPedChanged", newPed) end end @@ -152,7 +152,6 @@ function Actions:PedLoop() end) end - function Actions:Init() self:SlowLoop() self:PedLoop() diff --git a/[core]/es_extended/client/modules/adjustments.lua b/[core]/es_extended/client/modules/adjustments.lua index 37057b30..33577417 100644 --- a/[core]/es_extended/client/modules/adjustments.lua +++ b/[core]/es_extended/client/modules/adjustments.lua @@ -10,7 +10,8 @@ end function Adjustments:DisableAimAssist() if Config.DisableAimAssist then - SetPlayerLockon(ESX.playerId, false) + SetPlayerTargetingMode(3) + SetPlayerLockonRangeOverride(ESX.playerId, 0.0) end end diff --git a/[core]/es_extended/client/modules/callback.lua b/[core]/es_extended/client/modules/callback.lua index 738b3bb1..bd47e447 100644 --- a/[core]/es_extended/client/modules/callback.lua +++ b/[core]/es_extended/client/modules/callback.lua @@ -7,33 +7,44 @@ Callbacks.storage = {} Callbacks.id = 0 function Callbacks:Trigger(event, cb, invoker, ...) - self.requests[self.id] = cb + + self.requests[self.id] = { + await = type(cb) == "boolean", + cb = cb or promise:new() + } + local table = self.requests[self.id] + TriggerServerEvent("esx:triggerServerCallback", event, self.id, invoker, ...) self.id += 1 + + return table.cb end -function Callbacks:Execute(cb, ...) +function Callbacks:Execute(cb, id, ...) local success, errorString = pcall(cb, ...) if not success then - print(("[^1ERROR^7] Failed to execute Callback with RequestId: ^5%s^7"):format(self.currentId)) + print(("[^1ERROR^7] Failed to execute Callback with RequestId: ^5%s^7"):format(id)) error(errorString) return end - self.currentId = nil end function Callbacks:ServerRecieve(requestId, invoker, ...) - self.currentId = requestId - if not self.requests[self.currentId] then - return error(("Server Callback with requestId ^5%s^1 Was Called by ^5%s^1 but does not exist."):format(self.currentId, invoker)) + if not self.requests[requestId] then + return error(("Server Callback with requestId ^5%s^1 Was Called by ^5%s^1 but does not exist."):format(requestId, invoker)) end - local callback = self.requests[self.currentId] + local callback = self.requests[requestId] - Callbacks:Execute(callback, ...) self.requests[requestId] = nil + + if callback.await then + callback.cb:resolve({...}) + else + self:Execute(callback.cb, requestId, ...) + end end function Callbacks:Register(name, cb) @@ -41,7 +52,6 @@ function Callbacks:Register(name, cb) end function Callbacks:ClientRecieve(eventName, requestId, invoker, ...) - self.currentId = requestId if not self.storage[eventName] then return error(("Client Callback with requestId ^5%s^1 Was Called by ^5%s^1 but does not exist."):format(eventName, invoker)) @@ -52,7 +62,7 @@ function Callbacks:ClientRecieve(eventName, requestId, invoker, ...) end local callback = self.storage[eventName] - Callbacks:Execute(callback, returnCb, ...) + self:Execute(callback, requestId, returnCb, ...) end ---@param eventName string @@ -66,6 +76,28 @@ ESX.TriggerServerCallback = function(eventName, callback, ...) Callbacks:Trigger(eventName, callback, invoker, ...) end +---@param eventName string +---@param ... any +---@return any +ESX.AwaitServerCallback = function(eventName, ...) + local invokingResource = GetInvokingResource() + local invoker = (invokingResource and invokingResource ~= "unknown") and invokingResource or "es_extended" + + local p = Callbacks:Trigger(eventName, false, invoker, ...) + if not p then return end + + -- if the server callback takes longer than 15 seconds to respond, reject the promise + SetTimeout(15000, function() + if p.state == "pending" then + p:reject("Server Callback Timed Out") + end + end) + + Citizen.Await(p) + + return table.unpack(p.value) +end + ESX.SecureNetEvent("esx:serverCallback", function(...) Callbacks:ServerRecieve(...) end) diff --git a/[core]/es_extended/client/modules/npwd.lua b/[core]/es_extended/client/modules/npwd.lua index 98ff92e6..a1aa73a8 100644 --- a/[core]/es_extended/client/modules/npwd.lua +++ b/[core]/es_extended/client/modules/npwd.lua @@ -9,7 +9,7 @@ local function checkPhone() npwd:setPhoneDisabled((phoneItem and phoneItem.count or 0) <= 0) end -ESX.SecureNetEvent("esx:playerLoaded", checkPhone) +RegisterNetEvent("esx:playerLoaded", checkPhone) AddEventHandler("onClientResourceStart", function(resource) if resource ~= "npwd" then diff --git a/[core]/es_extended/client/modules/points.lua b/[core]/es_extended/client/modules/points.lua new file mode 100644 index 00000000..fee318be --- /dev/null +++ b/[core]/es_extended/client/modules/points.lua @@ -0,0 +1,57 @@ +local points = {} + +function ESX.CreatePointInternal(coords, distance, hidden, enter, leave) + local point = { + coords = coords, + distance = distance, + hidden = hidden, + enter = enter, + leave = leave, + resource = GetInvokingResource() + } + local handle = ESX.Table.SizeOf(points) + 1 + points[handle] = point + return handle +end + +function ESX.RemovePointInternal(handle) + points[handle] = nil +end + +function ESX.HidePointInternal(handle, hidden) + if points[handle] then + points[handle].hidden = hidden + end +end + +function StartPointsLoop() + CreateThread(function() + while true do + local coords = GetEntityCoords(ESX.PlayerData.ped) + for i, point in pairs(points) do + local distance = #(coords - point.coords) + + if not point.hidden and distance <= point.distance then + if not point.nearby then + points[i].nearby = true + points[i].enter() + end + point.currentDistance = distance + elseif point.nearby then + points[i].nearby = false + points[i].leave() + end + end + Wait(500) + end + end) +end + + +AddEventHandler('onResourceStop', function(resource) + for i, point in pairs(points) do + if point.resource == resource then + points[i] = nil + end + end +end) diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index 0fcdc5fc..8ab7f86d 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -45,6 +45,7 @@ client_scripts { 'client/modules/wrapper.lua', 'client/modules/callback.lua', 'client/modules/adjustments.lua', + 'client/modules/points.lua', 'client/main.lua', @@ -73,6 +74,7 @@ files { 'html/fonts/pdown.ttf', 'html/fonts/bankgothic.ttf', + "client/imports/*.lua", } dependencies { diff --git a/[core]/es_extended/imports.lua b/[core]/es_extended/imports.lua index 7357675e..d6eb1449 100644 --- a/[core]/es_extended/imports.lua +++ b/[core]/es_extended/imports.lua @@ -12,7 +12,7 @@ if not IsDuplicityVersion() then -- Only register this event for the client end end) - ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer) + RegisterNetEvent("esx:playerLoaded", function(xPlayer) ESX.PlayerData = xPlayer ESX.PlayerLoaded = true end) @@ -21,4 +21,23 @@ if not IsDuplicityVersion() then -- Only register this event for the client ESX.PlayerLoaded = false ESX.PlayerData = {} end) + + local external = {{"Class", "class.lua"}, {"Point", "point.lua"}} + for i=1, #external do + local module = external[i] + local path = string.format("client/imports/%s", module[2]) + + local file = LoadResourceFile("es_extended", path) + if file then + local fn, err = load(file, ('@@es_extended/%s'):format(path)) + + if not fn or err then + return error(('\n^1Error importing module (%s)'):format(external[i])) + end + + ESX[module[1]] = fn() + else + return error(('\n^1Error loading module (%s)'):format(external[i])) + end + end end diff --git a/[core]/es_extended/locales/cs.lua b/[core]/es_extended/locales/cs.lua index 0e9d3a92..a9b278fd 100644 --- a/[core]/es_extended/locales/cs.lua +++ b/[core]/es_extended/locales/cs.lua @@ -368,4 +368,36 @@ Locales["cs"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", + -- MK2 Weapon Tints + ["tint_classic_gray"] = "klasická šedá", + ["tint_classic_two_tone"] = "klasická dvoutónová", + ["tint_classic_white"] = "klasická bílá", + ["tint_classic_beige"] = "klasická béžová", + ["tint_classic_green"] = "klasická zelená", + ["tint_classic_blue"] = "klasická modrá", + ["tint_classic_earth"] = "klasická hnědá", + ["tint_classic_brown_black"] = "klasická hnědá-černá", + ["tint_contrast_red"] = "kontrastní červená", + ["tint_contrast_blue"] = "kontrastní modrá", + ["tint_contrast_yellow"] = "kontrastní žlutá", + ["tint_contrast_orange"] = "kontrastní oranžová", + ["tint_bold_pink"] = "odvážná růžová", + ["tint_bold_purple_yellow"] = "odvážná fialovo-žlutá", + ["tint_bold_orange"] = "odvážná oranžová", + ["tint_bold_green_purple"] = "odvážná zeleno-fialová", + ["tint_bold_red_feat"] = "odvážná červená feat", + ["tint_bold_green_feat"] = "odvážná zelená feat", + ["tint_bold_cyan_feat"] = "odvážná azurová feat", + ["tint_bold_yellow_feat"] = "odvážná žlutá feat", + ["tint_bold_red_white"] = "odvážná červená bílá", + ["tint_bold_blue_white"] = "odvážná modrá bílá", + ["tint_metallic_gold"] = "metalická zlatá", + ["tint_metallic_platinum"] = "metalická platina", + ["tint_metallic_gray_lilac"] = "metalická šedá lila", + ["tint_metallic_purple_lime"] = "metalická fialová limetka", + ["tint_metallic_red"] = "metalická červená", + ["tint_metallic_green"] = "metalická zelená", + ["tint_metallic_blue"] = "metalická modrá", + ["tint_metallic_white_aqua"] = "metalická bílá aqua", + ["tint_metallic_red_yellow"] = "metalická červená žlutá", } diff --git a/[core]/es_extended/locales/de.lua b/[core]/es_extended/locales/de.lua index cbdb524d..da224c3a 100644 --- a/[core]/es_extended/locales/de.lua +++ b/[core]/es_extended/locales/de.lua @@ -21,7 +21,7 @@ Locales["de"] = { ["received_weapon_ammo"] = "Du bekommst ~o~%sx %s für deine %s von %s", ["received_weapon_withammo"] = "Du bekommst %s mit ~o~%sx %s von %s", ["received_weapon_hasalready"] = "%s hat versucht dir eine %s zu geben, jedoch hast du diese Waffe bereits!", - ["received_weapon_noweapon"] = "%s hat versucht dir Munition für eine %s zu geben, jedoch hast du diese Waffe bereits!", + ["received_weapon_noweapon"] = "%s hat versucht dir Munition für eine %s zu geben, jedoch hast du diese Waffe nicht!", ["gave_account_money"] = "Du gibst %s€ (%s) an %s", ["received_account_money"] = "Du bekommst %s€ (%s) von %s", ["amount_invalid"] = "Ungültige Anzahl", @@ -378,4 +378,37 @@ Locales["de"] = { ["tint_lspd"] = "Blau", ["tint_orange"] = "Orange", ["tint_platinum"] = "Platin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klassisches Schwarz", + ["tint_classic_gray"] = "klassisches Grau", + ["tint_classic_two_tone"] = "klassisches Zwei-Ton", + ["tint_classic_white"] = "klassisches Weiß", + ["tint_classic_beige"] = "klassisches Beige", + ["tint_classic_green"] = "klassisches Grün", + ["tint_classic_blue"] = "klassisches Blau", + ["tint_classic_earth"] = "klassisches Erdfarben", + ["tint_classic_brown_black"] = "klassisches Braun-Schwarz", + ["tint_contrast_red"] = "Kontrast Rot", + ["tint_contrast_blue"] = "Kontrast Blau", + ["tint_contrast_yellow"] = "Kontrast Gelb", + ["tint_contrast_orange"] = "Kontrast Orange", + ["tint_bold_pink"] = "fette Pink", + ["tint_bold_purple_yellow"] = "fette Lila-Gelb", + ["tint_bold_orange"] = "fette Orange", + ["tint_bold_green_purple"] = "fette Grün-Lila", + ["tint_bold_red_feat"] = "fette Rot feat", + ["tint_bold_green_feat"] = "fette Grün feat", + ["tint_bold_cyan_feat"] = "fette Cyan feat", + ["tint_bold_yellow_feat"] = "fette Gelb feat", + ["tint_bold_red_white"] = "fette Rot Weiß", + ["tint_bold_blue_white"] = "fette Blau Weiß", + ["tint_metallic_gold"] = "metallisches Gold", + ["tint_metallic_platinum"] = "metallisches Platin", + ["tint_metallic_gray_lilac"] = "metallisches Grau-Lila", + ["tint_metallic_purple_lime"] = "metallisches Lila-Limette", + ["tint_metallic_red"] = "metallisches Rot", + ["tint_metallic_green"] = "metallisches Grün", + ["tint_metallic_blue"] = "metallisches Blau", + ["tint_metallic_white_aqua"] = "metallisches Weiß-Aqua", + ["tint_metallic_red_yellow"] = "metallisches Rot-Gelb", } diff --git a/[core]/es_extended/locales/el.lua b/[core]/es_extended/locales/el.lua index 1de660c6..ba1d1ab0 100644 --- a/[core]/es_extended/locales/el.lua +++ b/[core]/es_extended/locales/el.lua @@ -378,4 +378,37 @@ Locales["el"] = { ["tint_lspd"] = "μπλε δέρμα", ["tint_orange"] = "πορτοκαλί δέρμα", ["tint_platinum"] = "πλατίνενο δέρμα", + -- MK2 Weapon Tints + ["tint_classic_black"] = "κλασικό μαύρο", + ["tint_classic_gray"] = "κλασικό γκρι", + ["tint_classic_two_tone"] = "κλασικό δίχρωμο", + ["tint_classic_white"] = "κλασικό λευκό", + ["tint_classic_beige"] = "κλασικό μπεζ", + ["tint_classic_green"] = "κλασικό πράσινο", + ["tint_classic_blue"] = "κλασικό μπλε", + ["tint_classic_earth"] = "κλασική γή", + ["tint_classic_brown_black"] = "κλασικό καφέ-μαύρο", + ["tint_contrast_red"] = "αντίθεση κόκκινο", + ["tint_contrast_blue"] = "αντίθεση μπλε", + ["tint_contrast_yellow"] = "αντίθεση κίτρινο", + ["tint_contrast_orange"] = "αντίθεση πορτοκαλί", + ["tint_bold_pink"] = "τολμηρό ροζ", + ["tint_bold_purple_yellow"] = "τολμηρό μοβ-κίτρινο", + ["tint_bold_orange"] = "τολμηρό πορτοκαλί", + ["tint_bold_green_purple"] = "τολμηρό πράσινο-μοβ", + ["tint_bold_red_feat"] = "τολμηρό κόκκινο feat", + ["tint_bold_green_feat"] = "τολμηρό πράσινο feat", + ["tint_bold_cyan_feat"] = "τολμηρό κυανό feat", + ["tint_bold_yellow_feat"] = "τολμηρό κίτρινο feat", + ["tint_bold_red_white"] = "τολμηρό κόκκινο λευκό", + ["tint_bold_blue_white"] = "τολμηρό μπλε λευκό", + ["tint_metallic_gold"] = "μεταλλικό χρυσό", + ["tint_metallic_platinum"] = "μεταλλικό πλατίνα", + ["tint_metallic_gray_lilac"] = "μεταλλικό γκρι λιλά", + ["tint_metallic_purple_lime"] = "μεταλλικό μοβ-λάιμ", + ["tint_metallic_red"] = "μεταλλικό κόκκινο", + ["tint_metallic_green"] = "μεταλλικό πράσινο", + ["tint_metallic_blue"] = "μεταλλικό μπλε", + ["tint_metallic_white_aqua"] = "μεταλλικό λευκό aqua", + ["tint_metallic_red_yellow"] = "μεταλλικό κόκκινο-κίτρινο", } diff --git a/[core]/es_extended/locales/en.lua b/[core]/es_extended/locales/en.lua index 10a0bdd5..c0b71869 100644 --- a/[core]/es_extended/locales/en.lua +++ b/[core]/es_extended/locales/en.lua @@ -378,4 +378,37 @@ Locales["en"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "classic black", + ["tint_classic_gray"] = "classic gray", + ["tint_classic_two_tone"] = "classic two-tone", + ["tint_classic_white"] = "classic white", + ["tint_classic_beige"] = "classic beige", + ["tint_classic_green"] = "classic green", + ["tint_classic_blue"] = "classic blue", + ["tint_classic_earth"] = "classic earth", + ["tint_classic_brown_black"] = "classic brown-black", + ["tint_contrast_red"] = "contrast red", + ["tint_contrast_blue"] = "contrast blue", + ["tint_contrast_yellow"] = "contrast yellow", + ["tint_contrast_orange"] = "contrast orange", + ["tint_bold_pink"] = "bold pink", + ["tint_bold_purple_yellow"] = "bold purple-yellow", + ["tint_bold_orange"] = "bold orange", + ["tint_bold_green_purple"] = "bold green-purple", + ["tint_bold_red_feat"] = "bold red feat", + ["tint_bold_green_feat"] = "bold green feat", + ["tint_bold_cyan_feat"] = "bold cyan feat", + ["tint_bold_yellow_feat"] = "bold yellow feat", + ["tint_bold_red_white"] = "bold red-white", + ["tint_bold_blue_white"] = "bold blue-white", + ["tint_metallic_gold"] = "metallic gold", + ["tint_metallic_platinum"] = "metallic platinum", + ["tint_metallic_gray_lilac"] = "metallic gray-lilac", + ["tint_metallic_purple_lime"] = "metallic purple-lime", + ["tint_metallic_red"] = "metallic red", + ["tint_metallic_green"] = "metallic green", + ["tint_metallic_blue"] = "metallic blue", + ["tint_metallic_white_aqua"] = "metallic white-aqua", + ["tint_metallic_red_yellow"] = "metallic red-yellow", } diff --git a/[core]/es_extended/locales/es.lua b/[core]/es_extended/locales/es.lua index 9ee9a33b..9d03a65d 100644 --- a/[core]/es_extended/locales/es.lua +++ b/[core]/es_extended/locales/es.lua @@ -363,8 +363,37 @@ Locales["es"] = { ["tint_lspd"] = "Skin Azul", ["tint_orange"] = "Skin Naranja", ["tint_platinum"] = "Skin Plata", - - -- Duty related - ["stopped_duty"] = "Has salido de servicio.", - ["started_duty"] = "Has entrado de servicio.", + -- MK2 Weapon Tints + ["tint_classic_black"] = "negro clásico", + ["tint_classic_gray"] = "gris clásico", + ["tint_classic_two_tone"] = "dos tonos clásicos", + ["tint_classic_white"] = "blanco clásico", + ["tint_classic_beige"] = "beige clásico", + ["tint_classic_green"] = "verde clásico", + ["tint_classic_blue"] = "azul clásico", + ["tint_classic_earth"] = "tierra clásica", + ["tint_classic_brown_black"] = "marrón negro clásico", + ["tint_contrast_red"] = "rojo de contraste", + ["tint_contrast_blue"] = "azul de contraste", + ["tint_contrast_yellow"] = "amarillo de contraste", + ["tint_contrast_orange"] = "naranja de contraste", + ["tint_bold_pink"] = "rosa atrevida", + ["tint_bold_purple_yellow"] = "púrpura amarilla atrevida", + ["tint_bold_orange"] = "naranja atrevido", + ["tint_bold_green_purple"] = "verde púrpura atrevido", + ["tint_bold_red_feat"] = "rojo atrevido feat", + ["tint_bold_green_feat"] = "verde atrevido feat", + ["tint_bold_cyan_feat"] = "cian atrevido feat", + ["tint_bold_yellow_feat"] = "amarillo atrevido feat", + ["tint_bold_red_white"] = "rojo blanco atrevido", + ["tint_bold_blue_white"] = "azul blanco atrevido", + ["tint_metallic_gold"] = "oro metálico", + ["tint_metallic_platinum"] = "platino metálico", + ["tint_metallic_gray_lilac"] = "gris lila metálico", + ["tint_metallic_purple_lime"] = "púrpura lima metálico", + ["tint_metallic_red"] = "rojo metálico", + ["tint_metallic_green"] = "verde metálico", + ["tint_metallic_blue"] = "azul metálico", + ["tint_metallic_white_aqua"] = "blanco aqua metálico", + ["tint_metallic_red_yellow"] = "rojo amarillo metálico", } diff --git a/[core]/es_extended/locales/fi.lua b/[core]/es_extended/locales/fi.lua index 983fa79b..4d71ff48 100644 --- a/[core]/es_extended/locales/fi.lua +++ b/[core]/es_extended/locales/fi.lua @@ -237,4 +237,37 @@ Locales["fi"] = { ["tint_lspd"] = "Sininen ulkokuori", ["tint_orange"] = "Oranssi ulkokuori", ["tint_platinum"] = "Platina ulkokuori", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klassinen musta", + ["tint_classic_gray"] = "klassinen harmaa", + ["tint_classic_two_tone"] = "klassinen kaksivärinen", + ["tint_classic_white"] = "klassinen valkoinen", + ["tint_classic_beige"] = "klassinen beessi", + ["tint_classic_green"] = "klassinen vihreä", + ["tint_classic_blue"] = "klassinen sininen", + ["tint_classic_earth"] = "klassinen maa", + ["tint_classic_brown_black"] = "klassinen ruskea-musta", + ["tint_contrast_red"] = "kontrastinen punainen", + ["tint_contrast_blue"] = "kontrastinen sininen", + ["tint_contrast_yellow"] = "kontrastinen keltainen", + ["tint_contrast_orange"] = "kontrastinen oranssi", + ["tint_bold_pink"] = "rohkea vaaleanpunainen", + ["tint_bold_purple_yellow"] = "rohkea violetti-keltainen", + ["tint_bold_orange"] = "rohkea oranssi", + ["tint_bold_green_purple"] = "rohkea vihreä-violetti", + ["tint_bold_red_feat"] = "rohkea punainen feat", + ["tint_bold_green_feat"] = "rohkea vihreä feat", + ["tint_bold_cyan_feat"] = "rohkea syaani feat", + ["tint_bold_yellow_feat"] = "rohkea keltainen feat", + ["tint_bold_red_white"] = "rohkea punainen valkoinen", + ["tint_bold_blue_white"] = "rohkea sininen valkoinen", + ["tint_metallic_gold"] = "metallinen kulta", + ["tint_metallic_platinum"] = "metallinen platina", + ["tint_metallic_gray_lilac"] = "metallinen harmaa lila", + ["tint_metallic_purple_lime"] = "metallinen violetti limetti", + ["tint_metallic_red"] = "metallinen punainen", + ["tint_metallic_green"] = "metallinen vihreä", + ["tint_metallic_blue"] = "metallinen sininen", + ["tint_metallic_white_aqua"] = "metallinen valkoinen aqua", + ["tint_metallic_red_yellow"] = "metallinen punainen keltainen", } diff --git a/[core]/es_extended/locales/fr.lua b/[core]/es_extended/locales/fr.lua index 44760c69..3792406e 100644 --- a/[core]/es_extended/locales/fr.lua +++ b/[core]/es_extended/locales/fr.lua @@ -378,4 +378,37 @@ Locales["fr"] = { ["tint_lspd"] = "skin bleu", ["tint_orange"] = "skin orange", ["tint_platinum"] = "skin platine", + -- MK2 Weapon Tints + ["tint_classic_black"] = "noir classique", + ["tint_classic_gray"] = "gris classique", + ["tint_classic_two_tone"] = "deux tons classiques", + ["tint_classic_white"] = "blanc classique", + ["tint_classic_beige"] = "beige classique", + ["tint_classic_green"] = "vert classique", + ["tint_classic_blue"] = "bleu classique", + ["tint_classic_earth"] = "terre classique", + ["tint_classic_brown_black"] = "marron noir classique", + ["tint_contrast_red"] = "rouge contrasté", + ["tint_contrast_blue"] = "bleu contrasté", + ["tint_contrast_yellow"] = "jaune contrasté", + ["tint_contrast_orange"] = "orange contrasté", + ["tint_bold_pink"] = "rose audacieux", + ["tint_bold_purple_yellow"] = "violet jaune audacieux", + ["tint_bold_orange"] = "orange audacieux", + ["tint_bold_green_purple"] = "vert violet audacieux", + ["tint_bold_red_feat"] = "rouge audacieux feat", + ["tint_bold_green_feat"] = "vert audacieux feat", + ["tint_bold_cyan_feat"] = "cyan audacieux feat", + ["tint_bold_yellow_feat"] = "jaune audacieux feat", + ["tint_bold_red_white"] = "rouge blanc audacieux", + ["tint_bold_blue_white"] = "bleu blanc audacieux", + ["tint_metallic_gold"] = "or métallique", + ["tint_metallic_platinum"] = "platine métallique", + ["tint_metallic_gray_lilac"] = "gris lilas métallique", + ["tint_metallic_purple_lime"] = "violet lime métallique", + ["tint_metallic_red"] = "rouge métallique", + ["tint_metallic_green"] = "vert métallique", + ["tint_metallic_blue"] = "bleu métallique", + ["tint_metallic_white_aqua"] = "blanc aqua métallique", + ["tint_metallic_red_yellow"] = "rouge jaune métallique", } diff --git a/[core]/es_extended/locales/he.lua b/[core]/es_extended/locales/he.lua index 12ebc9e5..d6216573 100644 --- a/[core]/es_extended/locales/he.lua +++ b/[core]/es_extended/locales/he.lua @@ -372,4 +372,37 @@ Locales["he"] = { ["tint_lspd"] = "צבע כחול", ["tint_orange"] = "צבע כתום", ["tint_platinum"] = "צבע פלטינה", + -- MK2 Weapon Tints + ["tint_classic_black"] = "שחור קלאסי", + ["tint_classic_gray"] = "אפור קלאסי", + ["tint_classic_two_tone"] = "קלאסי דו-גוני", + ["tint_classic_white"] = "לבן קלאסי", + ["tint_classic_beige"] = "בז' קלאסי", + ["tint_classic_green"] = "ירוק קלאסי", + ["tint_classic_blue"] = "כחול קלאסי", + ["tint_classic_earth"] = "אדמה קלאסית", + ["tint_classic_brown_black"] = "חום שחור קלאסי", + ["tint_contrast_red"] = "אדום קונטרסט", + ["tint_contrast_blue"] = "כחול קונטרסט", + ["tint_contrast_yellow"] = "צהוב קונטרסט", + ["tint_contrast_orange"] = "כתום קונטרסט", + ["tint_bold_pink"] = "ורוד נועז", + ["tint_bold_purple_yellow"] = "סגול צהוב נועז", + ["tint_bold_orange"] = "כתום נועז", + ["tint_bold_green_purple"] = "ירוק סגול נועז", + ["tint_bold_red_feat"] = "אדום נועז feat", + ["tint_bold_green_feat"] = "ירוק נועז feat", + ["tint_bold_cyan_feat"] = "סיאן נועז feat", + ["tint_bold_yellow_feat"] = "צהוב נועז feat", + ["tint_bold_red_white"] = "אדום לבן נועז", + ["tint_bold_blue_white"] = "כחול לבן נועז", + ["tint_metallic_gold"] = "זהב מתכתי", + ["tint_metallic_platinum"] = "פלטינה מתכתית", + ["tint_metallic_gray_lilac"] = "אפור לילך מתכתי", + ["tint_metallic_purple_lime"] = "סגול ליים מתכתי", + ["tint_metallic_red"] = "אדום מתכתי", + ["tint_metallic_green"] = "ירוק מתכתי", + ["tint_metallic_blue"] = "כחול מתכתי", + ["tint_metallic_white_aqua"] = "לבן aqua מתכתי", + ["tint_metallic_red_yellow"] = "אדום צהוב מתכתי", } diff --git a/[core]/es_extended/locales/hu.lua b/[core]/es_extended/locales/hu.lua index 6971d662..5d3b230b 100644 --- a/[core]/es_extended/locales/hu.lua +++ b/[core]/es_extended/locales/hu.lua @@ -374,8 +374,37 @@ Locales["hu"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", - - -- Duty related - ["stopped_duty"] = "Leadtad a szolgálatot.", - ["started_duty"] = "Szolgálatba álltál.", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klasszikus fekete", + ["tint_classic_gray"] = "klasszikus szürke", + ["tint_classic_two_tone"] = "klasszikus két szín", + ["tint_classic_white"] = "klasszikus fehér", + ["tint_classic_beige"] = "klasszikus bézs", + ["tint_classic_green"] = "klasszikus zöld", + ["tint_classic_blue"] = "klasszikus kék", + ["tint_classic_earth"] = "klasszikus föld", + ["tint_classic_brown_black"] = "klasszikus barna-fekete", + ["tint_contrast_red"] = "kontraszt piros", + ["tint_contrast_blue"] = "kontraszt kék", + ["tint_contrast_yellow"] = "kontraszt sárga", + ["tint_contrast_orange"] = "kontraszt narancs", + ["tint_bold_pink"] = "merész rózsaszín", + ["tint_bold_purple_yellow"] = "merész lila-sárga", + ["tint_bold_orange"] = "merész narancs", + ["tint_bold_green_purple"] = "merész zöld-lila", + ["tint_bold_red_feat"] = "merész piros feat", + ["tint_bold_green_feat"] = "merész zöld feat", + ["tint_bold_cyan_feat"] = "merész cián feat", + ["tint_bold_yellow_feat"] = "merész sárga feat", + ["tint_bold_red_white"] = "merész piros fehér", + ["tint_bold_blue_white"] = "merész kék fehér", + ["tint_metallic_gold"] = "metál arany", + ["tint_metallic_platinum"] = "metál platina", + ["tint_metallic_gray_lilac"] = "metál szürke lila", + ["tint_metallic_purple_lime"] = "metál lila lime", + ["tint_metallic_red"] = "metál piros", + ["tint_metallic_green"] = "metál zöld", + ["tint_metallic_blue"] = "metál kék", + ["tint_metallic_white_aqua"] = "metál fehér aqua", + ["tint_metallic_red_yellow"] = "metál piros sárga", } diff --git a/[core]/es_extended/locales/id.lua b/[core]/es_extended/locales/id.lua index 1d7d1d82..bbd2587c 100644 --- a/[core]/es_extended/locales/id.lua +++ b/[core]/es_extended/locales/id.lua @@ -378,4 +378,37 @@ Locales["id"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "hitam klasik", + ["tint_classic_gray"] = "abu-abu klasik", + ["tint_classic_two_tone"] = "dua warna klasik", + ["tint_classic_white"] = "putih klasik", + ["tint_classic_beige"] = "beige klasik", + ["tint_classic_green"] = "hijau klasik", + ["tint_classic_blue"] = "biru klasik", + ["tint_classic_earth"] = "tanah klasik", + ["tint_classic_brown_black"] = "coklat hitam klasik", + ["tint_contrast_red"] = "merah kontras", + ["tint_contrast_blue"] = "biru kontras", + ["tint_contrast_yellow"] = "kuning kontras", + ["tint_contrast_orange"] = "oren kontras", + ["tint_bold_pink"] = "pink berani", + ["tint_bold_purple_yellow"] = "ungu kuning berani", + ["tint_bold_orange"] = "oren berani", + ["tint_bold_green_purple"] = "hijau ungu berani", + ["tint_bold_red_feat"] = "merah berani feat", + ["tint_bold_green_feat"] = "hijau berani feat", + ["tint_bold_cyan_feat"] = "sian berani feat", + ["tint_bold_yellow_feat"] = "kuning berani feat", + ["tint_bold_red_white"] = "merah putih berani", + ["tint_bold_blue_white"] = "biru putih berani", + ["tint_metallic_gold"] = "emas metalik", + ["tint_metallic_platinum"] = "platina metalik", + ["tint_metallic_gray_lilac"] = "abu-abu lilac metalik", + ["tint_metallic_purple_lime"] = "ungu jeruk nipis metalik", + ["tint_metallic_red"] = "merah metalik", + ["tint_metallic_green"] = "hijau metalik", + ["tint_metallic_blue"] = "biru metalik", + ["tint_metallic_white_aqua"] = "putih aqua metalik", + ["tint_metallic_red_yellow"] = "merah kuning metalik", } diff --git a/[core]/es_extended/locales/it.lua b/[core]/es_extended/locales/it.lua index 24280c15..8a7caf59 100644 --- a/[core]/es_extended/locales/it.lua +++ b/[core]/es_extended/locales/it.lua @@ -378,4 +378,37 @@ Locales["it"] = { ["tint_lspd"] = "color blu", ["tint_orange"] = "color arancio", ["tint_platinum"] = "color platino", + -- MK2 Weapon Tints + ["tint_classic_black"] = "nero classico", + ["tint_classic_gray"] = "grigio classico", + ["tint_classic_two_tone"] = "due toni classico", + ["tint_classic_white"] = "bianco classico", + ["tint_classic_beige"] = "beige classico", + ["tint_classic_green"] = "verde classico", + ["tint_classic_blue"] = "blu classico", + ["tint_classic_earth"] = "terra classica", + ["tint_classic_brown_black"] = "marrone nero classico", + ["tint_contrast_red"] = "rosso contrastante", + ["tint_contrast_blue"] = "blu contrastante", + ["tint_contrast_yellow"] = "giallo contrastante", + ["tint_contrast_orange"] = "arancione contrastante", + ["tint_bold_pink"] = "rosa audace", + ["tint_bold_purple_yellow"] = "viola giallo audace", + ["tint_bold_orange"] = "arancione audace", + ["tint_bold_green_purple"] = "verde viola audace", + ["tint_bold_red_feat"] = "rosso audace feat", + ["tint_bold_green_feat"] = "verde audace feat", + ["tint_bold_cyan_feat"] = "cyan audace feat", + ["tint_bold_yellow_feat"] = "giallo audace feat", + ["tint_bold_red_white"] = "rosso bianco audace", + ["tint_bold_blue_white"] = "blu bianco audace", + ["tint_metallic_gold"] = "oro metallico", + ["tint_metallic_platinum"] = "platino metallico", + ["tint_metallic_gray_lilac"] = "grigio lilla metallico", + ["tint_metallic_purple_lime"] = "viola lime metallico", + ["tint_metallic_red"] = "rosso metallico", + ["tint_metallic_green"] = "verde metallico", + ["tint_metallic_blue"] = "blu metallico", + ["tint_metallic_white_aqua"] = "bianco aqua metallico", + ["tint_metallic_red_yellow"] = "rosso giallo metallico", } diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua index b6a699ac..2dee1716 100644 --- a/[core]/es_extended/locales/nl.lua +++ b/[core]/es_extended/locales/nl.lua @@ -369,4 +369,37 @@ Locales["nl"] = { ["tint_lspd"] = "blauwe skin", ["tint_orange"] = "oranje skin", ["tint_platinum"] = "platina skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klassiek zwart", + ["tint_classic_gray"] = "klassiek grijs", + ["tint_classic_two_tone"] = "klassiek twee-tonig", + ["tint_classic_white"] = "klassiek wit", + ["tint_classic_beige"] = "klassiek beige", + ["tint_classic_green"] = "klassiek groen", + ["tint_classic_blue"] = "klassiek blauw", + ["tint_classic_earth"] = "klassieke aarde", + ["tint_classic_brown_black"] = "klassiek bruin zwart", + ["tint_contrast_red"] = "contrast rood", + ["tint_contrast_blue"] = "contrast blauw", + ["tint_contrast_yellow"] = "contrast geel", + ["tint_contrast_orange"] = "contrast oranje", + ["tint_bold_pink"] = "gedurfde roze", + ["tint_bold_purple_yellow"] = "gedurfde paarse geel", + ["tint_bold_orange"] = "gedurfde oranje", + ["tint_bold_green_purple"] = "gedurfde groene paarse", + ["tint_bold_red_feat"] = "gedurfde rode feat", + ["tint_bold_green_feat"] = "gedurfde groene feat", + ["tint_bold_cyan_feat"] = "gedurfde cyaan feat", + ["tint_bold_yellow_feat"] = "gedurfde gele feat", + ["tint_bold_red_white"] = "gedurfde rode witte", + ["tint_bold_blue_white"] = "gedurfde blauwe witte", + ["tint_metallic_gold"] = "metallisch goud", + ["tint_metallic_platinum"] = "metallisch platina", + ["tint_metallic_gray_lilac"] = "metallisch grijs lila", + ["tint_metallic_purple_lime"] = "metallisch paarse limo", + ["tint_metallic_red"] = "metallisch rood", + ["tint_metallic_green"] = "metallisch groen", + ["tint_metallic_blue"] = "metallisch blauw", + ["tint_metallic_white_aqua"] = "metallisch wit aqua", + ["tint_metallic_red_yellow"] = "metallisch rood geel", } diff --git a/[core]/es_extended/locales/pl.lua b/[core]/es_extended/locales/pl.lua index d50f91eb..a9dceb4f 100644 --- a/[core]/es_extended/locales/pl.lua +++ b/[core]/es_extended/locales/pl.lua @@ -236,4 +236,37 @@ Locales["pl"] = { ["tint_lspd"] = "niebieski skin", ["tint_orange"] = "pomarańczowy skin", ["tint_platinum"] = "platynowy skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klasyczna czerń", + ["tint_classic_gray"] = "klasyczny szary", + ["tint_classic_two_tone"] = "klasyczny dwutonowy", + ["tint_classic_white"] = "klasyczna biel", + ["tint_classic_beige"] = "klasyczny beż", + ["tint_classic_green"] = "klasyczna zieleń", + ["tint_classic_blue"] = "klasyczny niebieski", + ["tint_classic_earth"] = "klasyczna ziemia", + ["tint_classic_brown_black"] = "klasyczny brązowo-czarny", + ["tint_contrast_red"] = "kontrastowy czerwony", + ["tint_contrast_blue"] = "kontrastowy niebieski", + ["tint_contrast_yellow"] = "kontrastowy żółty", + ["tint_contrast_orange"] = "kontrastowy pomarańczowy", + ["tint_bold_pink"] = "odważny różowy", + ["tint_bold_purple_yellow"] = "odważny fioletowo-żółty", + ["tint_bold_orange"] = "odważny pomarańczowy", + ["tint_bold_green_purple"] = "odważny zielono-fioletowy", + ["tint_bold_red_feat"] = "odważny czerwony feat", + ["tint_bold_green_feat"] = "odważny zielony feat", + ["tint_bold_cyan_feat"] = "odważny cyjan feat", + ["tint_bold_yellow_feat"] = "odważny żółty feat", + ["tint_bold_red_white"] = "odważny czerwony biały", + ["tint_bold_blue_white"] = "odważny niebieski biały", + ["tint_metallic_gold"] = "złoto metaliczne", + ["tint_metallic_platinum"] = "platyna metaliczna", + ["tint_metallic_gray_lilac"] = "szaro-liliowe metaliczne", + ["tint_metallic_purple_lime"] = "fioletowo-limonkowe metaliczne", + ["tint_metallic_red"] = "czerwony metaliczny", + ["tint_metallic_green"] = "zielony metaliczny", + ["tint_metallic_blue"] = "niebieski metaliczny", + ["tint_metallic_white_aqua"] = "białe aqua metaliczne", + ["tint_metallic_red_yellow"] = "czerwono-żółte metaliczne", } diff --git a/[core]/es_extended/locales/sl.lua b/[core]/es_extended/locales/sl.lua index 2c3e1f8e..da0c9de4 100644 --- a/[core]/es_extended/locales/sl.lua +++ b/[core]/es_extended/locales/sl.lua @@ -374,4 +374,37 @@ Locales["sl"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klasična črna", + ["tint_classic_gray"] = "klasična siva", + ["tint_classic_two_tone"] = "klasična dvo-tonska", + ["tint_classic_white"] = "klasična bela", + ["tint_classic_beige"] = "klasična bež", + ["tint_classic_green"] = "klasična zelena", + ["tint_classic_blue"] = "klasična modra", + ["tint_classic_earth"] = "klasična zemlja", + ["tint_classic_brown_black"] = "klasična rjava-črna", + ["tint_contrast_red"] = "kontrastna rdeča", + ["tint_contrast_blue"] = "kontrastna modra", + ["tint_contrast_yellow"] = "kontrastna rumena", + ["tint_contrast_orange"] = "kontrastna oranžna", + ["tint_bold_pink"] = "drzna roza", + ["tint_bold_purple_yellow"] = "drzna vijolično-rumena", + ["tint_bold_orange"] = "drzna oranžna", + ["tint_bold_green_purple"] = "drzna zelena-vijolična", + ["tint_bold_red_feat"] = "drzna rdeča feat", + ["tint_bold_green_feat"] = "drzna zelena feat", + ["tint_bold_cyan_feat"] = "drzna cian feat", + ["tint_bold_yellow_feat"] = "drzna rumena feat", + ["tint_bold_red_white"] = "drzna rdeča bela", + ["tint_bold_blue_white"] = "drzna modra bela", + ["tint_metallic_gold"] = "metalik zlato", + ["tint_metallic_platinum"] = "metalik platina", + ["tint_metallic_gray_lilac"] = "metalik siv lila", + ["tint_metallic_purple_lime"] = "metalik vijolična limona", + ["tint_metallic_red"] = "metalik rdeča", + ["tint_metallic_green"] = "metalik zelena", + ["tint_metallic_blue"] = "metalik modra", + ["tint_metallic_white_aqua"] = "metalik bela aqua", + ["tint_metallic_red_yellow"] = "metalik rdeče rumeno", } diff --git a/[core]/es_extended/locales/sr.lua b/[core]/es_extended/locales/sr.lua index 6aefa25b..9ef51703 100644 --- a/[core]/es_extended/locales/sr.lua +++ b/[core]/es_extended/locales/sr.lua @@ -374,4 +374,37 @@ Locales["sr"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klasična crna", + ["tint_classic_gray"] = "klasična siva", + ["tint_classic_two_tone"] = "klasična dvo-tonska", + ["tint_classic_white"] = "klasična bela", + ["tint_classic_beige"] = "klasična bež", + ["tint_classic_green"] = "klasična zelena", + ["tint_classic_blue"] = "klasična plava", + ["tint_classic_earth"] = "klasična zemlja", + ["tint_classic_brown_black"] = "klasična braon-crna", + ["tint_contrast_red"] = "kontrastna crvena", + ["tint_contrast_blue"] = "kontrastna plava", + ["tint_contrast_yellow"] = "kontrastna žuta", + ["tint_contrast_orange"] = "kontrastna narandžasta", + ["tint_bold_pink"] = "drska roze", + ["tint_bold_purple_yellow"] = "drska ljubičasto-žuta", + ["tint_bold_orange"] = "drska narandžasta", + ["tint_bold_green_purple"] = "drska zelena-ljubičasta", + ["tint_bold_red_feat"] = "drska crvena feat", + ["tint_bold_green_feat"] = "drska zelena feat", + ["tint_bold_cyan_feat"] = "drska cijan feat", + ["tint_bold_yellow_feat"] = "drska žuta feat", + ["tint_bold_red_white"] = "drska crvena bela", + ["tint_bold_blue_white"] = "drska plava bela", + ["tint_metallic_gold"] = "metalik zlatna", + ["tint_metallic_platinum"] = "metalik platina", + ["tint_metallic_gray_lilac"] = "metalik siva lila", + ["tint_metallic_purple_lime"] = "metalik ljubičasta limeta", + ["tint_metallic_red"] = "metalik crvena", + ["tint_metallic_green"] = "metalik zelena", + ["tint_metallic_blue"] = "metalik plava", + ["tint_metallic_white_aqua"] = "metalik bela aqua", + ["tint_metallic_red_yellow"] = "metalik crvena-žuta", } diff --git a/[core]/es_extended/locales/sv.lua b/[core]/es_extended/locales/sv.lua index 193089a7..e528baca 100644 --- a/[core]/es_extended/locales/sv.lua +++ b/[core]/es_extended/locales/sv.lua @@ -378,4 +378,37 @@ Locales["sv"] = { ["tint_lspd"] = "blue skin", ["tint_orange"] = "orange skin", ["tint_platinum"] = "platinum skin", + -- MK2 Weapon Tints + ["tint_classic_black"] = "klassisk svart", + ["tint_classic_gray"] = "klassisk grå", + ["tint_classic_two_tone"] = "klassisk tvåfärgad", + ["tint_classic_white"] = "klassisk vit", + ["tint_classic_beige"] = "klassisk beige", + ["tint_classic_green"] = "klassisk grön", + ["tint_classic_blue"] = "klassisk blå", + ["tint_classic_earth"] = "klassisk jord", + ["tint_classic_brown_black"] = "klassisk brun svart", + ["tint_contrast_red"] = "kontrast röd", + ["tint_contrast_blue"] = "kontrast blå", + ["tint_contrast_yellow"] = "kontrast gul", + ["tint_contrast_orange"] = "kontrast orange", + ["tint_bold_pink"] = "djärv rosa", + ["tint_bold_purple_yellow"] = "djärv lila gul", + ["tint_bold_orange"] = "djärv orange", + ["tint_bold_green_purple"] = "djärv grön lila", + ["tint_bold_red_feat"] = "djärv röd feat", + ["tint_bold_green_feat"] = "djärv grön feat", + ["tint_bold_cyan_feat"] = "djärv cyan feat", + ["tint_bold_yellow_feat"] = "djärv gul feat", + ["tint_bold_red_white"] = "djärv röd vit", + ["tint_bold_blue_white"] = "djärv blå vit", + ["tint_metallic_gold"] = "metalliskt guld", + ["tint_metallic_platinum"] = "metalliskt platina", + ["tint_metallic_gray_lilac"] = "metalliskt grå lila", + ["tint_metallic_purple_lime"] = "metalliskt lila lime", + ["tint_metallic_red"] = "metalliskt röd", + ["tint_metallic_green"] = "metalliskt grön", + ["tint_metallic_blue"] = "metalliskt blå", + ["tint_metallic_white_aqua"] = "metalliskt vitt aqua", + ["tint_metallic_red_yellow"] = "metalliskt röd gul", } diff --git a/[core]/es_extended/locales/zh-cn.lua b/[core]/es_extended/locales/zh-cn.lua index a8a1ad8e..5971cc35 100644 --- a/[core]/es_extended/locales/zh-cn.lua +++ b/[core]/es_extended/locales/zh-cn.lua @@ -374,4 +374,37 @@ Locales["zh-cn"] = { ["tint_lspd"] = "洛圣都警局色调", ["tint_orange"] = "橙色调", ["tint_platinum"] = "铂金色调", + -- MK2 Weapon Tints + ["tint_classic_black"] = "经典黑色", + ["tint_classic_gray"] = "经典灰色", + ["tint_classic_two_tone"] = "经典双色", + ["tint_classic_white"] = "经典白色", + ["tint_classic_beige"] = "经典米色", + ["tint_classic_green"] = "经典绿色", + ["tint_classic_blue"] = "经典蓝色", + ["tint_classic_earth"] = "经典大地色", + ["tint_classic_brown_black"] = "经典棕黑色", + ["tint_contrast_red"] = "对比红色", + ["tint_contrast_blue"] = "对比蓝色", + ["tint_contrast_yellow"] = "对比黄色", + ["tint_contrast_orange"] = "对比橙色", + ["tint_bold_pink"] = "大胆粉色", + ["tint_bold_purple_yellow"] = "大胆紫黄色", + ["tint_bold_orange"] = "大胆橙色", + ["tint_bold_green_purple"] = "大胆绿色紫色", + ["tint_bold_red_feat"] = "大胆红色feat", + ["tint_bold_green_feat"] = "大胆绿色feat", + ["tint_bold_cyan_feat"] = "大胆青色feat", + ["tint_bold_yellow_feat"] = "大胆黄色feat", + ["tint_bold_red_white"] = "大胆红白色", + ["tint_bold_blue_white"] = "大胆蓝白色", + ["tint_metallic_gold"] = "金属金色", + ["tint_metallic_platinum"] = "金属铂金", + ["tint_metallic_gray_lilac"] = "金属灰紫色", + ["tint_metallic_purple_lime"] = "金属紫色青柠", + ["tint_metallic_red"] = "金属红色", + ["tint_metallic_green"] = "金属绿色", + ["tint_metallic_blue"] = "金属蓝色", + ["tint_metallic_white_aqua"] = "金属白色水蓝", + ["tint_metallic_red_yellow"] = "金属红黄色", } diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 1011c0d3..2bfeb79f 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -130,6 +130,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, ---@return number function self.getPlayTime() + -- luacheck: ignore return self.lastPlaytime + GetPlayerTimeOnline(self.source) end diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index 1b9c7522..61fbe78e 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -102,7 +102,7 @@ if not Config.Multichar then Wait(0) -- Required local identifier = ESX.GetIdentifier(playerId) - + -- luacheck: ignore if not SetEntityOrphanMode then return deferrals.done(("[ESX] ESX Requires a minimum Artifact version of 10188, Please update your server.")) end @@ -462,6 +462,7 @@ if not Config.CustomInventory then if not targetXPlayer.hasWeapon(itemName) then sourceXPlayer.showNotification(TranslateCap("gave_weapon_noweapon", targetXPlayer.name)) targetXPlayer.showNotification(TranslateCap("received_weapon_noweapon", sourceXPlayer.name, weapon.label)) + return end local _, weaponObject = ESX.GetWeapon(itemName) @@ -502,7 +503,8 @@ if not Config.CustomInventory then if itemCount == nil or itemCount < 1 then return xPlayer.showNotification(TranslateCap("imp_invalid_amount")) end - local account = xPlayer.getAccount(itemName) + + local account = xPlayer.getAccount(itemName) if itemCount > account.money or account.money < 1 then return xPlayer.showNotification(TranslateCap("imp_invalid_amount")) @@ -694,7 +696,7 @@ AddEventHandler("onResourceStart", function(key) StopResource(key) error(("WE STOPPED A RESOURCE THAT WILL BREAK ^1ESX^1, PLEASE REMOVE ^5%s^1"):format(key)) end - + -- luacheck: ignore if not SetEntityOrphanMode then CreateThread(function() while true do diff --git a/[core]/es_extended/server/modules/commands.lua b/[core]/es_extended/server/modules/commands.lua index dfb4baa5..4e9d6862 100644 --- a/[core]/es_extended/server/modules/commands.lua +++ b/[core]/es_extended/server/modules/commands.lua @@ -95,10 +95,17 @@ ESX.RegisterCommand( }) end + local xRoutingBucket = GetPlayerRoutingBucket(xPlayer.source) + ESX.OneSync.SpawnVehicle(args.car, playerCoords, playerHeading, upgrades, function(networkId) if networkId then local vehicle = NetworkGetEntityFromNetworkId(networkId) - for _ = 1, 20 do + + if xRoutingBucket ~= 0 then + SetEntityRoutingBucket(vehicle, xRoutingBucket) + end + + for _ = 1, 100 do Wait(0) SetPedIntoVehicle(playerPed, vehicle, -1) @@ -106,6 +113,7 @@ ESX.RegisterCommand( break end end + if GetVehiclePedIsIn(playerPed, false) ~= vehicle then showError("[^1ERROR^7] The player could not be seated in the vehicle") end diff --git a/[core]/es_extended/server/modules/onesync.lua b/[core]/es_extended/server/modules/onesync.lua index cb9bfdfa..87c5f7f0 100644 --- a/[core]/es_extended/server/modules/onesync.lua +++ b/[core]/es_extended/server/modules/onesync.lua @@ -101,7 +101,7 @@ function ESX.OneSync.SpawnVehicle(model, coords, heading, properties, cb) return error(("Could not spawn vehicle - ^5%s^7!"):format(model)) end end - + -- luacheck: ignore SetEntityOrphanMode(createdVehicle, 2) local networkId = NetworkGetNetworkIdFromEntity(createdVehicle) Entity(createdVehicle).state:set("VehicleProperties", vehicleProperties, true) diff --git a/[core]/es_extended/shared/config/weapons.lua b/[core]/es_extended/shared/config/weapons.lua index cbeecb54..d26ab75a 100644 --- a/[core]/es_extended/shared/config/weapons.lua +++ b/[core]/es_extended/shared/config/weapons.lua @@ -8,6 +8,41 @@ Config.DefaultWeaponTints = { [6] = TranslateCap("tint_orange"), [7] = TranslateCap("tint_platinum"), } +Config.MK2WeaponTints = { + [0] = TranslateCap('tint_classic_black'), + [1] = TranslateCap('tint_classic_gray'), + [2] = TranslateCap('tint_classic_two_tone'), + [3] = TranslateCap('tint_classic_white'), + [4] = TranslateCap('tint_classic_beige'), + [5] = TranslateCap('tint_classic_green'), + [6] = TranslateCap('tint_classic_blue'), + [7] = TranslateCap('tint_classic_earth'), + [8] = TranslateCap('tint_classic_brown_black'), + [9] = TranslateCap('tint_contrast_red'), + [10] = TranslateCap('tint_contrast_blue'), + [11] = TranslateCap('tint_contrast_yellow'), + [12] = TranslateCap('tint_contrast_orange'), + [13] = TranslateCap('tint_bold_pink'), + [14] = TranslateCap('tint_bold_purple_yellow'), + [15] = TranslateCap('tint_bold_orange'), + [16] = TranslateCap('tint_bold_green_purple'), + [17] = TranslateCap('tint_bold_red_feat'), + [18] = TranslateCap('tint_bold_green_feat'), + [19] = TranslateCap('tint_bold_cyan_feat'), + [20] = TranslateCap('tint_bold_yellow_feat'), + [21] = TranslateCap('tint_bold_red_white'), + [22] = TranslateCap('tint_bold_blue_white'), + [23] = TranslateCap('tint_metallic_gold'), + [24] = TranslateCap('tint_metallic_platinum'), + [25] = TranslateCap('tint_metallic_gray_lilac'), + [26] = TranslateCap('tint_metallic_purple_lime'), + [27] = TranslateCap('tint_metallic_red'), + [28] = TranslateCap('tint_metallic_green'), + [29] = TranslateCap('tint_metallic_blue'), + [30] = TranslateCap('tint_metallic_white_aqua'), + [31] = TranslateCap('tint_metallic_orange_yellow'), + [32] = TranslateCap('tint_metallic_red_yellow') +} Config.Weapons = { -- Melee @@ -111,7 +146,7 @@ Config.Weapons = { name = "WEAPON_REVOLVER_MK2", label = TranslateCap("weapon_revolver_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_PISTOL` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_REVOLVER_MK2_CLIP_01` }, { name = "ammo_tracer", label = TranslateCap("component_ammo_tracer"), hash = `COMPONENT_REVOLVER_MK2_CLIP_TRACER` }, @@ -153,7 +188,7 @@ Config.Weapons = { name = "WEAPON_PISTOL_MK2", label = TranslateCap("weapon_pistol_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_PISTOL` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_PISTOL_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_PISTOL_MK2_CLIP_02` }, @@ -217,7 +252,7 @@ Config.Weapons = { name = "WEAPON_SNSPISTOL_MK2", label = TranslateCap("weapon_snspistol_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_PISTOL` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_SNSPISTOL_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_SNSPISTOL_MK2_CLIP_02` }, @@ -333,7 +368,7 @@ Config.Weapons = { name = "WEAPON_PUMPSHOTGUN_MK2", label = TranslateCap("weapon_pumpshotgun_mk2"), ammo = { label = TranslateCap("ammo_shells"), hash = `AMMO_SHOTGUN` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "shells_default", label = TranslateCap("component_shells_default"), hash = `COMPONENT_PUMPSHOTGUN_MK2_CLIP_01` }, { name = "shells_incendiary", label = TranslateCap("component_shells_incendiary"), hash = `COMPONENT_PUMPSHOTGUN_MK2_CLIP_INCENDIARY` }, @@ -400,7 +435,7 @@ Config.Weapons = { name = "WEAPON_COMBATMG_MK2", label = TranslateCap("weapon_combatmg_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_MG` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_COMBATMG_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_COMBATMG_MK2_CLIP_02` }, @@ -525,7 +560,7 @@ Config.Weapons = { name = "WEAPON_SMG_MK2", label = TranslateCap("weapon_smg_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_SMG` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_SMG_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_SMG_MK2_CLIP_02` }, @@ -596,7 +631,7 @@ Config.Weapons = { name = "WEAPON_ASSAULTRIFLE_MK2", label = TranslateCap("weapon_assaultrifle_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_RIFLE` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_ASSAULTRIFLE_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_ASSAULTRIFLE_MK2_CLIP_02` }, @@ -651,7 +686,7 @@ Config.Weapons = { name = "WEAPON_BULLPUPRIFLE_MK2", label = TranslateCap("weapon_bullpuprifle_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_RIFLE` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_BULLPUPRIFLE_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_BULLPUPRIFLE_MK2_CLIP_02` }, @@ -707,7 +742,7 @@ Config.Weapons = { name = "WEAPON_CARBINERIFLE_MK2", label = TranslateCap("weapon_carbinerifle_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_RIFLE` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_CARBINERIFLE_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_CARBINERIFLE_MK2_CLIP_02` }, @@ -788,7 +823,7 @@ Config.Weapons = { name = "WEAPON_SPECIALCARBINE_MK2", label = TranslateCap("weapon_specialcarbine_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_RIFLE` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_SPECIALCARBINE_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_SPECIALCARBINE_MK2_CLIP_02` }, @@ -854,7 +889,7 @@ Config.Weapons = { name = "WEAPON_HEAVYSNIPER_MK2", label = TranslateCap("weapon_heavysniper_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_SNIPER` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_HEAVYSNIPER_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_HEAVYSNIPER_MK2_CLIP_02` }, @@ -903,7 +938,7 @@ Config.Weapons = { name = "WEAPON_MARKSMANRIFLE_MK2", label = TranslateCap("weapon_marksmanrifle_mk2"), ammo = { label = TranslateCap("ammo_rounds"), hash = `AMMO_SNIPER` }, - tints = Config.DefaultWeaponTints, + tints = Config.MK2WeaponTints, components = { { name = "clip_default", label = TranslateCap("component_clip_default"), hash = `COMPONENT_MARKSMANRIFLE_MK2_CLIP_01` }, { name = "clip_extended", label = TranslateCap("component_clip_extended"), hash = `COMPONENT_MARKSMANRIFLE_MK2_CLIP_02` }, diff --git a/[core]/esx_identity/dist/assets/index-B6T-7u2-.css b/[core]/esx_identity/dist/assets/index-B6T-7u2-.css deleted file mode 100644 index e0299875..00000000 --- a/[core]/esx_identity/dist/assets/index-B6T-7u2-.css +++ /dev/null @@ -1 +0,0 @@ -@import"https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap";body{font-family:sans-serif;overflow:hidden;background-color:transparent}.none{display:none}.dialog{width:477px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);background-color:#080808;border-radius:8px;border:none;color:#fff;font-family:Poppins,sans-serif}.dialog__header{background-color:#040404;border-top-left-radius:8px;border-top-right-radius:8px;padding:20px;text-align:center}.dialog__header h1{font-weight:700;margin-bottom:0;font-size:30px}.dialog__header span{color:#fd9800}.dialog__body{padding-block:20px;padding-inline:65px}.dialog__body-hint{text-align:center;margin-bottom:20px}.dialog__body-form{display:flex;flex-direction:column;gap:35px;font-weight:600;font-size:15px}.dialog__form-submit{border:none;background-color:#fd9800;color:#fff;font-size:18px;font-weight:700;border-radius:4px;padding-block:5px}.dialog__form-submit i{margin-right:5px}.dialog__form-group{display:flex;align-items:center;justify-content:space-between;gap:30px;background-color:#040404;position:relative}.dialog__form-group--radio{gap:0}.dialog__form-group label{text-align:center;flex-grow:1;flex-shrink:1;padding-inline:20px}.dialog__form-group input{background-color:transparent;border:none;height:30px;width:180px;flex-shrink:0;color:#fff}.dialog__form-group input:focus{background-color:#0f0f0fe6;border:none;border-radius:5px;color:#fff;outline:none;box-shadow:none}.dialog__form-validation{position:relative}.dialog__form-validation i{position:absolute;right:10px;top:50%;transform:translateY(-50%)}.dialog__form-radio{display:flex;align-items:center}.dialog__form-radio input{display:none}.dialog__form-radio label{display:flex;align-items:center;gap:10px;cursor:pointer}.dialog__form-radio input+label{height:30px;display:flex;align-items:center}.dialog__form-radio input:checked+label{color:#30a1fd;height:30px}.dialog__form-radio input:not(:checked)+label{color:#242424;height:30px}.dialog__form-message{position:absolute;top:35px;right:0;font-size:9px}.dialog__form-message--error{color:#733838}#male:checked+label{color:#30a1fd}#female:checked+label{color:#ff69b4}::placeholder{color:#242424;font-weight:600} diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua index 4860f315..872696e5 100644 --- 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 index a72e0b65..d0461b92 100644 --- 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/dist/assets/index-CaT4lk_v.js b/[core]/esx_identity/web/dist/assets/index-BR-kw549.js similarity index 98% rename from [core]/esx_identity/dist/assets/index-CaT4lk_v.js rename to [core]/esx_identity/web/dist/assets/index-BR-kw549.js index 2936a317..75747bb1 100644 --- a/[core]/esx_identity/dist/assets/index-CaT4lk_v.js +++ b/[core]/esx_identity/web/dist/assets/index-BR-kw549.js @@ -30,4 +30,4 @@ var Gf;function N(){return Gf.apply(null,arguments)}function cv(e){Gf=e}function [`+i+"] ";for(o in arguments[0])ge(arguments[0],o)&&(s+=o+": "+arguments[0][o]+", ");s=s.slice(0,-2)}else s=arguments[i];r.push(s)}Zf(e+` Arguments: `+Array.prototype.slice.call(r).join("")+` `+new Error().stack),n=!1}return t.apply(this,arguments)},t)}var Yl={};function Jf(e,t){N.deprecationHandler!=null&&N.deprecationHandler(e,t),Yl[e]||(Zf(t),Yl[e]=!0)}N.suppressDeprecationWarnings=!1;N.deprecationHandler=null;function Zt(e){return typeof Function<"u"&&e instanceof Function||Object.prototype.toString.call(e)==="[object Function]"}function dv(e){var t,n;for(n in e)ge(e,n)&&(t=e[n],Zt(t)?this[n]=t:this["_"+n]=t);this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)}function To(e,t){var n=En({},e),r;for(r in t)ge(t,r)&&(Ln(e[r])&&Ln(t[r])?(n[r]={},En(n[r],e[r]),En(n[r],t[r])):t[r]!=null?n[r]=t[r]:delete n[r]);for(r in e)ge(e,r)&&!ge(t,r)&&Ln(e[r])&&(n[r]=En({},n[r]));return n}function Ta(e){e!=null&&this.set(e)}var Do;Object.keys?Do=Object.keys:Do=function(e){var t,n=[];for(t in e)ge(e,t)&&n.push(t);return n};var hv={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"};function pv(e,t,n){var r=this._calendar[e]||this._calendar.sameElse;return Zt(r)?r.call(t,n):r}function Gt(e,t,n){var r=""+Math.abs(e),s=t-r.length,i=e>=0;return(i?n?"+":"":"-")+Math.pow(10,Math.max(0,s)).toString().substr(1)+r}var Da=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,ms=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Ki={},ar={};function K(e,t,n,r){var s=r;typeof r=="string"&&(s=function(){return this[r]()}),e&&(ar[e]=s),t&&(ar[t[0]]=function(){return Gt(s.apply(this,arguments),t[1],t[2])}),n&&(ar[n]=function(){return this.localeData().ordinal(s.apply(this,arguments),e)})}function _v(e){return e.match(/\[[\s\S]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function mv(e){var t=e.match(Da),n,r;for(n=0,r=t.length;n=0&&ms.test(e);)e=e.replace(ms,r),ms.lastIndex=0,n-=1;return e}var gv={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"};function vv(e){var t=this._longDateFormat[e],n=this._longDateFormat[e.toUpperCase()];return t||!n?t:(this._longDateFormat[e]=n.match(Da).map(function(r){return r==="MMMM"||r==="MM"||r==="DD"||r==="dddd"?r.slice(1):r}).join(""),this._longDateFormat[e])}var yv="Invalid date";function Ev(){return this._invalidDate}var bv="%d",Ov=/\d{1,2}/;function Sv(e){return this._ordinal.replace("%d",e)}var wv={future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",w:"a week",ww:"%d weeks",M:"a month",MM:"%d months",y:"a year",yy:"%d years"};function xv(e,t,n,r){var s=this._relativeTime[n];return Zt(s)?s(e,t,n,r):s.replace(/%d/i,e)}function Tv(e,t){var n=this._relativeTime[e>0?"future":"past"];return Zt(n)?n(t):n.replace(/%s/i,t)}var $l={D:"date",dates:"date",date:"date",d:"day",days:"day",day:"day",e:"weekday",weekdays:"weekday",weekday:"weekday",E:"isoWeekday",isoweekdays:"isoWeekday",isoweekday:"isoWeekday",DDD:"dayOfYear",dayofyears:"dayOfYear",dayofyear:"dayOfYear",h:"hour",hours:"hour",hour:"hour",ms:"millisecond",milliseconds:"millisecond",millisecond:"millisecond",m:"minute",minutes:"minute",minute:"minute",M:"month",months:"month",month:"month",Q:"quarter",quarters:"quarter",quarter:"quarter",s:"second",seconds:"second",second:"second",gg:"weekYear",weekyears:"weekYear",weekyear:"weekYear",GG:"isoWeekYear",isoweekyears:"isoWeekYear",isoweekyear:"isoWeekYear",w:"week",weeks:"week",week:"week",W:"isoWeek",isoweeks:"isoWeek",isoweek:"isoWeek",y:"year",years:"year",year:"year"};function kt(e){return typeof e=="string"?$l[e]||$l[e.toLowerCase()]:void 0}function Aa(e){var t={},n,r;for(r in e)ge(e,r)&&(n=kt(r),n&&(t[n]=e[r]));return t}var Dv={date:9,day:11,weekday:11,isoWeekday:11,dayOfYear:4,hour:13,millisecond:16,minute:14,month:8,quarter:7,second:15,weekYear:1,isoWeekYear:1,week:5,isoWeek:5,year:1};function Av(e){var t=[],n;for(n in e)ge(e,n)&&t.push({unit:n,priority:Dv[n]});return t.sort(function(r,s){return r.priority-s.priority}),t}var Qf=/\d/,bt=/\d\d/,ed=/\d{3}/,ka=/\d{4}/,pi=/[+-]?\d{6}/,Re=/\d\d?/,td=/\d\d\d\d?/,nd=/\d\d\d\d\d\d?/,_i=/\d{1,3}/,Ca=/\d{1,4}/,mi=/[+-]?\d{1,6}/,mr=/\d+/,gi=/[+-]?\d+/,kv=/Z|[+-]\d\d:?\d\d/gi,vi=/Z|[+-]\d\d(?::?\d\d)?/gi,Cv=/[+-]?\d+(\.\d{1,3})?/,as=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,gr=/^[1-9]\d?/,Ma=/^([1-9]\d|\d)/,Bs;Bs={};function Y(e,t,n){Bs[e]=Zt(t)?t:function(r,s){return r&&n?n:t}}function Mv(e,t){return ge(Bs,e)?Bs[e](t._strict,t._locale):new RegExp(Fv(e))}function Fv(e){return cn(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(t,n,r,s,i){return n||r||s||i}))}function cn(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function xt(e){return e<0?Math.ceil(e)||0:Math.floor(e)}function ce(e){var t=+e,n=0;return t!==0&&isFinite(t)&&(n=xt(t)),n}var Ao={};function xe(e,t){var n,r=t,s;for(typeof e=="string"&&(e=[e]),dn(t)&&(r=function(i,o){o[t]=ce(i)}),s=e.length,n=0;n68?1900:2e3)};var rd=vr("FullYear",!0);function Vv(){return yi(this.year())}function vr(e,t){return function(n){return n!=null?(sd(this,e,n),N.updateOffset(this,t),this):Zr(this,e)}}function Zr(e,t){if(!e.isValid())return NaN;var n=e._d,r=e._isUTC;switch(t){case"Milliseconds":return r?n.getUTCMilliseconds():n.getMilliseconds();case"Seconds":return r?n.getUTCSeconds():n.getSeconds();case"Minutes":return r?n.getUTCMinutes():n.getMinutes();case"Hours":return r?n.getUTCHours():n.getHours();case"Date":return r?n.getUTCDate():n.getDate();case"Day":return r?n.getUTCDay():n.getDay();case"Month":return r?n.getUTCMonth():n.getMonth();case"FullYear":return r?n.getUTCFullYear():n.getFullYear();default:return NaN}}function sd(e,t,n){var r,s,i,o,a;if(!(!e.isValid()||isNaN(n))){switch(r=e._d,s=e._isUTC,t){case"Milliseconds":return void(s?r.setUTCMilliseconds(n):r.setMilliseconds(n));case"Seconds":return void(s?r.setUTCSeconds(n):r.setSeconds(n));case"Minutes":return void(s?r.setUTCMinutes(n):r.setMinutes(n));case"Hours":return void(s?r.setUTCHours(n):r.setHours(n));case"Date":return void(s?r.setUTCDate(n):r.setDate(n));case"FullYear":break;default:return}i=n,o=e.month(),a=e.date(),a=a===29&&o===1&&!yi(i)?28:a,s?r.setUTCFullYear(i,o,a):r.setFullYear(i,o,a)}}function Nv(e){return e=kt(e),Zt(this[e])?this[e]():this}function Uv(e,t){if(typeof e=="object"){e=Aa(e);var n=Av(e),r,s=n.length;for(r=0;r=0?(a=new Date(e+400,t,n,r,s,i,o),isFinite(a.getFullYear())&&a.setFullYear(e)):a=new Date(e,t,n,r,s,i,o),a}function Jr(e){var t,n;return e<100&&e>=0?(n=Array.prototype.slice.call(arguments),n[0]=e+400,t=new Date(Date.UTC.apply(null,n)),isFinite(t.getUTCFullYear())&&t.setUTCFullYear(e)):t=new Date(Date.UTC.apply(null,arguments)),t}function Hs(e,t,n){var r=7+t-n,s=(7+Jr(e,0,r).getUTCDay()-t)%7;return-s+r-1}function cd(e,t,n,r,s){var i=(7+n-r)%7,o=Hs(e,r,s),a=1+7*(t-1)+i+o,u,l;return a<=0?(u=e-1,l=Ur(u)+a):a>Ur(e)?(u=e+1,l=a-Ur(e)):(u=e,l=a),{year:u,dayOfYear:l}}function Xr(e,t,n){var r=Hs(e.year(),t,n),s=Math.floor((e.dayOfYear()-r-1)/7)+1,i,o;return s<1?(o=e.year()-1,i=s+fn(o,t,n)):s>fn(e.year(),t,n)?(i=s-fn(e.year(),t,n),o=e.year()+1):(o=e.year(),i=s),{week:i,year:o}}function fn(e,t,n){var r=Hs(e,t,n),s=Hs(e+1,t,n);return(Ur(e)-r+s)/7}K("w",["ww",2],"wo","week");K("W",["WW",2],"Wo","isoWeek");Y("w",Re,gr);Y("ww",Re,bt);Y("W",Re,gr);Y("WW",Re,bt);us(["w","ww","W","WW"],function(e,t,n,r){t[r.substr(0,1)]=ce(e)});function Jv(e){return Xr(e,this._week.dow,this._week.doy).week}var Xv={dow:0,doy:6};function Qv(){return this._week.dow}function ey(){return this._week.doy}function ty(e){var t=this.localeData().week(this);return e==null?t:this.add((e-t)*7,"d")}function ny(e){var t=Xr(this,1,4).week;return e==null?t:this.add((e-t)*7,"d")}K("d",0,"do","day");K("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)});K("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)});K("dddd",0,0,function(e){return this.localeData().weekdays(this,e)});K("e",0,0,"weekday");K("E",0,0,"isoWeekday");Y("d",Re);Y("e",Re);Y("E",Re);Y("dd",function(e,t){return t.weekdaysMinRegex(e)});Y("ddd",function(e,t){return t.weekdaysShortRegex(e)});Y("dddd",function(e,t){return t.weekdaysRegex(e)});us(["dd","ddd","dddd"],function(e,t,n,r){var s=n._locale.weekdaysParse(e,r,n._strict);s!=null?t.d=s:se(n).invalidWeekday=e});us(["d","e","E"],function(e,t,n,r){t[r]=ce(e)});function ry(e,t){return typeof e!="string"?e:isNaN(e)?(e=t.weekdaysParse(e),typeof e=="number"?e:null):parseInt(e,10)}function sy(e,t){return typeof e=="string"?t.weekdaysParse(e)%7||7:isNaN(e)?null:e}function Ia(e,t){return e.slice(t,7).concat(e.slice(0,t))}var iy="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),fd="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),oy="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ay=as,uy=as,ly=as;function cy(e,t){var n=Vt(this._weekdays)?this._weekdays:this._weekdays[e&&e!==!0&&this._weekdays.isFormat.test(t)?"format":"standalone"];return e===!0?Ia(n,this._week.dow):e?n[e.day()]:n}function fy(e){return e===!0?Ia(this._weekdaysShort,this._week.dow):e?this._weekdaysShort[e.day()]:this._weekdaysShort}function dy(e){return e===!0?Ia(this._weekdaysMin,this._week.dow):e?this._weekdaysMin[e.day()]:this._weekdaysMin}function hy(e,t,n){var r,s,i,o=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],r=0;r<7;++r)i=qt([2e3,1]).day(r),this._minWeekdaysParse[r]=this.weekdaysMin(i,"").toLocaleLowerCase(),this._shortWeekdaysParse[r]=this.weekdaysShort(i,"").toLocaleLowerCase(),this._weekdaysParse[r]=this.weekdays(i,"").toLocaleLowerCase();return n?t==="dddd"?(s=We.call(this._weekdaysParse,o),s!==-1?s:null):t==="ddd"?(s=We.call(this._shortWeekdaysParse,o),s!==-1?s:null):(s=We.call(this._minWeekdaysParse,o),s!==-1?s:null):t==="dddd"?(s=We.call(this._weekdaysParse,o),s!==-1||(s=We.call(this._shortWeekdaysParse,o),s!==-1)?s:(s=We.call(this._minWeekdaysParse,o),s!==-1?s:null)):t==="ddd"?(s=We.call(this._shortWeekdaysParse,o),s!==-1||(s=We.call(this._weekdaysParse,o),s!==-1)?s:(s=We.call(this._minWeekdaysParse,o),s!==-1?s:null)):(s=We.call(this._minWeekdaysParse,o),s!==-1||(s=We.call(this._weekdaysParse,o),s!==-1)?s:(s=We.call(this._shortWeekdaysParse,o),s!==-1?s:null))}function py(e,t,n){var r,s,i;if(this._weekdaysParseExact)return hy.call(this,e,t,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),r=0;r<7;r++){if(s=qt([2e3,1]).day(r),n&&!this._fullWeekdaysParse[r]&&(this._fullWeekdaysParse[r]=new RegExp("^"+this.weekdays(s,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[r]=new RegExp("^"+this.weekdaysShort(s,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[r]=new RegExp("^"+this.weekdaysMin(s,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[r]||(i="^"+this.weekdays(s,"")+"|^"+this.weekdaysShort(s,"")+"|^"+this.weekdaysMin(s,""),this._weekdaysParse[r]=new RegExp(i.replace(".",""),"i")),n&&t==="dddd"&&this._fullWeekdaysParse[r].test(e))return r;if(n&&t==="ddd"&&this._shortWeekdaysParse[r].test(e))return r;if(n&&t==="dd"&&this._minWeekdaysParse[r].test(e))return r;if(!n&&this._weekdaysParse[r].test(e))return r}}function _y(e){if(!this.isValid())return e!=null?this:NaN;var t=Zr(this,"Day");return e!=null?(e=ry(e,this.localeData()),this.add(e-t,"d")):t}function my(e){if(!this.isValid())return e!=null?this:NaN;var t=(this.day()+7-this.localeData()._week.dow)%7;return e==null?t:this.add(e-t,"d")}function gy(e){if(!this.isValid())return e!=null?this:NaN;if(e!=null){var t=sy(e,this.localeData());return this.day(this.day()%7?t:t-7)}else return this.day()||7}function vy(e){return this._weekdaysParseExact?(ge(this,"_weekdaysRegex")||Ra.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(ge(this,"_weekdaysRegex")||(this._weekdaysRegex=ay),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)}function yy(e){return this._weekdaysParseExact?(ge(this,"_weekdaysRegex")||Ra.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(ge(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=uy),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)}function Ey(e){return this._weekdaysParseExact?(ge(this,"_weekdaysRegex")||Ra.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(ge(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=ly),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)}function Ra(){function e(c,f){return f.length-c.length}var t=[],n=[],r=[],s=[],i,o,a,u,l;for(i=0;i<7;i++)o=qt([2e3,1]).day(i),a=cn(this.weekdaysMin(o,"")),u=cn(this.weekdaysShort(o,"")),l=cn(this.weekdays(o,"")),t.push(a),n.push(u),r.push(l),s.push(a),s.push(u),s.push(l);t.sort(e),n.sort(e),r.sort(e),s.sort(e),this._weekdaysRegex=new RegExp("^("+s.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+r.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+n.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+t.join("|")+")","i")}function Pa(){return this.hours()%12||12}function by(){return this.hours()||24}K("H",["HH",2],0,"hour");K("h",["hh",2],0,Pa);K("k",["kk",2],0,by);K("hmm",0,0,function(){return""+Pa.apply(this)+Gt(this.minutes(),2)});K("hmmss",0,0,function(){return""+Pa.apply(this)+Gt(this.minutes(),2)+Gt(this.seconds(),2)});K("Hmm",0,0,function(){return""+this.hours()+Gt(this.minutes(),2)});K("Hmmss",0,0,function(){return""+this.hours()+Gt(this.minutes(),2)+Gt(this.seconds(),2)});function dd(e,t){K(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}dd("a",!0);dd("A",!1);function hd(e,t){return t._meridiemParse}Y("a",hd);Y("A",hd);Y("H",Re,Ma);Y("h",Re,gr);Y("k",Re,gr);Y("HH",Re,bt);Y("hh",Re,bt);Y("kk",Re,bt);Y("hmm",td);Y("hmmss",nd);Y("Hmm",td);Y("Hmmss",nd);xe(["H","HH"],ze);xe(["k","kk"],function(e,t,n){var r=ce(e);t[ze]=r===24?0:r});xe(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e});xe(["h","hh"],function(e,t,n){t[ze]=ce(e),se(n).bigHour=!0});xe("hmm",function(e,t,n){var r=e.length-2;t[ze]=ce(e.substr(0,r)),t[Ft]=ce(e.substr(r)),se(n).bigHour=!0});xe("hmmss",function(e,t,n){var r=e.length-4,s=e.length-2;t[ze]=ce(e.substr(0,r)),t[Ft]=ce(e.substr(r,2)),t[ln]=ce(e.substr(s)),se(n).bigHour=!0});xe("Hmm",function(e,t,n){var r=e.length-2;t[ze]=ce(e.substr(0,r)),t[Ft]=ce(e.substr(r))});xe("Hmmss",function(e,t,n){var r=e.length-4,s=e.length-2;t[ze]=ce(e.substr(0,r)),t[Ft]=ce(e.substr(r,2)),t[ln]=ce(e.substr(s))});function Oy(e){return(e+"").toLowerCase().charAt(0)==="p"}var Sy=/[ap]\.?m?\.?/i,wy=vr("Hours",!0);function xy(e,t,n){return e>11?n?"pm":"PM":n?"am":"AM"}var pd={calendar:hv,longDateFormat:gv,invalidDate:yv,ordinal:bv,dayOfMonthOrdinalParse:Ov,relativeTime:wv,months:Yv,monthsShort:id,week:Xv,weekdays:iy,weekdaysMin:oy,weekdaysShort:fd,meridiemParse:Sy},Ve={},Sr={},Qr;function Ty(e,t){var n,r=Math.min(e.length,t.length);for(n=0;n0;){if(s=Ei(i.slice(0,n).join("-")),s)return s;if(r&&r.length>=n&&Ty(i,r)>=n-1)break;n--}t++}return Qr}function Ay(e){return!!(e&&e.match("^[^/\\\\]*$"))}function Ei(e){var t=null,n;if(Ve[e]===void 0&&typeof Ds<"u"&&Ds&&Ds.exports&&Ay(e))try{t=Qr._abbr,n=require,n("./locale/"+e),wn(t)}catch{Ve[e]=null}return Ve[e]}function wn(e,t){var n;return e&&(dt(t)?n=pn(e):n=Va(e,t),n?Qr=n:typeof console<"u"&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),Qr._abbr}function Va(e,t){if(t!==null){var n,r=pd;if(t.abbr=e,Ve[e]!=null)Jf("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),r=Ve[e]._config;else if(t.parentLocale!=null)if(Ve[t.parentLocale]!=null)r=Ve[t.parentLocale]._config;else if(n=Ei(t.parentLocale),n!=null)r=n._config;else return Sr[t.parentLocale]||(Sr[t.parentLocale]=[]),Sr[t.parentLocale].push({name:e,config:t}),null;return Ve[e]=new Ta(To(r,t)),Sr[e]&&Sr[e].forEach(function(s){Va(s.name,s.config)}),wn(e),Ve[e]}else return delete Ve[e],null}function ky(e,t){if(t!=null){var n,r,s=pd;Ve[e]!=null&&Ve[e].parentLocale!=null?Ve[e].set(To(Ve[e]._config,t)):(r=Ei(e),r!=null&&(s=r._config),t=To(s,t),r==null&&(t.abbr=e),n=new Ta(t),n.parentLocale=Ve[e],Ve[e]=n),wn(e)}else Ve[e]!=null&&(Ve[e].parentLocale!=null?(Ve[e]=Ve[e].parentLocale,e===wn()&&wn(e)):Ve[e]!=null&&delete Ve[e]);return Ve[e]}function pn(e){var t;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return Qr;if(!Vt(e)){if(t=Ei(e),t)return t;e=[e]}return Dy(e)}function Cy(){return Do(Ve)}function Na(e){var t,n=e._a;return n&&se(e).overflow===-2&&(t=n[un]<0||n[un]>11?un:n[Ht]<1||n[Ht]>Fa(n[nt],n[un])?Ht:n[ze]<0||n[ze]>24||n[ze]===24&&(n[Ft]!==0||n[ln]!==0||n[Pn]!==0)?ze:n[Ft]<0||n[Ft]>59?Ft:n[ln]<0||n[ln]>59?ln:n[Pn]<0||n[Pn]>999?Pn:-1,se(e)._overflowDayOfYear&&(tHt)&&(t=Ht),se(e)._overflowWeeks&&t===-1&&(t=Rv),se(e)._overflowWeekday&&t===-1&&(t=Pv),se(e).overflow=t),e}var My=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Fy=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Iy=/Z|[+-]\d\d(?::?\d\d)?/,gs=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/],["YYYYMM",/\d{6}/,!1],["YYYY",/\d{4}/,!1]],Gi=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Ry=/^\/?Date\((-?\d+)/i,Py=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,Vy={UT:0,GMT:0,EDT:-4*60,EST:-5*60,CDT:-5*60,CST:-6*60,MDT:-6*60,MST:-7*60,PDT:-7*60,PST:-8*60};function _d(e){var t,n,r=e._i,s=My.exec(r)||Fy.exec(r),i,o,a,u,l=gs.length,c=Gi.length;if(s){for(se(e).iso=!0,t=0,n=l;tUr(o)||e._dayOfYear===0)&&(se(e)._overflowDayOfYear=!0),n=Jr(o,0,e._dayOfYear),e._a[un]=n.getUTCMonth(),e._a[Ht]=n.getUTCDate()),t=0;t<3&&e._a[t]==null;++t)e._a[t]=r[t]=s[t];for(;t<7;t++)e._a[t]=r[t]=e._a[t]==null?t===2?1:0:e._a[t];e._a[ze]===24&&e._a[Ft]===0&&e._a[ln]===0&&e._a[Pn]===0&&(e._nextDay=!0,e._a[ze]=0),e._d=(e._useUTC?Jr:Zv).apply(null,r),i=e._useUTC?e._d.getUTCDay():e._d.getDay(),e._tzm!=null&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[ze]=24),e._w&&typeof e._w.d<"u"&&e._w.d!==i&&(se(e).weekdayMismatch=!0)}}function Hy(e){var t,n,r,s,i,o,a,u,l;t=e._w,t.GG!=null||t.W!=null||t.E!=null?(i=1,o=4,n=Qn(t.GG,e._a[nt],Xr(Ie(),1,4).year),r=Qn(t.W,1),s=Qn(t.E,1),(s<1||s>7)&&(u=!0)):(i=e._locale._week.dow,o=e._locale._week.doy,l=Xr(Ie(),i,o),n=Qn(t.gg,e._a[nt],l.year),r=Qn(t.w,l.week),t.d!=null?(s=t.d,(s<0||s>6)&&(u=!0)):t.e!=null?(s=t.e+i,(t.e<0||t.e>6)&&(u=!0)):s=i),r<1||r>fn(n,i,o)?se(e)._overflowWeeks=!0:u!=null?se(e)._overflowWeekday=!0:(a=cd(n,r,s,i,o),e._a[nt]=a.year,e._dayOfYear=a.dayOfYear)}N.ISO_8601=function(){};N.RFC_2822=function(){};function La(e){if(e._f===N.ISO_8601){_d(e);return}if(e._f===N.RFC_2822){md(e);return}e._a=[],se(e).empty=!0;var t=""+e._i,n,r,s,i,o,a=t.length,u=0,l,c;for(s=Xf(e._f,e._locale).match(Da)||[],c=s.length,n=0;n0&&se(e).unusedInput.push(o),t=t.slice(t.indexOf(r)+r.length),u+=r.length),ar[i]?(r?se(e).empty=!1:se(e).unusedTokens.push(i),Iv(i,r,e)):e._strict&&!r&&se(e).unusedTokens.push(i);se(e).charsLeftOver=a-u,t.length>0&&se(e).unusedInput.push(t),e._a[ze]<=12&&se(e).bigHour===!0&&e._a[ze]>0&&(se(e).bigHour=void 0),se(e).parsedDateParts=e._a.slice(0),se(e).meridiem=e._meridiem,e._a[ze]=Wy(e._locale,e._a[ze],e._meridiem),l=se(e).era,l!==null&&(e._a[nt]=e._locale.erasConvertYear(l,e._a[nt])),Ua(e),Na(e)}function Wy(e,t,n){var r;return n==null?t:e.meridiemHour!=null?e.meridiemHour(t,n):(e.isPM!=null&&(r=e.isPM(n),r&&t<12&&(t+=12),!r&&t===12&&(t=0)),t)}function zy(e){var t,n,r,s,i,o,a=!1,u=e._f.length;if(u===0){se(e).invalidFormat=!0,e._d=new Date(NaN);return}for(s=0;sthis?this:e:hi()});function yd(e,t){var n,r;if(t.length===1&&Vt(t[0])&&(t=t[0]),!t.length)return Ie();for(n=t[0],r=1;rthis.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function h1(){if(!dt(this._isDSTShifted))return this._isDSTShifted;var e={},t;return xa(e,this),e=gd(e),e._a?(t=e._isUTC?qt(e._a):Ie(e._a),this._isDSTShifted=this.isValid()&&s1(e._a,t.toArray())>0):this._isDSTShifted=!1,this._isDSTShifted}function p1(){return this.isValid()?!this._isUTC:!1}function _1(){return this.isValid()?this._isUTC:!1}function bd(){return this.isValid()?this._isUTC&&this._offset===0:!1}var m1=/^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/,g1=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Ut(e,t){var n=e,r=null,s,i,o;return xs(e)?n={ms:e._milliseconds,d:e._days,M:e._months}:dn(e)||!isNaN(+e)?(n={},t?n[t]=+e:n.milliseconds=+e):(r=m1.exec(e))?(s=r[1]==="-"?-1:1,n={y:0,d:ce(r[Ht])*s,h:ce(r[ze])*s,m:ce(r[Ft])*s,s:ce(r[ln])*s,ms:ce(ko(r[Pn]*1e3))*s}):(r=g1.exec(e))?(s=r[1]==="-"?-1:1,n={y:Cn(r[2],s),M:Cn(r[3],s),w:Cn(r[4],s),d:Cn(r[5],s),h:Cn(r[6],s),m:Cn(r[7],s),s:Cn(r[8],s)}):n==null?n={}:typeof n=="object"&&("from"in n||"to"in n)&&(o=v1(Ie(n.from),Ie(n.to)),n={},n.ms=o.milliseconds,n.M=o.months),i=new bi(n),xs(e)&&ge(e,"_locale")&&(i._locale=e._locale),xs(e)&&ge(e,"_isValid")&&(i._isValid=e._isValid),i}Ut.fn=bi.prototype;Ut.invalid=r1;function Cn(e,t){var n=e&&parseFloat(e.replace(",","."));return(isNaN(n)?0:n)*t}function Bl(e,t){var n={};return n.months=t.month()-e.month()+(t.year()-e.year())*12,e.clone().add(n.months,"M").isAfter(t)&&--n.months,n.milliseconds=+t-+e.clone().add(n.months,"M"),n}function v1(e,t){var n;return e.isValid()&&t.isValid()?(t=$a(t,e),e.isBefore(t)?n=Bl(e,t):(n=Bl(t,e),n.milliseconds=-n.milliseconds,n.months=-n.months),n):{milliseconds:0,months:0}}function Od(e,t){return function(n,r){var s,i;return r!==null&&!isNaN(+r)&&(Jf(t,"moment()."+t+"(period, number) is deprecated. Please use moment()."+t+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),i=n,n=r,r=i),s=Ut(n,r),Sd(this,s,e),this}}function Sd(e,t,n,r){var s=t._milliseconds,i=ko(t._days),o=ko(t._months);e.isValid()&&(r=r??!0,o&&ad(e,Zr(e,"Month")+o*n),i&&sd(e,"Date",Zr(e,"Date")+i*n),s&&e._d.setTime(e._d.valueOf()+s*n),r&&N.updateOffset(e,i||o))}var y1=Od(1,"add"),E1=Od(-1,"subtract");function wd(e){return typeof e=="string"||e instanceof String}function b1(e){return Nt(e)||is(e)||wd(e)||dn(e)||S1(e)||O1(e)||e===null||e===void 0}function O1(e){var t=Ln(e)&&!Sa(e),n=!1,r=["years","year","y","months","month","M","days","day","d","dates","date","D","hours","hour","h","minutes","minute","m","seconds","second","s","milliseconds","millisecond","ms"],s,i,o=r.length;for(s=0;sn.valueOf():n.valueOf()9999?ws(n,t?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):Zt(Date.prototype.toISOString)?t?this.toDate().toISOString():new Date(this.valueOf()+this.utcOffset()*60*1e3).toISOString().replace("Z",ws(n,"Z")):ws(n,t?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")}function N1(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e="moment",t="",n,r,s,i;return this.isLocal()||(e=this.utcOffset()===0?"moment.utc":"moment.parseZone",t="Z"),n="["+e+'("]',r=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",s="-MM-DD[T]HH:mm:ss.SSS",i=t+'[")]',this.format(n+r+s+i)}function U1(e){e||(e=this.isUtc()?N.defaultFormatUtc:N.defaultFormat);var t=ws(this,e);return this.localeData().postformat(t)}function L1(e,t){return this.isValid()&&(Nt(e)&&e.isValid()||Ie(e).isValid())?Ut({to:this,from:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()}function Y1(e){return this.from(Ie(),e)}function $1(e,t){return this.isValid()&&(Nt(e)&&e.isValid()||Ie(e).isValid())?Ut({from:this,to:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()}function j1(e){return this.to(Ie(),e)}function xd(e){var t;return e===void 0?this._locale._abbr:(t=pn(e),t!=null&&(this._locale=t),this)}var Td=At("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(e){return e===void 0?this.localeData():this.locale(e)});function Dd(){return this._locale}var Ws=1e3,ur=60*Ws,zs=60*ur,Ad=(365*400+97)*24*zs;function lr(e,t){return(e%t+t)%t}function kd(e,t,n){return e<100&&e>=0?new Date(e+400,t,n)-Ad:new Date(e,t,n).valueOf()}function Cd(e,t,n){return e<100&&e>=0?Date.UTC(e+400,t,n)-Ad:Date.UTC(e,t,n)}function B1(e){var t,n;if(e=kt(e),e===void 0||e==="millisecond"||!this.isValid())return this;switch(n=this._isUTC?Cd:kd,e){case"year":t=n(this.year(),0,1);break;case"quarter":t=n(this.year(),this.month()-this.month()%3,1);break;case"month":t=n(this.year(),this.month(),1);break;case"week":t=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":t=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":t=n(this.year(),this.month(),this.date());break;case"hour":t=this._d.valueOf(),t-=lr(t+(this._isUTC?0:this.utcOffset()*ur),zs);break;case"minute":t=this._d.valueOf(),t-=lr(t,ur);break;case"second":t=this._d.valueOf(),t-=lr(t,Ws);break}return this._d.setTime(t),N.updateOffset(this,!0),this}function H1(e){var t,n;if(e=kt(e),e===void 0||e==="millisecond"||!this.isValid())return this;switch(n=this._isUTC?Cd:kd,e){case"year":t=n(this.year()+1,0,1)-1;break;case"quarter":t=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":t=n(this.year(),this.month()+1,1)-1;break;case"week":t=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":t=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":t=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":t=this._d.valueOf(),t+=zs-lr(t+(this._isUTC?0:this.utcOffset()*ur),zs)-1;break;case"minute":t=this._d.valueOf(),t+=ur-lr(t,ur)-1;break;case"second":t=this._d.valueOf(),t+=Ws-lr(t,Ws)-1;break}return this._d.setTime(t),N.updateOffset(this,!0),this}function W1(){return this._d.valueOf()-(this._offset||0)*6e4}function z1(){return Math.floor(this.valueOf()/1e3)}function K1(){return new Date(this.valueOf())}function G1(){var e=this;return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second(),e.millisecond()]}function q1(){var e=this;return{years:e.year(),months:e.month(),date:e.date(),hours:e.hours(),minutes:e.minutes(),seconds:e.seconds(),milliseconds:e.milliseconds()}}function Z1(){return this.isValid()?this.toISOString():null}function J1(){return wa(this)}function X1(){return En({},se(this))}function Q1(){return se(this).overflow}function eE(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}}K("N",0,0,"eraAbbr");K("NN",0,0,"eraAbbr");K("NNN",0,0,"eraAbbr");K("NNNN",0,0,"eraName");K("NNNNN",0,0,"eraNarrow");K("y",["y",1],"yo","eraYear");K("y",["yy",2],0,"eraYear");K("y",["yyy",3],0,"eraYear");K("y",["yyyy",4],0,"eraYear");Y("N",ja);Y("NN",ja);Y("NNN",ja);Y("NNNN",fE);Y("NNNNN",dE);xe(["N","NN","NNN","NNNN","NNNNN"],function(e,t,n,r){var s=n._locale.erasParse(e,r,n._strict);s?se(n).era=s:se(n).invalidEra=e});Y("y",mr);Y("yy",mr);Y("yyy",mr);Y("yyyy",mr);Y("yo",hE);xe(["y","yy","yyy","yyyy"],nt);xe(["yo"],function(e,t,n,r){var s;n._locale._eraYearOrdinalRegex&&(s=e.match(n._locale._eraYearOrdinalRegex)),n._locale.eraYearOrdinalParse?t[nt]=n._locale.eraYearOrdinalParse(e,s):t[nt]=parseInt(e,10)});function tE(e,t){var n,r,s,i=this._eras||pn("en")._eras;for(n=0,r=i.length;n=0)return i[r]}function rE(e,t){var n=e.since<=e.until?1:-1;return t===void 0?N(e.since).year():N(e.since).year()+(t-e.offset)*n}function sE(){var e,t,n,r=this.localeData().eras();for(e=0,t=r.length;ei&&(t=i),EE.call(this,e,t,n,r,s))}function EE(e,t,n,r,s){var i=cd(e,t,n,r,s),o=Jr(i.year,0,i.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}K("Q",0,"Qo","quarter");Y("Q",Qf);xe("Q",function(e,t){t[un]=(ce(e)-1)*3});function bE(e){return e==null?Math.ceil((this.month()+1)/3):this.month((e-1)*3+this.month()%3)}K("D",["DD",2],"Do","date");Y("D",Re,gr);Y("DD",Re,bt);Y("Do",function(e,t){return e?t._dayOfMonthOrdinalParse||t._ordinalParse:t._dayOfMonthOrdinalParseLenient});xe(["D","DD"],Ht);xe("Do",function(e,t){t[Ht]=ce(e.match(Re)[0])});var Fd=vr("Date",!0);K("DDD",["DDDD",3],"DDDo","dayOfYear");Y("DDD",_i);Y("DDDD",ed);xe(["DDD","DDDD"],function(e,t,n){n._dayOfYear=ce(e)});function OE(e){var t=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return e==null?t:this.add(e-t,"d")}K("m",["mm",2],0,"minute");Y("m",Re,Ma);Y("mm",Re,bt);xe(["m","mm"],Ft);var SE=vr("Minutes",!1);K("s",["ss",2],0,"second");Y("s",Re,Ma);Y("ss",Re,bt);xe(["s","ss"],ln);var wE=vr("Seconds",!1);K("S",0,0,function(){return~~(this.millisecond()/100)});K(0,["SS",2],0,function(){return~~(this.millisecond()/10)});K(0,["SSS",3],0,"millisecond");K(0,["SSSS",4],0,function(){return this.millisecond()*10});K(0,["SSSSS",5],0,function(){return this.millisecond()*100});K(0,["SSSSSS",6],0,function(){return this.millisecond()*1e3});K(0,["SSSSSSS",7],0,function(){return this.millisecond()*1e4});K(0,["SSSSSSSS",8],0,function(){return this.millisecond()*1e5});K(0,["SSSSSSSSS",9],0,function(){return this.millisecond()*1e6});Y("S",_i,Qf);Y("SS",_i,bt);Y("SSS",_i,ed);var bn,Id;for(bn="SSSS";bn.length<=9;bn+="S")Y(bn,mr);function xE(e,t){t[Pn]=ce(("0."+e)*1e3)}for(bn="S";bn.length<=9;bn+="S")xe(bn,xE);Id=vr("Milliseconds",!1);K("z",0,0,"zoneAbbr");K("zz",0,0,"zoneName");function TE(){return this._isUTC?"UTC":""}function DE(){return this._isUTC?"Coordinated Universal Time":""}var k=os.prototype;k.add=y1;k.calendar=T1;k.clone=D1;k.diff=R1;k.endOf=H1;k.format=U1;k.from=L1;k.fromNow=Y1;k.to=$1;k.toNow=j1;k.get=Nv;k.invalidAt=Q1;k.isAfter=A1;k.isBefore=k1;k.isBetween=C1;k.isSame=M1;k.isSameOrAfter=F1;k.isSameOrBefore=I1;k.isValid=J1;k.lang=Td;k.locale=xd;k.localeData=Dd;k.max=Jy;k.min=Zy;k.parsingFlags=X1;k.set=Uv;k.startOf=B1;k.subtract=E1;k.toArray=G1;k.toObject=q1;k.toDate=K1;k.toISOString=V1;k.inspect=N1;typeof Symbol<"u"&&Symbol.for!=null&&(k[Symbol.for("nodejs.util.inspect.custom")]=function(){return"Moment<"+this.format()+">"});k.toJSON=Z1;k.toString=P1;k.unix=z1;k.valueOf=W1;k.creationData=eE;k.eraName=sE;k.eraNarrow=iE;k.eraAbbr=oE;k.eraYear=aE;k.year=rd;k.isLeapYear=Vv;k.weekYear=pE;k.isoWeekYear=_E;k.quarter=k.quarters=bE;k.month=ud;k.daysInMonth=Kv;k.week=k.weeks=ty;k.isoWeek=k.isoWeeks=ny;k.weeksInYear=vE;k.weeksInWeekYear=yE;k.isoWeeksInYear=mE;k.isoWeeksInISOWeekYear=gE;k.date=Fd;k.day=k.days=_y;k.weekday=my;k.isoWeekday=gy;k.dayOfYear=OE;k.hour=k.hours=wy;k.minute=k.minutes=SE;k.second=k.seconds=wE;k.millisecond=k.milliseconds=Id;k.utcOffset=o1;k.utc=u1;k.local=l1;k.parseZone=c1;k.hasAlignedHourOffset=f1;k.isDST=d1;k.isLocal=p1;k.isUtcOffset=_1;k.isUtc=bd;k.isUTC=bd;k.zoneAbbr=TE;k.zoneName=DE;k.dates=At("dates accessor is deprecated. Use date instead.",Fd);k.months=At("months accessor is deprecated. Use month instead",ud);k.years=At("years accessor is deprecated. Use year instead",rd);k.zone=At("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",a1);k.isDSTShifted=At("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",h1);function AE(e){return Ie(e*1e3)}function kE(){return Ie.apply(null,arguments).parseZone()}function Rd(e){return e}var ve=Ta.prototype;ve.calendar=pv;ve.longDateFormat=vv;ve.invalidDate=Ev;ve.ordinal=Sv;ve.preparse=Rd;ve.postformat=Rd;ve.relativeTime=xv;ve.pastFuture=Tv;ve.set=dv;ve.eras=tE;ve.erasParse=nE;ve.erasConvertYear=rE;ve.erasAbbrRegex=lE;ve.erasNameRegex=uE;ve.erasNarrowRegex=cE;ve.months=Bv;ve.monthsShort=Hv;ve.monthsParse=zv;ve.monthsRegex=qv;ve.monthsShortRegex=Gv;ve.week=Jv;ve.firstDayOfYear=ey;ve.firstDayOfWeek=Qv;ve.weekdays=cy;ve.weekdaysMin=dy;ve.weekdaysShort=fy;ve.weekdaysParse=py;ve.weekdaysRegex=vy;ve.weekdaysShortRegex=yy;ve.weekdaysMinRegex=Ey;ve.isPM=Oy;ve.meridiem=xy;function Ks(e,t,n,r){var s=pn(),i=qt().set(r,t);return s[n](i,e)}function Pd(e,t,n){if(dn(e)&&(t=e,e=void 0),e=e||"",t!=null)return Ks(e,t,n,"month");var r,s=[];for(r=0;r<12;r++)s[r]=Ks(e,r,n,"month");return s}function Ha(e,t,n,r){typeof e=="boolean"?(dn(t)&&(n=t,t=void 0),t=t||""):(t=e,n=t,e=!1,dn(t)&&(n=t,t=void 0),t=t||"");var s=pn(),i=e?s._week.dow:0,o,a=[];if(n!=null)return Ks(t,(n+i)%7,r,"day");for(o=0;o<7;o++)a[o]=Ks(t,(o+i)%7,r,"day");return a}function CE(e,t){return Pd(e,t,"months")}function ME(e,t){return Pd(e,t,"monthsShort")}function FE(e,t,n){return Ha(e,t,n,"weekdays")}function IE(e,t,n){return Ha(e,t,n,"weekdaysShort")}function RE(e,t,n){return Ha(e,t,n,"weekdaysMin")}wn("en",{eras:[{since:"0001-01-01",until:1/0,offset:1,name:"Anno Domini",narrow:"AD",abbr:"AD"},{since:"0000-12-31",until:-1/0,offset:1,name:"Before Christ",narrow:"BC",abbr:"BC"}],dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var t=e%10,n=ce(e%100/10)===1?"th":t===1?"st":t===2?"nd":t===3?"rd":"th";return e+n}});N.lang=At("moment.lang is deprecated. Use moment.locale instead.",wn);N.langData=At("moment.langData is deprecated. Use moment.localeData instead.",pn);var en=Math.abs;function PE(){var e=this._data;return this._milliseconds=en(this._milliseconds),this._days=en(this._days),this._months=en(this._months),e.milliseconds=en(e.milliseconds),e.seconds=en(e.seconds),e.minutes=en(e.minutes),e.hours=en(e.hours),e.months=en(e.months),e.years=en(e.years),this}function Vd(e,t,n,r){var s=Ut(t,n);return e._milliseconds+=r*s._milliseconds,e._days+=r*s._days,e._months+=r*s._months,e._bubble()}function VE(e,t){return Vd(this,e,t,1)}function NE(e,t){return Vd(this,e,t,-1)}function Hl(e){return e<0?Math.floor(e):Math.ceil(e)}function UE(){var e=this._milliseconds,t=this._days,n=this._months,r=this._data,s,i,o,a,u;return e>=0&&t>=0&&n>=0||e<=0&&t<=0&&n<=0||(e+=Hl(Mo(n)+t)*864e5,t=0,n=0),r.milliseconds=e%1e3,s=xt(e/1e3),r.seconds=s%60,i=xt(s/60),r.minutes=i%60,o=xt(i/60),r.hours=o%24,t+=xt(o/24),u=xt(Nd(t)),n+=u,t-=Hl(Mo(u)),a=xt(n/12),n%=12,r.days=t,r.months=n,r.years=a,this}function Nd(e){return e*4800/146097}function Mo(e){return e*146097/4800}function LE(e){if(!this.isValid())return NaN;var t,n,r=this._milliseconds;if(e=kt(e),e==="month"||e==="quarter"||e==="year")switch(t=this._days+r/864e5,n=this._months+Nd(t),e){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(t=this._days+Math.round(Mo(this._months)),e){case"week":return t/7+r/6048e5;case"day":return t+r/864e5;case"hour":return t*24+r/36e5;case"minute":return t*1440+r/6e4;case"second":return t*86400+r/1e3;case"millisecond":return Math.floor(t*864e5)+r;default:throw new Error("Unknown unit "+e)}}function _n(e){return function(){return this.as(e)}}var Ud=_n("ms"),YE=_n("s"),$E=_n("m"),jE=_n("h"),BE=_n("d"),HE=_n("w"),WE=_n("M"),zE=_n("Q"),KE=_n("y"),GE=Ud;function qE(){return Ut(this)}function ZE(e){return e=kt(e),this.isValid()?this[e+"s"]():NaN}function Kn(e){return function(){return this.isValid()?this._data[e]:NaN}}var JE=Kn("milliseconds"),XE=Kn("seconds"),QE=Kn("minutes"),eb=Kn("hours"),tb=Kn("days"),nb=Kn("months"),rb=Kn("years");function sb(){return xt(this.days()/7)}var rn=Math.round,nr={ss:44,s:45,m:45,h:22,d:26,w:null,M:11};function ib(e,t,n,r,s){return s.relativeTime(t||1,!!n,e,r)}function ob(e,t,n,r){var s=Ut(e).abs(),i=rn(s.as("s")),o=rn(s.as("m")),a=rn(s.as("h")),u=rn(s.as("d")),l=rn(s.as("M")),c=rn(s.as("w")),f=rn(s.as("y")),g=i<=n.ss&&["s",i]||i0,g[4]=r,ib.apply(null,g)}function ab(e){return e===void 0?rn:typeof e=="function"?(rn=e,!0):!1}function ub(e,t){return nr[e]===void 0?!1:t===void 0?nr[e]:(nr[e]=t,e==="s"&&(nr.ss=t-1),!0)}function lb(e,t){if(!this.isValid())return this.localeData().invalidDate();var n=!1,r=nr,s,i;return typeof e=="object"&&(t=e,e=!1),typeof e=="boolean"&&(n=e),typeof t=="object"&&(r=Object.assign({},nr,t),t.s!=null&&t.ss==null&&(r.ss=t.s-1)),s=this.localeData(),i=ob(this,!n,r,s),n&&(i=s.pastFuture(+this,i)),s.postformat(i)}var qi=Math.abs;function Jn(e){return(e>0)-(e<0)||+e}function Si(){if(!this.isValid())return this.localeData().invalidDate();var e=qi(this._milliseconds)/1e3,t=qi(this._days),n=qi(this._months),r,s,i,o,a=this.asSeconds(),u,l,c,f;return a?(r=xt(e/60),s=xt(r/60),e%=60,r%=60,i=xt(n/12),n%=12,o=e?e.toFixed(3).replace(/\.?0+$/,""):"",u=a<0?"-":"",l=Jn(this._months)!==Jn(a)?"-":"",c=Jn(this._days)!==Jn(a)?"-":"",f=Jn(this._milliseconds)!==Jn(a)?"-":"",u+"P"+(i?l+i+"Y":"")+(n?l+n+"M":"")+(t?c+t+"D":"")+(s||r||e?"T":"")+(s?f+s+"H":"")+(r?f+r+"M":"")+(e?f+o+"S":"")):"P0D"}var he=bi.prototype;he.isValid=n1;he.abs=PE;he.add=VE;he.subtract=NE;he.as=LE;he.asMilliseconds=Ud;he.asSeconds=YE;he.asMinutes=$E;he.asHours=jE;he.asDays=BE;he.asWeeks=HE;he.asMonths=WE;he.asQuarters=zE;he.asYears=KE;he.valueOf=GE;he._bubble=UE;he.clone=qE;he.get=ZE;he.milliseconds=JE;he.seconds=XE;he.minutes=QE;he.hours=eb;he.days=tb;he.weeks=sb;he.months=nb;he.years=rb;he.humanize=lb;he.toISOString=Si;he.toString=Si;he.toJSON=Si;he.locale=xd;he.localeData=Dd;he.toIsoString=At("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Si);he.lang=Td;K("X",0,0,"unix");K("x",0,0,"valueOf");Y("x",gi);Y("X",Cv);xe("X",function(e,t,n){n._d=new Date(parseFloat(e)*1e3)});xe("x",function(e,t,n){n._d=new Date(ce(e))});//! moment.js -N.version="2.30.1";cv(Ie);N.fn=k;N.min=Xy;N.max=Qy;N.now=e1;N.utc=qt;N.unix=AE;N.months=CE;N.isDate=is;N.locale=wn;N.invalid=hi;N.duration=Ut;N.isMoment=Nt;N.weekdays=FE;N.parseZone=kE;N.localeData=pn;N.isDuration=xs;N.monthsShort=ME;N.weekdaysMin=RE;N.defineLocale=Va;N.updateLocale=ky;N.locales=Cy;N.weekdaysShort=IE;N.normalizeUnits=kt;N.relativeTimeRounding=ab;N.relativeTimeThreshold=ub;N.calendarFormat=x1;N.prototype=k;N.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"};const cb={class:"dialog"},fb={class:"dialog__body"},db={class:"dialog__form-group"},hb={class:"dialog__form-validation"},pb={class:"dialog__form-group"},_b={class:"dialog__form-validation"},mb={class:"dialog__form-group"},gb={class:"dialog__form-group"},vb={class:"dialog__form-group dialog__form-group--radio"},yb={class:"dialog__form-radio"},Eb={class:"dialog__form-radio"},bb={class:"dialog__form-group"},Ob={__name:"HelloWorld",setup(e){const t=r=>{fetch("http://esx_identity/register",{method:"POST",body:JSON.stringify({firstname:r.firstname,lastname:r.lastname,dateofbirth:r.dob,sex:r.gender,height:r.height})})},n=zf({firstname:Os().required("Firstname is required").min(3,"Firstname must be at least 3 characters"),lastname:Os().required("Lastname is required").min(3,"Lastname must be at least 3 characters"),dob:Oa().required("Date of Birth is required").transform((r,s)=>{const i=N(s,"DD/MM/YYYY",!0);return i.isValid()?i.toDate():new Date("")}).typeError("Date must be in mm/dd/yyyy format"),gender:Os().required("Gender is required"),height:jf().required("Height is required").min(120,"Minimum height is 120cm").max(220,"Maximum height is 220cm").typeError("Amount must be a number")});return(r,s)=>(Uc(),D0("div",cb,[s[9]||(s[9]=we("div",{class:"dialog__header"},[we("h1",null,[Tr("CHARACTER "),we("span",null,"IDENTITY")])],-1)),we("div",fb,[s[8]||(s[8]=we("p",{class:"dialog__body-hint"},"Start by creating your identity",-1)),Ne(re(hg),{class:"dialog__body-form",id:"register",action:"#",novalidate:"",onSubmit:t,"validation-schema":re(n)},{default:_c(()=>[we("div",db,[s[0]||(s[0]=we("label",{for:"firstname"},"Firstname",-1)),we("div",hb,[Ne(re(qn),{id:"firstname",type:"text",name:"firstname",placeholder:"Firstname",validateOnInput:""})]),Ne(re(Or),{name:"firstname",class:"dialog__form-message dialog__form-message--error"})]),we("div",pb,[s[1]||(s[1]=we("label",{for:"lastname"},"Lastname",-1)),we("div",_b,[Ne(re(qn),{id:"lastname",type:"text",name:"lastname",placeholder:"Lastname",validateOnInput:""})]),Ne(re(Or),{name:"lastname",class:"dialog__form-message dialog__form-message--error"})]),we("div",mb,[s[2]||(s[2]=we("label",{for:"dob"},"Date of birth",-1)),Ne(re(qn),{id:"dob",type:"text",name:"dob",placeholder:"mm/dd/yyyy",validateOnInput:""}),Ne(re(Or),{name:"dob",class:"dialog__form-message dialog__form-message--error"})]),we("div",gb,[s[5]||(s[5]=we("label",{for:"gender"},"Gender",-1)),we("div",vb,[we("div",yb,[Ne(re(qn),{type:"radio",id:"male",value:"m",name:"gender",validateOnInput:""}),s[3]||(s[3]=we("label",{for:"male"},[we("i",{class:"fas fa-mars"}),Tr("Male ")],-1))]),we("div",Eb,[Ne(re(qn),{type:"radio",id:"female",value:"f",name:"gender",validateOnInput:""}),s[4]||(s[4]=we("label",{for:"female"},[we("i",{class:"fas fa-venus"}),Tr("Female ")],-1))])]),Ne(re(Or),{name:"gender",class:"dialog__form-message dialog__form-message--error"})]),we("div",bb,[s[6]||(s[6]=we("label",{for:"height"},"Height",-1)),Ne(re(qn),{id:"height",type:"text",name:"height",placeholder:"175",validateOnInput:""}),Ne(re(Or),{name:"height",class:"dialog__form-message dialog__form-message--error"})]),s[7]||(s[7]=we("button",{class:"dialog__form-submit",id:"submit",type:"submit"},[we("i",{class:"fas fa-user-plus"}),Tr("CREATE ")],-1))]),_:1},8,["validation-schema"])])]))}},Sb={__name:"App",setup(e){return ti(()=>{fetch("http://esx_identity/ready",{method:"POST",body:JSON.stringify({})}),window.addEventListener("message",t=>{t.data.type==="enableui"&&document.body.classList[t.data.enable?"remove":"add"]("none")})}),(t,n)=>(Uc(),A0(Ob))}};cp(Sb).mount("#app")});export default wb(); +N.version="2.30.1";cv(Ie);N.fn=k;N.min=Xy;N.max=Qy;N.now=e1;N.utc=qt;N.unix=AE;N.months=CE;N.isDate=is;N.locale=wn;N.invalid=hi;N.duration=Ut;N.isMoment=Nt;N.weekdays=FE;N.parseZone=kE;N.localeData=pn;N.isDuration=xs;N.monthsShort=ME;N.weekdaysMin=RE;N.defineLocale=Va;N.updateLocale=ky;N.locales=Cy;N.weekdaysShort=IE;N.normalizeUnits=kt;N.relativeTimeRounding=ab;N.relativeTimeThreshold=ub;N.calendarFormat=x1;N.prototype=k;N.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"};const cb={class:"dialog"},fb={class:"dialog__body"},db={class:"dialog__form-group"},hb={class:"dialog__form-validation"},pb={class:"dialog__form-group"},_b={class:"dialog__form-validation"},mb={class:"dialog__form-group"},gb={class:"dialog__form-group"},vb={class:"dialog__form-group dialog__form-group--radio"},yb={class:"dialog__form-radio"},Eb={class:"dialog__form-radio"},bb={class:"dialog__form-group"},Ob={__name:"Identity",setup(e){const t=r=>{fetch("http://esx_identity/register",{method:"POST",body:JSON.stringify({firstname:r.firstname,lastname:r.lastname,dateofbirth:N(r.dob).format("DD/MM/YYYY"),sex:r.gender,height:r.height})})},n=zf({firstname:Os().required("Firstname is required").min(3,"Firstname must be at least 3 characters"),lastname:Os().required("Lastname is required").min(3,"Lastname must be at least 3 characters"),dob:Oa().required("Date of Birth is required").min(new Date("1900-01-01"),"Date is too early").max(N().subtract(1,"years").toDate(),"You need to be atleast 1 year old"),gender:Os().required("Gender is required"),height:jf().required("Height is required").min(120,"Minimum height is 120cm").max(220,"Maximum height is 220cm").typeError("Amount must be a number")});return(r,s)=>(Uc(),D0("div",cb,[s[9]||(s[9]=we("div",{class:"dialog__header"},[we("h1",null,[Tr("CHARACTER "),we("span",null,"IDENTITY")])],-1)),we("div",fb,[s[8]||(s[8]=we("p",{class:"dialog__body-hint"},"Start by creating your identity",-1)),Ne(re(hg),{class:"dialog__body-form",id:"register",action:"#",novalidate:"",onSubmit:t,"validation-schema":re(n)},{default:_c(()=>[we("div",db,[s[0]||(s[0]=we("label",{for:"firstname"},"Firstname",-1)),we("div",hb,[Ne(re(qn),{id:"firstname",type:"text",name:"firstname",placeholder:"Firstname",validateOnInput:""})]),Ne(re(Or),{name:"firstname",class:"dialog__form-message dialog__form-message--error"})]),we("div",pb,[s[1]||(s[1]=we("label",{for:"lastname"},"Lastname",-1)),we("div",_b,[Ne(re(qn),{id:"lastname",type:"text",name:"lastname",placeholder:"Lastname",validateOnInput:""})]),Ne(re(Or),{name:"lastname",class:"dialog__form-message dialog__form-message--error"})]),we("div",mb,[s[2]||(s[2]=we("label",{for:"dob"},"Date of birth",-1)),Ne(re(qn),{id:"dob",type:"date",name:"dob",placeholder:"dd/mm/yyyy",validateOnInput:""}),Ne(re(Or),{name:"dob",class:"dialog__form-message dialog__form-message--error"})]),we("div",gb,[s[5]||(s[5]=we("label",{for:"gender"},"Gender",-1)),we("div",vb,[we("div",yb,[Ne(re(qn),{type:"radio",id:"male",value:"m",name:"gender",validateOnInput:""}),s[3]||(s[3]=we("label",{for:"male"},[we("i",{class:"fas fa-mars"}),Tr("Male ")],-1))]),we("div",Eb,[Ne(re(qn),{type:"radio",id:"female",value:"f",name:"gender",validateOnInput:""}),s[4]||(s[4]=we("label",{for:"female"},[we("i",{class:"fas fa-venus"}),Tr("Female ")],-1))])]),Ne(re(Or),{name:"gender",class:"dialog__form-message dialog__form-message--error"})]),we("div",bb,[s[6]||(s[6]=we("label",{for:"height"},"Height",-1)),Ne(re(qn),{id:"height",type:"text",name:"height",placeholder:"175",validateOnInput:""}),Ne(re(Or),{name:"height",class:"dialog__form-message dialog__form-message--error"})]),s[7]||(s[7]=we("button",{class:"dialog__form-submit",id:"submit",type:"submit"},[we("i",{class:"fas fa-user-plus"}),Tr("CREATE ")],-1))]),_:1},8,["validation-schema"])])]))}},Sb={__name:"App",setup(e){return ti(()=>{fetch("http://esx_identity/ready",{method:"POST",body:JSON.stringify({})}),window.addEventListener("message",t=>{t.data.type==="enableui"&&document.body.classList[t.data.enable?"remove":"add"]("none")})}),(t,n)=>(Uc(),A0(Ob))}};cp(Sb).mount("#app")});export default wb(); diff --git a/[core]/esx_identity/web/dist/assets/index-CBKwBtku.css b/[core]/esx_identity/web/dist/assets/index-CBKwBtku.css new file mode 100644 index 00000000..1ad7fe3f --- /dev/null +++ b/[core]/esx_identity/web/dist/assets/index-CBKwBtku.css @@ -0,0 +1 @@ +@import"https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap";body{font-family:sans-serif;overflow:hidden;background-color:transparent}.none{display:none}.dialog{width:477px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);background-color:#080808;border-radius:8px;border:none;color:#fff;font-family:Poppins,sans-serif}.dialog__header{background-color:#040404;border-top-left-radius:8px;border-top-right-radius:8px;padding:20px;text-align:center}.dialog__header h1{font-weight:700;margin-bottom:0;font-size:30px}.dialog__header span{color:#fd9800}.dialog__body{padding-block:20px;padding-inline:65px}.dialog__body-hint{text-align:center;margin-bottom:20px}.dialog__body-form{display:flex;flex-direction:column;gap:35px;font-weight:600;font-size:15px}.dialog__form-submit{border:none;background-color:#fd9800;color:#fff;font-size:18px;font-weight:700;border-radius:4px;padding-block:5px}.dialog__form-submit i{margin-right:5px}.dialog__form-group{display:flex;align-items:center;justify-content:space-between;gap:30px;background-color:#040404;position:relative}.dialog__form-group--radio{gap:0}.dialog__form-group label{flex-grow:1;flex-shrink:1;padding-inline:20px}.dialog__form-group input{background-color:transparent;border:none;height:30px;width:180px;flex-shrink:0;color:#fff}.dialog__form-group input:focus{background-color:#0f0f0fe6;border:none;border-radius:5px;color:#fff;outline:none;box-shadow:none}.dialog__form-validation{position:relative}.dialog__form-validation i{position:absolute;right:10px;top:50%;transform:translateY(-50%)}.dialog__form-radio{display:flex;align-items:center}.dialog__form-radio input{display:none}.dialog__form-radio label{display:flex;align-items:center;gap:10px;cursor:pointer}.dialog__form-radio input+label{height:30px;display:flex;align-items:center}.dialog__form-radio input:checked+label{color:#30a1fd;height:30px}.dialog__form-radio input:not(:checked)+label{color:#242424;height:30px}.dialog__form-message{position:absolute;top:35px;right:0;font-size:9px}.dialog__form-message--error{color:#733838}#male:checked+label{color:#30a1fd}#female:checked+label{color:#ff69b4}::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/dist/index.html b/[core]/esx_identity/web/dist/index.html similarity index 83% rename from [core]/esx_identity/dist/index.html rename to [core]/esx_identity/web/dist/index.html index 6e42d2ca..0bd855e1 100644 --- a/[core]/esx_identity/dist/index.html +++ b/[core]/esx_identity/web/dist/index.html @@ -11,8 +11,8 @@ - - + + diff --git a/[core]/esx_identity/dist/vite.svg b/[core]/esx_identity/web/dist/vite.svg similarity index 100% rename from [core]/esx_identity/dist/vite.svg rename to [core]/esx_identity/web/dist/vite.svg diff --git a/[core]/esx_identity/index.html b/[core]/esx_identity/web/index.html similarity index 100% rename from [core]/esx_identity/index.html rename to [core]/esx_identity/web/index.html diff --git a/[core]/esx_identity/package-lock.json b/[core]/esx_identity/web/package-lock.json similarity index 100% rename from [core]/esx_identity/package-lock.json rename to [core]/esx_identity/web/package-lock.json diff --git a/[core]/esx_identity/package.json b/[core]/esx_identity/web/package.json similarity index 100% rename from [core]/esx_identity/package.json rename to [core]/esx_identity/web/package.json diff --git a/[core]/esx_identity/public/vite.svg b/[core]/esx_identity/web/public/vite.svg similarity index 100% rename from [core]/esx_identity/public/vite.svg rename to [core]/esx_identity/web/public/vite.svg diff --git a/[core]/esx_identity/src/App.vue b/[core]/esx_identity/web/src/App.vue similarity index 85% rename from [core]/esx_identity/src/App.vue rename to [core]/esx_identity/web/src/App.vue index a5abab90..c8dc6797 100644 --- a/[core]/esx_identity/src/App.vue +++ b/[core]/esx_identity/web/src/App.vue @@ -1,6 +1,6 @@