From c6282b77d1cfd4520986c9432b6c13fbd1ec587d Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 26 Jun 2020 12:20:20 +0200 Subject: [PATCH 01/42] Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations --- .../views/admin/washing-reservations/create.blade.php | 4 ++-- .../views/admin/washing-reservations/delete.blade.php | 4 ++-- .../views/admin/washing-reservations/edit.blade.php | 4 ++-- .../views/admin/washing-reservations/index.blade.php | 4 ++-- .../views/admin/washing-reservations/show.blade.php | 4 ++-- .../views/admin/washing-reservations/store.blade.php | 6 +++--- .../views/admin/washing-reservations/update.blade.php | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/skolehjem/resources/views/admin/washing-reservations/create.blade.php b/skolehjem/resources/views/admin/washing-reservations/create.blade.php index 5460e31..01d38ad 100644 --- a/skolehjem/resources/views/admin/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/create.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Booking - Opret + Vaske Reservationer - Opret @endsection @section("path") - Opret Booking / + Opret Vaske Reservationer / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/washing-reservations/delete.blade.php b/skolehjem/resources/views/admin/washing-reservations/delete.blade.php index faf2283..1fdbf71 100644 --- a/skolehjem/resources/views/admin/washing-reservations/delete.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/delete.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Booking - Fjern + Vaske Reservationer - Fjern @endsection @section("path") - Fjern Booking / + Fjern Vaske Reservationer / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/washing-reservations/edit.blade.php b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php index 036dbf0..66e0edb 100644 --- a/skolehjem/resources/views/admin/washing-reservations/edit.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Booking - Rediger + Vaske Reservationer - Rediger @endsection @section("path") - Rediger Booking / + Rediger Vaske Reservationer / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 251ea53..88c4d5a 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Booking - Vis + Vaske Reservationer - Vis @endsection @section("path") - Vis Booking / + Vis Vaske Reservationer / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/washing-reservations/show.blade.php b/skolehjem/resources/views/admin/washing-reservations/show.blade.php index 9971c49..a77b6b7 100644 --- a/skolehjem/resources/views/admin/washing-reservations/show.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/show.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Booking - Vis + Vaske Reservationer - Vis @endsection @section("path") - Vis Booking / + Vis Vaske Reservationer / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/washing-reservations/store.blade.php b/skolehjem/resources/views/admin/washing-reservations/store.blade.php index 616c3e8..85ed1d7 100644 --- a/skolehjem/resources/views/admin/washing-reservations/store.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/store.blade.php @@ -2,13 +2,13 @@ @extends("admin.layout.header") @section("title") - Booking - Opret + Vaske Reservationer - Opret @endsection @section("path") - Opret Booking / + Opret Vaske Reservationer / @endsection @section("content") - Booking blev (ikke) oprettet. + Vaske Reservationer blev (ikke) oprettet. @endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/update.blade.php b/skolehjem/resources/views/admin/washing-reservations/update.blade.php index 9dd8408..f890995 100644 --- a/skolehjem/resources/views/admin/washing-reservations/update.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/update.blade.php @@ -2,13 +2,13 @@ @extends("admin.layout.header") @section("title") - Booking - Rediger + Vaske Reservationer - Rediger @endsection @section("path") - Rediger Booking / + Rediger Vaske Reservationer / @endsection @section("content") - Din booking blev (ikke) redigeret. + Din Vaske Reservationer blev (ikke) redigeret. @endsection From b555af06c7eb94daf87cdb0965ff0f5aca33a1f0 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 10:30:09 +0200 Subject: [PATCH 02/42] Lavet contact create controller --- skolehjem/app/Contact.php | 4 +++- .../app/Http/Controllers/ContactController.php | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Contact.php b/skolehjem/app/Contact.php index c035b2a..5570122 100644 --- a/skolehjem/app/Contact.php +++ b/skolehjem/app/Contact.php @@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model; class Contact extends Model { - // + protected $fillable = [ + 'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday" + ]; } diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 63eea17..5da67c6 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -28,7 +28,8 @@ class ContactController extends Controller */ public function create() { - // + return Response::detect("contacts.create"); + } /** @@ -39,7 +40,15 @@ class ContactController extends Controller */ public function store(Request $request) { - // + $requestContact = $request->validate([ + "idk kev" => "required|max:255", + + ]); + + $contact = new MenuPlan($requestContact); + $contact->save(); + + return Response::detect("contacts.store"); } /** From 488995ca37792456072e32f246736df639656fe3 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 10:31:24 +0200 Subject: [PATCH 03/42] Contact frontend --- .../views/admin/contact/create.blade.php | 26 +++++++++++++++ .../views/admin/contact/index.blade.php | 33 +++++++++++++++++++ .../views/admin/layout/base.blade.php | 3 ++ 3 files changed, 62 insertions(+) create mode 100644 skolehjem/resources/views/admin/contact/create.blade.php create mode 100644 skolehjem/resources/views/admin/contact/index.blade.php diff --git a/skolehjem/resources/views/admin/contact/create.blade.php b/skolehjem/resources/views/admin/contact/create.blade.php new file mode 100644 index 0000000..9e95044 --- /dev/null +++ b/skolehjem/resources/views/admin/contact/create.blade.php @@ -0,0 +1,26 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Kontakter - Opret +@endsection + +@section("path") + Opret Kontakt / +@endsection + +@section("content") +

Opret Kontakt:

+
+ @csrf + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/contact/index.blade.php b/skolehjem/resources/views/admin/contact/index.blade.php new file mode 100644 index 0000000..da92e7e --- /dev/null +++ b/skolehjem/resources/views/admin/contact/index.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Events - Vis +@endsection + +@section("path") + Vis Kontakter / +@endsection + +@section("content") + + + + + + + + + + @foreach($contacts as $contact) + + + + + + + + + @endforeach +
Kontakt NavnTitelE-mailTlfUpdateDelete
{{ $contact->name }}{{ $contact->title }}{{ $contact->email }}{{ $contact->phone }}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 0706b73..c5eecc5 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -45,6 +45,9 @@
ReadVis Kontakter
+
+ CreateOpret Kontakt +
From bb307df506b16a5689049d4f3224d0107aee06a9 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 10:37:37 +0200 Subject: [PATCH 04/42] ikd kev --- skolehjem/app/Contact.php | 2 +- skolehjem/app/Http/Controllers/ContactController.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Contact.php b/skolehjem/app/Contact.php index 5570122..74d306b 100644 --- a/skolehjem/app/Contact.php +++ b/skolehjem/app/Contact.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Contact extends Model { protected $fillable = [ - 'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday" + 'name_first', "name_last", 'email', 'tel' ]; } diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 5da67c6..c899c69 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -28,7 +28,7 @@ class ContactController extends Controller */ public function create() { - return Response::detect("contacts.create"); + return Response::detect("contact.create"); } @@ -41,8 +41,10 @@ class ContactController extends Controller public function store(Request $request) { $requestContact = $request->validate([ - "idk kev" => "required|max:255", - + "name_first" => "required|max:255", + "name_last" => "required|max:255", + "email" => "required|max:255", + "tel" => "required|max:255", ]); $contact = new MenuPlan($requestContact); From 86bf8cbc6ed79fd1d9ebcc4d8bc7437b9a3d0816 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 10:37:42 +0200 Subject: [PATCH 05/42] Contact frontend --- skolehjem/resources/views/admin/layout/base.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index c5eecc5..2b9b9b6 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -43,10 +43,10 @@

Kontakter

- ReadVis Kontakter + ReadVis Kontakter
- CreateOpret Kontakt + CreateOpret Kontakt
From e8f13d81ec653ca301b5e06413b12ac38abdd0dd Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 10:40:34 +0200 Subject: [PATCH 06/42] Contact frontend --- .../views/admin/{contact => contacts}/create.blade.php | 0 .../views/admin/{contact => contacts}/index.blade.php | 0 skolehjem/resources/views/admin/layout/base.blade.php | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename skolehjem/resources/views/admin/{contact => contacts}/create.blade.php (100%) rename skolehjem/resources/views/admin/{contact => contacts}/index.blade.php (100%) diff --git a/skolehjem/resources/views/admin/contact/create.blade.php b/skolehjem/resources/views/admin/contacts/create.blade.php similarity index 100% rename from skolehjem/resources/views/admin/contact/create.blade.php rename to skolehjem/resources/views/admin/contacts/create.blade.php diff --git a/skolehjem/resources/views/admin/contact/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php similarity index 100% rename from skolehjem/resources/views/admin/contact/index.blade.php rename to skolehjem/resources/views/admin/contacts/index.blade.php diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 2b9b9b6..c5eecc5 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -43,10 +43,10 @@

Kontakter

- ReadVis Kontakter + ReadVis Kontakter
- CreateOpret Kontakt + CreateOpret Kontakt
From f952ad33aa996c8722505bc9f5469a397e1b6fb4 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 10:41:27 +0200 Subject: [PATCH 07/42] Added s til controller --- skolehjem/app/Http/Controllers/ContactController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index c899c69..399a899 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -18,7 +18,7 @@ class ContactController extends Controller $contact = Contact::query()->paginate($request->input("limit", 20)); - return Response::detect("contact.index", [ "contact" => $contact]); + return Response::detect("contacts.index", [ "contact" => $contact]); } /** @@ -28,7 +28,7 @@ class ContactController extends Controller */ public function create() { - return Response::detect("contact.create"); + return Response::detect("contacts.create"); } @@ -47,7 +47,7 @@ class ContactController extends Controller "tel" => "required|max:255", ]); - $contact = new MenuPlan($requestContact); + $contact = new Contact($requestContact); $contact->save(); return Response::detect("contacts.store"); From 246ae2235d52e0d3664f1bb45431f7f3ed889591 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 10:46:28 +0200 Subject: [PATCH 08/42] =?UTF-8?q?Removed=20Fredag-S=C3=B8ndag=20on=20menup?= =?UTF-8?q?lan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skolehjem/resources/views/admin/menuplans/create.blade.php | 6 ------ skolehjem/resources/views/admin/menuplans/edit.blade.php | 6 ------ skolehjem/resources/views/admin/menuplans/index.blade.php | 6 ------ skolehjem/resources/views/admin/menuplans/show.blade.php | 6 ------ 4 files changed, 24 deletions(-) diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index fab76ef..04c6ef5 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -21,12 +21,6 @@ - - - - - - diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 97cf74b..a8a8cc3 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -22,12 +22,6 @@ - - - - - - diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index c42d8e0..e165a9b 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -16,9 +16,6 @@ Tirsdag Onsdag Torsdag - Fredag - Lørdag - Søndag Update Delete @@ -28,9 +25,6 @@ {{$menuplan->tuesday}} {{$menuplan->wednesday}} {{$menuplan->thursday}} - {{$menuplan->friday}} - {{$menuplan->saturday}} - {{$menuplan->sunday}} $menuplan ]) }}">Update
$menuplan ]) }}" class="w-100"> diff --git a/skolehjem/resources/views/admin/menuplans/show.blade.php b/skolehjem/resources/views/admin/menuplans/show.blade.php index 5a8b198..fb7f9ab 100644 --- a/skolehjem/resources/views/admin/menuplans/show.blade.php +++ b/skolehjem/resources/views/admin/menuplans/show.blade.php @@ -16,9 +16,6 @@ Tirsdag Onsdag Torsdag - Fredag - Lørdag - Søndag Update Delete @@ -27,9 +24,6 @@ {Tirsdag} {Onsdag} {Torsdag} - {Fredag} - {Lørdag} - {Søndag} Update Delete From 0f93f4ca979e294c86ae979db615fc22bb46b091 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 10:50:04 +0200 Subject: [PATCH 09/42] Fixes --- .../views/admin/menuplans/create.blade.php | 14 +++++------ .../admin/washing-machines/create.blade.php | 23 +------------------ 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index fab76ef..30f8f0d 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -14,19 +14,19 @@ @csrf - + - + - + - + - + - + - + diff --git a/skolehjem/resources/views/admin/washing-machines/create.blade.php b/skolehjem/resources/views/admin/washing-machines/create.blade.php index b8915bb..c81e7c9 100644 --- a/skolehjem/resources/views/admin/washing-machines/create.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/create.blade.php @@ -14,28 +14,7 @@
@csrf - +
- -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{--
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
--}} @endsection From 469c21645acaf819a0135f56c74e92d64933d82d Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 10:56:53 +0200 Subject: [PATCH 10/42] Added Event route in admins left navbar --- skolehjem/resources/views/admin/layout/base.blade.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index c5eecc5..e9ee9cb 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -28,6 +28,15 @@ CreateOpret Menuplan +
+

Aktiviteter

+
+ ReadVis Aktiviteter +
+
+ CreateOpret Aktivitet +
+

Vaskemaskiner

From 02faa63b98f609589d8ef8d11e9dcf3c6133bf0c Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 11:09:39 +0200 Subject: [PATCH 11/42] =?UTF-8?q?Removed=20Fredag-S=C3=B8ndag=20in=20menup?= =?UTF-8?q?lans?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/views/app/menuplans/index.blade.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php index cbd4249..f66d484 100644 --- a/skolehjem/resources/views/app/menuplans/index.blade.php +++ b/skolehjem/resources/views/app/menuplans/index.blade.php @@ -25,18 +25,6 @@

Torsdag

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

-
-

Fredag

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

-
-
-

Lørdag

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

-
-
-

Søndag

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

-
@endsection From ba7344004410088ae5676bbd3edc87071dc60c9d Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 11:14:07 +0200 Subject: [PATCH 12/42] =?UTF-8?q?Lavet=20s=C3=A5dan=20at=20man=20kan=20add?= =?UTF-8?q?e=20information=20til=20contacts=20databasen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skolehjem/app/Contact.php | 2 +- skolehjem/app/Http/Controllers/ContactController.php | 2 +- .../migrations/2020_06_29_065007_create_contact.php | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Contact.php b/skolehjem/app/Contact.php index 74d306b..353a325 100644 --- a/skolehjem/app/Contact.php +++ b/skolehjem/app/Contact.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Contact extends Model { protected $fillable = [ - 'name_first', "name_last", 'email', 'tel' + 'name_first', "name_last", 'email', 'phone' ]; } diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 399a899..96cae3e 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -44,7 +44,7 @@ class ContactController extends Controller "name_first" => "required|max:255", "name_last" => "required|max:255", "email" => "required|max:255", - "tel" => "required|max:255", + "phone" => "required|max:255", ]); $contact = new Contact($requestContact); diff --git a/skolehjem/database/migrations/2020_06_29_065007_create_contact.php b/skolehjem/database/migrations/2020_06_29_065007_create_contact.php index 01a3235..233c7e3 100644 --- a/skolehjem/database/migrations/2020_06_29_065007_create_contact.php +++ b/skolehjem/database/migrations/2020_06_29_065007_create_contact.php @@ -13,9 +13,14 @@ class CreateContact extends Migration */ public function up() { - Schema::create('contact', function (Blueprint $table) { + Schema::create('contacts', function (Blueprint $table) { $table->id(); $table->timestamps(); + $table->string('name_first', 255); + $table->string('name_last', 255); + $table->string('email', 255); + $table->integer('phone'); + //$table->unique('email'); }); } From b198f830c3a3983fe2f6664e0e0d554997f136be Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 11:34:21 +0200 Subject: [PATCH 13/42] Kontakt frontend --- .../views/admin/contacts/edit.blade.php | 27 +++++++++++++++++++ .../views/admin/contacts/store.blade.php | 14 ++++++++++ .../views/admin/contacts/update.blade.php | 14 ++++++++++ 3 files changed, 55 insertions(+) create mode 100644 skolehjem/resources/views/admin/contacts/edit.blade.php create mode 100644 skolehjem/resources/views/admin/contacts/store.blade.php create mode 100644 skolehjem/resources/views/admin/contacts/update.blade.php diff --git a/skolehjem/resources/views/admin/contacts/edit.blade.php b/skolehjem/resources/views/admin/contacts/edit.blade.php new file mode 100644 index 0000000..5167abf --- /dev/null +++ b/skolehjem/resources/views/admin/contacts/edit.blade.php @@ -0,0 +1,27 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Kontakt - Rediger +@endsection + +@section("path") + Rediger Kontakt / +@endsection + +@section("content") +

Rediger Kontakt:

+
$contact]) }}"> + @csrf + @method("put") + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/contacts/store.blade.php b/skolehjem/resources/views/admin/contacts/store.blade.php new file mode 100644 index 0000000..d6adde7 --- /dev/null +++ b/skolehjem/resources/views/admin/contacts/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Kontakter - Opret +@endsection + +@section("path") + Opbevar Kontakt / +@endsection + +@section("content") + Kontakten blev (ikke) oprettet. +@endsection diff --git a/skolehjem/resources/views/admin/contacts/update.blade.php b/skolehjem/resources/views/admin/contacts/update.blade.php new file mode 100644 index 0000000..b02c301 --- /dev/null +++ b/skolehjem/resources/views/admin/contacts/update.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Kontakt - Rediger +@endsection + +@section("path") + Rediger Bruger / +@endsection + +@section("content") + Kontakten blev (ikke) redigeret. +@endsection From ad0f61dd51bd21c655e83c3fc7d9c59fa1dca5e4 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 11:38:18 +0200 Subject: [PATCH 14/42] Kontakt frontend --- skolehjem/resources/views/admin/contacts/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index da92e7e..05353bf 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -21,8 +21,8 @@ @foreach($contacts as $contact) - {{ $contact->name }} - {{ $contact->title }} + {{ $contact->name_first }} + {{ $contact->name_last }} {{ $contact->email }} {{ $contact->phone }} Update From c86c067d07e6fb2e1ab6164c9b6345fbd74e02d6 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 11:39:00 +0200 Subject: [PATCH 15/42] added s to the end of contacts --- skolehjem/app/Http/Controllers/ContactController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 96cae3e..3e0213f 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -18,7 +18,7 @@ class ContactController extends Controller $contact = Contact::query()->paginate($request->input("limit", 20)); - return Response::detect("contacts.index", [ "contact" => $contact]); + return Response::detect("contacts.index", [ "contacts" => $contact]); } /** From 137c12cbeecebc022ee96ab2f65d3e8cdd889ab6 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 11:41:33 +0200 Subject: [PATCH 16/42] Kontakt frontend --- skolehjem/resources/views/admin/contacts/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 05353bf..f277ce0 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -25,8 +25,8 @@ {{ $contact->name_last }} {{ $contact->email }} {{ $contact->phone }} - Update - Delete + $contact ]) }}">Update + $contact ]) }}">Delete @endforeach From a0a6f1a9cbf4dc9d6c8c4fc291bf02157a2408ee Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 11:48:36 +0200 Subject: [PATCH 17/42] Laver edit, show, update,delete controller for contacts --- .../Http/Controllers/ContactController.php | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 3e0213f..6a64f05 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -61,7 +61,8 @@ class ContactController extends Controller */ public function show($id) { - // + return Response::detect("contacts.show", [ "contacts" => $id]); + } /** @@ -72,7 +73,8 @@ class ContactController extends Controller */ public function edit($id) { - // + $contacts = Contact::find($id); + return Response::detect("contacts.edit", ["contact" => $contacts]); } /** @@ -84,7 +86,15 @@ class ContactController extends Controller */ public function update(Request $request, $id) { - // + + $data = $request->all(); + //FORCED UPDATE + + $contact = Contact::find($id); + $contact->update($data); + $contact->save(); + + return Response::detect("contacts.update", [ "contact" => $contact ]); } /** @@ -95,6 +105,9 @@ class ContactController extends Controller */ public function destroy($id) { - // + + $contact = Contact::find($id); + $contact->delete(); + return redirect()->route("contacts.index"); } } From f5cdf848a37df3c8dd51d9cc2bec8efcfeb062df Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 11:57:11 +0200 Subject: [PATCH 18/42] Added Staff section and routing + some backend (That should be checked out) --- .../app/Http/Controllers/StaffController.php | 203 ++++++++++++++++++ skolehjem/app/Staff.php | 10 + .../views/admin/staff/create.blade.php | 30 +++ .../views/admin/staff/delete.blade.php | 13 ++ .../views/admin/staff/edit.blade.php | 31 +++ .../views/admin/staff/index.blade.php | 42 ++++ .../views/admin/staff/login.blade.php | 27 +++ .../views/admin/staff/logout.blade.php | 14 ++ .../views/admin/staff/show.blade.php | 14 ++ .../views/admin/staff/store.blade.php | 14 ++ .../views/admin/staff/update.blade.php | 14 ++ skolehjem/routes/web.php | 1 + 12 files changed, 413 insertions(+) create mode 100644 skolehjem/app/Http/Controllers/StaffController.php create mode 100644 skolehjem/app/Staff.php create mode 100644 skolehjem/resources/views/admin/staff/create.blade.php create mode 100644 skolehjem/resources/views/admin/staff/delete.blade.php create mode 100644 skolehjem/resources/views/admin/staff/edit.blade.php create mode 100644 skolehjem/resources/views/admin/staff/index.blade.php create mode 100644 skolehjem/resources/views/admin/staff/login.blade.php create mode 100644 skolehjem/resources/views/admin/staff/logout.blade.php create mode 100644 skolehjem/resources/views/admin/staff/show.blade.php create mode 100644 skolehjem/resources/views/admin/staff/store.blade.php create mode 100644 skolehjem/resources/views/admin/staff/update.blade.php diff --git a/skolehjem/app/Http/Controllers/StaffController.php b/skolehjem/app/Http/Controllers/StaffController.php new file mode 100644 index 0000000..38b2821 --- /dev/null +++ b/skolehjem/app/Http/Controllers/StaffController.php @@ -0,0 +1,203 @@ +middleware([ "auth" ])->only("logout"); +// $this->middleware([ "guest" ])->only("login"); +// +// $this->middleware([ "permission:user.list", "role:admin" ])->only("index"); +// $this->middleware([ "permission:user.show", "role:admin" ])->only("show"); +// $this->middleware([ "permission:user.edit", "role:admin" ])->only([ "edit", "update" ]); +// $this->middleware([ "permission:user.delete", "role:admin" ])->only("delete"); + } + + /** + * Display a listing of the resource. + * + * @param Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index(Request $request) + { + $staff = Staff::query()->paginate($request->query("page", 20)); + + return Response::detect("staff.index", [ "staff" => $staff ]); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function create() + { + return Response::detect("staff.create"); + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function store(Request $request) + { + Log::debug("STORE FUNCTION"); + + $data = $request->validate([ + "name_first" => "required|max:255", + "name_last" => "required|max:255", + "email" => "required|email|unique:users", + "password" => "required|max:60", + "phone" => "required|unique:users", + + ]); + + Log::debug("FINISHED VALIDATION?"); + + $staff = new Staff($data); + + Log::debug("CREATED USER [NOT PERSISTED YET]"); + + $staff->save(); + + Log::debug("SAVED STAFF"); + + return view("staff.store"); + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function show($id) + { + $staff = Staff::find($id); + + return Response::detect("staff.show", [ + "staff" => $staff + ]); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function edit($id) + { + $staff = Staff::find($id); + + return Response::detect("staff.edit", [ + "staff" => $staff + ]); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function update(Request $request, $id) + { + $data = $request->all(); + +// $data = $request->validate([ +// "name_first" => "max:255", +// "name_last" => "max:255", +// "email" => "email|unique:users", +// "password" => "max:60", +// "phone" => "unique:users", +// ]); + + // Validates if the user is updating itself or another user. +// if($id === Auth::id()) { +// $user = Auth::user(); +// +// $user->update($data); +// +// $user->save(); +// return Response::detect("users.edit", [ +// "user" => $user +// ]); +// } + + //TODO: Implement when security's ready!!! +// else if(Auth::user()->hasPermissionTo("user.edit")) { + $staff = Staff::find($id); + + /** @var Staff $staff */ + $staff->update($data); + + $staff->save(); +// } + + $staffs = Staff::query()->paginate(20); + + return Response::detect("users.index", [ + "staffs" => $staffs + ]); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function destroy($id) + { +// if($id === Auth::id()) { +// $user = Auth::user(); +// $user->delete(); +// } +// else if(Auth::user()->hasPermissionTo("user.delete")) { + $staff = Staff::find($id); + + $staff->delete(); +// } + + return redirect()->route("staff.index"); + } + + /*******************************************/ + /* Authentication */ + /*******************************************/ + + public function showLogin() { + return view("admin.staff.login"); + } + + public function login(Request $request) { + $data = $request->only("email", "password"); + + if(Auth::attempt($data)) { + //TODO: Implement home? + return redirect()->route("staff.index"); + } + + return redirect()->back(303); + } + + public function logout(Request $request) { + Auth::logout(); + + return redirect()->to("/"); + } +} diff --git a/skolehjem/app/Staff.php b/skolehjem/app/Staff.php new file mode 100644 index 0000000..23fc501 --- /dev/null +++ b/skolehjem/app/Staff.php @@ -0,0 +1,10 @@ +Opret Personal / +@endsection + +@section("content") +

Opret Personal:

+
+ @csrf + + + + + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/staff/delete.blade.php b/skolehjem/resources/views/admin/staff/delete.blade.php new file mode 100644 index 0000000..4c3f81e --- /dev/null +++ b/skolehjem/resources/views/admin/staff/delete.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Personal - Fjern +@endsection + +@section("path") + Fjern Personal / +@endsection + +@section("content") +@endsection diff --git a/skolehjem/resources/views/admin/staff/edit.blade.php b/skolehjem/resources/views/admin/staff/edit.blade.php new file mode 100644 index 0000000..fe8271d --- /dev/null +++ b/skolehjem/resources/views/admin/staff/edit.blade.php @@ -0,0 +1,31 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Personal - Rediger +@endsection + +@section("path") + Rediger Personal / +@endsection + +@section("content") +

Rediger Personal:

+
$staff]) }}"> + @csrf + @method("put") + + + + + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/staff/index.blade.php b/skolehjem/resources/views/admin/staff/index.blade.php new file mode 100644 index 0000000..e206090 --- /dev/null +++ b/skolehjem/resources/views/admin/staff/index.blade.php @@ -0,0 +1,42 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Personal - Vis +@endsection + +@section("path") + Vis Personal / +@endsection + +@section("content") + + + + + + + + + + @foreach($staffs as $staff) + + + + + + + + + @endforeach +
FornavnEfternavnEmailTlf nrUpdateDelete
{{ $staff->name_first }}{{ $staff->name_last }}{{ $staff->email }}{{ $staff->phone }} $staff->id ]) }}">Update +
$staff ]) }}" class="w-100"> + @csrf + @method("delete") + + +
+
+ + {{ $staff->links() }} +@endsection diff --git a/skolehjem/resources/views/admin/staff/login.blade.php b/skolehjem/resources/views/admin/staff/login.blade.php new file mode 100644 index 0000000..5accdac --- /dev/null +++ b/skolehjem/resources/views/admin/staff/login.blade.php @@ -0,0 +1,27 @@ +@extends("app.layout.base") + +@section("title") + Login +@endsection + +@section("content") +
+
+ Syddansk Erhvervsskole +
+
+ @csrf + + + + + +
+ Forgot password? +
+@endsection diff --git a/skolehjem/resources/views/admin/staff/logout.blade.php b/skolehjem/resources/views/admin/staff/logout.blade.php new file mode 100644 index 0000000..d364bbd --- /dev/null +++ b/skolehjem/resources/views/admin/staff/logout.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Home - Logud +@endsection + +@section("path") + Logud / +@endsection + +@section("content") + +@endsection diff --git a/skolehjem/resources/views/admin/staff/show.blade.php b/skolehjem/resources/views/admin/staff/show.blade.php new file mode 100644 index 0000000..5563064 --- /dev/null +++ b/skolehjem/resources/views/admin/staff/show.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Personal - Vis +@endsection + +@section("path") + Vis Personal / +@endsection + +@section("content") + show.blade.php +@endsection diff --git a/skolehjem/resources/views/admin/staff/store.blade.php b/skolehjem/resources/views/admin/staff/store.blade.php new file mode 100644 index 0000000..43ae210 --- /dev/null +++ b/skolehjem/resources/views/admin/staff/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Personal - Opret +@endsection + +@section("path") + Opret Personal / +@endsection + +@section("content") + Personal blev (ikke) oprettet. +@endsection diff --git a/skolehjem/resources/views/admin/staff/update.blade.php b/skolehjem/resources/views/admin/staff/update.blade.php new file mode 100644 index 0000000..7f7a25f --- /dev/null +++ b/skolehjem/resources/views/admin/staff/update.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Personal - Rediger +@endsection + +@section("path") + Rediger Personal / +@endsection + +@section("content") + Din Personal blev (ikke) redigeret. +@endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 260a3f8..ef7c2dd 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -29,6 +29,7 @@ Route::get("/logout", "UserController@logout")->name("users.logout"); Route::resource("contacts", "ContactController"); Route::resource("menu-plans", "MenuPlanController"); Route::resource("users", "UserController"); +Route::resource("staff", "StaffController"); Route::resource("events", "EventController"); Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-reservations", "WashingReservationController"); From 30b31e030970af9188e8b8bd7d692a9b9352aa48 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 12:20:09 +0200 Subject: [PATCH 19/42] Kontakt frontend --- .../views/admin/contacts/delete.blade.php | 14 ++++++++++++++ skolehjem/resources/views/app/root/index.blade.php | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 skolehjem/resources/views/admin/contacts/delete.blade.php diff --git a/skolehjem/resources/views/admin/contacts/delete.blade.php b/skolehjem/resources/views/admin/contacts/delete.blade.php new file mode 100644 index 0000000..b126821 --- /dev/null +++ b/skolehjem/resources/views/admin/contacts/delete.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Kontakter - Opret +@endsection + +@section("path") + Slet Kontakt / +@endsection + +@section("content") + Din kontakt blev slettet +@endsection diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index df2b1fe..1984f5d 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -21,11 +21,14 @@ {{--@extends("app.washing-reservations.index")--}} {{--Menuplan--}} -{{----}}@extends("app.menuplans.index") +{{--@extends("app.menuplans.index")--}} {{--Contact--}} {{--@extends("app.contact.index")--}} +{{--Account--}} +{{----}}@extends("app.users.index") + {{----}} {{------Admin Panel {{----}} From 3f5886223b3d963a29d32aa59ee774d78756059f Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 12:21:16 +0200 Subject: [PATCH 20/42] idk kev --- skolehjem/app/Http/Controllers/ContactController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 6a64f05..3792500 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -88,13 +88,11 @@ class ContactController extends Controller { $data = $request->all(); - //FORCED UPDATE - $contact = Contact::find($id); $contact->update($data); $contact->save(); - return Response::detect("contacts.update", [ "contact" => $contact ]); + return Response::detect("contacts.update", [ "contacts" => $contact ]); } /** From d37c0c63f63cd4a42bdb847460b62615505d471d Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 12:24:45 +0200 Subject: [PATCH 21/42] Kontakt frontend --- skolehjem/resources/views/admin/contacts/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index f277ce0..36b034a 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -26,7 +26,7 @@ {{ $contact->email }} {{ $contact->phone }} $contact ]) }}">Update - $contact ]) }}">Delete + $contact ]) }}">Delete @endforeach From 600bbe7746899d8ba08d770a456dac2abfd6ce42 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 12:29:23 +0200 Subject: [PATCH 22/42] Fixed routing and backend to staff section --- .../app/Http/Controllers/StaffController.php | 38 +++++++++---------- skolehjem/app/Staff.php | 37 +++++++++++++++++- .../views/admin/layout/base.blade.php | 9 +++++ .../views/admin/staff/index.blade.php | 6 +-- 4 files changed, 67 insertions(+), 23 deletions(-) diff --git a/skolehjem/app/Http/Controllers/StaffController.php b/skolehjem/app/Http/Controllers/StaffController.php index 38b2821..c5fbf78 100644 --- a/skolehjem/app/Http/Controllers/StaffController.php +++ b/skolehjem/app/Http/Controllers/StaffController.php @@ -16,10 +16,10 @@ class StaffController extends Controller // $this->middleware([ "auth" ])->only("logout"); // $this->middleware([ "guest" ])->only("login"); // -// $this->middleware([ "permission:user.list", "role:admin" ])->only("index"); -// $this->middleware([ "permission:user.show", "role:admin" ])->only("show"); -// $this->middleware([ "permission:user.edit", "role:admin" ])->only([ "edit", "update" ]); -// $this->middleware([ "permission:user.delete", "role:admin" ])->only("delete"); +// $this->middleware([ "permission:staff.list", "role:admin" ])->only("index"); +// $this->middleware([ "permission:staff.show", "role:admin" ])->only("show"); +// $this->middleware([ "permission:staff.edit", "role:admin" ])->only([ "edit", "update" ]); +// $this->middleware([ "permission:staff.delete", "role:admin" ])->only("delete"); } /** @@ -30,9 +30,9 @@ class StaffController extends Controller */ public function index(Request $request) { - $staff = Staff::query()->paginate($request->query("page", 20)); + $staffs = Staff::query()->paginate($request->query("page", 20)); - return Response::detect("staff.index", [ "staff" => $staff ]); + return Response::detect("staff.index", [ "staffs" => $staffs ]); } /** @@ -58,9 +58,9 @@ class StaffController extends Controller $data = $request->validate([ "name_first" => "required|max:255", "name_last" => "required|max:255", - "email" => "required|email|unique:users", + "email" => "required|email|unique:staff", "password" => "required|max:60", - "phone" => "required|unique:users", + "phone" => "required|unique:staff", ]); @@ -68,7 +68,7 @@ class StaffController extends Controller $staff = new Staff($data); - Log::debug("CREATED USER [NOT PERSISTED YET]"); + Log::debug("CREATED STAFF [NOT PERSISTED YET]"); $staff->save(); @@ -121,25 +121,25 @@ class StaffController extends Controller // $data = $request->validate([ // "name_first" => "max:255", // "name_last" => "max:255", -// "email" => "email|unique:users", +// "email" => "email|unique:staff", // "password" => "max:60", -// "phone" => "unique:users", +// "phone" => "unique:staff", // ]); - // Validates if the user is updating itself or another user. + // Validates if the staff is updating itself or another staff. // if($id === Auth::id()) { -// $user = Auth::user(); +// $staff = Auth::staff(); // -// $user->update($data); +// $staff->update($data); // -// $user->save(); -// return Response::detect("users.edit", [ -// "user" => $user +// $staff->save(); +// return Response::detect("staff.edit", [ +// "staff" => $staff // ]); // } //TODO: Implement when security's ready!!! -// else if(Auth::user()->hasPermissionTo("user.edit")) { +// else if(Auth::staff()->hasPermissionTo("staff.edit")) { $staff = Staff::find($id); /** @var Staff $staff */ @@ -150,7 +150,7 @@ class StaffController extends Controller $staffs = Staff::query()->paginate(20); - return Response::detect("users.index", [ + return Response::detect("staff.index", [ "staffs" => $staffs ]); } diff --git a/skolehjem/app/Staff.php b/skolehjem/app/Staff.php index 23fc501..841134d 100644 --- a/skolehjem/app/Staff.php +++ b/skolehjem/app/Staff.php @@ -3,8 +3,43 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Illuminate\Notifications\Notifiable; +use Illuminate\Support\Facades\Hash; +use Spatie\Permission\Traits\HasRoles; class Staff extends Model { - // + use Notifiable; + use HasRoles; + + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + 'name_first', "name_last", 'email', 'password', "phone" + ]; + + /** + * The attributes that should be hidden for arrays. + * + * @var array + */ + protected $hidden = [ + 'password', 'remember_token', + ]; + + /** + * The attributes that should be cast to native types. + * + * @var array + */ + protected $casts = [ + 'email_verified_at' => 'datetime', + ]; + + public function setPasswordAttribute($password) { + $this->attributes["password"] = Hash::make($password); + } } diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index e9ee9cb..e3398e2 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -58,6 +58,15 @@ CreateOpret Kontakt +
+

Personale

+
+ ReadVis Personale +
+
+ CreateOpret Personal +
+
diff --git a/skolehjem/resources/views/admin/staff/index.blade.php b/skolehjem/resources/views/admin/staff/index.blade.php index e206090..88f80ff 100644 --- a/skolehjem/resources/views/admin/staff/index.blade.php +++ b/skolehjem/resources/views/admin/staff/index.blade.php @@ -25,9 +25,9 @@ {{ $staff->name_last }} {{ $staff->email }} {{ $staff->phone }} - $staff->id ]) }}">Update + $staff->id ]) }}">Update -
$staff ]) }}" class="w-100"> + $staff ]) }}" class="w-100"> @csrf @method("delete") @@ -38,5 +38,5 @@ @endforeach - {{ $staff->links() }} + {{ $staffs->links() }} @endsection From 7d80b014c742df0d404f9851e9f41591ada750e3 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 12:32:34 +0200 Subject: [PATCH 23/42] Kontakt frontend --- skolehjem/resources/views/admin/contacts/update.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/contacts/update.blade.php b/skolehjem/resources/views/admin/contacts/update.blade.php index b02c301..5bcac64 100644 --- a/skolehjem/resources/views/admin/contacts/update.blade.php +++ b/skolehjem/resources/views/admin/contacts/update.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Bruger / + Rediger Bruger / @endsection @section("content") From 04ad9f6d1c2f9bdbc63964fdc871eb797782b192 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 12:35:24 +0200 Subject: [PATCH 24/42] Kontakt frontend --- skolehjem/resources/views/admin/contacts/update.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/contacts/update.blade.php b/skolehjem/resources/views/admin/contacts/update.blade.php index 5bcac64..f10aa0f 100644 --- a/skolehjem/resources/views/admin/contacts/update.blade.php +++ b/skolehjem/resources/views/admin/contacts/update.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Bruger / + $contact]) }}" class="text-white">Rediger Bruger / @endsection @section("content") From f61f67d0bc0c6660409759217ddcce5486ba1d35 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 12:36:07 +0200 Subject: [PATCH 25/42] slette s --- skolehjem/app/Http/Controllers/ContactController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 3792500..2fb0e54 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -73,8 +73,8 @@ class ContactController extends Controller */ public function edit($id) { - $contacts = Contact::find($id); - return Response::detect("contacts.edit", ["contact" => $contacts]); + $contact = Contact::find($id); + return Response::detect("contacts.edit", ["contact" => $contact]); } /** From 8047e33ad3fd13bd32b312511e2024a6b4264657 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 12:45:27 +0200 Subject: [PATCH 26/42] Kontakt frontend --- skolehjem/resources/views/admin/contacts/update.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/contacts/update.blade.php b/skolehjem/resources/views/admin/contacts/update.blade.php index f10aa0f..7543877 100644 --- a/skolehjem/resources/views/admin/contacts/update.blade.php +++ b/skolehjem/resources/views/admin/contacts/update.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - $contact]) }}" class="text-white">Rediger Bruger / + Rediger Bruger / @endsection @section("content") From f7786be6652b0e851c0fcb9251e460fe9e9c65de Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 12:56:08 +0200 Subject: [PATCH 27/42] Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php --- skolehjem/app/{Feedback.php => Feedbacks.php} | 2 +- .../Http/Controllers/FeedbackController.php | 14 +++++----- .../views/admin/feedbacks/index.blade.php | 27 +++++++++++++++++++ .../views/admin/layout/base.blade.php | 6 +++++ 4 files changed, 41 insertions(+), 8 deletions(-) rename skolehjem/app/{Feedback.php => Feedbacks.php} (71%) create mode 100644 skolehjem/resources/views/admin/feedbacks/index.blade.php diff --git a/skolehjem/app/Feedback.php b/skolehjem/app/Feedbacks.php similarity index 71% rename from skolehjem/app/Feedback.php rename to skolehjem/app/Feedbacks.php index dae03bd..cdd8531 100644 --- a/skolehjem/app/Feedback.php +++ b/skolehjem/app/Feedbacks.php @@ -4,7 +4,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; -class Feedback extends Model +class Feedbacks extends Model { // } diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 590e2f9..f920349 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use App\Feedback; +use App\Feedbacks; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -17,9 +17,9 @@ class FeedbackController extends Controller */ public function index(Request $request) { - $feedback = Feedback::query()->paginate($request->input("limit", 20)); + $feedback = Feedbacks::query()->paginate($request->input("limit", 20)); - return Response::detect("feedback.index", [ "feedback" => $feedback ]); + return Response::detect("feedbacks.index", [ "feedback" => $feedback ]); } /** @@ -45,7 +45,7 @@ class FeedbackController extends Controller "link" => "required|max:255" ]); - $feedback = new Feedback($requestBody); + $feedback = new Feedbacks($requestBody); $feedback->save(); return Response::detect("feedback.store"); @@ -70,7 +70,7 @@ class FeedbackController extends Controller */ public function edit($id) { - $feedback = Feedback::find($id); + $feedback = Feedbacks::find($id); return Response::detect("feedbacks.edit", [ "feedback" => $feedback @@ -90,7 +90,7 @@ class FeedbackController extends Controller "time" => "required" ]); - $feedback = Feedback::find($id); + $feedback = Feedbacks::find($id); $feedback->update($data); @@ -109,7 +109,7 @@ class FeedbackController extends Controller */ public function destroy($id) { - $feedback = Feedback::find($id); + $feedback = Feedbacks::find($id); $feedback->delete(); return Response::detect("feedbacks.destroy"); diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php new file mode 100644 index 0000000..3961ebb --- /dev/null +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -0,0 +1,27 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Feedback - Vis +@endsection + +@section("path") + Vis Feedback / +@endsection + +@section("content") + + + + + + @foreach($feedback as $fb) + + + + + @endforeach +
Feedback BeskedRis el. Ros
{{ $fb->message }}{{ $fb->suggestion_form }}
+ + {{ $feedback->links() }} +@endsection diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index e3398e2..bb2b8c3 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -67,6 +67,12 @@ CreateOpret Personal
+
+

Feedback

+
+ ReadVis Feedback +
+
From f16018cb15a8fc6e8ccb1445dbf9e4d842db7262 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 13:07:17 +0200 Subject: [PATCH 28/42] Kontakt frontend --- .../app/Http/Controllers/ContactController.php | 4 ++-- .../resources/views/admin/contacts/show.blade.php | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 skolehjem/resources/views/admin/contacts/show.blade.php diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 3792500..db33a3f 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -62,7 +62,6 @@ class ContactController extends Controller public function show($id) { return Response::detect("contacts.show", [ "contacts" => $id]); - } /** @@ -103,9 +102,10 @@ class ContactController extends Controller */ public function destroy($id) { - $contact = Contact::find($id); + $contact->delete(); + return redirect()->route("contacts.index"); } } diff --git a/skolehjem/resources/views/admin/contacts/show.blade.php b/skolehjem/resources/views/admin/contacts/show.blade.php new file mode 100644 index 0000000..08e64ab --- /dev/null +++ b/skolehjem/resources/views/admin/contacts/show.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Kontakter - Opret +@endsection + +@section("path") + Slet Kontakt / +@endsection + +@section("content") +@endsection From 08d5436f22b7123453f2bf0e8d03c8eb0f5d17d1 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 13:08:39 +0200 Subject: [PATCH 29/42] Fix delete controller --- skolehjem/app/Http/Controllers/ContactController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 2fb0e54..eb5c1f0 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -103,9 +103,7 @@ class ContactController extends Controller */ public function destroy($id) { - - $contact = Contact::find($id); - $contact->delete(); + $id->delete(); return redirect()->route("contacts.index"); } } From 42aa2b5c83e7204e5add17c755a24bda28427c80 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 13:18:39 +0200 Subject: [PATCH 30/42] Renamed contact to contacts in app --- .../resources/views/app/{contact => contacts}/index.blade.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename skolehjem/resources/views/app/{contact => contacts}/index.blade.php (100%) diff --git a/skolehjem/resources/views/app/contact/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php similarity index 100% rename from skolehjem/resources/views/app/contact/index.blade.php rename to skolehjem/resources/views/app/contacts/index.blade.php From c6ffa26baa9e84e69e9ed9f2be0e99120fd5440d Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 13:18:58 +0200 Subject: [PATCH 31/42] Fixes --- skolehjem/app/Http/Controllers/ContactController.php | 7 ++++--- skolehjem/resources/views/admin/contacts/index.blade.php | 2 +- .../resources/views/admin/menuplans/index.blade.php | 9 +-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index eb5c1f0..426f335 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -98,10 +98,11 @@ class ContactController extends Controller /** * Remove the specified resource from storage. * - * @param int $id - * @return \Illuminate\Http\Response + * @param int $id + * @return \Illuminate\Http\RedirectResponse + * @throws \Exception */ - public function destroy($id) + public function destroy(Contact $id) { $id->delete(); return redirect()->route("contacts.index"); diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 36b034a..f277ce0 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -26,7 +26,7 @@ {{ $contact->email }} {{ $contact->phone }} $contact ]) }}">Update - $contact ]) }}">Delete + $contact ]) }}">Delete @endforeach diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index e165a9b..5acdd7c 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -26,14 +26,7 @@ {{$menuplan->wednesday}} {{$menuplan->thursday}} $menuplan ]) }}">Update - - $menuplan ]) }}" class="w-100"> - @csrf - @method("delete") - - - - + $menuplan ]) }}">Delete @endforeach From db088ad9ba3b9d85952c327fa4245826a72610b9 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 13:20:48 +0200 Subject: [PATCH 32/42] Fix delete controller --- skolehjem/app/Http/Controllers/ContactController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index eb5c1f0..fd798de 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -101,7 +101,7 @@ class ContactController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy(Contact $id) { $id->delete(); return redirect()->route("contacts.index"); From b48907b523ad1ccbfd025133beb37261099c5928 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 13:27:48 +0200 Subject: [PATCH 33/42] Made staff migrate --- .../2020_06_29_112658_create_staff_table.php | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php diff --git a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php new file mode 100644 index 0000000..652e6d9 --- /dev/null +++ b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('staff'); + } +} From b942d8c1e1a93c63d5e5a42cd33202b547b57e79 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 13:29:19 +0200 Subject: [PATCH 34/42] Updated create_staff_table --- .../migrations/2020_06_29_112658_create_staff_table.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php index 652e6d9..0ad0194 100644 --- a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php +++ b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php @@ -15,6 +15,13 @@ class CreateStaffTable extends Migration { Schema::create('staff', function (Blueprint $table) { $table->id(); + $table->string('name_first'); + $table->string('name_last'); + $table->string('email')->unique(); + $table->timestamp('email_verified_at')->nullable(); + $table->string('password'); + $table->integer("phone")->unique(); + $table->rememberToken(); $table->timestamps(); }); } From 6441a8838a8669ebb17cc1c755c2190b7205b368 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 13:30:13 +0200 Subject: [PATCH 35/42] Added a new column to feedbacks --- .../database/migrations/2020_06_08_091617_create_feedbacks.php | 1 + 1 file changed, 1 insertion(+) diff --git a/skolehjem/database/migrations/2020_06_08_091617_create_feedbacks.php b/skolehjem/database/migrations/2020_06_08_091617_create_feedbacks.php index ea1a0b9..c5700fa 100644 --- a/skolehjem/database/migrations/2020_06_08_091617_create_feedbacks.php +++ b/skolehjem/database/migrations/2020_06_08_091617_create_feedbacks.php @@ -16,6 +16,7 @@ class CreateFeedbacks extends Migration Schema::create('feedbacks', function (Blueprint $table) { $table->id(); $table->string("message"); + $table->string("suggestion_form"); //Skriver om det er Ris el. Ros $table->timestamps(); }); } From 8df9869f281cd3a29f7243a221deb2aceb63cf73 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 13:36:51 +0200 Subject: [PATCH 36/42] remove , --- skolehjem/app/Http/Controllers/StaffController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/StaffController.php b/skolehjem/app/Http/Controllers/StaffController.php index c5fbf78..f09264f 100644 --- a/skolehjem/app/Http/Controllers/StaffController.php +++ b/skolehjem/app/Http/Controllers/StaffController.php @@ -60,7 +60,7 @@ class StaffController extends Controller "name_last" => "required|max:255", "email" => "required|email|unique:staff", "password" => "required|max:60", - "phone" => "required|unique:staff", + "phone" => "required|unique:staff" ]); From 5e624d75614688c1532aa4906fe37d2e2e16d789 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 13:38:05 +0200 Subject: [PATCH 37/42] Fixes --- skolehjem/resources/views/admin/staff/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/staff/edit.blade.php b/skolehjem/resources/views/admin/staff/edit.blade.php index fe8271d..aa0b337 100644 --- a/skolehjem/resources/views/admin/staff/edit.blade.php +++ b/skolehjem/resources/views/admin/staff/edit.blade.php @@ -19,7 +19,7 @@ - + From 357c046e440de15eb96d235c8c20b7590e4527fe Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 13:47:18 +0200 Subject: [PATCH 38/42] Fixes --- skolehjem/resources/views/admin/contacts/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index f277ce0..36b034a 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -26,7 +26,7 @@ {{ $contact->email }} {{ $contact->phone }} $contact ]) }}">Update - $contact ]) }}">Delete + $contact ]) }}">Delete @endforeach From 7fb492035468c6fce134c996974d7c48a40ecefc Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 13:55:47 +0200 Subject: [PATCH 39/42] Fixes --- skolehjem/app/Http/Controllers/UserController.php | 2 +- skolehjem/resources/views/admin/contacts/index.blade.php | 2 +- skolehjem/resources/views/admin/users/index.blade.php | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 5880e1d..78a6be3 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -75,7 +75,7 @@ class UserController extends Controller Log::debug("SAVED USER"); - return view("users.store"); + return Response::detect("users.store"); } /** diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 36b034a..0d1554f 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -26,7 +26,7 @@ {{ $contact->email }} {{ $contact->phone }} $contact ]) }}">Update - $contact ]) }}">Delete + $contact ]) }}">Delete @endforeach diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 00448d7..a6e15d1 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -26,14 +26,7 @@ {{ $user->email }} {{ $user->phone }} $user->id ]) }}">Update - -
$user ]) }}" class="w-100"> - @csrf - @method("delete") - - -
- + $user ]) }}">Delete @endforeach From b32a782b177159342bb43ca8f64da38355688e76 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 14:08:26 +0200 Subject: [PATCH 40/42] Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index --- .../views/app/contacts/index.blade.php | 3 +++ .../views/app/feedbacks/index.blade.php | 19 +++++++++++++++++++ .../resources/views/app/root/index.blade.php | 7 +++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 skolehjem/resources/views/app/feedbacks/index.blade.php diff --git a/skolehjem/resources/views/app/contacts/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php index daa8c1a..e61a011 100644 --- a/skolehjem/resources/views/app/contacts/index.blade.php +++ b/skolehjem/resources/views/app/contacts/index.blade.php @@ -44,5 +44,8 @@

Kollegieassistent

+45 24 62 94 50 Ring + + Send feedback omkring hvem el. hvad som helst + Giv Feedback @endsection diff --git a/skolehjem/resources/views/app/feedbacks/index.blade.php b/skolehjem/resources/views/app/feedbacks/index.blade.php new file mode 100644 index 0000000..9bb2e5e --- /dev/null +++ b/skolehjem/resources/views/app/feedbacks/index.blade.php @@ -0,0 +1,19 @@ +@extends("app.layout.base") + +@section("title") + Feedback - Ris/Ros +@endsection + +@section("content") +
+
+ Ris el. Ros? + + + +
+
+@endsection diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index 1984f5d..4ea4a76 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -3,7 +3,7 @@ {{----}} {{--Index--}} -{{--@extends("app.users.index")--}} +{{----}}@extends("app.users.index") {{--Login--}} {{--@extends("app.users.login")--}} @@ -27,7 +27,10 @@ {{--@extends("app.contact.index")--}} {{--Account--}} -{{----}}@extends("app.users.index") +{{--@extends("app.users.index")--}} + +{{--Feedback--}} +{{--@extends("app.feedbacks.index")--}} {{----}} {{------Admin Panel From e329f3f38372af0f7cbd5e55ec0e7f4a71511ade Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 14:11:15 +0200 Subject: [PATCH 41/42] Fixes --- skolehjem/public/css/admin.css | 4 ++++ skolehjem/resources/sass/admin/content/table.scss | 4 ++++ skolehjem/resources/views/admin/contacts/index.blade.php | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index 4ad42b5..01da997 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6608,12 +6608,16 @@ main { .tbl { border-collapse: collapse; width: 100%; + table-layout: fixed; } .tbl td, .tbl th { border: 1px solid #ddd; padding: 8px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .tbl tr:nth-child(even) { diff --git a/skolehjem/resources/sass/admin/content/table.scss b/skolehjem/resources/sass/admin/content/table.scss index 552714b..65550e1 100644 --- a/skolehjem/resources/sass/admin/content/table.scss +++ b/skolehjem/resources/sass/admin/content/table.scss @@ -1,11 +1,15 @@ .tbl { border-collapse: collapse; width: 100%; + table-layout: fixed; } .tbl td, .tbl th { border: 1px solid #ddd; padding: 8px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .tbl tr:nth-child(even){background-color: rgba(0, 0, 0, 0.1);} diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 0d1554f..36b034a 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -26,7 +26,7 @@ {{ $contact->email }} {{ $contact->phone }} $contact ]) }}">Update - $contact ]) }}">Delete + $contact ]) }}">Delete @endforeach From 45a730264028c7d7dc4d8d8d4f8af9cb40387543 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 29 Jun 2020 14:26:39 +0200 Subject: [PATCH 42/42] Removed unnecessary code from StaffController.php --- .../app/Http/Controllers/StaffController.php | 24 +++---------------- .../views/admin/staff/index.blade.php | 9 +------ 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/skolehjem/app/Http/Controllers/StaffController.php b/skolehjem/app/Http/Controllers/StaffController.php index f09264f..eecf517 100644 --- a/skolehjem/app/Http/Controllers/StaffController.php +++ b/skolehjem/app/Http/Controllers/StaffController.php @@ -53,8 +53,6 @@ class StaffController extends Controller */ public function store(Request $request) { - Log::debug("STORE FUNCTION"); - $data = $request->validate([ "name_first" => "required|max:255", "name_last" => "required|max:255", @@ -64,17 +62,10 @@ class StaffController extends Controller ]); - Log::debug("FINISHED VALIDATION?"); - $staff = new Staff($data); - - Log::debug("CREATED STAFF [NOT PERSISTED YET]"); - $staff->save(); - Log::debug("SAVED STAFF"); - - return view("staff.store"); + return Response::detect("staff.store"); } /** @@ -161,18 +152,9 @@ class StaffController extends Controller * @param int $id * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function destroy($id) + public function destroy(Staff $id) { -// if($id === Auth::id()) { -// $user = Auth::user(); -// $user->delete(); -// } -// else if(Auth::user()->hasPermissionTo("user.delete")) { - $staff = Staff::find($id); - - $staff->delete(); -// } - + $id->delete(); return redirect()->route("staff.index"); } diff --git a/skolehjem/resources/views/admin/staff/index.blade.php b/skolehjem/resources/views/admin/staff/index.blade.php index 88f80ff..f7a55b3 100644 --- a/skolehjem/resources/views/admin/staff/index.blade.php +++ b/skolehjem/resources/views/admin/staff/index.blade.php @@ -26,14 +26,7 @@ {{ $staff->email }} {{ $staff->phone }} $staff->id ]) }}">Update - -
$staff ]) }}" class="w-100"> - @csrf - @method("delete") - - -
- + $staff->id ]) }}">Delete @endforeach