From 793ccf534e5e0a741fb179e65f418387dec6ffff Mon Sep 17 00:00:00 2001
From: elmo <elmo@localhost.localdomain>
Date: Mon, 21 Oct 2024 09:19:12 +0800
Subject: [PATCH] Fix menu routing for competitor entity

---
 config/packages/catalyst_auth.yaml      | 27 +++++++++++++------------
 config/packages/catalyst_menu.yaml      |  2 +-
 config/routes/competitor.yaml           |  6 +++---
 config/routes/home.yaml                 |  4 ----
 src/Controller/CompetitorController.php |  6 +++---
 src/Entity/Competitor.php               |  1 -
 templates/menu.html.twig                |  5 +++--
 7 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/config/packages/catalyst_auth.yaml b/config/packages/catalyst_auth.yaml
index 636f5a8d..0b30d56e 100644
--- a/config/packages/catalyst_auth.yaml
+++ b/config/packages/catalyst_auth.yaml
@@ -2,6 +2,20 @@ catalyst_auth:
     main:
         user_entity: "App\\Entity\\User"
         acl_data: 
+            - id: competitor
+              label: Competitor Access
+              acls:
+                - id: competitor.menu
+                  label: Menu
+                - id: competitor.list
+                  label: List
+                - id: competitor.add
+                  label: Add
+                - id: competitor.update
+                  label: Update
+                - id: competitor.delete
+                  label: Delete
+                  
             - id: dashboard
               label: Dashboard Access
               acls:
@@ -673,19 +687,6 @@ catalyst_auth:
                 - id: item_pricing.update
                   label: Update
             
-            - id: competitor
-              label: Competitors
-              acls:
-                - id: competitor.menu
-                  label: Menu
-                - id: competitor.list
-                  label: List
-                - id: competitor.add
-                  label: Add
-                - id: competitor.update
-                  label: Update
-                - id: competitor.delete
-                  label: Delete
 
     api:
         user_entity: "App\\Entity\\ApiUser"
diff --git a/config/packages/catalyst_menu.yaml b/config/packages/catalyst_menu.yaml
index 68f2532f..604d9a8c 100644
--- a/config/packages/catalyst_menu.yaml
+++ b/config/packages/catalyst_menu.yaml
@@ -7,7 +7,7 @@ catalyst_menu:
           order: 1
 
 
-        - id: competitors
+        - id: competitor
           acl: competitor.menu
           label: Competitors
           icon: fa fa-battery-0 #hehe
diff --git a/config/routes/competitor.yaml b/config/routes/competitor.yaml
index 1fdab836..e66379b4 100644
--- a/config/routes/competitor.yaml
+++ b/config/routes/competitor.yaml
@@ -1,4 +1,4 @@
-competitor_list:
+competitor:
     path: /competitors
     controller: App\Controller\CompetitorController::index
 
@@ -18,12 +18,12 @@ competitor_create_submit:
     methods: [POST]
 
 competitor_update:
-    path: /competitors/update/{id}
+    path: /competitors/{id}
     controller: App\Controller\CompetitorController::updateForm
     methods: [GET]
 
 competitor_update_submit:
-    path: /competitors/update/{id}
+    path: /competitors/{id}
     controller: App\Controller\CompetitorController::updateSubmit
     methods: [POST]
 
diff --git a/config/routes/home.yaml b/config/routes/home.yaml
index 0af6039b..da111860 100644
--- a/config/routes/home.yaml
+++ b/config/routes/home.yaml
@@ -2,10 +2,6 @@ home:
     path: /
     controller: App\Controller\HomeController::index
 
-home2:
-    path: /home
-    controller: App\Controller\HomeController::index
-
 rider_locations:
     path: /rider_locations
     controller: App\Controller\HomeController::getRiderLocations
diff --git a/src/Controller/CompetitorController.php b/src/Controller/CompetitorController.php
index 88ff0c7f..b1b08fad 100644
--- a/src/Controller/CompetitorController.php
+++ b/src/Controller/CompetitorController.php
@@ -20,7 +20,7 @@ class CompetitorController extends Controller
 {
 
     /**
-     * @Menu(selected="competitors")
+     * @Menu(selected="competitor")
      */
     public function index()
     {
@@ -125,7 +125,7 @@ class CompetitorController extends Controller
     }
 
     /**
-     * @Menu(selected="competitors")
+     * @Menu(selected="competitor")
      */
     public function addForm()
     {
@@ -182,7 +182,7 @@ class CompetitorController extends Controller
     }
 
     /**
-     * @Menu(selected="competitors")
+     * @Menu(selected="competitor")
      */
     public function updateForm($id)
 
diff --git a/src/Entity/Competitor.php b/src/Entity/Competitor.php
index 3acad262..76a36c4c 100644
--- a/src/Entity/Competitor.php
+++ b/src/Entity/Competitor.php
@@ -2,7 +2,6 @@
 
 namespace App\Entity;
 
-use App\Repository\CompetitorRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
diff --git a/templates/menu.html.twig b/templates/menu.html.twig
index bbc59305..1c1457f6 100644
--- a/templates/menu.html.twig
+++ b/templates/menu.html.twig
@@ -14,7 +14,7 @@
                     <li class="m-menu__item " aria-haspopup="true" >
                 {% endif %}
 
-                    <a " href="{{ mi.getRoute }}" class="m-menu__link{% if mi.hasChildren %} m-menu__toggle{% endif %}">
+                    <a href="{{ menu_link(mi) }}" class="m-menu__link{% if mi.hasChildren %} m-menu__toggle{% endif %}">
                         <i class="m-menu__link-icon {{ mi.getIcon }}"></i>
                         <span class="m-menu__link-title">
                             <span class="m-menu__link-wrap">
@@ -49,7 +49,7 @@
                 {% else %}
                 <li class="m-menu__item " aria-haspopup="true" >
                 {% endif %}
-                    <a " href="{{ menu_link(mi) }}" class="m-menu__link ">
+                    <a  href="{{ menu_link(mi) }}" class="m-menu__link ">
                         <i class="m-menu__link-bullet m-menu__link-bullet--dot">
                             <span></span>
                         </i>
@@ -63,3 +63,4 @@
         </ul>
     </div>
 {% endmacro %}
+