From a4ff9a359015876c2f100afadcd895aa555656c5 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 07:45:58 +0200 Subject: [PATCH 1/7] Fixed calender CSS --- .idea/dataSources.xml | 10 +++++++++- skolehjem/public/css/webapp.css | 2 +- skolehjem/resources/sass/webapp/_default.scss | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) 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/public/css/webapp.css b/skolehjem/public/css/webapp.css index e9ec7da..c953bde 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -6752,7 +6752,7 @@ main { @media (min-width: 410px) { .calendar-table__header .calendar-table__col { - width: 54px; + width: 47.5px; } } 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; } } } From c803d1229910821b721c84ef93a1a7079b48b438 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 08:03:42 +0200 Subject: [PATCH 2/7] Frontend support for role selection in user create, read and update. --- skolehjem/public/css/admin.css | 3 ++- skolehjem/public/css/webapp.css | 3 ++- skolehjem/resources/sass/app/forms/_forms.scss | 2 +- .../views/admin/users/create.blade.php | 6 ++++++ .../resources/views/admin/users/edit.blade.php | 18 ++++++++++++------ .../views/admin/users/index.blade.php | 6 ++++-- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index 01da997..366494f 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; diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index c953bde..9ce5e9d 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; 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/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 a6e15d1..7aae5c8 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -16,18 +16,20 @@ Efternavn Email Tlf nr + Rolle Update Delete @foreach($users as $user) - + {{ $user->name_first }} {{ $user->name_last }} {{ $user->email }} {{ $user->phone }} + {{ $user->roles }} $user->id ]) }}">Update $user ]) }}">Delete - + @endforeach From c732d8eec0a18cfa3bfb35a625d04bad1fb15a9c Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 30 Jun 2020 08:21:36 +0200 Subject: [PATCH 3/7] Fixed menuplan create --- skolehjem/app/Http/Controllers/MenuPlanController.php | 5 +---- .../migrations/2020_06_23_070657_create_menu_plans.php | 3 --- skolehjem/resources/views/admin/menuplans/store.blade.php | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) 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 9506908..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/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 From 2562c69c364cc6b982d2c62cbd9448b393eed639 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 08:23:07 +0200 Subject: [PATCH 4/7] Fixed delete on indexes --- skolehjem/public/css/admin.css | 10 ++++++++++ skolehjem/public/css/webapp.css | 10 ++++++++++ .../resources/sass/app/general/_hide.scss | 10 ++++++++++ .../views/admin/contacts/index.blade.php | 8 +++++++- .../views/admin/events/index.blade.php | 7 ++++--- .../views/admin/external-links/index.blade.php | 7 ++++--- .../views/admin/menuplans/index.blade.php | 8 +++++++- .../views/admin/staff/index.blade.php | 18 ++++++++++++------ .../views/admin/users/index.blade.php | 8 +++++++- .../admin/washing-reservations/index.blade.php | 18 ++++++++++++------ 10 files changed, 83 insertions(+), 21 deletions(-) diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index 366494f..67294f5 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -474,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 9ce5e9d..4e077df 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -474,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/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/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 ]) }}">Update - $contact ]) }}">Delete +
$contact ]) }}" class="w-100 nostyle"> + @csrf + @method("delete") + + +
+ @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 ]) }}">Update -
$event ]) }}" class="w-100"> + $event ]) }}" class="w-100 nostyle"> @csrf @method("delete") - -
+ + + @endforeach diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index 413a55f..88be850 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 ]) }}">Update -
$link ]) }}" class="w-100"> + $link ]) }}" class="w-100 nostyle"> @csrf @method("delete") - -
+ + + @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 ]) }}">Update - $menuplan ]) }}">Delete +
$menuplan ]) }}" class="w-100 nostyle"> + @csrf + @method("delete") + + +
+ @endforeach 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 ]) }}">Update - $staff->id ]) }}">Delete + {{ $staff->name_first }} + {{ $staff->name_last }} + {{ $staff->email }} + {{ $staff->phone }} + $staff->id ]) }}">Update +
$staff->id ]) }}" class="w-100 nostyle"> + @csrf + @method("delete") + + +
+ @endforeach diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 7aae5c8..d40a09c 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -28,7 +28,13 @@ {{ $user->phone }} {{ $user->roles }} $user->id ]) }}">Update - $user ]) }}">Delete +
$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.} - Update - Delete + {Fornavn} + {Efternavn} + {Tlf Nr} + {Vaskemaskine Nr.} + Update +
+ @csrf + @method("delete") + + +
+ @endforeach From d93fff517afa026b28eaeed5ca04e55d54654b75 Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 30 Jun 2020 08:35:40 +0200 Subject: [PATCH 5/7] Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel) --- skolehjem/app/Feedbacks.php | 4 +++- skolehjem/app/Http/Controllers/FeedbackController.php | 10 +++++----- .../resources/views/app/feedbacks/index.blade.php | 9 +++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/skolehjem/app/Feedbacks.php b/skolehjem/app/Feedbacks.php index cdd8531..3233639 100644 --- a/skolehjem/app/Feedbacks.php +++ b/skolehjem/app/Feedbacks.php @@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model; class Feedbacks extends Model { - // + protected $fillable = [ + 'message', "suggestion_form" + ]; } diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index f920349..ff763f5 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -41,14 +41,14 @@ class FeedbackController extends Controller public function store(Request $request) { $requestBody = $request->validate([ - "name" => "required|max:255", - "link" => "required|max:255" + "message" => "required", + "suggestion_form" => "required|max:255" ]); - $feedback = new Feedbacks($requestBody); - $feedback->save(); + $feedbacks = new Feedbacks($requestBody); + $feedbacks->save(); - return Response::detect("feedback.store"); + return Response::detect("root.index"); } /** diff --git a/skolehjem/resources/views/app/feedbacks/index.blade.php b/skolehjem/resources/views/app/feedbacks/index.blade.php index 9bb2e5e..1555346 100644 --- a/skolehjem/resources/views/app/feedbacks/index.blade.php +++ b/skolehjem/resources/views/app/feedbacks/index.blade.php @@ -6,14 +6,15 @@ @section("content")
-
+ + @csrf Ris el. Ros? - - - + +
@endsection From 223ba6dc410bcd3c77f55ad0ae8f19b7228cd8a0 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 08:48:51 +0200 Subject: [PATCH 6/7] Created files for gallery --- skolehjem/app/Album.php | 10 ++++++++++ skolehjem/app/Http/Controllers/AlbumController.php | 10 ++++++++++ skolehjem/app/Http/Controllers/ImageController.php | 10 ++++++++++ skolehjem/app/Http/Controllers/VideoController.php | 10 ++++++++++ skolehjem/app/Image.php | 10 ++++++++++ skolehjem/app/Video.php | 10 ++++++++++ 6 files changed, 60 insertions(+) create mode 100644 skolehjem/app/Album.php create mode 100644 skolehjem/app/Http/Controllers/AlbumController.php create mode 100644 skolehjem/app/Http/Controllers/ImageController.php create mode 100644 skolehjem/app/Http/Controllers/VideoController.php create mode 100644 skolehjem/app/Image.php create mode 100644 skolehjem/app/Video.php diff --git a/skolehjem/app/Album.php b/skolehjem/app/Album.php new file mode 100644 index 0000000..e8571ed --- /dev/null +++ b/skolehjem/app/Album.php @@ -0,0 +1,10 @@ + Date: Tue, 30 Jun 2020 08:50:04 +0200 Subject: [PATCH 7/7] Made gallery, video, album, migrations --- ...2020_06_30_064605_create_gallery_album.php | 31 +++++++++++++++++++ ...2020_06_30_064640_create_gallery_video.php | 31 +++++++++++++++++++ ...2020_06_30_064737_create_gallery_image.php | 31 +++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php create mode 100644 skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php create mode 100644 skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php diff --git a/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php b/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php new file mode 100644 index 0000000..64ef7bb --- /dev/null +++ b/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('gallery_album'); + } +} diff --git a/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php b/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php new file mode 100644 index 0000000..47e1419 --- /dev/null +++ b/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('gallery_video'); + } +} diff --git a/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php b/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php new file mode 100644 index 0000000..ad0d012 --- /dev/null +++ b/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('gallery_image'); + } +}