Skip to content

Commit 3b7ee68

Browse files
heloufirheloufir
authored
Merge pull request #107 from devaslanphp/dev
Administration enhancement
2 parents aa6816c + fef961b commit 3b7ee68

23 files changed

Lines changed: 191 additions & 296 deletions

‎app/View/Components/Administration.php‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎app/View/Components/MainMenu.php‎

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,42 +27,93 @@ public function __construct()
2727
'icon' => 'fa-table-columns',
2828
'always_shown' => true,
2929
'show_notification_indicator' => false,
30-
'permission' => ''
30+
'permissions' => ['']
3131
],
3232
'analytics' => [
3333
'title' => 'Analytics',
3434
'icon' => 'fa-chart-bar',
3535
'always_shown' => false,
3636
'show_notification_indicator' => false,
37-
'permission' => 'Can view Analytics page'
37+
'permissions' => ['Can view Analytics page']
3838
],
3939
'tickets' => [
4040
'title' => 'Tickets',
4141
'icon' => 'fa-ticket',
4242
'always_shown' => false,
4343
'show_notification_indicator' => false,
44-
'permission' => 'Can view Tickets page'
44+
'permissions' => ['Can view Tickets page']
4545
],
4646
'kanban' => [
4747
'title' => 'Kanban Board',
4848
'icon' => 'fa-clipboard-check',
4949
'always_shown' => false,
5050
'show_notification_indicator' => false,
51-
'permission' => 'Can view Kanban page'
51+
'permissions' => ['Can view Kanban page']
5252
],
5353
'administration' => [
5454
'title' => 'Administration',
5555
'icon' => 'fa-cogs',
5656
'always_shown' => false,
5757
'show_notification_indicator' => false,
58-
'permission' => 'Can view Administration page'
58+
'permissions' => [
59+
'View all users', 'View company users',
60+
'View all companies', 'View own companies',
61+
'Manage ticket statuses',
62+
'Manage ticket types',
63+
'Manage ticket priorities',
64+
'View activity log'
65+
],
66+
'children' => [
67+
[
68+
'title' => 'Manage users',
69+
'route' => 'administration.users',
70+
'icon' => 'fa-users',
71+
'always_shown' => false,
72+
'permissions' => ['View all users', 'View company users']
73+
],
74+
[
75+
'title' => 'Manage companies',
76+
'route' => 'administration.companies',
77+
'icon' => 'fa-building',
78+
'always_shown' => false,
79+
'permissions' => ['View all companies', 'View own companies']
80+
],
81+
[
82+
'title' => 'Manage statuses',
83+
'route' => 'administration.ticket-statuses',
84+
'icon' => 'fa-square-check',
85+
'always_shown' => false,
86+
'permissions' => ['Manage ticket statuses']
87+
],
88+
[
89+
'title' => 'Manage types',
90+
'route' => 'administration.ticket-types',
91+
'icon' => 'fa-copy',
92+
'always_shown' => false,
93+
'permissions' => ['Manage ticket types']
94+
],
95+
[
96+
'title' => 'Manage priorities',
97+
'route' => 'administration.ticket-priorities',
98+
'icon' => 'fa-arrow-up',
99+
'always_shown' => false,
100+
'permissions' => ['Manage ticket priorities']
101+
],
102+
[
103+
'title' => 'Activity logs',
104+
'route' => 'administration.activity-logs',
105+
'icon' => 'fa-bell',
106+
'always_shown' => false,
107+
'permissions' => ['View activity log']
108+
]
109+
]
59110
],
60111
'notifications' => [
61112
'title' => 'Notifications',
62113
'icon' => 'fa-bell',
63114
'always_shown' => true,
64115
'show_notification_indicator' => true,
65-
'permission' => ''
116+
'permissions' => ['']
66117
],
67118
];
68119
}

‎database/help_desk.pgsql.sql‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ INSERT INTO permissions (id, name, guard_name, created_at, updated_at) VALUES
107107
(17, 'Can view Analytics page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
108108
(18, 'Can view Tickets page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
109109
(19, 'Can view Kanban page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
110-
(20, 'Can view Administration page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
111110
(21, 'View all users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
112111
(22, 'View company users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
113112
(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
144143
(17, 'App\Models\User', 4),
145144
(18, 'App\Models\User', 4),
146145
(19, 'App\Models\User', 4),
147-
(20, 'App\Models\User', 4),
148146
(21, 'App\Models\User', 4),
149147
(22, 'App\Models\User', 4),
150148
(25, 'App\Models\User', 4),
@@ -178,7 +176,6 @@ INSERT INTO model_has_permissions (permission_id, model_type, model_id) VALUES
178176
(17, 'App\Models\User', 6),
179177
(18, 'App\Models\User', 6),
180178
(19, 'App\Models\User', 6),
181-
(20, 'App\Models\User', 6),
182179
(22, 'App\Models\User', 6),
183180
(29, 'App\Models\User', 6),
184181
(30, 'App\Models\User', 6),

‎database/help_desk.sql‎

Lines changed: 68 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ INSERT INTO `permissions` (`id`, `name`, `guard_name`, `created_at`, `updated_at
107107
(17, 'Can view Analytics page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
108108
(18, 'Can view Tickets page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
109109
(19, 'Can view Kanban page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
110-
(20, 'Can view Administration page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'),
111110
(21, 'View all users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
112111
(22, 'View company users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'),
113112
(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
124123
(39, 'Update companies', 'web', '2022-09-25 17:19:38', '2022-09-25 17:19:38'),
125124
(40, 'Delete companies', 'web', '2022-09-25 17:19:38', '2022-09-25 17:19:38');
126125

126+
TRUNCATE TABLE model_has_permissions;
127127
INSERT INTO `model_has_permissions` (`permission_id`, `model_type`, `model_id`) VALUES
128-
(1, 'App\Models\User', 4),
129-
(2, 'App\Models\User', 4),
130-
(3, 'App\Models\User', 4),
131-
(4, 'App\Models\User', 4),
132-
(5, 'App\Models\User', 4),
133-
(6, 'App\Models\User', 4),
134-
(7, 'App\Models\User', 4),
135-
(8, 'App\Models\User', 4),
136-
(9, 'App\Models\User', 4),
137-
(10, 'App\Models\User', 4),
138-
(11, 'App\Models\User', 4),
139-
(12, 'App\Models\User', 4),
140-
(13, 'App\Models\User', 4),
141-
(14, 'App\Models\User', 4),
142-
(15, 'App\Models\User', 4),
143-
(16, 'App\Models\User', 4),
144-
(17, 'App\Models\User', 4),
145-
(18, 'App\Models\User', 4),
146-
(19, 'App\Models\User', 4),
147-
(20, 'App\Models\User', 4),
148-
(21, 'App\Models\User', 4),
149-
(22, 'App\Models\User', 4),
150-
(25, 'App\Models\User', 4),
151-
(26, 'App\Models\User', 4),
152-
(27, 'App\Models\User', 4),
153-
(28, 'App\Models\User', 4),
154-
(29, 'App\Models\User', 4),
155-
(30, 'App\Models\User', 4),
156-
(31, 'App\Models\User', 4),
157-
(32, 'App\Models\User', 4),
158-
(33, 'App\Models\User', 4),
159-
(34, 'App\Models\User', 4),
160-
(38, 'App\Models\User', 4),
161-
(39, 'App\Models\User', 4),
162-
(40, 'App\Models\User', 4),
163-
(5, 'App\Models\User', 5),
164-
(11, 'App\Models\User', 5),
165-
(12, 'App\Models\User', 5),
166-
(13, 'App\Models\User', 5),
167-
(14, 'App\Models\User', 5),
168-
(15, 'App\Models\User', 5),
169-
(16, 'App\Models\User', 5),
170-
(17, 'App\Models\User', 5),
171-
(18, 'App\Models\User', 5),
172-
(19, 'App\Models\User', 5),
173-
(5, 'App\Models\User', 6),
174-
(11, 'App\Models\User', 6),
175-
(12, 'App\Models\User', 6),
176-
(13, 'App\Models\User', 6),
177-
(14, 'App\Models\User', 6),
178-
(17, 'App\Models\User', 6),
179-
(18, 'App\Models\User', 6),
180-
(19, 'App\Models\User', 6),
181-
(20, 'App\Models\User', 6),
182-
(22, 'App\Models\User', 6),
183-
(29, 'App\Models\User', 6),
184-
(30, 'App\Models\User', 6),
185-
(34, 'App\Models\User', 6),
186-
(39, 'App\Models\User', 6),
187-
(5, 'App\Models\User', 10),
188-
(11, 'App\Models\User', 10),
189-
(12, 'App\Models\User', 10),
190-
(13, 'App\Models\User', 10),
191-
(14, 'App\Models\User', 10),
192-
(15, 'App\Models\User', 10),
193-
(16, 'App\Models\User', 10),
194-
(17, 'App\Models\User', 10),
195-
(18, 'App\Models\User', 10),
196-
(19, 'App\Models\User', 10);
128+
(1, 'App\\Models\\User', 4),
129+
(2, 'App\\Models\\User', 4),
130+
(3, 'App\\Models\\User', 4),
131+
(4, 'App\\Models\\User', 4),
132+
(5, 'App\\Models\\User', 4),
133+
(6, 'App\\Models\\User', 4),
134+
(7, 'App\\Models\\User', 4),
135+
(8, 'App\\Models\\User', 4),
136+
(9, 'App\\Models\\User', 4),
137+
(10, 'App\\Models\\User', 4),
138+
(11, 'App\\Models\\User', 4),
139+
(12, 'App\\Models\\User', 4),
140+
(13, 'App\\Models\\User', 4),
141+
(14, 'App\\Models\\User', 4),
142+
(15, 'App\\Models\\User', 4),
143+
(16, 'App\\Models\\User', 4),
144+
(17, 'App\\Models\\User', 4),
145+
(18, 'App\\Models\\User', 4),
146+
(19, 'App\\Models\\User', 4),
147+
(21, 'App\\Models\\User', 4),
148+
(22, 'App\\Models\\User', 4),
149+
(25, 'App\\Models\\User', 4),
150+
(26, 'App\\Models\\User', 4),
151+
(27, 'App\\Models\\User', 4),
152+
(28, 'App\\Models\\User', 4),
153+
(29, 'App\\Models\\User', 4),
154+
(30, 'App\\Models\\User', 4),
155+
(31, 'App\\Models\\User', 4),
156+
(32, 'App\\Models\\User', 4),
157+
(33, 'App\\Models\\User', 4),
158+
(34, 'App\\Models\\User', 4),
159+
(38, 'App\\Models\\User', 4),
160+
(39, 'App\\Models\\User', 4),
161+
(40, 'App\\Models\\User', 4),
162+
(5, 'App\\Models\\User', 5),
163+
(11, 'App\\Models\\User', 5),
164+
(12, 'App\\Models\\User', 5),
165+
(13, 'App\\Models\\User', 5),
166+
(14, 'App\\Models\\User', 5),
167+
(15, 'App\\Models\\User', 5),
168+
(16, 'App\\Models\\User', 5),
169+
(17, 'App\\Models\\User', 5),
170+
(18, 'App\\Models\\User', 5),
171+
(19, 'App\\Models\\User', 5),
172+
(5, 'App\\Models\\User', 6),
173+
(11, 'App\\Models\\User', 6),
174+
(12, 'App\\Models\\User', 6),
175+
(13, 'App\\Models\\User', 6),
176+
(14, 'App\\Models\\User', 6),
177+
(17, 'App\\Models\\User', 6),
178+
(18, 'App\\Models\\User', 6),
179+
(19, 'App\\Models\\User', 6),
180+
(22, 'App\\Models\\User', 6),
181+
(29, 'App\\Models\\User', 6),
182+
(30, 'App\\Models\\User', 6),
183+
(34, 'App\\Models\\User', 6),
184+
(39, 'App\\Models\\User', 6),
185+
(5, 'App\\Models\\User', 10),
186+
(11, 'App\\Models\\User', 10),
187+
(12, 'App\\Models\\User', 10),
188+
(13, 'App\\Models\\User', 10),
189+
(14, 'App\\Models\\User', 10),
190+
(15, 'App\\Models\\User', 10),
191+
(16, 'App\\Models\\User', 10),
192+
(17, 'App\\Models\\User', 10),
193+
(18, 'App\\Models\\User', 10),
194+
(19, 'App\\Models\\User', 10);
197195

198196
SET foreign_key_checks = 1;

‎database/seeders/PermissionsSeeder.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class PermissionsSeeder extends Seeder
2828
'Can view Analytics page',
2929
'Can view Tickets page',
3030
'Can view Kanban page',
31-
'Can view Administration page',
3231
'View all users',
3332
'View company users',
3433
'Create users',

‎public/docs/index.html‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- Logo -->
5555
<a class="logo ml-md-3" href="index.html" title="Help Desk">
5656
<img src="/docs/assets/images/logo.png" alt="Help Desk" width="120" /> </a>
57-
<span class="text-2 ml-2">v1.4.2</span>
57+
<span class="text-2 ml-2">v1.4.3</span>
5858
<!-- Logo End -->
5959

6060
<!-- Navbar Toggler -->
@@ -91,6 +91,7 @@
9191
<li class="nav-item"><a class="nav-link" href="#idocs_faq">FAQ</a></li>
9292
<li class="nav-item"><a class="nav-link" href="#idocs_changelog">Changelog</a>
9393
<ul class="nav flex-column">
94+
<li class="nav-item"><a class="nav-link" href="#v1-4-3">v1.4.3</a></li>
9495
<li class="nav-item"><a class="nav-link" href="#v1-4-2">v1.4.2</a></li>
9596
<li class="nav-item"><a class="nav-link" href="#v1-4-1">v1.4.1</a></li>
9697
<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>
131132
<div class="row">
132133
<div class="col-sm-6 col-lg-4">
133134
<ul class="list-unstyled">
134-
<li><strong>Version:</strong> 1.4.2</li>
135+
<li><strong>Version:</strong> 1.4.3</li>
135136
<li><strong>Author:</strong> <a href="mailto:eloufirhatim@gmail.com"
136137
target="_blank">heloufir</a>
137138
</li>
@@ -330,6 +331,12 @@ <h5 class="mb-0"> <a href="#" class="collapsed" data-toggle="collapse" data-targ
330331
<section id="idocs_changelog">
331332
<h2>Changelog</h2>
332333
<p class="text-4">See what's new added, changed, fixed, improved or updated in the latest versions. </p>
334+
<h3 id="v1-4-3">Version 1.4.3 <small class="text-muted">(27 September, 2022)</small></h3>
335+
<ul>
336+
<li>Administration design enhancement</li>
337+
<li>Remove administration images</li>
338+
<li>Update main menu</li>
339+
</ul>
333340
<h3 id="v1-4-2">Version 1.4.2 <small class="text-muted">(27 September, 2022)</small></h3>
334341
<ul>
335342
<li>Bug-fix: make ticket content required</li>

‎public/images/administration/activity-logs.jpg‎

-6.1 KB
Binary file not shown.

‎public/images/administration/companies.jpeg‎

-228 KB
Binary file not shown.

‎public/images/administration/priorities.jpg‎

-20.4 KB
Binary file not shown.

‎public/images/administration/types.jpg‎

-29 KB
Binary file not shown.

0 commit comments

Comments
 (0)