Forced merge: merge ai-dev into master

frontend/src/menuAside.ts

@@ -7,15 +7,6 @@ const menuAside: MenuAsideItem[] = [
     icon: icon.mdiViewDashboardOutline,
     label: 'Dashboard',
   },
-
-  {
-    href: '/users/users-list',
-    label: 'Users',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon: icon.mdiAccountGroup ?? icon.mdiTable,
-    permissions: 'READ_USERS',
-  },
   {
     href: '/posts/posts-list',
     label: 'Posts',
@@ -27,67 +18,80 @@ const menuAside: MenuAsideItem[] = [
         : icon.mdiTable ?? icon.mdiTable,
     permissions: 'READ_POSTS',
   },
-  {
-    href: '/tags/tags-list',
-    label: 'Tags',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon:
-      'mdiTag' in icon
-        ? icon['mdiTag' as keyof typeof icon]
-        : icon.mdiTable ?? icon.mdiTable,
-    permissions: 'READ_TAGS',
-  },
-  {
-    href: '/stages/stages-list',
-    label: 'Stages',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon: icon.mdiTable ?? icon.mdiTable,
-    permissions: 'READ_STAGES',
-  },
-  {
-    href: '/roles/roles-list',
-    label: 'Roles',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon: icon.mdiShieldAccountVariantOutline ?? icon.mdiTable,
-    permissions: 'READ_ROLES',
-  },
-  {
-    href: '/permissions/permissions-list',
-    label: 'Permissions',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon: icon.mdiShieldAccountOutline ?? icon.mdiTable,
-    permissions: 'READ_PERMISSIONS',
-  },
-  {
-    href: '/companies/companies-list',
-    label: 'Companies',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon: icon.mdiTable ?? icon.mdiTable,
-    permissions: 'READ_COMPANIES',
-  },
   {
     href: '/profile',
     label: 'Profile',
     icon: icon.mdiAccountCircle,
   },
-
   {
-    href: '/contact',
+    label: 'Admin',
-    label: 'Home page',
+    icon: icon.mdiShieldAccountVariantOutline,
-    icon: icon.mdiHome,
+    menu: [
-    withDevider: true,
+      {
-  },
+        href: '/users/users-list',
-  {
+        label: 'Users',
-    href: '/api-docs',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    target: '_blank',
+        // @ts-ignore
-    label: 'Swagger API',
+        icon: icon.mdiAccountGroup ?? icon.mdiTable,
-    icon: icon.mdiFileCode,
+        permissions: 'READ_USERS',
-    permissions: 'READ_API_DOCS',
+      },
+      {
+        href: '/tags/tags-list',
+        label: 'Tags',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        icon:
+          'mdiTag' in icon
+            ? icon['mdiTag' as keyof typeof icon]
+            : icon.mdiTable ?? icon.mdiTable,
+        permissions: 'READ_TAGS',
+      },
+      {
+        href: '/stages/stages-list',
+        label: 'Stages',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        icon: icon.mdiTable ?? icon.mdiTable,
+        permissions: 'READ_STAGES',
+      },
+      {
+        href: '/roles/roles-list',
+        label: 'Roles',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        icon: icon.mdiShieldAccountVariantOutline ?? icon.mdiTable,
+        permissions: 'READ_ROLES',
+      },
+      {
+        href: '/permissions/permissions-list',
+        label: 'Permissions',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        icon: icon.mdiShieldAccountOutline ?? icon.mdiTable,
+        permissions: 'READ_PERMISSIONS',
+      },
+      {
+        href: '/companies/companies-list',
+        label: 'Companies',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        icon: icon.mdiTable ?? icon.mdiTable,
+        permissions: 'READ_COMPANIES',
+      },
+      {
+        href: '/contact',
+        label: 'Home page',
+        icon: icon.mdiHome,
+        withDevider: true,
+      },
+      {
+        href: '/api-docs',
+        target: '_blank',
+        label: 'Swagger API',
+        icon: icon.mdiFileCode,
+        permissions: 'READ_API_DOCS',
+      },
+    ],
   },
 ];
 

frontend/tailwind.config.js

@@ -62,9 +62,7 @@ module.exports = {
           500: '#D9DBE9',
           400: '#EFF0F6',
           300: '#F7F7FC',
-        red: {
+
-          500: '#E63946',
-          600: '#D62839',
         },
         red: {
           300: '#F56565',
@@ -73,7 +71,6 @@ module.exports = {
           700: '#9B2C2C',
         },
 
-        },
       spacing: {
         '18': '4.5rem',
         '22': '5.5rem',