Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

 Conflicts:

	skolehjem/public/css/admin.css

skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php

@@ -17,6 +17,8 @@ class CreateWashingReservations extends Migration
             $table->id();
             $table->timestamp("time");
             $table->timestamps();
+            $table->unsignedBigInteger('machine');
+            $table->foreign("machine")->references('id')->on('washing_machines');
         });
     }
 

skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateResourceCategories extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('resource_categories', function (Blueprint $table) {
+            $table->id();
+            $table->string("name")->unique();
+            $table->text("description");
+            $table->string("slug")->unique();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('resource_categories');
+    }
+}