Merge remote-tracking branch 'origin/master'

skolehjem/app/Event.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Event extends Model
+{
+    //
+}

skolehjem/app/Http/Controllers/EventController.php

@@ -49,7 +49,7 @@ class EventController extends Controller
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Show the form for editing the specified resource.-
      *
      * @param  int  $id
      * @return \Illuminate\Http\Response

skolehjem/app/Resource.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Resource extends Model
+{
+    //
+}

skolehjem/app/ResourceCategory.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ResourceCategory extends Model
+{
+    //
+}

skolehjem/app/ResourceExtension.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ResourceExtension extends Model
+{
+    //
+}

skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php

@@ -15,6 +15,7 @@ class CreateWashingReservations extends Migration
     {
         Schema::create('washing_reservations', function (Blueprint $table) {
             $table->id();
+            $table->time("time");
             $table->timestamps();
         });
     }

skolehjem/database/migrations/2020_06_09_081037_alter_feedbacks.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterFeedbacks extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

skolehjem/database/migrations/2020_06_09_081126_alter_washing_reservations.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterWashingReservations extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}