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

.idea/dataSources.xml

@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="laravel" uuid="666d3dad-499f-4d99-8988-fd376e6db9e6">
+    <data-source source="LOCAL" name="laravel.sqlite" uuid="bf392a85-1584-4a27-a552-e491a55b9410">
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite</jdbc-url>
-      <libraries>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/license.txt</url>
-        </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/sqlite-jdbc-3.31.1.jar</url>
-        </library>
-      </libraries>
     </data-source>
   </component>
 </project>

skolehjem/app/Http/Controllers/ResourceExtensionController.php

@@ -50,9 +50,8 @@ class ResourceExtensionController extends Controller
     public function store(Request $request)
     {
         $requestBody = $request->validate([
-            "name" => "required|unique:events|max:255",
+            "extension" => "unique|required|max:255",
-            "description" => "required|max:255",
+            "description" => "required|max:255"
-            "date" => "required"
         ]);
 
         $event = new ResourceExtension($requestBody);

skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php

@@ -16,6 +16,7 @@ class CreateAlbumsTable extends Migration
         Schema::create('albums', function (Blueprint $table) {
             $table->id();
             $table->timestamps();
+            $table->foreignId('user_id')->constrained();
         });
     }
 

skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php

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

skolehjem/database/seeds/UserSeeder.php

@@ -21,11 +21,13 @@ class UserSeeder extends Seeder
 
         Log::debug("YEET");
 
+
         if(User::where("name_first", "admin"))
         {
             return;
         }
 
+
         Log::debug("OPRET");
         $user = new \App\User();
 

skolehjem/routes/web.php

@@ -38,3 +38,4 @@ Route::resource("washing-machines", "WashingMachineController");
 Route::resource("washing-reservations", "WashingReservationController");
 Route::resource("feedbacks", "FeedbackController");
 Route::resource("external-links", "ExternalLinkController");
+Route::resource("resource-extensions", "ResourceExtensionController");