Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

.idea/encodings.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/backpack-hvid.svg" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/eye-dark.svg" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/print-hvid.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/users-hvid.svg" charset="UTF-8" />
   </component>
 </project>

skolehjem/app/Http/Controllers/EventController.php

@@ -73,7 +73,7 @@ class EventController extends Controller
         $allEvents = Event::query()->where('name', '=', $request->name)->get();
 
         if(count($allEvents) > 0) {
-            return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
+            return redirect()->route("events.index", ['events' => $event]);
         } else {
             if($request->file("resource")) {
                 $event->resource_id = ResourceController::store($request)->id;
@@ -171,7 +171,7 @@ class EventController extends Controller
         $allEvents = Event::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
 
         if(count($allEvents) > 0){
-            return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
+            return redirect()->route("events.index", ['events' => $event]);
         }else{
             $event->update($data);
             $event->save();
@@ -321,6 +321,13 @@ class EventController extends Controller
         }
     }
 
+    public function nameCheckUpdate(Request $request){
+        $event = Event::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($event) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
 }
 
 

skolehjem/app/Http/Controllers/GuideController.php

@@ -199,12 +199,19 @@ class GuideController extends Controller
 
 
 
-    public function nameCheck(Request $request){
+    public function nameCheck(Request $request) {
         $guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->get();
         if(count($guide) > 0 && $request->nameCheck !== NULL){
             return 1;
         }
     }
 
+    public function nameCheckUpdate(Request $request) {
+        $guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($guide) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
 
 }

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -69,7 +69,7 @@ class MenuPlanController extends Controller
         $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->get();
 
         if(count($allMenuPlans) > 0)
-            return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
+            return redirect()->route("menu-plans.index");
         else {
             $menuPlan->save();
             $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
@@ -134,7 +134,7 @@ class MenuPlanController extends Controller
         $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->where('id', '!=', $id)->get();
 
         if(count($allMenuPlans) > 0){
-            return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
+            return redirect()->route("menu-plans.index");
         }else{
             $menuplan->update($data);
             $menuplan->save();
@@ -180,8 +180,6 @@ class MenuPlanController extends Controller
      */
     public function genPDF($Id){
         $menuPlan = MenuPlan::query()->where("id", "=", $Id)->first();
-        //$images = App\Resource::query()->where("id", '=', $menuPlan->resource_id)->first();
-        //$imagesSize = getimagesize($images->filename);
         $pdf = \Illuminate\Support\Facades\App::make('dompdf.wrapper');
         $data = '<html style="padding: 0; margin: 0; width: 100%; height: 100%;">'.
                     '<head style="padding: 0; margin: 0; width: 100%; height: 100%;">
@@ -207,8 +205,6 @@ class MenuPlanController extends Controller
 
     }
 
-
-
     public function nameCheck(Request $request){
         $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->get();
         if(count($menuplan) > 0 && $request->nameCheck !== NULL){
@@ -216,4 +212,11 @@ class MenuPlanController extends Controller
         }
     }
 
+    public function nameCheckUpdate(Request $request){
+        $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($menuplan) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
 }

skolehjem/app/Http/Controllers/NewsController.php

@@ -154,7 +154,6 @@ class NewsController extends Controller
         return redirect()->route("news.index");
     }
 
-
     public function nameCheck(Request $request){
         $news = News::query()->where('subname', 'LIKE',$request->nameCheck)->get();
         if(count($news) > 0 && $request->nameCheck !== NULL){
@@ -162,4 +161,10 @@ class NewsController extends Controller
         }
     }
 
+    public function nameCheckUpdate(Request $request){
+        $news = News::query()->where('subname', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($news) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
 }

skolehjem/app/Http/Controllers/RolesController.php

@@ -63,7 +63,7 @@ class rolesController extends Controller
 
         // If there already is a role with that name, then don't create
         if(count($allRoles) > 0)
-            return redirect()->route("roles.store")->with('RoleNameExists', '<p><b>Der findes allerede en rolle med det navn!</b></p>');
+            return redirect()->route("roles.store");
         else { // Else - Create it
             $role->save();
             $roles = Role::query()->paginate($request->input("limit", 20));
@@ -111,7 +111,7 @@ class rolesController extends Controller
         $allRoles = Role::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
 
         if(count($allRoles) > 0){
-            return redirect()->route("roles.index", [ "role" => $role ])->with('RoleNameExists', '<p><b>Der findes allerede en rolle med det navn!</b></p>');
+            return redirect()->route("roles.index", [ "role" => $role ]);
         }else{
             $role->update($data);
             $role->save();
@@ -172,7 +172,6 @@ class rolesController extends Controller
         }
     }
 
-
     public function nameCheck(Request $request){
         $roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->get();
         if(count($roles) > 0 && $request->nameCheck !== NULL){
@@ -180,5 +179,10 @@ class rolesController extends Controller
         }
     }
 
-
+    public function nameCheckUpdate(Request $request){
+        $roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($roles) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
 }

skolehjem/public/images/icons/users-hvid.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 fill="#fff" viewBox="0 0 490.667 490.667" style="enable-background:new 0 0 490.667 490.667;" xml:space="preserve">
+<g>
+	<g>
+		<circle cx="245.333" cy="160" r="74.667"/>
+	</g>
+</g>
+<g>
+	<g>
+		<circle cx="394.667" cy="224" r="53.333"/>
+	</g>
+</g>
+<g>
+	<g>
+		<circle cx="97.515" cy="224" r="53.333"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M245.333,256c-76.459,0-138.667,62.208-138.667,138.667c0,5.888,4.779,10.667,10.667,10.667h256
+			c5.888,0,10.667-4.779,10.667-10.667C384,318.208,321.792,256,245.333,256z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M115.904,300.971c-6.528-1.387-13.163-2.304-19.904-2.304c-52.928,0-96,43.072-96,96c0,5.888,4.779,10.667,10.667,10.667
+			h76.629c-1.195-3.349-1.963-6.912-1.963-10.667C85.333,359.659,96.768,327.339,115.904,300.971z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M394.667,298.667c-6.741,0-13.376,0.917-19.904,2.304c19.136,26.368,30.571,58.688,30.571,93.696
+			c0,3.755-0.768,7.317-1.963,10.667H480c5.888,0,10.667-4.779,10.667-10.667C490.667,341.739,447.595,298.667,394.667,298.667z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

skolehjem/public/images/icons/users.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 490.667 490.667" style="enable-background:new 0 0 490.667 490.667;" xml:space="preserve">
+<g>
+	<g>
+		<circle cx="245.333" cy="160" r="74.667"/>
+	</g>
+</g>
+<g>
+	<g>
+		<circle cx="394.667" cy="224" r="53.333"/>
+	</g>
+</g>
+<g>
+	<g>
+		<circle cx="97.515" cy="224" r="53.333"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M245.333,256c-76.459,0-138.667,62.208-138.667,138.667c0,5.888,4.779,10.667,10.667,10.667h256
+			c5.888,0,10.667-4.779,10.667-10.667C384,318.208,321.792,256,245.333,256z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M115.904,300.971c-6.528-1.387-13.163-2.304-19.904-2.304c-52.928,0-96,43.072-96,96c0,5.888,4.779,10.667,10.667,10.667
+			h76.629c-1.195-3.349-1.963-6.912-1.963-10.667C85.333,359.659,96.768,327.339,115.904,300.971z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M394.667,298.667c-6.741,0-13.376,0.917-19.904,2.304c19.136,26.368,30.571,58.688,30.571,93.696
+			c0,3.755-0.768,7.317-1.963,10.667H480c5.888,0,10.667-4.779,10.667-10.667C490.667,341.739,447.595,298.667,394.667,298.667z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

skolehjem/resources/lang/dk/msg.php

@@ -39,6 +39,8 @@ return[
     "bookingliste" => "Booking Liste",
     "ugestor" => "Uge",
     "maskiner" => "Vaskemaskiner",
+    "fjern" => "Fjern",
+    "tid" => "Tid",
     "tilgængeligetider" => "Tilgængelige tider",
     "reserver" => "Reserver",
     "rediger" => "Rediger",

skolehjem/resources/views/admin/events/edit.blade.php

@@ -27,8 +27,9 @@
     <form method="post" action="{{route("events.update", ["event" => $event])}}">
         @csrf
         @method("PUT")
-        <label for="event_title">Event Titel:</label>
+        <label for="name">Event Titel:</label>
-        <input value="{{$event->name}}" type="text" name="name" id="event_title" required>
+        <label hidden id="error" for="errormesseages">Dette Event navn findes allerede</label>
+        <input value="{{$event->name}}" type="text" name="name" id="name" required>
         <label for="accountable">Event Ansvarlig:</label>
         <input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
         <label for="description">Beskrivelse</label>
@@ -42,7 +43,7 @@
                     <span class="toggle__text">Opret som nyhed</span>
                 </span>
         </label>
-        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+        <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
 
     <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@@ -83,5 +84,57 @@
                 }
             );
         });
+
+        $(document).ready(function () {
+            $value = $('#name').val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('events.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id':{{$event->id}}},
+                success:function (data) {
+                    console.log(data);
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        });
+
+        $('#name').on('keyup', function () {
+            $value = $(this).val();
+            console.log($value);
+            $.ajax({
+                type: 'get',
+                url: '{{route('events.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id':{{$event->id}}},
+                success:function (data) {
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        })
     </script>
 @endsection

skolehjem/resources/views/admin/events/index.blade.php

@@ -18,7 +18,6 @@
             <input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input>
         </form>
     </div>
-    {!! session()->get('EventNameExists') !!}
 
     <table class="tbl mt-2">
         <tr>

skolehjem/resources/views/admin/guides/edit.blade.php

@@ -28,6 +28,7 @@
         @csrf
         @method("PUT")
         <label for="title">Navn</label>
+        <label hidden id="error" for="errormesseages">Navn findes allerede</label>
         <input value="{{$guide->name}}" type="text" name="name" id="title" required>
         <label for="editor">Vejledning</label>
         <div id="editor">{!! $guide->guide_articles !!}</div>
@@ -38,7 +39,7 @@
                     <span class="toggle__text">Opret som nyhed</span>
                 </span>
         </label>
-        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+        <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
 
     <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@@ -79,5 +80,57 @@
                 }
             );
         });
+
+        $(document).ready(function () {
+            $value = $('#title').val();
+            console.log($value);
+            $.ajax({
+                type: 'get',
+                url: '{{route('guides.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id':{{$guide->id}}},
+                success:function (data) {
+                    console.log(data);
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        });
+
+        $('#title').on('keyup', function () {
+            $value = $(this).val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('guides.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id':{{$guide->id}}},
+                success:function (data) {
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        })
     </script>
 @endsection

skolehjem/resources/views/admin/index.blade.php

@@ -6,5 +6,155 @@
 @endsection
 
 @section("content")
+    <style>
+        .card {
+            min-width: 200px;
+            width: calc(25% - 16px);
+            margin: 0 8px 0 8px;
+        }
+        .content {
+            display: flex;
+            flex-wrap: wrap;
+            flex-direction: row;
+        }
+        .card > .head {
+            padding: 0 8px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: calc(100% - 16px);
+            min-height: 170px;
+        }
+        .mr-2 {
+            margin-right: 1rem;
+        }
 
+        h3 {
+            margin-top: 0;
+        }
+
+        .event_card > .header {
+            padding-top: 1rem;
+        }
+
+        .ql-align-center {
+            text-align: center;
+        }
+
+        .ql-align-center > strong {
+            color: lightseagreen;
+            margin: auto;
+        }
+    </style>
+
+    {{-- Brugere --}}
+    <div class="card">
+        <div class="head" style="background-color: orange;">
+            <div>
+                <img style="width: 4rem;" src="{{ asset("/images/icons/users-hvid.svg") }}" alt="">
+                <h1 class="text-white">Brugere</h1>
+            </div>
+            <h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\User::all()) }}</h1>
+        </div>
+        <table class="tbl mt-1">
+            <tr>
+                <th class="text-white text-center" style="background-color: orange;">Nyeste brugere</th>
+            </tr>
+            @for($i = 0; $i < 5 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++)
+                <tr>
+                    <td>{{ ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)) . ' ' . ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)) }}</td>
+                </tr>
+            @endfor
+        </table>
+    </div>
+
+    {{-- Aktiviteter --}}
+    <div class="card">
+        <div class="head" style="background-color: red;">
+            <div>
+                <img style="margin-top: 8px;width: 3rem;" src="{{ asset("/images/icons/Aktiviteter.svg") }}" alt="">
+                <h1 class="text-white">Aktiviteter</h1>
+            </div>
+            <h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\Event::all()) }}</h1>
+        </div>
+        <table class="tbl mt-1">
+            <tr>
+                <th class="text-white text-center" style="background-color: red;">Næste aktivitet</th>
+            </tr>
+        </table>
+        @if(\App\Event::query()->orderByDesc("date")->first() !== null)
+            <div class="event_card">
+                @if(\App\Event::query()->orderByDesc("date")->first()->resource_id !== null)
+                    <div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", \App\Event::query()->orderByDesc("date")->first()->resource_id)->first()->filename) }}');">
+                        <h3 style="text-shadow: 2px 2px 2px #00788A;" class="text-white text-center">{{ \App\Event::query()->orderByDesc("date")->first()->name }}</h3>
+                        <p style="text-shadow: 2px 2px 2px #00788A"; class="text-white text-center mt-0">{{__('msg.af')}}: {{ \App\Event::query()->orderByDesc("date")->first()->accountable }}</p>
+                        <p style="text-shadow: 2px 2px 2px #00788A"; class="text-white text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderByDesc("date")->first()->date))->format('d/m/Y \k\l\. H:i') }}</p>
+                    </div>
+                @else
+                    <div class="header">
+                        <h3>{{ \App\Event::query()->orderByDesc("date")->first()->name }}</h3>
+                        <p class="text-center mt-0">Af: {{ \App\Event::query()->orderByDesc("date")->first()->accountable }}</p>
+                        <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderByDesc("date")->first()->date))->format('d/m/Y \k\l\. H:i') }}</p>
+                    </div>
+                @endif
+
+                <div class="container" style="margin-top: 8px;">
+                    {!! \App\Helpers::closetags(substr(\App\Event::query()->orderByDesc("date")->first()->description, 0, 300) )!!}
+                    <input type="hidden" name="event_id" value="{{ \App\Event::query()->orderByDesc("date")->first()->id }}">
+                    <div class="row" style="justify-content: space-between; margin-top: 16px;">
+                        <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => \App\Event::query()->orderByDesc("date")->first()->id ])}}">{{__('msg.sedeltagere')}}</a>
+                    </div>
+                </div>
+            </div>
+        @else
+            <p style="padding: 0 4px">Der er ingen aktiviteter</p>
+        @endif
+    </div>
+
+    <div class="card">
+        <div class="head" style="background-color: deepskyblue;">
+            <div>
+                <img style="width: 4rem;" src="{{ asset("/images/icons/Vejledninger.svg") }}" alt="">
+                <h1 class="text-white">Vejledninger</h1>
+            </div>
+            <h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\Guide::all()) }}</h1>
+        </div>
+        <table class="tbl mt-1">
+            <tr>
+                <th class="text-white text-center" style="background-color: deepskyblue;">Seneste Vejledninger</th>
+            </tr>
+            @if(count(\App\Guide::all()) > 0)
+                @for($i = 0; $i < 5 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++)
+                    <tr>
+                        <td>{{ ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)) }}</td>
+                    </tr>
+                @endfor
+            @else
+                <tr>
+                    <td class="text-center">Der er ingen vejledninger</td>
+                </tr>
+            @endif
+        </table>
+    </div>
+
+    <div class="card">
+        <div class="head" style="background-color: lightseagreen;">
+            <div>
+                <img style="width: 4rem;" src="{{ asset("/images/icons/Menuplan.svg") }}" alt="">
+                <h1 class="text-white">Menuplan</h1>
+            </div>
+            <h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\MenuPlan::all()) }}</h1>
+        </div>
+        <table class="tbl mt-1">
+            <tr>
+                <th class="text-white text-center" style="background-color: lightseagreen;">Ugens Menuplan</th>
+            </tr>
+        </table>
+            @if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
+                {!! \App\MenuPlan::query()->where("week", "=", date('W'))->first()->menu !!}
+            @else
+                <p class="text-center">Der er ingen menuplan for denne uge</p>
+            @endif
+
+    </div>
 @endsection

skolehjem/resources/views/admin/layout/header.blade.php

@@ -1,6 +1,6 @@
 @section("header")
     <header class="row align-items-center" style="background-color: #00788a;">
-        <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
+        <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" style="cursor: pointer;" onclick="window.location.href = '{{ route("root.index") }}';" class="brand" alt="Syddansk Erhvervsskole">
 
         @auth
             <a href="{{ route("users.account") }}" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>

skolehjem/resources/views/admin/menuplans/create.blade.php

@@ -108,9 +108,6 @@
         }
         change();
 
-
-
-
         //Dont delete me, if the user reloads the pages with text in the text-box this code runs.
         $(document).ready(function () {
             $value = $('#week').val();
@@ -162,8 +159,6 @@
                 }
             });
         })
-
-
     </script>
 @endsection
 

skolehjem/resources/views/admin/menuplans/edit.blade.php

@@ -28,6 +28,7 @@
         @csrf
         @method("PUT")
         <label for="mandag">Uge:</label>
+        <label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
         <input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required>
         <div id="editor">{!! $menuplan->menu !!}</div>
         <textarea name="menu" class="d-none" id="hiddenArea"></textarea>
@@ -37,7 +38,7 @@
                     <span class="toggle__text">Opret som nyhed</span>
                 </span>
         </label>
-        <input type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
+        <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
     </form>
 
     <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@@ -78,5 +79,57 @@
                 }
             );
         });
+
+        //Dont delete me, if the user reloads the pages with text in the text-box this code runs.
+        $(document).ready(function () {
+            $value = $('#week').val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('menuplans.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id':{{$menuplan->id}}},
+                success:function (data) {
+                    console.log(data);
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        });
+
+        $('#week').on('keyup', function () {
+            $value = $(this).val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('menuplans.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id':{{$menuplan->id}}},
+                success:function (data) {
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        })
     </script>
 @endsection

skolehjem/resources/views/admin/menuplans/index.blade.php

@@ -14,7 +14,6 @@
     <div class="row align-items-center">
         <a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('menu-plans.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
     </div>
-    {!! session()->get('WeekExists') !!}
 
     <table class="tbl mt-2">
         <tr>
@@ -26,7 +25,7 @@
         @foreach($menuPlans as $menuplan)
         <tr>
             <td>{{$menuplan->week}}</td>
-            <td><a href="{{ route("pdf.genPDF", [ "menuPlan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
+            <td><a href="{{ route("pdf.genPDF", [ "menuPlan" => $menuplan ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
             <td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
             <td><form method="post" action="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}" class="w-100 nostyle">
                     @csrf

skolehjem/resources/views/admin/news/create.blade.php

@@ -67,7 +67,6 @@
             );
         });
 
-
         //Dont delete me, if the user reloads the pages with text in the text-box this code runs.
         $(document).ready(function () {
             $value = $('#title').val();
@@ -119,7 +118,5 @@
                 }
             });
         })
-
-
     </script>
 @endsection

skolehjem/resources/views/admin/news/edit.blade.php

@@ -21,10 +21,11 @@
         @csrf
         @method("PUT")
         <label for="title">Navn</label>
-        <input value="{{$news->name}}" type="text" name="subname" id="title" required>
+        <label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
+        <input value="{{$news->subname}}" type="text" name="subname" id="title" required>
         <div id="editor">{!! $news->content !!}</div>
         <textarea name="content" class="d-none" id="hiddenArea"></textarea>
-        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+        <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
 
     <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@@ -65,5 +66,57 @@
                 }
             );
         });
+
+        //Dont delete me, if the user reloads the pages with text in the text-box this code runs.
+        $(document).ready(function () {
+            $value = $('#title').val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('news.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id': {{$news->id}}},
+                success:function (data) {
+                    console.log(data);
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        });
+
+        $('#title').on('keyup', function () {
+            $value = $(this).val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('news.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id': {{$news->id}}},
+                success:function (data) {
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        })
     </script>
 @endsection

skolehjem/resources/views/admin/roles/create.blade.php

@@ -14,7 +14,7 @@
     <form method="post" action="{{ route("roles.store") }}">
         @csrf
         <label for="name">Navn:</label>
-        <label hidden id="error" for="errormesseages">Role navnet findes allerede</label>
+        <label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
             <input type="text" name="name" id="name" placeholder="Admin" required>
         <label for="name">Beskrivelse:</label>
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
@@ -32,8 +32,6 @@
             );
         });
 
-
-
         $(document).ready(function () {
             $value = $('#name').val();
             $.ajax({
@@ -83,6 +81,5 @@
                 }
             });
         })
-
     </script>
 @endsection

skolehjem/resources/views/admin/roles/edit.blade.php

@@ -15,10 +15,11 @@
         @csrf
         @method("put")
         <label for="name">Navn:</label>
+        <label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
             <input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
         <label for="name">Beskrivelse:</label>
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
-        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+        <input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger">
     </form>
 @endsection
 @section("scripts")
@@ -31,5 +32,55 @@
                 }
             );
         });
+
+        $(document).ready(function () {
+            $value = $('#name').val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('roles.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id': {{$role->id}}},
+                success:function (data) {
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        });
+
+        $('#name').on('keyup', function () {
+            $value = $(this).val();
+            $.ajax({
+                type: 'get',
+                url: '{{route('roles.nameCheckUpdate')}}',
+                data: {'nameCheck':$value, 'id': {{$role->id}}},
+                success:function (data) {
+                    if(data){
+                        $("#error").show(100);
+                        $("#error").css('color', 'red');
+                        $("#disable").prop('disabled', true);
+                        $('#disable').css('cursor','not-allowed');
+                    }else{
+                        $("#error").hide();
+                        $("#disable").prop('disabled', false);
+                        $('#disable').css('cursor','pointer');
+                    }
+
+                },
+                error:function (data) {
+                    console.log(data);
+                }
+            });
+        })
     </script>
 @endsection

skolehjem/resources/views/admin/roles/index.blade.php

@@ -18,7 +18,6 @@
             <input type="text" class="form-controller" id="search" name="search"  placeholder="Søg efter navn"></input>
         </form>
     </div>
-    {!! session()->get('RoleNameExists') !!}
 
     <table class="tbl mt-2">
         <tr>

skolehjem/resources/views/app/menuplans/index.blade.php

@@ -12,8 +12,12 @@
             @foreach($menuPlans as $menuplan)
                 @if($menuplan->week == $Week)
                     <h1 class="text-center sde-blue mb-0">{{ __('msg.menuplan') }}</h1>
+                    @if(request()->cookie("mode") !== "dark")
                         <span class="text-center sde-black-80 bold">{{ __('msg.ugestor') }}: {{$menuplan->week}}</span>
-                    <div class="col w-100 mt-auto">
+                    @else
+                        <span class="text-center text-white bold">{{ __('msg.ugestor') }}: {{$menuplan->week}}</span>
+                    @endif
+                    <div class="col w-100 mt-1">
                         {!! $menuplan->menu !!}
                     </div>
                 @endif

skolehjem/routes/web.php

@@ -55,7 +55,7 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode")
 //Convert to PDF
 Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id");
 
-//Check name adminpanle
+//Check name adminpanel
 Route::get("/eventCheck", "EventController@nameCheck")->name("events.nameCheck");
 Route::get("/roleCheck", "RolesController@nameCheck")->name("roles.nameCheck");
 Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck");
@@ -66,6 +66,13 @@ Route::get("/locationsCheck", "LocationController@nameCheck")->name("locations.n
 Route::get("/washingCheck", "WashingMachineController@nameCheck")->name("washing-machines.nameCheck");
 
 
+//Check name update adminpanel
+Route::get("/eventCheckUpdate", "EventController@nameCheckUpdate")->name("events.nameCheckUpdate");
+Route::get("/roleCheckUpdate", "RolesController@nameCheckUpdate")->name("roles.nameCheckUpdate");
+Route::get("/guidesCheckUpdate", "GuideController@nameCheckUpdate")->name("guides.nameCheckUpdate");
+Route::get("/newsCheckUpdate", "NewsController@nameCheckUpdate")->name("news.nameCheckUpdate");
+Route::get("/menuplanCheckUpdate", "MenuPlanController@nameCheckUpdate")->name("menuplans.nameCheckUpdate");
+
 
 
 Route::resource("contacts", "ContactController");