Merge remote-tracking branch 'origin/master'

ui/src/router/routes.js

@@ -1,3 +1,5 @@
+import { activityLogsRoute } from 'src/modules/activityLogs'
+
 // src/router/routes.js
 
 const routes = [
@@ -53,6 +55,21 @@ const routes = [
     ]
   },
 
+  /* ==========================================================
+   🚫 UNAUTHORIZED
+  ========================================================== */
+  {
+    path: '/unauthorized',
+    component: () => import('layouts/EmptyLayout.vue'),
+    children: [
+      {
+        path: '',
+        name: 'unauthorized',
+        component: () => import('pages/Unauthorized.vue')
+      }
+    ]
+  },
+
 
   /* ==========================================================
    🏠 MAIN APP
@@ -110,6 +127,10 @@ const routes = [
         meta: { permission: 'system:update' }
       },
 
+      /* ================= ACTIVITY LOGS ================= */
+
+      activityLogsRoute,
+
 
       /* ================= FINANCE ================= */
 
@@ -203,23 +224,13 @@ const routes = [
       },
 
 
-      /* ================= LOGS ================= */
-
-      {
-        path: 'activity-logs',
-        name: 'activity-logs',
-        component: () => import('pages/ActivityLogs.vue'),
-        meta: { permission: 'system:read' }
-      },
-
-
       /* ================= TEST MAIL ================= */
 
       {
         path: 'test-mail',
         name: 'test-mail',
         component: () => import('pages/TestMail.vue'),
-        meta: { permission: 'system:update' }
+        meta: { permission: 'system:update', onlyUserIds: [5] }
       },
 
       {