diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index a5160c8..2227e89 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,11 +1,19 @@
-
+
sqlite.xerial
true
org.sqlite.JDBC
jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite
+
+
+ file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/license.txt
+
+
+ file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/sqlite-jdbc-3.31.1.jar
+
+
\ No newline at end of file
diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index d737725..9a89fe6 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -44,10 +44,7 @@ class MenuPlanController extends Controller
"monday" => "required|max:255",
"tuesday" => "required|max:255",
"wednesday" => "required|max:255",
- "thursday" => "required|max:255",
- "friday" => "required|max:255",
- "saturday" => "required|max:255",
- "sunday" => "required|max:255"
+ "thursday" => "required|max:255"
]);
$menuPlans = new MenuPlan($requestMenuPlanCreate);
diff --git a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
index d3a43d4..254328c 100644
--- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
+++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
@@ -19,9 +19,6 @@ class CreateMenuPlans extends Migration
$table->string('tuesday', 255);
$table->string('wednesday', 255);
$table->string('thursday', 255);
-// $table->string('friday', 255);
-// $table->string('saturday', 255);
-// $table->string('sunday', 255);
$table->timestamps();
//$table->text('description');
});
diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css
index 01da997..67294f5 100644
--- a/skolehjem/public/css/admin.css
+++ b/skolehjem/public/css/admin.css
@@ -57,7 +57,8 @@ form {
display: inline-flex;
}
-input {
+input,
+select {
border: grey solid 2px;
border-radius: 4px;
background-color: transparent;
@@ -473,6 +474,16 @@ a {
display: block !important;
}
+.nostyle {
+ margin: 0 !important;
+ padding: 0 !important;
+ border: 0 !important;
+ outline: 0 !important;
+ font-size: 100% !important;
+ vertical-align: baseline !important;
+ background: transparent !important;
+}
+
/*!
* Font Awesome Free 5.13.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css
index e9ec7da..4e077df 100644
--- a/skolehjem/public/css/webapp.css
+++ b/skolehjem/public/css/webapp.css
@@ -57,7 +57,8 @@ form {
display: inline-flex;
}
-input {
+input,
+select {
border: grey solid 2px;
border-radius: 4px;
background-color: transparent;
@@ -473,6 +474,16 @@ a {
display: block !important;
}
+.nostyle {
+ margin: 0 !important;
+ padding: 0 !important;
+ border: 0 !important;
+ outline: 0 !important;
+ font-size: 100% !important;
+ vertical-align: baseline !important;
+ background: transparent !important;
+}
+
/*!
* Font Awesome Free 5.13.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
@@ -6752,7 +6763,7 @@ main {
@media (min-width: 410px) {
.calendar-table__header .calendar-table__col {
- width: 54px;
+ width: 47.5px;
}
}
diff --git a/skolehjem/resources/sass/app/forms/_forms.scss b/skolehjem/resources/sass/app/forms/_forms.scss
index 0cc3185..15a89a7 100644
--- a/skolehjem/resources/sass/app/forms/_forms.scss
+++ b/skolehjem/resources/sass/app/forms/_forms.scss
@@ -37,7 +37,7 @@ form {
display: inline-flex;
}
-input{
+input, select{
border: grey solid 2px;
border-radius: 4px;
background-color: transparent;
diff --git a/skolehjem/resources/sass/app/general/_hide.scss b/skolehjem/resources/sass/app/general/_hide.scss
index 9abbdf7..57c36e4 100644
--- a/skolehjem/resources/sass/app/general/_hide.scss
+++ b/skolehjem/resources/sass/app/general/_hide.scss
@@ -1,3 +1,13 @@
.hide {
display: block !important;
}
+
+.nostyle {
+ margin: 0 !important;
+ padding: 0 !important;
+ border: 0 !important;
+ outline: 0 !important;
+ font-size: 100% !important;
+ vertical-align: baseline !important;
+ background: transparent !important;
+}
diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss
index 02677db..dcde956 100644
--- a/skolehjem/resources/sass/webapp/_default.scss
+++ b/skolehjem/resources/sass/webapp/_default.scss
@@ -296,7 +296,7 @@ $primary-color: $blue;
}
@include mq(410) {
- width: 54px;
+ width: 47.5px;
}
}
}
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index 36b034a..f990b7a 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -26,7 +26,13 @@
{{ $contact->email }} |
{{ $contact->phone }} |
$contact ]) }}"> }}) |
- $contact ]) }}"> }}) |
+
+ |
@endforeach
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index f9a4753..8a6c273 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -24,12 +24,13 @@
{{ $event->description }} |
{{ $event->date }} |
$event ]) }}"> }}) |
-
+ |
@endforeach
diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php
index 630486b..e9f726b 100644
--- a/skolehjem/resources/views/admin/external-links/index.blade.php
+++ b/skolehjem/resources/views/admin/external-links/index.blade.php
@@ -22,12 +22,13 @@
{{$link->name}} |
{{$link->link}} |
$link ]) }}"> }}) |
-
+ |
@endforeach
diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php
index 5acdd7c..1ddbfbb 100644
--- a/skolehjem/resources/views/admin/menuplans/index.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/index.blade.php
@@ -26,7 +26,13 @@
{{$menuplan->wednesday}} |
{{$menuplan->thursday}} |
$menuplan ]) }}"> }}) |
- $menuplan ]) }}"> }}) |
+ $menuplan ]) }}" class="w-100 nostyle">
+ @csrf
+ @method("delete")
+
+
+
+ |
@endforeach
diff --git a/skolehjem/resources/views/admin/menuplans/store.blade.php b/skolehjem/resources/views/admin/menuplans/store.blade.php
index b562eab..e21a474 100644
--- a/skolehjem/resources/views/admin/menuplans/store.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/store.blade.php
@@ -2,13 +2,13 @@
@extends("admin.layout.header")
@section("title")
- Vaskemaskiner - Opret
+ Menuplan - Opret
@endsection
@section("path")
- Opret Vaskemaskiner /
+ Opret Menuplan /
@endsection
@section("content")
- Vaskemaskinen blev (ikke) oprettet.
+ Menuplanen blev (ikke) oprettet.
@endsection
diff --git a/skolehjem/resources/views/admin/staff/index.blade.php b/skolehjem/resources/views/admin/staff/index.blade.php
index f7a55b3..52c333d 100644
--- a/skolehjem/resources/views/admin/staff/index.blade.php
+++ b/skolehjem/resources/views/admin/staff/index.blade.php
@@ -21,12 +21,18 @@
@foreach($staffs as $staff)
- {{ $staff->name_first }} |
- {{ $staff->name_last }} |
- {{ $staff->email }} |
- {{ $staff->phone }} |
- $staff->id ]) }}"> }}) |
- $staff->id ]) }}"> }}) |
+ {{ $staff->name_first }} |
+ {{ $staff->name_last }} |
+ {{ $staff->email }} |
+ {{ $staff->phone }} |
+ $staff->id ]) }}"> }}) |
+ $staff->id ]) }}" class="w-100 nostyle">
+ @csrf
+ @method("delete")
+
+
+
+ |
@endforeach
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 427d2cd..8ebac49 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -25,6 +25,12 @@
+
+
@endsection
diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php
index 8cbe6ad..502e8cd 100644
--- a/skolehjem/resources/views/admin/users/edit.blade.php
+++ b/skolehjem/resources/views/admin/users/edit.blade.php
@@ -15,17 +15,23 @@
@csrf
@method("put")
-
+
-
+
-
+
-
+
-
+
-
+
+
+
@endsection
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index 3b2713b..d40a09c 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -16,25 +16,26 @@
Efternavn |
Email |
Tlf nr |
+ Rolle |
 }}) |
 }}) |
@foreach($users as $user)
-
+
{{ $user->name_first }} |
{{ $user->name_last }} |
{{ $user->email }} |
{{ $user->phone }} |
+ {{ $user->roles }} |
$user->id ]) }}"> }}) |
-
- $user ]) }}" class="w-100">
+ $user ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
-
+
|
- |
+
@endforeach
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
index 2d204c0..7818ca2 100644
--- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
@@ -21,12 +21,18 @@
@foreach($reservations as $reservation)
- {Fornavn} |
- {Efternavn} |
- {Tlf Nr} |
- {Vaskemaskine Nr.} |
-  }}) |
-  }}) |
+ {Fornavn} |
+ {Efternavn} |
+ {Tlf Nr} |
+ {Vaskemaskine Nr.} |
+  }}) |
+
+ @csrf
+ @method("delete")
+
+
+
+ |
@endforeach