Merge pull request #597 from bitpredator/dev

chore: esx_menu_dialog improves code formatting
bitpredator · Dec 31, 2023 · 5b03dcb · 5b03dcb
2 parents 32900ed + d621dfe
commit 5b03dcb
Show file tree

Hide file tree

Showing 9 changed files with 630 additions and 286 deletions.
diff --git a/server-data/resources/[esx]/esx_menu_dialog/.editorconfig b/server-data/resources/[esx]/esx_menu_dialog/.editorconfig
diff --git a/server-data/resources/[esx]/esx_menu_dialog/LICENSE b/server-data/resources/[esx]/esx_menu_dialog/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_dialog
-    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_dialog  Copyright (C) 2015-2023
+    esx_menu_dialog  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.

diff --git a/server-data/resources/[esx]/esx_menu_dialog/README.md b/server-data/resources/[esx]/esx_menu_dialog/README.md
@@ -12,7 +12,7 @@ start esx_menu_dialog
 ### License
 esx_menu_dialog - input dialog for ESX
 
-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 the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 

diff --git a/server-data/resources/[esx]/esx_menu_dialog/client/main.lua b/server-data/resources/[esx]/esx_menu_dialog/client/main.lua
@@ -1,7 +1,7 @@
 local Timeouts, OpenedMenus, MenuType = {}, {}, 'dialog'
 
 local function openMenu(namespace, name, data)
-	for i=1, #Timeouts, 1 do
+	for i = 1, #Timeouts, 1 do
 		ESX.ClearTimeout(Timeouts[i])
 	end
 
@@ -33,7 +33,6 @@ local function closeMenu(namespace, name)
 	if not next(OpenedMenus) then
 		SetNuiFocus(false)
 	end
-
 end
 
 ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu)
@@ -78,4 +77,4 @@ AddEventHandler('esx_menu_dialog:message:menu_change', function(data)
 	if menu.change ~= nil then
 		menu.change(data, menu)
 	end
-end)
+end)
diff --git a/server-data/resources/[esx]/esx_menu_dialog/fxmanifest.lua b/server-data/resources/[esx]/esx_menu_dialog/fxmanifest.lua
@@ -1,10 +1,9 @@
 fx_version 'adamant'
 
 game 'gta5'
-
 description 'ESX Menu Dialog'
-
-version '0.0.4'
+lua54 'yes'
+version '1.0.0'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/server-data/resources/[esx]/esx_menu_dialog/html/css/app.css b/server-data/resources/[esx]/esx_menu_dialog/html/css/app.css
@@ -1,132 +1,132 @@
-
-@import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap');
+@import url("https://fonts.googleapis.com/css?family=Montserrat&display=swap");
 
 #controls {
-	font-family: montserrat;
-	font-size: 3em;
-	color: #FFF;
-	position: absolute;
-	bottom: 40;
-	right: 40;
+    font-family: montserrat;
+    font-size: 3em;
+    color: #fff;
+    position: absolute;
+    bottom: 40;
+    right: 40;
 }
 
 .controls {
-	display: none;
+    display: none;
 }
 
 .dialog {
-	font-family: montserrat;
-	background: rgba(33, 33, 33, 0.8);
-  color: #fff;
-	position: absolute;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-	overflow: hidden;
-	top: 50%;
-	left: 50%;
-	width: 600px;
-	height: 152px;
-	transform: translate(-50%, -50%);
+    font-family: montserrat;
+    background: rgba(33, 33, 33, 0.8);
+    color: #fff;
+    position: absolute;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    overflow: hidden;
+    top: 50%;
+    left: 50%;
+    width: 600px;
+    height: 152px;
+    transform: translate(-50%, -50%);
 }
 
 .head {
-	display: flex;
-	flex-basis: 100%;
-	align-items: center;
-	color: #fff;
+    display: flex;
+    flex-basis: 100%;
+    align-items: center;
+    color: #fff;
 }
 
 .dialog.big {
-	height: 200px;
+    height: 200px;
 }
 
 .dialog .head {
-	background: rgba(25, 25, 25, 0.9);
-	text-align: center;
-	height: 40px;
+    background: rgba(25, 25, 25, 0.9);
+    text-align: center;
+    height: 40px;
 }
 
 .dialog .head span::before {
-	content: "";
-	display: inline-block;
-	height: 100%;
-	vertical-align: middle;
+    content: "";
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
 }
 
 .dialog input[type="text"] {
-	width: 60%;
-	height: 32px;
-  outline: 0;
-  background: none;
-  text-align: center;
-  margin-top: 26px;
-  margin-left: 125px;
-	font-size: large;
-  transition: all 0.2s ease-in-out;
-  color: white;
-  border: 0.5px solid #ffffff3b;
-  border-radius: 0px;
+    width: 60%;
+    height: 32px;
+    outline: 0;
+    background: none;
+    text-align: center;
+    margin-top: 26px;
+    margin-left: 125px;
+    font-size: large;
+    transition: all 0.2s ease-in-out;
+    color: white;
+    border: 0.5px solid #ffffff3b;
+    border-radius: 0px;
 }
 
-.dialog input[type="text"]:active, .dialog input[type="text"]:hover {
-  color: white;
+.dialog input[type="text"]:active,
+.dialog input[type="text"]:hover {
+    color: white;
 }
 
 .dialog textarea {
-	width: 100%;
-	height: 128px;
+    width: 100%;
+    height: 128px;
 }
 
 .dialog button[name="submit"] {
-	width: 17.6%;
-	height: 32px;
-  margin-left: 160px;
-  font-weight: 300;
-  color: rgb(37, 34, 53);
-	border-radius: 10px;
-  text-transform: uppercase;
-  background: rgb(50, 79, 208);
-  outline: 0;
-  border: none;
-  transition: all 0.2s ease-in-out;
+    width: 17.6%;
+    height: 32px;
+    margin-left: 160px;
+    font-weight: 300;
+    color: rgb(37, 34, 53);
+    border-radius: 10px;
+    text-transform: uppercase;
+    background: rgb(50, 79, 208);
+    outline: 0;
+    border: none;
+    transition: all 0.2s ease-in-out;
 }
 
 .dialog button {
-  z-index: 9999;
-	transform: translate(-0%, 50%);
+    z-index: 9999;
+    transform: translate(-0%, 50%);
 }
 
 .dialog button[name="cancel"] {
-	width: 17.6%;
-	height: 32px;
-  margin-left: 60px;
-  border: none;
-  text-transform: uppercase;
-  font-weight: 200;
-	border-radius: 10px;
-  color: rgb(53, 34, 34);
-  outline: 0;
-  background: #c74545;
-  transition: all 0.2s ease-in-out;
+    width: 17.6%;
+    height: 32px;
+    margin-left: 60px;
+    border: none;
+    text-transform: uppercase;
+    font-weight: 200;
+    border-radius: 10px;
+    color: rgb(53, 34, 34);
+    outline: 0;
+    background: #c74545;
+    transition: all 0.2s ease-in-out;
 }
 
 .dialog button[name="cancel"]:hover {
-  letter-spacing: 1px;
-  color: #ffffff;
-  width: 17.6%;
+    letter-spacing: 1px;
+    color: #ffffff;
+    width: 17.6%;
 }
 
 .dialog button[name="submit"]:hover {
-  letter-spacing: 1px;
-  color: white;
-  width: 17.6%;
+    letter-spacing: 1px;
+    color: white;
+    width: 17.6%;
 }
 
 .head::before,
 .head::after {
-	content: "";
-	flex-grow: 1;
-	background: #00e1ff;
-	height: 2px;
-	margin: 0px 3px;
+    content: "";
+    flex-grow: 1;
+    background: #00e1ff;
+    height: 2px;
+    margin: 0px 3px;
 }