From 715b188ecd983cfa38847bc7cb629a1c497c5e1d Mon Sep 17 00:00:00 2001 From: Vedran Zelen Date: Mon, 27 Jul 2020 13:24:35 +0200 Subject: [PATCH 1/3] removed useless comment --- skolehjem/app/Http/Controllers/ContactController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 7abfc08..e649834 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -6,7 +6,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use App\Contact; use phpDocumentor\Reflection\Types\Context; -//hello + class ContactController extends Controller { public function __construct() From fb65c1b9fc23a27b373427430130181de5d9e151 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 28 Jul 2020 08:18:45 +0200 Subject: [PATCH 2/3] Added UserEvent.php --- .../app/Http/Controllers/UserController.php | 2 +- skolehjem/app/UserEvent.php | 10 +++++ ...7_01_064330_create_resource_categories.php | 4 +- ..._07_28_061420_create_user_events_table.php | 37 +++++++++++++++++++ 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 skolehjem/app/UserEvent.php create mode 100644 skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 7e3be4d..7d76618 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -286,7 +286,7 @@ class UserController extends Controller "\"Update\"". "\"Delete\"". ""; - $users = DB::table('users')->where('name_first', 'LIKE',$request->search.'%') + $users = User::query()->where('name_first', 'LIKE',$request->search.'%') ->orWhere('name_last','LIKE', $request->search.'%') ->orWhere('phone','LIKE', $request->search.'%') ->orWhere('email','LIKE',$request->search. '%')->get(); diff --git a/skolehjem/app/UserEvent.php b/skolehjem/app/UserEvent.php new file mode 100644 index 0000000..3899fd5 --- /dev/null +++ b/skolehjem/app/UserEvent.php @@ -0,0 +1,10 @@ +id(); $table->string("name")->unique(); $table->text("description"); $table->string("slug")->unique(); $table->timestamps(); - }); + });*/ } /** diff --git a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php new file mode 100644 index 0000000..e129f3c --- /dev/null +++ b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer("user_id")->unique(); + $table->integer("event_id")->unique(); + + $table->timestamps(); + + $table->foreign("user_id")->references("id")->on("users"); + $table->foreign("event_id")->references("id")->on("events"); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('user_events'); + } +} From b89c1509feb7f802e0cc39475621bf3b6ca14a9a Mon Sep 17 00:00:00 2001 From: Vedran Zelen Date: Tue, 28 Jul 2020 08:34:10 +0200 Subject: [PATCH 3/3] Added comments for easier understanding. --- .../migrations/2014_10_12_000000_create_users_table.php | 7 ++++++- .../2014_10_12_100000_create_password_resets_table.php | 2 ++ .../2019_08_19_000000_create_failed_jobs_table.php | 3 +++ .../2020_06_08_080402_create_permission_tables.php | 2 ++ .../2020_06_08_085447_create_washing_reservations.php | 2 ++ .../migrations/2020_06_08_090042_create_calendar_dates.php | 2 ++ .../2020_06_08_090108_create_calendar_events.php | 2 ++ .../migrations/2020_06_08_091617_create_feedbacks.php | 2 ++ .../2020_06_08_123954_create_washing_machines.php | 2 ++ .../migrations/2020_06_09_081037_alter_feedbacks.php | 2 ++ .../2020_06_09_081126_alter_washing_reservations.php | 2 ++ .../migrations/2020_06_23_070657_create_menu_plans.php | 2 ++ .../migrations/2020_06_24_064840_create_external_links.php | 2 ++ .../migrations/2020_06_29_065007_create_contact.php | 2 ++ .../migrations/2020_06_29_091545_create_events.php | 2 ++ .../migrations/2020_06_30_065154_create_albums_table.php | 2 ++ .../2020_07_01_061911_create_resource_category.php | 2 ++ .../2020_07_01_062112_create_resource_extension.php | 2 ++ .../migrations/2020_07_01_062544_create_resource.php | 2 ++ .../2020_07_01_064330_create_resource_categories.php | 2 ++ skolehjem/database/seeds/UserSeeder.php | 7 +++++-- 21 files changed, 50 insertions(+), 3 deletions(-) diff --git a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php index 9760e02..ef119d6 100644 --- a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php +++ b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,5 +1,7 @@ id(); $table->string('name_first'); @@ -34,6 +37,8 @@ class CreateUsersTable extends Migration * * @return void */ + + //if table exists, drop table. public function down() { Schema::dropIfExists('users'); diff --git a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php b/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php index 0ee0a36..5a8c158 100644 --- a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -1,5 +1,7 @@ phone = 12345678; - + //gives all permission to the Admin. foreach (\Spatie\Permission\Models\Permission::all() as $permission) { $user->givePermissionTo($permission); }