diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php
index 204cbf9..b0bb6bc 100644
--- a/skolehjem/app/Http/Controllers/ContactController.php
+++ b/skolehjem/app/Http/Controllers/ContactController.php
@@ -145,8 +145,8 @@ class ContactController extends Controller
"
Titel ".
"E-mail ".
"Tlf ".
- " ".
- " ".
+ " ".
+ " ".
"";
diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 08dd555..bbfb2af 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -244,9 +244,9 @@ class EventController extends Controller
"Event Navn ".
"Event Ansvarlig ".
"Event Dato ".
- " ".
- " ".
- " ".
+ " ".
+ " ".
+ " ".
"";
$events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%')
->orWhere('date','LIKE', $request->search.'%')
diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php
index 6fbedac..ded3ca6 100644
--- a/skolehjem/app/Http/Controllers/FeedbackController.php
+++ b/skolehjem/app/Http/Controllers/FeedbackController.php
@@ -133,8 +133,9 @@ class FeedbackController extends Controller
public function search(Request $request){
if($request->ajax()){
$output = "".
+ "Dato ".
"Feedback Besked ".
- "Ris el. Ros ".
+ "Ris el. Ros ".
" ".
" ";
@@ -149,6 +150,7 @@ class FeedbackController extends Controller
if(count($feedbacks) !== 0){
foreach ($feedbacks as $key => $feedback){
$output.=''.
+ '' . date('d-m-Y', strtotime($feedback->created_at)) . ' '.
'' . $feedback->message . ' '.
'' . $feedback->suggestion_form . ' '.
' ";
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index c566f53..63fef18 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -10,6 +10,9 @@
@endsection
@section("content")
+
Opret Aktivitet
@@ -29,20 +32,22 @@
@foreach($events as $event)
-
- {{ $event->name }}
- {{ $event->accountable }}
- {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}
- $event ]) }}">
- $event ]) }}">
-
+
+
+ @endif
@endforeach
diff --git a/skolehjem/resources/views/admin/events/signups.blade.php b/skolehjem/resources/views/admin/events/signups.blade.php
index 3bf7443..53a77ae 100644
--- a/skolehjem/resources/views/admin/events/signups.blade.php
+++ b/skolehjem/resources/views/admin/events/signups.blade.php
@@ -10,15 +10,7 @@
@endsection
@section("content")
-
-
-
- @csrf
-
-
-
-
-
+
Tilmeldtes Fornavn
Tilmeldtes Efternavn
diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php
index 9eb667d..34e32f8 100644
--- a/skolehjem/resources/views/admin/feedbacks/index.blade.php
+++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php
@@ -20,6 +20,12 @@
Ris
Ros
+
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 49e291b..b34963c 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -77,80 +77,91 @@
@if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "locations.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index")
+
@else
@if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index")
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index b8af390..16db481 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -32,7 +32,7 @@
Rolle
-
+
diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php
index 2bd79a1..fdab4ff 100644
--- a/skolehjem/resources/views/app/about/index.blade.php
+++ b/skolehjem/resources/views/app/about/index.blade.php
@@ -12,9 +12,9 @@
Denne app er udviklet til Odense erhvervskollegie.
{{__("msg.programmedby")}}:
Anders Rasmussen, anders164a@gmail.com
- Frederik Milling Pytlick, frederikpyt@gmail.com
- Vedran Zelen, vedr0021@gmail.com
- Victor Neerholt, victorneerholt@gmail.com
- Sebastian Davaris, seba4928@edu.sde.dk
+ Frederik Milling Pytlick,frederikpyt@gmail.com
+ Vedran Zelen,vedr0021@gmail.com
+ Victor Neerholt,victorneerholt@gmail.com
+ Sebastian Davaris,seba4928@edu.sde.dk
@endsection