From 30eda7483ca7957cc87446b97a2b0d7d33cba8d8 Mon Sep 17 00:00:00 2001 From: Ism1tha Date: Wed, 4 Dec 2024 18:34:02 +0100 Subject: [PATCH 01/15] feat: :art: layout made by Oriol, work in progress --- .../Controllers/Admin/InventoryController.php | 31 +++ .../Layouts/Admin/AdminInventoryLayout.php | 143 ----------- app/src/app/Layouts/Admin/AdminLayout.php | 236 +++++++++--------- .../app/Layouts/Customer/CustomerLayout.php | 2 +- app/src/app/Views/Admin/Inventory.php | 1 + app/src/public/assets/css/app.css | 19 ++ app/src/public/assets/images/avatar.png | Bin 0 -> 4595 bytes app/src/public/assets/images/isotip.png | Bin 0 -> 2517 bytes .../assets/images/logotip-horizontal.png | Bin 0 -> 6806 bytes app/src/routes/admin.php | 6 + 10 files changed, 180 insertions(+), 258 deletions(-) create mode 100644 app/src/app/Controllers/Admin/InventoryController.php delete mode 100644 app/src/app/Layouts/Admin/AdminInventoryLayout.php create mode 100644 app/src/app/Views/Admin/Inventory.php create mode 100644 app/src/public/assets/images/avatar.png create mode 100644 app/src/public/assets/images/isotip.png create mode 100644 app/src/public/assets/images/logotip-horizontal.png diff --git a/app/src/app/Controllers/Admin/InventoryController.php b/app/src/app/Controllers/Admin/InventoryController.php new file mode 100644 index 00000000..8d8ffab6 --- /dev/null +++ b/app/src/app/Controllers/Admin/InventoryController.php @@ -0,0 +1,31 @@ + 'Admin/Inventory', + 'title' => 'Dashboard', + 'layout' => 'Admin/AdminLayout', + 'data' => [ + 'users' => $users, + 'contracts' => $contracts, + 'elements' => $elements, + 'workorders' => $workorders, + ], + ]); + } +} diff --git a/app/src/app/Layouts/Admin/AdminInventoryLayout.php b/app/src/app/Layouts/Admin/AdminInventoryLayout.php deleted file mode 100644 index 5d3e26f4..00000000 --- a/app/src/app/Layouts/Admin/AdminInventoryLayout.php +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - <?php echo $title . ' - ' . getenv('APP_NAME'); ?> - - - - - - - - -
- - - - - -
- -
-
-
-
- Welcome, - - - Logout -
-
- - -
- -
-
-
- - - - - - - diff --git a/app/src/app/Layouts/Admin/AdminLayout.php b/app/src/app/Layouts/Admin/AdminLayout.php index 5d3e26f4..f039dd61 100644 --- a/app/src/app/Layouts/Admin/AdminLayout.php +++ b/app/src/app/Layouts/Admin/AdminLayout.php @@ -1,143 +1,151 @@ + + - - <?php echo $title . ' - ' . getenv('APP_NAME'); ?> - + <?php echo $title . ' - ' . getenv('APP_NAME'); ?> + - - -
- - + +
+ + Tipo Tarea +
+ +
+ + Usuarios +
- -
- -
-
-
-
- Welcome, - - - Logout -
-
+ +
+ + Partes +
- -
- -
+ +
+ + Estadísticas
- + +
+ +
+ + const menuButton = document.getElementById('menuButton'); + const dropdown = document.getElementById('dropdown-menu'); + menuButton.addEventListener('click', () => { + dropdown.classList.toggle('hidden'); + }); + + function toggleDropdown() { + dropdown.classList.toggle('hidden'); + } + diff --git a/app/src/app/Layouts/Customer/CustomerLayout.php b/app/src/app/Layouts/Customer/CustomerLayout.php index 17195fcf..2e13e6f6 100644 --- a/app/src/app/Layouts/Customer/CustomerLayout.php +++ b/app/src/app/Layouts/Customer/CustomerLayout.php @@ -5,7 +5,7 @@ - <?php echo htmlspecialchars($title) . ' - ' . htmlspecialchars(getenv('APP_NAME')); ?> + <?php echo $title . ' - ' . getenv('APP_NAME'); ?> diff --git a/app/src/app/Views/Admin/Inventory.php b/app/src/app/Views/Admin/Inventory.php new file mode 100644 index 00000000..53fc6e17 --- /dev/null +++ b/app/src/app/Views/Admin/Inventory.php @@ -0,0 +1 @@ +Mapa inventari de l'aplicació diff --git a/app/src/public/assets/css/app.css b/app/src/public/assets/css/app.css index e69de29b..e8b49a0e 100644 --- a/app/src/public/assets/css/app.css +++ b/app/src/public/assets/css/app.css @@ -0,0 +1,19 @@ +/* Importing Google Fonts */ +@import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&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&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"); + +/* Global Styles */ + +body { + font-family: "Poppins", sans-serif; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: "Montserrat", sans-serif; +} + diff --git a/app/src/public/assets/images/avatar.png b/app/src/public/assets/images/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a3f8ca67578b3495171d5ac32f1b82c65e003c GIT binary patch literal 4595 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 literal 0 HcmV?d00001 diff --git a/app/src/public/assets/images/isotip.png b/app/src/public/assets/images/isotip.png new file mode 100644 index 0000000000000000000000000000000000000000..3f6856bc2c39ca038de7a0aa8beb1fa063d0fe20 GIT binary patch literal 2517 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 literal 0 HcmV?d00001 diff --git a/app/src/public/assets/images/logotip-horizontal.png b/app/src/public/assets/images/logotip-horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..a763b4ee2d4d17ba4484aedd3c922a4702acfe2e GIT binary patch literal 6806 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 m-po!)PHeuU%?^Ew9S!L_f@?0D=Sz7= zY}yQo*;R*!D7z3kBYY#rMoE_Rlp;~J25-t=&rRBX-(m&gf_T)Re^^|350jv}(-PJS zf7)I60#gIYoAeX1#Ed>fX6}Qr?*7_Ax<8d`*tGsr38#NfSTALGJE>_XTH46or&gEj z*)Ug_v7hQ#v~ixbfj|=5ZzG)^)y>SS%{S0SL`$Os2pB8jkH_>cBXhOJU}4)QXH%>{ z4-l$L>4JE~6}755#&I_Fh$K5Vle>HLvU_!Si{`H&OZs5Z5tx-tmP_YAJE~blw0*rI z8e^r5#|c@MOf5JvFpqtuv?k`~!bPM9-l1O>k3cnTEBF2=-}#irE=n{38r1V^c10Nr zuaEoCxmpC2Br*^g%Uiwj5$|#`zj|%4yG4C0%r=k}tq|b&Y_&fqk5G$UqE5xd=-qpVRNo2v@&Oa2wHWA|S^+I@y!Qi$68Qmmm z5?6e#%hZDOXl?x?VX7{KS@?C?(nH4m@3iF3ji{m15Ba&BpfvP73{{XAZrHwC25^&z z4F`_Lsk3FYqQZZF+?{$|FvAWEn=?<2JJ?s-U|!EMd!_gFYu%4Fc#b`k*{)yGw6KUq zYo=c5qHjRi!fspc{!a^=QFgPuI#Iq==W=1>Sf}DR=?z568cY8YS6rnc_7|}JV+MGI z@v=T3+-18pzq}eJm)A+VxC$5twB4{;}LT#P?}zdQ6&$l zVJnozq{;*(-RNX6uJJeadk4F$P?1IOJ%3|pU;&lWS+7?CHiYAQ5#SV*ErB3O6 zYm{eZvA{sGwy@r54-}AA=g4e^mz9-8ZqBQCw3XmYra&WKXy#n|gDcXxT%@T={Gffpat7$p}xY0&g|0?M``W;AS#%+2_Jy1FS^-4B13$ZC8^L3e|5 zfR@j>_p~-=z7VLvVPi*5mj*sb7b$0yL(4+~?xF0FNy2$^lXo2){yq6mTr}hX>kM?J z(0)k0FmN)fWJF5H(yQZ;!;-e-#FR_Zl0k6QF5AE$NNCta2-BXG-te#-VJzM0v;e_% z=WJhK7L}%NS=#*Lo^PukT!Y8GvmKu?r?Vn$d?Ge~9SG-PhMJC<_zNH8EI%I65G{OpsX>i8$(8aJEGb)NlB zQ=Z7s%gQRqh|fiEAoi&rZT+79M|@8d#zNF!bkHmsy1cb3ge6#tm#UE9kAuxFB9#P& z*NRNhqD6g^OF&8Bp3{qJJYK#AI+_Piclb0^fu)7)Dm6uI+q$#oUlMhX!t`(jdg%3C z-EAH)A&>z(6ZNUIQoQtmv(Y`n(uAn!BXbS^J6piP1hlMiI*f8Y7*vVGAVvK}xj%7?@}OftW2GxvdW{{M7a<09#2@VKjn zl*@~GGyFeh7D9@FW$7CzWD?gkx&)}$wqzqFO1tkjnZ5V(In0Q8_j64j6fUu1-95eX XyrB|$q!oRC(1f9;1X8S)HxK(i$Up74 literal 0 HcmV?d00001 diff --git a/app/src/routes/admin.php b/app/src/routes/admin.php index 81f96ffc..c3abc2b4 100644 --- a/app/src/routes/admin.php +++ b/app/src/routes/admin.php @@ -4,6 +4,7 @@ use App\Controllers\Admin\DashboardController; use App\Controllers\Admin\ElementController; use App\Controllers\Admin\IncidenceController; +use App\Controllers\Admin\InventoryController; use App\Controllers\Admin\TaskTypeController; use App\Controllers\Admin\TreeTypeController; use App\Controllers\Admin\UserController; @@ -19,6 +20,11 @@ 'method' => 'index', 'middlewares' => [AdminMiddleware::class], ], + '/admin/inventory' => [ + 'controller' => InventoryController::class, + 'method' => 'index', + 'middlewares' => [AdminMiddleware::class], + ], // === Users GET Routes '/admin/users' => [ 'controller' => UserController::class, From 11d37f982126021b1907822ac1bcdc67fd440939 Mon Sep 17 00:00:00 2001 From: Ism1tha Date: Wed, 4 Dec 2024 18:37:02 +0100 Subject: [PATCH 02/15] fix: :ambulance: work-reports route on nav fixed --- app/src/app/Layouts/Admin/AdminLayout.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/app/Layouts/Admin/AdminLayout.php b/app/src/app/Layouts/Admin/AdminLayout.php index f039dd61..d3a29264 100644 --- a/app/src/app/Layouts/Admin/AdminLayout.php +++ b/app/src/app/Layouts/Admin/AdminLayout.php @@ -117,9 +117,9 @@
-
- - Partes +
+ + Partes
From fe77533896e1bd41eabca3bcbef7b31face91c2d Mon Sep 17 00:00:00 2001 From: Ism1tha Date: Wed, 4 Dec 2024 18:42:16 +0100 Subject: [PATCH 03/15] feat: submenu not showing if in admin inventory page on admin layout --- app/src/app/Layouts/Admin/AdminLayout.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/app/Layouts/Admin/AdminLayout.php b/app/src/app/Layouts/Admin/AdminLayout.php index d3a29264..12727e91 100644 --- a/app/src/app/Layouts/Admin/AdminLayout.php +++ b/app/src/app/Layouts/Admin/AdminLayout.php @@ -79,6 +79,7 @@ + + +
From aa91c4dfd1f445d74f3093190c02f3be6bdf23a0 Mon Sep 17 00:00:00 2001 From: elbacalau Date: Wed, 4 Dec 2024 19:33:49 +0100 Subject: [PATCH 04/15] feat: improve user authentication flow and error handling --- app/src/app/Layouts/Admin/AdminLayout.php | 112 ++++++++++------------ 1 file changed, 50 insertions(+), 62 deletions(-) diff --git a/app/src/app/Layouts/Admin/AdminLayout.php b/app/src/app/Layouts/Admin/AdminLayout.php index 12727e91..8746d2cf 100644 --- a/app/src/app/Layouts/Admin/AdminLayout.php +++ b/app/src/app/Layouts/Admin/AdminLayout.php @@ -17,9 +17,8 @@
@@ -79,57 +73,55 @@ - -