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 "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>". "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>". "</tr>"; - $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 @@ +<?php + +namespace App; + +use Illuminate\Database\Eloquent\Model; + +class UserEvent extends Model +{ + // +} diff --git a/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php b/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php index ab8cf54..9b364cf 100644 --- a/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php +++ b/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php @@ -15,13 +15,13 @@ class CreateResourceCategories extends Migration */ public function up() { - Schema::create('resource_categories', function (Blueprint $table) { + /*Schema::create('resource_categories', function (Blueprint $table) { $table->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 @@ +<?php + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; + +class CreateUserEventsTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('user_events', function (Blueprint $table) { + $table->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'); + } +}