diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php
index c581e55..0ffc9b6 100644
--- a/skolehjem/app/Http/Controllers/ContactController.php
+++ b/skolehjem/app/Http/Controllers/ContactController.php
@@ -7,7 +7,7 @@ use Illuminate\Http\Response;
use App\Contact;
use Illuminate\Support\Facades\DB;
use phpDocumentor\Reflection\Types\Context;
-//hello
+
class ContactController extends Controller
{
public function __construct()
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
"
 | ".
" | ".
"";
- $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_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 @@
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');
+ }
+}
diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php
index e723546..d86b174 100644
--- a/skolehjem/database/seeds/UserSeeder.php
+++ b/skolehjem/database/seeds/UserSeeder.php
@@ -28,7 +28,10 @@ class UserSeeder extends Seeder
}*/
-
+ /**
+ * A user is created as the Admin with the below fields.
+ * Super User or Admin. Is allowed for all permission and is not to exist in final product release but purely for testing.
+ */
Log::debug("OPRET");
$user = new \App\User();
@@ -39,7 +42,7 @@ class UserSeeder extends Seeder
$user->phone = 12345678;
-
+ //gives all permission to the Admin.
foreach (\Spatie\Permission\Models\Permission::all() as $permission) {
$user->givePermissionTo($permission);
}