From f69aa300b420a08e536434cfbe5ea816d525200c Mon Sep 17 00:00:00 2001
From: Kailash Nadh <kailash@nadh.in>
Date: Mon, 17 Jun 2024 16:47:46 +0530
Subject: [PATCH] Move User/Roles nav items under Settings.

---
 frontend/src/components/Navigation.vue | 15 +++++----------
 frontend/src/router/index.js           |  8 ++++----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Navigation.vue b/frontend/src/components/Navigation.vue
index 54572476..f6546be6 100644
--- a/frontend/src/components/Navigation.vue
+++ b/frontend/src/components/Navigation.vue
@@ -42,24 +42,19 @@
         :label="$t('globals.terms.analytics')" />
     </b-menu-item><!-- campaigns -->
 
-    <b-menu-item v-if="$can('users:*') || $can('roles:*')" :expanded="activeGroup.users" :active="activeGroup.users"
-      data-cy="users" @update:active="(state) => toggleGroup('users', state)" icon="account-multiple"
-      :label="$t('globals.terms.users')">
-      <b-menu-item v-if="$can('users:get')" :to="{ name: 'users' }" tag="router-link" :active="activeItem.users"
-        data-cy="users" icon="account-multiple" :label="$t('globals.terms.users')" />
-      <b-menu-item v-if="$can('roles:get')" :to="{ name: 'roles' }" tag="router-link" :active="activeItem.roles"
-        data-cy="roles" icon="newspaper-variant-outline" :label="$t('users.roles')" />
-    </b-menu-item>
-
     <b-menu-item v-if="$can('settings:*')" :expanded="activeGroup.settings" :active="activeGroup.settings"
       data-cy="settings" @update:active="(state) => toggleGroup('settings', state)" icon="cog-outline"
       :label="$t('menu.settings')">
       <b-menu-item v-if="$can('settings:get')" :to="{ name: 'settings' }" tag="router-link"
         :active="activeItem.settings" data-cy="all-settings" icon="cog-outline" :label="$t('menu.settings')" />
+      <b-menu-item v-if="$can('users:get')" :to="{ name: 'users' }" tag="router-link" :active="activeItem.users"
+        data-cy="users" icon="account-multiple" :label="$t('globals.terms.users')" />
+      <b-menu-item v-if="$can('roles:get')" :to="{ name: 'roles' }" tag="router-link" :active="activeItem.roles"
+        data-cy="roles" icon="newspaper-variant-outline" :label="$t('users.roles')" />
       <b-menu-item v-if="$can('settings:maintain')" :to="{ name: 'maintenance' }" tag="router-link"
         :active="activeItem.maintenance" data-cy="maintenance" icon="wrench-outline" :label="$t('menu.maintenance')" />
       <b-menu-item v-if="$can('settings:get')" :to="{ name: 'logs' }" tag="router-link" :active="activeItem.logs"
-        data-cy="logs" icon="newspaper-variant-outline" :label="$t('menu.logs')" />
+        data-cy="logs" icon="format-list-bulleted-square" :label="$t('menu.logs')" />
     </b-menu-item><!-- settings -->
 
     <b-menu-item v-if="isMobile" icon="logout-variant" :label="$t('users.logout')" @click.prevent="doLogout" />
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 4e576917..f28d378f 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -114,15 +114,15 @@ const routes = [
     component: () => import('../views/Logs.vue'),
   },
   {
-    path: '/users',
+    path: '/settings/users',
     name: 'users',
-    meta: { title: 'globals.terms.users', group: 'users' },
+    meta: { title: 'globals.terms.users', group: 'settings' },
     component: () => import('../views/Users.vue'),
   },
   {
-    path: '/users/roles',
+    path: '/settings/users/roles',
     name: 'roles',
-    meta: { title: 'users.roles', group: 'users' },
+    meta: { title: 'users.roles', group: 'settings' },
     component: () => import('../views/Roles.vue'),
   },
   {