Skip to content

Commit

Permalink
Merge pull request #557 from bitpredator/dev
Browse files Browse the repository at this point in the history
chore: removed white strings inside some sql
  • Loading branch information
bitpredator authored Nov 12, 2023
2 parents 340153f + f8ad09d commit 733f6e0
Show file tree
Hide file tree
Showing 28 changed files with 340 additions and 320 deletions.
6 changes: 5 additions & 1 deletion .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@
12. [ox_inventory]: chore: remove store dmvshool @bitpredator
13. [BasicItem]: chore: code cleanup and fixes @bitpredator
14. [BOBHunt]: refactor: code cleaning, various corrections to the code as well as license updates @bitpredator
15. [BOBHunt]: refactor: supports all translations natively @bitpredator
15. [BOBHunt]: refactor: supports all translations natively @bitpredator
16. [SQL]: chore: removed white strings inside some sql @bitpredator
17. [esx_addoninventory]: delete: removed the .editorconfig file @bitpredator
18. [ox_inventory]: fix: corrected the weight of the items @bitpredator
19. [esx_identity]: chore: update the code version and improve the formatting @bitpredator
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


INSERT INTO `addon_account` (name, label, shared) VALUES
('society_ballas', 'Ballas', 1)
;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


INSERT INTO `addon_account` (name, label, shared) VALUES
('society_dustman', 'Dustman', 1)
;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


INSERT INTO `addon_account` (name, label, shared) VALUES
('society_import', 'Import', 1)
;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


INSERT INTO `addon_account` (name, label, shared) VALUES
('society_unicorn', 'Unicorn', 1)
;
Expand Down
4 changes: 2 additions & 2 deletions server-data/resources/[esx]/esx_identity/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

esx_identity
Copyright (C) 2015-2022 Jérémie N'gadi
Copyright (C) 2015-2023 Jérémie N'gadi

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

esx_identity Copyright (C) 2015-2022 Jérémie N'gadi
esx_identity Copyright (C) 2015-2023 Jérémie N'gadi
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
8 changes: 4 additions & 4 deletions server-data/resources/[esx]/esx_identity/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<h1 align='center'>[ESX] Identity</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://docs.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
<h1 align='center'>[ESX] Identity</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>

A Core Resource that Allows the player to Pick their characters, Name, Gender, Height and Date-of-birth.

![Preview](https://cdn.discordapp.com/attachments/714118962568364106/997871502798094426/Screenshot_51.png)
![Preview](./preview.png)

# Infomation

## Requirements

[esx_skin](./../esx_skin/README.md)
[esx_skin](./../esx_skin/README.md)

## Commands

Expand All @@ -21,7 +21,7 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, H

esx_identity - Make your Character a Person!

Copyright (C) 2015-2022 Jérémie N'gadi
Copyright (C) 2015-2023 Jérémie N'gadi

This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.

Expand Down
5 changes: 3 additions & 2 deletions server-data/resources/[esx]/esx_identity/client/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ if not Config.UseDeferrals then

RegisterNetEvent('esx_identity:showRegisterIdentity', function()
TriggerEvent('esx_skin:resetFirstSpawn')
while not ready do
while not (ready and loadingScreenFinished) do
print('Waiting for esx_identity NUI..')
Wait(100)
end
if not ESX.PlayerData.dead then setGuiState(true) end
end)

RegisterNUICallback('register', function(data)
RegisterNUICallback('register', function(data,cb)
if not guiEnabled then
return
end
Expand All @@ -68,5 +68,6 @@ if not Config.UseDeferrals then
TriggerEvent('esx_skin:playerRegistered')
end
end, data)
cb(1)
end)
end
14 changes: 7 additions & 7 deletions server-data/resources/[esx]/esx_identity/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Config.UseDeferrals = false
Config.DateFormat = 'DD/MM/YYYY'

-- These values are for the second input validation in server/main.lua
Config.MaxNameLength = 20 -- Max Name Length.
Config.MinHeight = 120 -- 120 cm lowest height
Config.MaxHeight = 220 -- 220 cm max height.
Config.LowestYear = 1900 -- 112 years old is the oldest you can be.
Config.HighestYear = 2005 -- 18 years old is the youngest you can be.
Config.MaxNameLength = 20 -- Max Name Length.
Config.MinHeight = 120 -- 120 cm lowest height
Config.MaxHeight = 220 -- 220 cm max height.
Config.LowestYear = 1900 -- 112 years old is the oldest you can be.
Config.HighestYear = 2005 -- 18 years old is the youngest you can be.

Config.FullCharDelete = true -- Delete all reference to character.
Config.EnableDebugging = ESX.GetConfig().EnableDebug -- prints for debugging :)
Config.FullCharDelete = true -- Delete all reference to character.
Config.EnableDebugging = ESX.GetConfig().EnableDebug -- prints for debugging :)
3 changes: 1 addition & 2 deletions server-data/resources/[esx]/esx_identity/fxmanifest.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
fx_version 'adamant'

game 'gta5'

description 'ESX Identity'
lua54 'yes'
version '0.0.4'
version '1.0.0'

shared_scripts {
'@es_extended/imports.lua',
Expand Down
216 changes: 108 additions & 108 deletions server-data/resources/[esx]/esx_identity/html/css/style.css
Original file line number Diff line number Diff line change
@@ -1,153 +1,153 @@
@import url("https://fonts.googleapis.com/css2?family=Oswald&display=swap");

body {
font-family: sans-serif;
overflow: hidden;
background-color: transparent;
font-family: sans-serif;
overflow: hidden;
background-color: transparent;
}

.none {
display: none;
display: none;
}

.dialog {
width: 332px;
opacity: 0.95;
padding: 20px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-color: #152029;
border-radius: 10px;
box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d;
border: none;
color: #ffffff;
width: 332px;
opacity: 0.95;
padding: 20px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-color: #152029;
border-radius: 10px;
box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d;
border: none;
color: #ffffff;
}

.title {
font-family: "Oswald", sans-serif;
font-size: 22px;
text-align: center;
padding: 5px;
margin-bottom: 20px;
font-family: "Oswald", sans-serif;
font-size: 22px;
text-align: center;
padding: 5px;
margin-bottom: 20px;
}

input {
margin-bottom: 15px;
border: none;
border-bottom: 2px solid #58636c;
width: 100%;
outline: none;
padding: 10px;
padding-left: 0;
font-family: "Oswald", sans-serif;
color: #ffffff;
text-align: left;
background-color: #152029;
margin-bottom: 15px;
border: none;
border-bottom: 2px solid #58636c;
width: 100%;
outline: none;
padding: 10px;
padding-left: 0;
font-family: "Oswald", sans-serif;
color: #ffffff;
text-align: left;
background-color: #152029;
}

::placeholder {
/* Chrome, Firefox, Opera, Safari 10.1+ */
color: rgba(84, 97, 105, 255);
font-family: "Oswald", sans-serif;
font-weight: 200;
opacity: 1;
/* Firefox */
/* Chrome, Firefox, Opera, Safari 10.1+ */
color: rgba(84, 97, 105, 255);
font-family: "Oswald", sans-serif;
font-weight: 200;
opacity: 1;
/* Firefox */
}

.radio-toolbar input[type="radio"] {
opacity: 0;
position: absolute;
width: 36%;
opacity: 0;
position: absolute;
width: 36%;
}

.radio-toolbar label {
display: inline-block;
margin-top: 5px;
background-color: rgba(15, 15, 15, 0.9);
padding: 10px 20px;
font-family: "Oswald", sans-serif;
font-weight: 500;
font-size: 16px;
color: #ffffff;
border: none;
border-radius: 5px;
width: 36%;
}

.radio-toolbar input[type="radio"]:checked+label {
width: 36%;
background-color: rgba(15, 15, 15, 0.9);
border: none;
border-bottom: 1px solid #93a3b6;
border-radius: 5px;
color: #ffffff;
}

.radio-toolbar input[type="radio"]:focus+label {
background-color: rgba(15, 15, 15, 0.9);
border: none;
border-bottom: 1px solid #93a3b6;
border-radius: 5px;
color: #ffffff;
display: inline-block;
margin-top: 5px;
background-color: rgba(15, 15, 15, 0.9);
padding: 10px 20px;
font-family: "Oswald", sans-serif;
font-weight: 500;
font-size: 16px;
color: #ffffff;
border: none;
border-radius: 5px;
width: 36%;
}

.radio-toolbar input[type="radio"]:checked + label {
width: 36%;
background-color: rgba(15, 15, 15, 0.9);
border: none;
border-bottom: 1px solid #93a3b6;
border-radius: 5px;
color: #ffffff;
}

.radio-toolbar input[type="radio"]:focus + label {
background-color: rgba(15, 15, 15, 0.9);
border: none;
border-bottom: 1px solid #93a3b6;
border-radius: 5px;
color: #ffffff;
}

.radio-toolbar label:hover {
background-color: rgba(28, 24, 24, 0.931);
width: 36%;
color: #ffffff;
background-color: rgba(28, 24, 24, 0.931);
width: 36%;
color: #ffffff;
}

button {
display: block;
margin-top: 35px;
/*padding: 10px;*/
background-color: #4569c6;
outline: none;
border: 2px double rgba(40, 40, 40, 0.9);
color: #ffffff;
height: 30px;
width: 100%;
display: block;
margin-top: 35px;
/*padding: 10px;*/
background-color: #4569c6;
outline: none;
border: 2px double rgba(40, 40, 40, 0.9);
color: #ffffff;
height: 30px;
width: 100%;
}

h1 {
display: block;
margin-top: 5px;
margin-right: 5px;
padding: 10px;
background-color: rgba(15, 15, 15, 0.9);
color: #ffffff;
width: 93%;
text-align: center;
display: block;
margin-top: 5px;
margin-right: 5px;
padding: 10px;
background-color: rgba(15, 15, 15, 0.9);
color: #ffffff;
width: 93%;
text-align: center;
}

.range-wrap {
position: relative;
margin: 0 auto 3rem;
position: relative;
margin: 0 auto 3rem;
}

.range {
width: 100%;
width: 100%;
}

.bubble {
background: rgba(15, 15, 15, 0.9);
color: #ffffff;
padding: 4px 12px;
position: absolute;
border-radius: 4px;
left: 50%;
transform: translateX(-50%);
background: rgba(15, 15, 15, 0.9);
color: #ffffff;
padding: 4px 12px;
position: absolute;
border-radius: 4px;
left: 50%;
transform: translateX(-50%);
}

.bubble::after {
content: "";
position: absolute;
width: 2px;
height: 2px;
background: rgba(15, 15, 15, 0.9);
color: black;
top: -1px;
left: 50%;
}
content: "";
position: absolute;
width: 2px;
height: 2px;
background: rgba(15, 15, 15, 0.9);
color: black;
top: -1px;
left: 50%;
}
Loading

0 comments on commit 733f6e0

Please sign in to comment.