Merge pull request #107 from devaslanphp/dev

Administration enhancement

app/View/Components/MainMenu.php

@@ -27,42 +27,93 @@ public function __construct()
                 'icon' => 'fa-table-columns',
                 'always_shown' => true,
                 'show_notification_indicator' => false,
-                'permission' => ''
+                'permissions' => ['']
             ],
             'analytics' => [
                 'title' => 'Analytics',
                 'icon' => 'fa-chart-bar',
                 'always_shown' => false,
                 'show_notification_indicator' => false,
-                'permission' => 'Can view Analytics page'
+                'permissions' => ['Can view Analytics page']
             ],
             'tickets' => [
                 'title' => 'Tickets',
                 'icon' => 'fa-ticket',
                 'always_shown' => false,
                 'show_notification_indicator' => false,
-                'permission' => 'Can view Tickets page'
+                'permissions' => ['Can view Tickets page']
             ],
             'kanban' => [
                 'title' => 'Kanban Board',
                 'icon' => 'fa-clipboard-check',
                 'always_shown' => false,
                 'show_notification_indicator' => false,
-                'permission' => 'Can view Kanban page'
+                'permissions' => ['Can view Kanban page']
             ],
             'administration' => [
                 'title' => 'Administration',
                 'icon' => 'fa-cogs',
                 'always_shown' => false,
                 'show_notification_indicator' => false,
-                'permission' => 'Can view Administration page'
+                'permissions' => [
+                    'View all users', 'View company users',
+                    'View all companies', 'View own companies',
+                    'Manage ticket statuses',
+                    'Manage ticket types',
+                    'Manage ticket priorities',
+                    'View activity log'
+                ],
+                'children' => [
+                    [
+                        'title' => 'Manage users',
+                        'route' => 'administration.users',
+                        'icon' => 'fa-users',
+                        'always_shown' => false,
+                        'permissions' => ['View all users', 'View company users']
+                    ],
+                    [
+                        'title' => 'Manage companies',
+                        'route' => 'administration.companies',
+                        'icon' => 'fa-building',
+                        'always_shown' => false,
+                        'permissions' => ['View all companies', 'View own companies']
+                    ],
+                    [
+                        'title' => 'Manage statuses',
+                        'route' => 'administration.ticket-statuses',
+                        'icon' => 'fa-square-check',
+                        'always_shown' => false,
+                        'permissions' => ['Manage ticket statuses']
+                    ],
+                    [
+                        'title' => 'Manage types',
+                        'route' => 'administration.ticket-types',
+                        'icon' => 'fa-copy',
+                        'always_shown' => false,
+                        'permissions' => ['Manage ticket types']
+                    ],
+                    [
+                        'title' => 'Manage priorities',
+                        'route' => 'administration.ticket-priorities',
+                        'icon' => 'fa-arrow-up',
+                        'always_shown' => false,
+                        'permissions' => ['Manage ticket priorities']
+                    ],
+                    [
+                        'title' => 'Activity logs',
+                        'route' => 'administration.activity-logs',
+                        'icon' => 'fa-bell',
+                        'always_shown' => false,
+                        'permissions' => ['View activity log']
+                    ]
+                ]
             ],
             'notifications' => [
                 'title' => 'Notifications',
                 'icon' => 'fa-bell',
                 'always_shown' => true,
                 'show_notification_indicator' => true,
-                'permission' => ''
+                'permissions' => ['']
             ],
         ];
     }

database/help_desk.pgsql.sql

@@ -107,7 +107,6 @@ INSERT INTO permissions (id, name, guard_name, created_at, updated_at) VALUES
 (17, 'Can view Analytics page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
 (18, 'Can view Tickets page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
 (19, 'Can view Kanban page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
-(20, 'Can view Administration page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
 (21, 'View all users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
 (22, 'View company users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
 (25, 'Manage ticket statuses', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
@@ -144,7 +143,6 @@ INSERT INTO model_has_permissions (permission_id, model_type, model_id) VALUES
 (17, 'App\Models\User', 4),
 (18, 'App\Models\User', 4),
 (19, 'App\Models\User', 4),
-(20, 'App\Models\User', 4),
 (21, 'App\Models\User', 4),
 (22, 'App\Models\User', 4),
 (25, 'App\Models\User', 4),
@@ -178,7 +176,6 @@ INSERT INTO model_has_permissions (permission_id, model_type, model_id) VALUES
 (17, 'App\Models\User', 6),
 (18, 'App\Models\User', 6),
 (19, 'App\Models\User', 6),
-(20, 'App\Models\User', 6),
 (22, 'App\Models\User', 6),
 (29, 'App\Models\User', 6),
 (30, 'App\Models\User', 6),

database/help_desk.sql

@@ -107,7 +107,6 @@ INSERT INTO `permissions` (`id`, `name`, `guard_name`, `created_at`, `updated_at
 (17, 'Can view Analytics page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
 (18, 'Can view Tickets page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
 (19, 'Can view Kanban page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
-(20, 'Can view Administration page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
 (21, 'View all users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
 (22, 'View company users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
 (25, 'Manage ticket statuses', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
@@ -124,75 +123,74 @@ INSERT INTO `permissions` (`id`, `name`, `guard_name`, `created_at`, `updated_at
 (39, 'Update companies', 'web', '2022-09-25 17:19:38', '2022-09-25 17:19:38'),
 (40, 'Delete companies', 'web', '2022-09-25 17:19:38', '2022-09-25 17:19:38');
 
+TRUNCATE TABLE model_has_permissions;
 INSERT INTO `model_has_permissions` (`permission_id`, `model_type`, `model_id`) VALUES
-(1, 'App\Models\User', 4),
-(2, 'App\Models\User', 4),
-(3, 'App\Models\User', 4),
-(4, 'App\Models\User', 4),
-(5, 'App\Models\User', 4),
-(6, 'App\Models\User', 4),
-(7, 'App\Models\User', 4),
-(8, 'App\Models\User', 4),
-(9, 'App\Models\User', 4),
-(10, 'App\Models\User', 4),
-(11, 'App\Models\User', 4),
-(12, 'App\Models\User', 4),
-(13, 'App\Models\User', 4),
-(14, 'App\Models\User', 4),
-(15, 'App\Models\User', 4),
-(16, 'App\Models\User', 4),
-(17, 'App\Models\User', 4),
-(18, 'App\Models\User', 4),
-(19, 'App\Models\User', 4),
-(20, 'App\Models\User', 4),
-(21, 'App\Models\User', 4),
-(22, 'App\Models\User', 4),
-(25, 'App\Models\User', 4),
-(26, 'App\Models\User', 4),
-(27, 'App\Models\User', 4),
-(28, 'App\Models\User', 4),
-(29, 'App\Models\User', 4),
-(30, 'App\Models\User', 4),
-(31, 'App\Models\User', 4),
-(32, 'App\Models\User', 4),
-(33, 'App\Models\User', 4),
-(34, 'App\Models\User', 4),
-(38, 'App\Models\User', 4),
-(39, 'App\Models\User', 4),
-(40, 'App\Models\User', 4),
-(5, 'App\Models\User', 5),
-(11, 'App\Models\User', 5),
-(12, 'App\Models\User', 5),
-(13, 'App\Models\User', 5),
-(14, 'App\Models\User', 5),
-(15, 'App\Models\User', 5),
-(16, 'App\Models\User', 5),
-(17, 'App\Models\User', 5),
-(18, 'App\Models\User', 5),
-(19, 'App\Models\User', 5),
-(5, 'App\Models\User', 6),
-(11, 'App\Models\User', 6),
-(12, 'App\Models\User', 6),
-(13, 'App\Models\User', 6),
-(14, 'App\Models\User', 6),
-(17, 'App\Models\User', 6),
-(18, 'App\Models\User', 6),
-(19, 'App\Models\User', 6),
-(20, 'App\Models\User', 6),
-(22, 'App\Models\User', 6),
-(29, 'App\Models\User', 6),
-(30, 'App\Models\User', 6),
-(34, 'App\Models\User', 6),
-(39, 'App\Models\User', 6),
-(5, 'App\Models\User', 10),
-(11, 'App\Models\User', 10),
-(12, 'App\Models\User', 10),
-(13, 'App\Models\User', 10),
-(14, 'App\Models\User', 10),
-(15, 'App\Models\User', 10),
-(16, 'App\Models\User', 10),
-(17, 'App\Models\User', 10),
-(18, 'App\Models\User', 10),
-(19, 'App\Models\User', 10);
+(1, 'App\\Models\\User', 4),
+(2, 'App\\Models\\User', 4),
+(3, 'App\\Models\\User', 4),
+(4, 'App\\Models\\User', 4),
+(5, 'App\\Models\\User', 4),
+(6, 'App\\Models\\User', 4),
+(7, 'App\\Models\\User', 4),
+(8, 'App\\Models\\User', 4),
+(9, 'App\\Models\\User', 4),
+(10, 'App\\Models\\User', 4),
+(11, 'App\\Models\\User', 4),
+(12, 'App\\Models\\User', 4),
+(13, 'App\\Models\\User', 4),
+(14, 'App\\Models\\User', 4),
+(15, 'App\\Models\\User', 4),
+(16, 'App\\Models\\User', 4),
+(17, 'App\\Models\\User', 4),
+(18, 'App\\Models\\User', 4),
+(19, 'App\\Models\\User', 4),
+(21, 'App\\Models\\User', 4),
+(22, 'App\\Models\\User', 4),
+(25, 'App\\Models\\User', 4),
+(26, 'App\\Models\\User', 4),
+(27, 'App\\Models\\User', 4),
+(28, 'App\\Models\\User', 4),
+(29, 'App\\Models\\User', 4),
+(30, 'App\\Models\\User', 4),
+(31, 'App\\Models\\User', 4),
+(32, 'App\\Models\\User', 4),
+(33, 'App\\Models\\User', 4),
+(34, 'App\\Models\\User', 4),
+(38, 'App\\Models\\User', 4),
+(39, 'App\\Models\\User', 4),
+(40, 'App\\Models\\User', 4),
+(5, 'App\\Models\\User', 5),
+(11, 'App\\Models\\User', 5),
+(12, 'App\\Models\\User', 5),
+(13, 'App\\Models\\User', 5),
+(14, 'App\\Models\\User', 5),
+(15, 'App\\Models\\User', 5),
+(16, 'App\\Models\\User', 5),
+(17, 'App\\Models\\User', 5),
+(18, 'App\\Models\\User', 5),
+(19, 'App\\Models\\User', 5),
+(5, 'App\\Models\\User', 6),
+(11, 'App\\Models\\User', 6),
+(12, 'App\\Models\\User', 6),
+(13, 'App\\Models\\User', 6),
+(14, 'App\\Models\\User', 6),
+(17, 'App\\Models\\User', 6),
+(18, 'App\\Models\\User', 6),
+(19, 'App\\Models\\User', 6),
+(22, 'App\\Models\\User', 6),
+(29, 'App\\Models\\User', 6),
+(30, 'App\\Models\\User', 6),
+(34, 'App\\Models\\User', 6),
+(39, 'App\\Models\\User', 6),
+(5, 'App\\Models\\User', 10),
+(11, 'App\\Models\\User', 10),
+(12, 'App\\Models\\User', 10),
+(13, 'App\\Models\\User', 10),
+(14, 'App\\Models\\User', 10),
+(15, 'App\\Models\\User', 10),
+(16, 'App\\Models\\User', 10),
+(17, 'App\\Models\\User', 10),
+(18, 'App\\Models\\User', 10),
+(19, 'App\\Models\\User', 10);
 
 SET foreign_key_checks = 1;

database/seeders/PermissionsSeeder.php

@@ -28,7 +28,6 @@ class PermissionsSeeder extends Seeder
         'Can view Analytics page',
         'Can view Tickets page',
         'Can view Kanban page',
-        'Can view Administration page',
         'View all users',
         'View company users',
         'Create users',

public/docs/index.html

@@ -54,7 +54,7 @@
           <!-- Logo -->
           <a class="logo ml-md-3" href="index.html" title="Help Desk">
             <img src="/docs/assets/images/logo.png" alt="Help Desk" width="120" /> </a>
-          <span class="text-2 ml-2">v1.4.2</span>
+          <span class="text-2 ml-2">v1.4.3</span>
           <!-- Logo End -->
 
           <!-- Navbar Toggler -->
@@ -91,6 +91,7 @@
           <li class="nav-item"><a class="nav-link" href="#idocs_faq">FAQ</a></li>
           <li class="nav-item"><a class="nav-link" href="#idocs_changelog">Changelog</a>
             <ul class="nav flex-column">
+                <li class="nav-item"><a class="nav-link" href="#v1-4-3">v1.4.3</a></li>
                 <li class="nav-item"><a class="nav-link" href="#v1-4-2">v1.4.2</a></li>
                 <li class="nav-item"><a class="nav-link" href="#v1-4-1">v1.4.1</a></li>
                 <li class="nav-item"><a class="nav-link" href="#v1-4-0">v1.4.0</a></li>
@@ -131,7 +132,7 @@ <h2>Help Desk</h2>
             <div class="row">
               <div class="col-sm-6 col-lg-4">
                 <ul class="list-unstyled">
-                  <li><strong>Version:</strong> 1.4.2</li>
+                  <li><strong>Version:</strong> 1.4.3</li>
                   <li><strong>Author:</strong> <a href="mailto:[email protected]"
                       target="_blank">heloufir</a>
                   </li>
@@ -330,6 +331,12 @@ <h5 class="mb-0"> <a href="#" class="collapsed" data-toggle="collapse" data-targ
           <section id="idocs_changelog">
             <h2>Changelog</h2>
             <p class="text-4">See what's new added, changed, fixed, improved or updated in the latest versions. </p>
+            <h3 id="v1-4-3">Version 1.4.3 <small class="text-muted">(27 September, 2022)</small></h3>
+            <ul>
+              <li>Administration design enhancement</li>
+              <li>Remove administration images</li>
+              <li>Update main menu</li>
+            </ul>
             <h3 id="v1-4-2">Version 1.4.2 <small class="text-muted">(27 September, 2022)</small></h3>
             <ul>
               <li>Bug-fix: make ticket content required</li>