Merge pull request #346 from dotkernel/issue-345

Issue #345: Implemented route grouping

Author: arhimede

composer.json

@@ -40,6 +40,7 @@
         "dotkernel/dot-mail": "^5.1.0",
         "dotkernel/dot-navigation": "^3.4.2",
         "dotkernel/dot-rbac-guard": "^3.4.2",
+        "dotkernel/dot-router": "^1.0.4",
         "dotkernel/dot-session": "^5.6.0",
         "dotkernel/dot-twigrenderer": "3.4.3",
         "friendsofphp/proxy-manager-lts": "^1.0.16",

config/config.php

@@ -28,6 +28,7 @@
     Mezzio\Twig\ConfigProvider::class,
 
     // Dotkernel packages
+    Dot\Cache\ConfigProvider::class,
     Dot\Cli\ConfigProvider::class,
     Dot\DataFixtures\ConfigProvider::class,
     Dot\DependencyInjection\ConfigProvider::class,
@@ -40,9 +41,9 @@
     Dot\Navigation\ConfigProvider::class,
     Dot\Rbac\ConfigProvider::class,
     Dot\Rbac\Guard\ConfigProvider::class,
+    Dot\Router\ConfigProvider::class,
     Dot\Session\ConfigProvider::class,
     Dot\Twig\ConfigProvider::class,
-    Dot\Cache\ConfigProvider::class,
 
     // Include cache configuration
     new ArrayProvider($cacheConfig),

src/Admin/src/Handler/Account/GetAccountEditFormHandler.php

@@ -38,7 +38,7 @@ public function __construct(
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->accountForm->setAttribute('action', $this->router->generateUri('admin::edit-account'));
+        $this->accountForm->setAttribute('action', $this->router->generateUri('admin::account-edit'));
         $this->changePasswordForm->setAttribute(
             'action',
             $this->router->generateUri('admin::account-change-password')
@@ -50,7 +50,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $this->accountForm->bind($admin);
 
         return new HtmlResponse(
-            $this->template->render('admin::account', [
+            $this->template->render('admin::account-view', [
                 'accountForm'        => $this->accountForm->prepare(),
                 'changePasswordForm' => $this->changePasswordForm->prepare(),
             ])

src/Admin/src/Handler/Account/GetAccountLoginFormHandler.php

@@ -49,7 +49,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         return new HtmlResponse(
-            $this->template->render('admin::login', [
+            $this->template->render('admin::login-form', [
                 'form' => $this->form->prepare(),
             ])
         );

src/Admin/src/Handler/Account/PostAccountChangePasswordHandler.php

@@ -53,7 +53,7 @@ public function __construct(
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         try {
-            $this->accountForm->setAttribute('action', $this->router->generateUri('admin::edit-account'));
+            $this->accountForm->setAttribute('action', $this->router->generateUri('admin::account-edit'));
             $this->changePasswordForm->setAttribute(
                 'action',
                 $this->router->generateUri('admin::account-change-password')
@@ -68,7 +68,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $this->changePasswordForm->setData($this->getPostParams($request));
             if (! $this->changePasswordForm->isValid()) {
                 return new HtmlResponse(
-                    $this->template->render('admin::account', [
+                    $this->template->render('admin::account-view', [
                         'accountForm'        => $this->accountForm->prepare(),
                         'changePasswordForm' => $this->changePasswordForm->prepare(),
                     ])

src/Admin/src/Handler/Account/PostAccountEditHandler.php

@@ -51,8 +51,7 @@ public function __construct(
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->accountForm->setAttribute('action', $this->router->generateUri('admin::edit-account'));
-
+        $this->accountForm->setAttribute('action', $this->router->generateUri('admin::account-edit'));
         $this->changePasswordForm->setAttribute(
             'action',
             $this->router->generateUri('admin::account-change-password')
@@ -64,7 +63,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $this->accountForm->setData($this->getPostParams($request));
         if (! $this->accountForm->isValid()) {
             return new HtmlResponse(
-                $this->template->render('admin::account', [
+                $this->template->render('admin::account-view', [
                     'accountForm'        => $this->accountForm->prepare(),
                     'changePasswordForm' => $this->changePasswordForm->prepare(),
                 ])
@@ -89,6 +88,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $this->messenger->addError(Message::AN_ERROR_OCCURRED);
         }
 
-        return new RedirectResponse($this->router->generateUri('admin::edit-account'));
+        return new RedirectResponse($this->router->generateUri('admin::account-edit'));
     }
 }

src/Admin/src/Handler/Admin/GetAdminCreateFormHandler.php

@@ -32,7 +32,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $this->form->setAttribute('action', $this->router->generateUri('admin::admin-create'));
 
         return new HtmlResponse(
-            $this->template->render('admin::create-admin-form', [
+            $this->template->render('admin::admin-create-form', [
                 'form' => $this->form->prepare(),
             ])
         );

src/Admin/src/Handler/Admin/GetAdminDeleteFormHandler.php

@@ -53,7 +53,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         );
 
         return new HtmlResponse(
-            $this->template->render('admin::delete-admin-form', [
+            $this->template->render('admin::admin-delete-form', [
                 'form'  => $this->form->prepare(),
                 'admin' => $admin,
             ]),

src/Admin/src/Handler/Admin/GetAdminEditFormHandler.php

@@ -70,7 +70,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $this->form->bind($adminFormData);
 
         return new HtmlResponse(
-            $this->template->render('admin::edit-admin-form', [
+            $this->template->render('admin::admin-edit-form', [
                 'form' => $this->form->prepare(),
             ])
         );

src/Admin/src/Handler/Admin/GetAdminListHandler.php

@@ -61,7 +61,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $this->form->setAttribute('action', $this->router->generateUri('admin::admin-create'));
 
         return new HtmlResponse(
-            $this->template->render('admin::list', [
+            $this->template->render('admin::admin-list', [
                 'params'     => $params,
                 'admins'     => $result['rows'],
                 'statuses'   => AdminStatusEnum::cases(),