From f0132bee2c27dec590d6921860ebc0e127f463b3 Mon Sep 17 00:00:00 2001 From: Vedde Date: Tue, 30 Jun 2020 11:27:39 +0200 Subject: [PATCH 1/2] worked on ResourceExtensionController.php and added resource_extension migration --- .../ResourceExtensionController.php | 5 ++- ...6_30_092130_create_resource_extensions.php | 33 +++++++++++++++++++ skolehjem/routes/web.php | 1 + 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php 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_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 @@ +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/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"); From 6c020e36daa4ba526f9a64d04b7695c42956f13c Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 11:30:12 +0200 Subject: [PATCH 2/2] Made role controller, added index and create --- .idea/dataSources.xml | 10 +--------- .../2020_06_30_065154_create_albums_table.php | 1 + skolehjem/database/seeds/UserSeeder.php | 2 ++ 3 files changed, 4 insertions(+), 9 deletions(-) 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 @@ - + sqlite.xerial true org.sqlite.JDBC jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/license.txt - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/sqlite-jdbc-3.31.1.jar - - \ No newline at end of file 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/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();