From 988ceb7c8a3f191ae4205322258e030b9488fbf2 Mon Sep 17 00:00:00 2001
From: Sebastian <seba4928@edu.sde.dk>
Date: Mon, 29 Jun 2020 14:49:57 +0200
Subject: [PATCH] Fixed error AND 0x01

---
 skolehjem/app/MenuPlan.php                    |  2 +-
 .../2014_10_12_000000_create_users_table.php  |  3 ++
 ..._06_08_080402_create_permission_tables.php | 18 +++++----
 .../2020_06_23_070657_create_menu_plans.php   |  6 +--
 .../2020_06_29_112658_create_staff_table.php  | 38 -------------------
 .../views/admin/layout/base.blade.php         | 18 ++++-----
 .../views/admin/users/index.blade.php         |  9 ++++-
 skolehjem/routes/web.php                      |  2 +-
 8 files changed, 36 insertions(+), 60 deletions(-)
 delete mode 100644 skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php

diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php
index cce1492..c8131e1 100644
--- a/skolehjem/app/MenuPlan.php
+++ b/skolehjem/app/MenuPlan.php
@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class MenuPlan extends Model
 {
     protected $fillable = [
-        'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday"
+        'monday', "tuesday", 'wednesday', 'thursday'
     ];
 }
diff --git a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php
index 04e336e..9760e02 100644
--- a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php
@@ -13,6 +13,9 @@ class CreateUsersTable extends Migration
      */
     public function up()
     {
+        if(Schema::hasTable("users"))
+            return;
+
         Schema::create('users', function (Blueprint $table) {
             $table->id();
             $table->string('name_first');
diff --git a/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php b/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php
index 81d91b2..8e7ae7b 100644
--- a/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php
+++ b/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php
@@ -20,13 +20,17 @@ class CreatePermissionTables extends Migration
             throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.');
         }
 
-        Schema::create($tableNames['permissions'], function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('description');
-            $table->string('guard_name');
-            $table->timestamps();
-        });
+        if(!Schema::hasTable("permissions"))
+        {
+            Schema::create($tableNames['permissions'], function (Blueprint $table) {
+                $table->bigIncrements('id');
+                $table->string('name');
+                $table->string('description');
+                $table->string('guard_name');
+                $table->timestamps();
+            });
+        }
+
 
         Schema::create($tableNames['roles'], function (Blueprint $table) {
             $table->bigIncrements('id');
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..d3a43d4 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,9 @@ 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->string('friday', 255);
+//            $table->string('saturday', 255);
+//            $table->string('sunday', 255);
             $table->timestamps();
             //$table->text('description');
         });
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
deleted file mode 100644
index 0ad0194..0000000
--- a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateStaffTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        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();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('staff');
-    }
-}
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 9732280..5ef177c 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -61,15 +61,15 @@
                 <a href="{{ route("contacts.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
             </div>
         </div>
-        <div class="segment">
-            <h3 class="text-white">Personale</h3>
-            <div class="row">
-                <a href="{{ route('staff.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Personale</a>
-            </div>
-            <div class="row">
-                <a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>
-            </div>
-        </div>
+{{--        <div class="segment">--}}
+{{--            <h3 class="text-white">Personale</h3>--}}
+{{--            <div class="row">--}}
+{{--                <a href="{{ route('staff.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Personale</a>--}}
+{{--            </div>--}}
+{{--            <div class="row">--}}
+{{--                <a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>--}}
+{{--            </div>--}}
+{{--        </div>--}}
         <div class="segment">
             <h3 class="text-white">Feedback</h3>
             <div class="row">
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index a6e15d1..3b2713b 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -26,7 +26,14 @@
                 <td>{{ $user->email }}</td>
                 <td>{{ $user->phone }}</td>
                 <td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-                <td><a href="{{ route("users.destroy", [ "user" => $user ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
+                <td>
+                    <form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}"  class="w-100">
+                        @csrf
+                        @method("delete")
+
+                        <button class="w-100"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
+                    </form>
+                </td>
         </tr>
         @endforeach
     </table>
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 4c9643f..97c63aa 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -31,7 +31,7 @@ Route::get("phones", "PhoneController@index")->name("phones.index");
 Route::resource("contacts", "ContactController");
 Route::resource("menu-plans", "MenuPlanController");
 Route::resource("users", "UserController");
-Route::resource("staff", "StaffController");
+//Route::resource("staff", "StaffController");
 Route::resource("events", "EventController");
 Route::resource("washing-machines", "WashingMachineController");
 Route::resource("washing-reservations", "WashingReservationController");