Merge pull request #261 from dotkernel/issue-255

Javascript refactoring and packages updates

Author: arhimede

package.json

@@ -23,25 +23,24 @@
   },
   "homepage": "https://github.com/dotkernel/admin#readme",
   "dependencies": {
-    "@fullcalendar/core": "^6.1.11",
-    "@fullcalendar/daygrid": "^6.1.11",
-    "@fullcalendar/interaction": "^6.1.11",
-    "@fullcalendar/list": "^6.1.11",
-    "@fullcalendar/timegrid": "^6.1.11",
+    "@fullcalendar/core": "^6.1.14",
+    "@fullcalendar/daygrid": "^6.1.14",
+    "@fullcalendar/interaction": "^6.1.14",
+    "@fullcalendar/list": "^6.1.14",
+    "@fullcalendar/timegrid": "^6.1.14",
     "@popperjs/core": "^2.11.8",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^5.3.3",
     "bootstrap-datepicker": "^1.10.0",
     "bootstrap-icons": "^1.11.3",
-    "bootstrap-table": "^1.22.2",
+    "bootstrap-table": "^1.23.0",
     "brand-colors": "^2.1.1",
-    "chart.js": "^2.9.4",
+    "chart.js": "^4.4.3",
     "easy-pie-chart": "^2.1.7",
     "file-loader": "^6.2.0",
-    "fullcalendar": "^6.1.11",
+    "fullcalendar": "^6.1.14",
     "jquery": "^3.7.1",
     "jquery-sparkline": "^2.4.0",
-    "jvectormap": "^2.0.4",
     "load-google-maps-api": "^2.0.2",
     "lodash": "^4.17.21",
     "masonry-layout": "^4.2.2",
@@ -50,12 +49,12 @@
     "skycons": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/eslint-parser": "^7.23.10",
+    "@babel/core": "^7.24.7",
+    "@babel/eslint-parser": "^7.24.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/plugin-transform-runtime": "^7.23.9",
-    "@babel/runtime": "^7.23.9",
+    "@babel/plugin-transform-runtime": "^7.24.7",
+    "@babel/runtime": "^7.24.7",
     "babel-core": "^6.26.3",
     "babel-loader": "^9.1.3",
     "babel-preset-env": "^1.7.0",
@@ -64,27 +63,27 @@
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^12.0.2",
     "cross-env": "^7.0.3",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^6.0.0",
-    "eslint": "^8.57.0",
+    "css-loader": "5.2.7",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.1",
     "expose-loader": "^5.0.0",
     "html-webpack-plugin": "^5.6.0",
     "imagemin-webpack-plugin": "^2.4.2",
-    "mini-css-extract-plugin": "^2.8.0",
-    "postcss": "^8.4.35",
-    "postcss-loader": "^8.1.0",
-    "postcss-preset-env": "^9.4.0",
-    "sass": "^1.71.1",
-    "sass-loader": "^14.1.1",
+    "mini-css-extract-plugin": "^2.9.0",
+    "postcss": "^8.4.39",
+    "postcss-loader": "^8.1.1",
+    "postcss-preset-env": "^9.6.0",
+    "sass": "^1.77.1",
+    "sass-loader": "^14.2.1",
     "shx": "^0.3.4",
-    "style-loader": "^3.3.4",
-    "stylelint": "^16.2.1",
-    "stylelint-config-standard": "^36.0.0",
-    "webpack": "^5.90.3",
+    "style-loader": "^4.0.0",
+    "stylelint": "^16.6.1",
+    "stylelint-config-standard": "^36.0.1",
+    "webpack": "^5.92.1",
     "webpack-cli": "^5.1.4",
     "webpack-dashboard": "^3.3.8",
-    "webpack-dev-server": "^5.0.2"
+    "webpack-dev-server": "^5.0.4"
   }
 }

public/css/app.css

@@ -37,7 +37,6 @@
 use Psr\Http\Message\ResponseInterface;
 use Throwable;
 
-use function json_decode;
 use function password_verify;
 
 class AdminController extends AbstractActionController
@@ -92,20 +91,20 @@ public function addAction(): ResponseInterface
             } else {
                 return new JsonResponse(
                     ['message' => $this->forms->getMessagesAsString($this->adminForm)],
-                    StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR
+                    StatusCodeInterface::STATUS_BAD_REQUEST
                 );
             }
         }
 
-        return new HtmlResponse(
-            $this->template->render(
+        return new JsonResponse([
+            'data' => $this->template->render(
                 'partial::ajax-form',
                 [
                     'form'       => $this->adminForm,
                     'formAction' => '/admin/add',
                 ]
-            )
-        );
+            ),
+        ]);
     }
 
     /**
@@ -152,29 +151,37 @@ public function editAction(): ResponseInterface
 
         $this->adminForm->bind($adminFormData);
 
-        return new HtmlResponse(
-            $this->template->render(
+        return new JsonResponse([
+            'data' => $this->template->render(
                 'partial::ajax-form',
                 [
                     'form'       => $this->adminForm,
                     'formAction' => '/admin/edit/' . $uuid,
                 ]
-            )
-        );
+            ),
+        ]);
     }
 
     /**
      * @throws NonUniqueResultException
      */
     public function deleteAction(): ResponseInterface
     {
-        $data = json_decode($this->getRequest()->getBody()->getContents(), true);
-        $uuid = $data['value']['uuid'] ?? null;
+        if (! $this->isDelete()) {
+            return new JsonResponse([
+                'error' => [
+                    'messages' => [
+                        [Message::METHOD_NOT_ALLOWED],
+                    ],
+                ],
+            ], StatusCodeInterface::STATUS_METHOD_NOT_ALLOWED);
+        }
 
+        $uuid = $this->getAttribute('uuid');
         if (empty($uuid)) {
             return new JsonResponse(
                 ['message' => Message::ADMIN_NOT_FOUND],
-                StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR
+                StatusCodeInterface::STATUS_NOT_FOUND
             );
         }
 

public/images/app/logo.svg

@@ -19,7 +19,11 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
         $app->route(
             '/admin[/{action}[/{uuid}]]',
             AdminController::class,
-            [RequestMethodInterface::METHOD_GET, RequestMethodInterface::METHOD_POST],
+            [
+                RequestMethodInterface::METHOD_GET,
+                RequestMethodInterface::METHOD_POST,
+                RequestMethodInterface::METHOD_DELETE,
+            ],
             'admin'
         );