diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 2227e89..1bad499 100644 --- a/.idea/dataSources.xml +++ b/.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> \ No newline at end of file diff --git a/skolehjem/app/Http/Controllers/ResourceExtensionController.php b/skolehjem/app/Http/Controllers/ResourceExtensionController.php index e5136e2..422ecc5 100644 --- a/skolehjem/app/Http/Controllers/ResourceExtensionController.php +++ b/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", - "description" => "required|max:255", - "date" => "required" + "extension" => "unique|required|max:255", + "description" => "required|max:255" ]); $event = new ResourceExtension($requestBody); diff --git a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php index 5efab97..bfe0dab 100644 --- a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php +++ b/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(); }); } diff --git a/skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php b/skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php new file mode 100644 index 0000000..3f1abb5 --- /dev/null +++ b/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'); + } +} diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php index d90fae8..029d2d4 100644 --- a/skolehjem/database/seeds/UserSeeder.php +++ b/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(); diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index ce578ac..b371e91 100644 --- a/skolehjem/routes/web.php +++ b/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");