diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 79ca184..5b09c39 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -9,6 +9,7 @@ + diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 86b677a..1292bd8 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -29,7 +29,8 @@ class RolesController extends Controller */ public function index(Request $request) { - $roles = Role::query()->where("id", "!=", 1)->where("id", "!=", 2)->get(); + //$roles = Role::query()->where("id", "!=", 1)->where("id", "!=", 2)->get(); Add this bitch if the users isn't allowed to se the rolls with id 1 and 2 + $roles = Role::query()->get(); return Response::detect("roles.index", [ "roles" => $roles]); } diff --git a/skolehjem/public/images/icons/statistics.svg b/skolehjem/public/images/icons/statistics.svg new file mode 100644 index 0000000..babb1c5 --- /dev/null +++ b/skolehjem/public/images/icons/statistics.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/manifest.json b/skolehjem/public/manifest.json new file mode 100644 index 0000000..1eb2411 --- /dev/null +++ b/skolehjem/public/manifest.json @@ -0,0 +1,19 @@ +{ + "short_name": "Ekapp", + "name": "Syddansk Erhverskollegie App", + "description": "Informations app about Erhverskollegiet", + "icons": [ + { + "src": "icon/appIcon.svg", + "sizes": "192x192" + } + ], + "lang": "da-DK", + "dir": "ltr", + "orientation": "portrait-primary", + "start_url": "https://ekapp.sde.dk", + "background_color": "#00788a", + "display": "standalone", + "scope": "/", + "theme_color": "#00788a" +} diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index 508565a..e1102cd 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -10,6 +10,7 @@ @endsection @section("content") + @yield("header")
@@ -126,53 +131,57 @@ + +
+

Statistik

Statistik
+
@if(auth()->user()->can('user.show')) -
+

Brugere

Brugere
@endif @if(auth()->user()->can('roles.show')) -
+

Roller

Roller
@endif @if(auth()->user()->can('news.show')) -
+

Nyheder

Nyheder
@endif @if(auth()->user()->can('menuplan.show')) -
+

Menuplan

Menuplan
@endif @if(auth()->user()->can('event.show')) -
+

Aktiviteter

Aktiviteter
@endif @if(auth()->user()->can('washing.machine.show')) -
+

Vaskemaskiner

Vaskemaskiner
@endif @if(auth()->user()->can('washing.machine.reservation.show')) -
+

Reservationer

Reservationer
@endif @if(auth()->user()->can('contact.show')) -
+

Kontakter

Kontakter
@endif @if(auth()->user()->can('guides.show')) -
+

Vejledning

Vejledning
@endif @if(auth()->user()->can('feedback.show')) -
+

Feedback

Feedback
@endif diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index 936d14c..dfc16b1 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -61,6 +61,7 @@ ); }); + function change() { if ($('#isNews').is(":checked")) {