Merge pull request #617 from bitpredator/dev

chore:  cumulative updates for the release of version 1.0.0

.github/CHANGELOG.md

@@ -99,4 +99,8 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
 73. [esx_context]: chore: esx_context update to version 1.0.0 @bitpredator
 74. [esx_menu_default]: chore: esx_menu_default update to version 1.0.0 @bitpredator
 75. [esx_multicharacter]: refactor: esx_multicharacter @bitpredator
-76. [esx_multicharacter]: fix:  fixed problem which prevented the menu from opening @bitpredator
+76. [esx_multicharacter]: fix:  fixed problem which prevented the menu from opening @bitpredator
+77. [esx_notify]: refactor: formatting(all): Format with prettier and lua formatter @bitpredator
+78. [esx_progressbar]: refactor: formatting(all): Format with prettier and lua formatter @bitpredator
+79. [esx_society]: refactor: (esx_society):  complete rebuild for esx_society @bitpredator
+80. [npwd]: fix: database error npwd @bitpredator

server-data/[SQL]/es_extended.sql

@@ -269,9 +269,9 @@ CREATE TABLE IF NOT EXISTS `datastore_data` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `index_datastore_data_name_owner` (`name`,`owner`),
   KEY `index_datastore_data_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=135 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=146 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
--- Dump dei dati della tabella es_extended.datastore_data: ~74 rows (circa)
+-- Dump dei dati della tabella es_extended.datastore_data: ~145 rows (circa)
 INSERT INTO `datastore_data` (`id`, `name`, `owner`, `data`) VALUES
 	(1, 'society_ammu', NULL, '\'{}\''),
 	(2, 'society_baker', NULL, '\'{}\''),
@@ -406,7 +406,18 @@ INSERT INTO `datastore_data` (`id`, `name`, `owner`, `data`) VALUES
 	(131, 'property', NULL, '{}'),
 	(132, 'property', NULL, '{}'),
 	(133, 'property', NULL, '{}'),
-	(134, 'property', NULL, '{}');
+	(134, 'property', NULL, '{}'),
+	(135, 'property', NULL, '{}'),
+	(136, 'property', NULL, '{}'),
+	(137, 'property', NULL, '{}'),
+	(138, 'property', NULL, '{}'),
+	(139, 'property', NULL, '{}'),
+	(140, 'property', NULL, '{}'),
+	(141, 'property', NULL, '{}'),
+	(142, 'property', NULL, '{}'),
+	(143, 'property', NULL, '{}'),
+	(144, 'property', NULL, '{}'),
+	(145, 'property', NULL, '{}');
 
 -- Dump della struttura di tabella es_extended.fine_types
 CREATE TABLE IF NOT EXISTS `fine_types` (
@@ -421,56 +432,56 @@ CREATE TABLE IF NOT EXISTS `fine_types` (
 INSERT INTO `fine_types` (`id`, `label`, `amount`, `category`) VALUES
 	(1, 'Usage abusif du klaxon', 30, 0),
 	(2, 'Franchir une ligne continue', 40, 0),
-	(3, 'Circulation à contresens', 250, 0),
-	(4, 'Demi-tour non autorisé', 250, 0),
+	(3, 'Circulation à contresens', 250, 0),
+	(4, 'Demi-tour non autorisé', 250, 0),
 	(5, 'Circulation hors-route', 170, 0),
-	(6, 'Non-respect des distances de sécurité', 30, 0),
-	(7, 'Arrêt dangereux / interdit', 150, 0),
-	(8, 'Stationnement gênant / interdit', 70, 0),
-	(9, 'Non respect  de la priorité à droite', 70, 0),
-	(10, 'Non-respect à un véhicule prioritaire', 90, 0),
+	(6, 'Non-respect des distances de sécurité', 30, 0),
+	(7, 'Arrêt dangereux / interdit', 150, 0),
+	(8, 'Stationnement gênant / interdit', 70, 0),
+	(9, 'Non respect  de la priorité à droite', 70, 0),
+	(10, 'Non-respect à un véhicule prioritaire', 90, 0),
 	(11, 'Non-respect d\'un stop', 105, 0),
 	(12, 'Non-respect d\'un feu rouge', 130, 0),
-	(13, 'Dépassement dangereux', 100, 0),
-	(14, 'Véhicule non en état', 100, 0),
+	(13, 'Dépassement dangereux', 100, 0),
+	(14, 'Véhicule non en état', 100, 0),
 	(15, 'Conduite sans permis', 1500, 0),
-	(16, 'Délit de fuite', 800, 0),
-	(17, 'Excès de vitesse < 5 kmh', 90, 0),
-	(18, 'Excès de vitesse 5-15 kmh', 120, 0),
-	(19, 'Excès de vitesse 15-30 kmh', 180, 0),
-	(20, 'Excès de vitesse > 30 kmh', 300, 0),
+	(16, 'Délit de fuite', 800, 0),
+	(17, 'Excès de vitesse < 5 kmh', 90, 0),
+	(18, 'Excès de vitesse 5-15 kmh', 120, 0),
+	(19, 'Excès de vitesse 15-30 kmh', 180, 0),
+	(20, 'Excès de vitesse > 30 kmh', 300, 0),
 	(21, 'Entrave de la circulation', 110, 1),
-	(22, 'Dégradation de la voie publique', 90, 1),
-	(23, 'Trouble à l\'ordre publique', 90, 1),
-	(24, 'Entrave opération de police', 130, 1),
+	(22, 'Dégradation de la voie publique', 90, 1),
+	(23, 'Trouble à l\'ordre publique', 90, 1),
+	(24, 'Entrave opération de police', 130, 1),
 	(25, 'Insulte envers / entre civils', 75, 1),
-	(26, 'Outrage à agent de police', 110, 1),
+	(26, 'Outrage à agent de police', 110, 1),
 	(27, 'Menace verbale ou intimidation envers civil', 90, 1),
 	(28, 'Menace verbale ou intimidation envers policier', 150, 1),
-	(29, 'Manifestation illégale', 250, 1),
+	(29, 'Manifestation illégale', 250, 1),
 	(30, 'Tentative de corruption', 1500, 1),
 	(31, 'Arme blanche sortie en ville', 120, 2),
-	(32, 'Arme léthale sortie en ville', 300, 2),
-	(33, 'Port d\'arme non autorisé (défaut de license)', 600, 2),
-	(34, 'Port d\'arme illégal', 700, 2),
+	(32, 'Arme léthale sortie en ville', 300, 2),
+	(33, 'Port d\'arme non autorisé (défaut de license)', 600, 2),
+	(34, 'Port d\'arme illégal', 700, 2),
 	(35, 'Pris en flag lockpick', 300, 2),
 	(36, 'Vol de voiture', 1800, 2),
 	(37, 'Vente de drogue', 1500, 2),
 	(38, 'Fabriquation de drogue', 1500, 2),
 	(39, 'Possession de drogue', 650, 2),
-	(40, 'Prise d\'ôtage civil', 1500, 2),
-	(41, 'Prise d\'ôtage agent de l\'état', 2000, 2),
+	(40, 'Prise d\'ôtage civil', 1500, 2),
+	(41, 'Prise d\'ôtage agent de l\'état', 2000, 2),
 	(42, 'Braquage particulier', 650, 2),
 	(43, 'Braquage magasin', 650, 2),
 	(44, 'Braquage de banque', 1500, 2),
 	(45, 'Tir sur civil', 2000, 3),
-	(46, 'Tir sur agent de l\'état', 2500, 3),
+	(46, 'Tir sur agent de l\'état', 2500, 3),
 	(47, 'Tentative de meurtre sur civil', 3000, 3),
-	(48, 'Tentative de meurtre sur agent de l\'état', 5000, 3),
+	(48, 'Tentative de meurtre sur agent de l\'état', 5000, 3),
 	(49, 'Meurtre sur civil', 10000, 3),
-	(50, 'Meurte sur agent de l\'état', 30000, 3),
+	(50, 'Meurte sur agent de l\'état', 30000, 3),
 	(51, 'Meurtre involontaire', 1800, 3),
-	(52, 'Escroquerie à l\'entreprise', 2000, 2);
+	(52, 'Escroquerie à l\'entreprise', 2000, 2);
 
 -- Dump della struttura di tabella es_extended.items
 CREATE TABLE IF NOT EXISTS `items` (
@@ -532,7 +543,7 @@ INSERT INTO `job_grades` (`id`, `job_name`, `grade`, `name`, `label`, `salary`,
 	(6, 'mechanic', 0, 'recrue', 'Recrue', 12, '{}', '{}'),
 	(7, 'mechanic', 1, 'novice', 'Novice', 24, '{}', '{}'),
 	(8, 'mechanic', 2, 'experimente', 'Experimente', 36, '{}', '{}'),
-	(9, 'mechanic', 3, 'chief', 'Chef d\'équipe', 48, '{}', '{}'),
+	(9, 'mechanic', 3, 'chief', 'Chef d\'équipe', 48, '{}', '{}'),
 	(10, 'mechanic', 4, 'boss', 'Patron', 0, '{}', '{}'),
 	(11, 'police', 0, 'recruit', 'Recrue', 20, '{}', '{}'),
 	(12, 'police', 1, 'officer', 'Officier', 40, '{}', '{}'),
@@ -700,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `npwd_match_profiles` (
   UNIQUE KEY `identifier_UNIQUE` (`identifier`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
--- Dump dei dati della tabella es_extended.npwd_match_profiles: ~0 rows (circa)
+-- Dump dei dati della tabella es_extended.npwd_match_profiles: ~1 rows (circa)
 
 -- Dump della struttura di tabella es_extended.npwd_match_views
 CREATE TABLE IF NOT EXISTS `npwd_match_views` (
@@ -828,8 +839,7 @@ CREATE TABLE IF NOT EXISTS `npwd_twitter_profiles` (
   KEY `identifier` (`identifier`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
--- Dump dei dati della tabella es_extended.npwd_twitter_profiles: ~0 rows (circa)
-INSERT INTO `npwd_twitter_profiles` (`id`, `profile_name`, `identifier`, `avatar_url`, `createdAt`, `updatedAt`) VALUES
+-- Dump dei dati della tabella es_extended.npwd_twitter_profiles: ~1 rows (circa)
 
 -- Dump della struttura di tabella es_extended.npwd_twitter_reports
 CREATE TABLE IF NOT EXISTS `npwd_twitter_reports` (
@@ -861,7 +871,7 @@ CREATE TABLE IF NOT EXISTS `npwd_twitter_tweets` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `npwd_twitter_tweets_npwd_twitter_profiles_id_fk` (`profile_id`) USING BTREE,
   CONSTRAINT `npwd_twitter_tweets_npwd_twitter_profiles_id_fk` FOREIGN KEY (`profile_id`) REFERENCES `npwd_twitter_profiles` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- Dump dei dati della tabella es_extended.npwd_twitter_tweets: ~0 rows (circa)
 
@@ -906,7 +916,7 @@ CREATE TABLE IF NOT EXISTS `ox_inventory` (
   UNIQUE KEY `owner` (`owner`,`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
--- Dump dei dati della tabella es_extended.ox_inventory: ~4 rows (circa)
+-- Dump dei dati della tabella es_extended.ox_inventory: ~0 rows (circa)
 
 -- Dump della struttura di tabella es_extended.rented_vehicles
 CREATE TABLE IF NOT EXISTS `rented_vehicles` (
@@ -959,7 +969,7 @@ CREATE TABLE IF NOT EXISTS `users` (
   PRIMARY KEY (`identifier`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
--- Dump dei dati della tabella es_extended.users: ~0 rows (circa)
+-- Dump dei dati della tabella es_extended.users: ~1 rows (circa)
 
 -- Dump della struttura di tabella es_extended.user_licenses
 CREATE TABLE IF NOT EXISTS `user_licenses` (
@@ -984,7 +994,7 @@ CREATE TABLE IF NOT EXISTS `uteknark1` (
   KEY `stage` (`stage`,`time`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
--- Dump dei dati della tabella es_extended.uteknark1: ~1 rows (circa)
+-- Dump dei dati della tabella es_extended.uteknark1: ~0 rows (circa)
 
 -- Dump della struttura di tabella es_extended.vehicles
 CREATE TABLE IF NOT EXISTS `vehicles` (
@@ -1248,7 +1258,7 @@ CREATE TABLE IF NOT EXISTS `vehicle_categories` (
 -- Dump dei dati della tabella es_extended.vehicle_categories: ~11 rows (circa)
 INSERT INTO `vehicle_categories` (`name`, `label`) VALUES
 	('compacts', 'Compacts'),
-	('coupes', 'Coupés'),
+	('coupes', 'Coupés'),
 	('motorcycles', 'Motos'),
 	('muscle', 'Muscle'),
 	('offroad', 'Off Road'),

server-data/resources/[bpt_cars]/pack_cars/fxmanifest.lua

@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'bpt_cars'
 lua54 'yes'
-version '0.0.4'
+version '1.0.0'
 
 files {
 -- p911r

server-data/resources/[esx]/esx_notify/LICENSE

@@ -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_menu_default
-    Copyright (C) 2015-2023 
+    Copyright (C) 2015-2024 
 
     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
@@ -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_menu_default  Copyright (C) 2015-2023 
+    esx_menu_default  Copyright (C) 2015-2024
     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.

server-data/resources/[esx]/esx_notify/Notify.lua

@@ -4,11 +4,10 @@ local Debug = ESX.GetConfig().EnableDebug
 ---@param length number the length of the notification
 ---@param message any the message :D
 local function Notify(notificatonType, length, message)
-
     if Debug then
-        print("1 ".. tostring(notificatonType))
-        print("2 "..tostring(length))
-        print("3 "..message)
+        print(('1 %s'):format(tostring(notificatonType)))
+        print(('2 %s'):format(tostring(length)))
+        print(('3 %s'):format(message))
     end
 
     if type(notificatonType) ~= "string" then
@@ -20,9 +19,9 @@ local function Notify(notificatonType, length, message)
     end
 
     if Debug then
-        print("4 ".. tostring(notificatonType))
-        print("5 "..tostring(length))
-        print("6 "..message)
+        print(('4 %s'):format(tostring(notificatonType)))
+        print(('5 %s'):format(tostring(length)))
+        print(('6 %s'):format(message))
     end
 
     SendNuiMessage(json.encode({

server-data/resources/[esx]/esx_notify/fxmanifest.lua

@@ -1,7 +1,7 @@
 fx_version 'adamant'
 lua54 'yes'
 game 'gta5'
-version '0.0.4'
+version '1.0.0'
 author 'ESX-Framework'
 description 'Official NUI Notification system for ESX'
 

server-data/resources/[esx]/esx_notify/nui/css/style.css

@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@100&family=Poppins:wght@300;400;500;600;800&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@100&family=Poppins:wght@300;400;500;600;800&display=swap");
 
 :root {
     --color: #919191;
@@ -16,7 +16,7 @@ body {
     height: 100vh;
     color: var(--color);
     font-weight: 100;
-    font-family: 'Poppins', sans-serif;
+    font-family: "Poppins", sans-serif;
     overflow: hidden;
 }
 
@@ -32,16 +32,16 @@ body {
     min-width: 20rem;
     width: fit-content;
     height: 3.5rem;
-    background: rgba(5,5, 5, 0.9);
-    border-radius: .5rem;
-    margin-top: .5rem;
+    background: rgba(5, 5, 5, 0.9);
+    border-radius: 0.5rem;
+    margin-top: 0.5rem;
     animation: anim 300ms ease-in-out;
     align-items: center;
 }
 
 #root .innerText {
-    padding-left: .4rem;
-    padding-right: .4rem;
+    padding-left: 0.4rem;
+    padding-right: 0.4rem;
     width: 100%;
 }
 
@@ -52,7 +52,7 @@ body {
 
 #root .text {
     display: inline-block;
-    margin-left: .5rem;
+    margin-left: 0.5rem;
 }
 
 #root .error {
@@ -68,21 +68,17 @@ body {
 }
 
 .material-symbols-outlined {
-    font-variation-settings:
-             'FILL' 0,
-             'wght' 400,
-             'GRAD' 0,
-             'opsz' 48
+    font-variation-settings: "FILL" 0, "wght" 400, "GRAD" 0, "opsz" 48;
 }
 
 @keyframes anim {
     0% {
         transform: scaleY(0);
     }
     80% {
-        transform: scaleY(1.1)
+        transform: scaleY(1.1);
     }
     100% {
-        transform: scaleY(1)
+        transform: scaleY(1);
     }
-}
+}

server-data/resources/[esx]/esx_notify/nui/index.html

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
-    <link rel="stylesheet" href="css/style.css">
-    <script src="js/script.js"></script>
-    <title>ESX Notify</title>
-</head>
-<body>
-    <div id="root">
-        <!-- this is just a template! No touchy touchy -->
-    </div>
-</body>
-</html>
+    <head>
+        <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
+        <link rel="stylesheet" href="css/style.css" />
+        <script src="js/script.js"></script>
+        <title>ESX Notify</title>
+    </head>
+    <body>
+        <div id="root">
+            <!-- this is just a template! No touchy touchy -->
+        </div>
+    </body>
+</html>