Update routes

userfrosting · Apr 4, 2023 · a8cd447 · a8cd447
1 parent 682659a
commit a8cd447
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/app/src/Routes/GroupsRoute.php b/app/src/Routes/GroupsRoute.php
@@ -38,7 +38,8 @@ public function register(App $app): void
             $group->get('', GroupsPageAction::class)
                   ->setName('uri_groups');
             $group->get('/g/{slug}', GroupPageAction::class)
-                  ->add(GroupInjector::class);
+                  ->add(GroupInjector::class)
+                  ->setName('page.group');
         })->add(AuthGuard::class); //->add(new NoCache());
 
         $app->group('/api/groups', function (RouteCollectorProxy $group) {

diff --git a/app/templates/navigation/sidebar-menu.html.twig b/app/templates/navigation/sidebar-menu.html.twig
@@ -6,33 +6,33 @@
     {% endif %}
     {% if checkAccess('uri_users') %}
     <li>
-        <a href="{{site.uri.public}}/users"><i class="fas fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
+        <a href="{{ urlFor('uri_users') }}"><i class="fas fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
     </li>
     {% elseif checkAccess('uri_group', {
         'group': current_user.group
     }) %}
     <li>
-        <a href="{{site.uri.public}}/groups/g/{{current_user.group.slug}}"><i class="{{current_user.group.icon}} fa-fw"></i> <span>{{ translate("GROUP.MANAGE") }}</span></a>
+        <a href="{{ urlFor('page.group', {'slug': current_user.group.slug}) }}"><i class="fas {{current_user.group.icon}} fa-fw"></i> <span>{{ translate("GROUP.MANAGE") }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_activities') %}
     <li>
-        <a href="{{site.uri.public}}/activities"><i class="fas fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
+        <a href="{{ urlFor('uri_activities') }}"><i class="fas fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_roles') %}
     <li>
-        <a href="{{site.uri.public}}/roles"><i class="fas fa-id-card fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
+        <a href="{{ urlFor('uri_roles') }}"><i class="fas fa-id-card fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_permissions') %}
     <li>
-        <a href="{{site.uri.public}}/permissions"><i class="fas fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
+        <a href="{{ urlFor('uri_permissions') }}"><i class="fas fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_groups') %}
     <li>
-        <a href="{{site.uri.public}}/groups"><i class="fas fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
+        <a href="{{ urlFor('uri_groups') }}"><i class="fas fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
     </li>
     {% endif %}
 {% endblock %}
diff --git a/app/templates/pages/dashboard.html.twig b/app/templates/pages/dashboard.html.twig
@@ -9,7 +9,7 @@
     {% if checkAccess('uri_users') %}
     <div class="row">
         <div class="col-md-4 col-sm-6 col-xs-12">
-          <a href="{{site.uri.public}}/users"> {# TODO #}
+          <a href="{{ urlFor('uri_users') }}">
             <div class="info-box">
               <span class="info-box-icon bg-aqua"><i class="fas fa-user fa-fw"></i></span>
               <div class="info-box-content">
@@ -24,7 +24,7 @@
         <!-- /.col -->
 
         <div class="col-md-4 col-sm-6 col-xs-12">
-          <a href="{{site.uri.public}}/roles"> {# TODO #}
+          <a href="{{ urlFor('uri_roles') }}">
             <div class="info-box">
               <span class="info-box-icon bg-red"><i class="fas fa-id-card"></i></span>
               <div class="info-box-content">
@@ -39,7 +39,7 @@
         <!-- /.col -->
 
         <div class="col-md-4 col-sm-6 col-xs-12">
-          <a href="{{site.uri.public}}/groups"> {# TODO #}
+          <a href="{{ urlFor('uri_groups') }}">
             <div class="info-box">
               <span class="info-box-icon bg-green"><i class="fas fa-users"></i></span>
               <div class="info-box-content">
@@ -103,8 +103,10 @@
                       <ul class="users-list clearfix">
                         {% for user in users %}
                         <li>
-                          <img src="{{ user.avatar }}" alt="User Image">
-                          <a class="users-list-name" href="{{site.uri.public}}/users/u/{{user.user_name}}">{{user.first_name}} {{user.last_name}}</a> {# TODO #}
+                          <a class="users-list-name" href="{{ urlFor('page.user', {'user_name': user.user_name}) }}">
+                            <img src="{{ user.avatar }}" alt="User Image">
+                            <div>{{user.first_name}} {{user.last_name}}</div>
+                          </a>
                           <span class="users-list-date">{{ user.registered }}</span>
                         </li>
                         {% endfor %}
@@ -113,7 +115,7 @@
                     </div>
                     <!-- /.box-body -->
                     <div class="box-footer text-center">
-                      <a href="{{site.uri.public}}/users" class="uppercase">{{translate("USER.VIEW_ALL")}}</a> {# TODO #}
+                      <a href="{{ urlFor('uri_users') }}" class="uppercase">{{translate("USER.VIEW_ALL")}}</a>
                     </div>
                     <!-- /.box-footer -->
                   </div>