Merge branch 'master' into LiveSearch

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_06_29_065007_create_contact.php

@@ -16,8 +16,8 @@ class CreateContact extends Migration
         Schema::create('contacts', function (Blueprint $table) {
             $table->id();
             $table->timestamps();
-            $table->string('name_first', 255);
-            $table->string('name_last', 255);
+            $table->string('contactname', 255);
+            $table->string('title', 255);
             $table->string('email', 255);
             $table->integer('phone');
             //$table->unique('email');

skolehjem/database/migrations/2020_07_01_061911_create_resource_category.php

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

skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateResourceExtensions extends Migration
+class CreateResourceExtension extends Migration
 {
     /**
      * Run the migrations.
@@ -15,9 +15,12 @@ class CreateResourceExtensions extends Migration
     {
         Schema::create('resource_extensions', function (Blueprint $table) {
             $table->id();
-            $table->string("extension")->unique();
+            $table->string("extension", 60)->unique();
             $table->text("description");
+            $table->unsignedInteger("resource_category_id");
             $table->timestamps();
+
+            $table->foreign("resource_category_id")->references("id")->on("resource_categories");
         });
     }
 

skolehjem/database/migrations/2020_07_01_062544_create_resource.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateResource extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('resources', function (Blueprint $table) {
+            $table->id();
+            $table->string("filename")->unique();
+            $table->unsignedInteger("extension_id");
+            $table->timestamps();
+
+            $table->foreign("extension_id")->references("id")->on("resource_extensions");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('resources');
+    }
+}

skolehjem/database/seeds/PermissionSeeder.php

@@ -17,6 +17,7 @@ class PermissionSeeder extends Seeder
             /**
              * The USER specific permissions
              */
+            "user.create" => "Creation of new user",
             "user.list" => "Access to list the users.",
             "user.show" => "Shows another user profile.",
             "user.edit" => "Allows editing of other users.",

skolehjem/database/seeds/UserSeeder.php

@@ -19,13 +19,13 @@ class UserSeeder extends Seeder
 //        } catch (Exception $e) {
 //        }
 
-        Log::debug("YEET");
+    
 
 
-        if(User::where("name_first", "admin"))
+        /*if(User::where("name_first", "admin"))
         {
             return;
-        }
+        }*/