Merge branch 'develop' into 'master'

gsvnet · Mar 12, 2021 · 2b33d4e · 2b33d4e
2 parents 811db5a + c7532ad
commit 2b33d4e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/GSVnet/Core/Composers/NavigationViewComposer.php b/GSVnet/Core/Composers/NavigationViewComposer.php
@@ -270,6 +270,14 @@ private function getStructure()
 //            ],
 
 
+            'activiteiten' => [
+                'title' => 'Activiteiten',
+                'url' => action('EventController@showIndex'),
+                'visible' => function(){
+                    return Auth::check() && Gate::allows('events.show-private');
+                }
+            ],
+
             'jaarbundel' => [
                 'title' => 'Jaarbundel',
                 'url' => action('UserController@showUsers'),
@@ -342,6 +350,13 @@ private function getStructure()
                             return Gate::allows('docs.show');
                         }
                     ],
+                    'admin' => [
+                        'title' => 'Admin',
+                        'url' => action('Admin\AdminController@index'),
+                        'visible' => function(){
+                            return Gate::allows('admin.show');
+                        }
+                    ],
                     'sponsorprogramma' => [
                         'title' => 'Sponsors',
                         'url' => action('HomeController@sponsorProgram'),

diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -10,7 +10,7 @@
 // Route::get('kiezel', 'HomeController@showKiezel');
 
 // Kei 2020
-Route::get('kei', 'HomeController@showKei');
+// Route::get('kei', 'HomeController@showKei');
 
 // Privacy-related stuff
 Route::get('privacy-statement', 'PublicFilesController@showPrivacyStatement');

diff --git a/config/permissions.php b/config/permissions.php
@@ -89,6 +89,10 @@
             'senate' => true
         ],
 
+        'admin.show' => [
+            'type' => [User::MEMBER, User::REUNIST]
+        ],
+
         'admin' => [
             'committee' => ['webcie']
         ],