diff --git a/skolehjem/public/images/icons/Kontoret.svg b/skolehjem/public/images/icons/Kontoret.svg index 20c70b6..b01e4a9 100644 --- a/skolehjem/public/images/icons/Kontoret.svg +++ b/skolehjem/public/images/icons/Kontoret.svg @@ -1 +1 @@ -Artboard 8 \ No newline at end of file + \ No newline at end of file diff --git a/skolehjem/public/images/icons/appIcon.svg b/skolehjem/public/images/icons/appIcon.svg new file mode 100644 index 0000000..d1a5787 --- /dev/null +++ b/skolehjem/public/images/icons/appIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/skolehjem/public/images/icons/browserFavIcon.svg b/skolehjem/public/images/icons/browserFavIcon.svg new file mode 100644 index 0000000..aa4e745 --- /dev/null +++ b/skolehjem/public/images/icons/browserFavIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/skolehjem/public/images/icons/news.svg b/skolehjem/public/images/icons/news.svg index fb9ee37..3a4be93 100644 --- a/skolehjem/public/images/icons/news.svg +++ b/skolehjem/public/images/icons/news.svg @@ -1,3 +1 @@ - + \ No newline at end of file diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index f5dd9f3..3462d32 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -10,12 +10,17 @@ @endsection @section("content") +
@if(auth()->user()->can('contact.create')) CreateOpret Kontakt @endif
- +
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index d34321a..7fdcf08 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -13,13 +13,18 @@ +
@if(auth()->user()->can('event.show')) CreateOpret Aktivitet @endif
-
Kontakt Navn Titel
+
diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 22fe017..0909a7c 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -11,7 +11,12 @@ @section("content") -
Aktivitet Navn Aktivitet Ansvarlig
+ +
diff --git a/skolehjem/resources/views/admin/guides/index.blade.php b/skolehjem/resources/views/admin/guides/index.blade.php index e84cedf..99bc107 100644 --- a/skolehjem/resources/views/admin/guides/index.blade.php +++ b/skolehjem/resources/views/admin/guides/index.blade.php @@ -10,13 +10,18 @@ @endsection @section("content") + @if(auth()->user()->can('guides.create'))
CreateOpret Bruger Vejledning CreateOpret vejlednings kategori
@endif -
+
Dato Feedback Besked
@@ -55,7 +60,7 @@
-
+
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php index 1ab9406..23cd544 100644 --- a/skolehjem/resources/views/admin/index.blade.php +++ b/skolehjem/resources/views/admin/index.blade.php @@ -49,10 +49,20 @@ color: lightseagreen; margin: auto; } + + .letterSpaceTable{ + letter-spacing: 1.2px; + } + + .letterSpaceNotTable{ + letter-spacing: 2px; + } + +
-
+

Brugere

@@ -61,10 +71,10 @@
- + @for($i = 0; $i < 10 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++) - + @endfor @@ -72,7 +82,7 @@
-
+

Aktiviteter

@@ -81,7 +91,7 @@
Nyeste brugereNyeste brugere
{{ ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)) . ' ' . ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)) }}
- + @if(\App\Event::query()->orderBy("date", "asc")->first() == null) @@ -92,7 +102,7 @@ @if(\App\Event::query()->orderBy("date", "asc")->first() !== null)
-
Næste aktivitetNæste aktivitet
+
@@ -107,7 +117,7 @@
{{ \App\Event::query()->orderBy("date", "asc")->first()->name }}
-
+
@@ -123,7 +133,7 @@
-
+

Vejledninger

@@ -132,11 +142,11 @@
{!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->description, 0, 300) )!!}
- + @if(count(\App\Guide::all()) > 0) @for($i = 0; $i < 10 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++) - + @endfor @@ -149,7 +159,7 @@
-
+

Menuplan

@@ -158,23 +168,25 @@
Seneste VejledningerSeneste Vejledninger
{{ ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)) }}
- + @if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null) {{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}} - - + + - - + + - - + + - - + + + + @else diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index f7674e2..2fc02e2 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -3,7 +3,7 @@ @yield("title") - + @if(auth()->user()->can('menuplan.create'))
@@ -17,7 +22,7 @@
@endif -
Ugens MenuplanUgens Menuplan
{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}
{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}
{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}
{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}
Der er ingen menuplan for denne uge
+
diff --git a/skolehjem/resources/views/admin/news/index.blade.php b/skolehjem/resources/views/admin/news/index.blade.php index 688b85b..e6675fe 100644 --- a/skolehjem/resources/views/admin/news/index.blade.php +++ b/skolehjem/resources/views/admin/news/index.blade.php @@ -10,12 +10,17 @@ @endsection @section("content") + @if(auth()->user()->can('news.create'))
CreateOpret Nyheder
@endif -
Uge Print
+
diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index 1568f97..1ea7035 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -10,12 +10,17 @@ @endsection @section("content") +
@if(auth()->user()->can('roles.create')) CreateOpret Rolle @endif
-
Navn Udløbsdato
+
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index a7ace07..aa9b8a8 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -44,6 +44,10 @@ cursor: not-allowed; } + .letterSpaceTable{ + letter-spacing: 1.2px; + } + td >
@@ -51,12 +55,12 @@ CreateOpret Bruger @endif
-
Navn Beskrivelse
+
- - + + @if(auth()->user()->can('user.edit')) diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index 277d8b7..e8f92d1 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -10,6 +10,11 @@ @endsection @section("content") +
@if(auth()->user()->can('washing.machine.create')) CreateOpret Vaskemaskine @@ -28,7 +33,7 @@
-
Fornavn EfternavnEmailTlf nrMailTelefon Rolle(r) ShowImage
+
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index f8abade..c6adf75 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -13,7 +13,12 @@ -
Navn Lokation
+ +
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 8a7ccaa..dc00241 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -5,9 +5,10 @@ + - - @if(request()->cookie("mode") == "dark") + +@if(request()->cookie("mode") == "dark") @else @@ -27,7 +28,7 @@ @else @endif -
Lokation Vaskemaskine