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/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 30b25c1..426f335 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -95,9 +95,16 @@ class ContactController extends Controller return Response::detect("contacts.update", [ "contacts" => $contact ]); } - + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\RedirectResponse + * @throws \Exception + */ public function destroy(Contact $id) { $id->delete(); - return Response::detect("contacts.destroy");} + return redirect()->route("contacts.index"); + } } 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/app/Http/Controllers/StaffController.php b/skolehjem/app/Http/Controllers/StaffController.php index c5fbf78..eecf517 100644 --- a/skolehjem/app/Http/Controllers/StaffController.php +++ b/skolehjem/app/Http/Controllers/StaffController.php @@ -53,28 +53,19 @@ 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", "email" => "required|email|unique:staff", "password" => "required|max:60", - "phone" => "required|unique:staff", + "phone" => "required|unique:staff" ]); - 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/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/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(); }); } 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..0ad0194 --- /dev/null +++ b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php @@ -0,0 +1,38 @@ +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(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('staff'); + } +} 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/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 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") 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 +
+
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 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 @@ - + 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 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 diff --git a/skolehjem/resources/views/app/contact/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php similarity index 91% rename from skolehjem/resources/views/app/contact/index.blade.php rename to skolehjem/resources/views/app/contacts/index.blade.php index daa8c1a..e61a011 100644 --- a/skolehjem/resources/views/app/contact/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