Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

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()

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();

skolehjem/app/UserEvent.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserEvent extends Model
+{
+    //
+}

skolehjem/database/migrations/2014_10_12_000000_create_users_table.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -13,9 +15,10 @@ class CreateUsersTable extends Migration
      */
     public function up()
     {
+        //checks if table already exists
         if(Schema::hasTable("users"))
             return;
-
+        //if not, create a table with these fields
         Schema::create('users', function (Blueprint $table) {
             $table->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');

skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2019_08_19_000000_create_failed_jobs_table.php

@@ -1,4 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
+
+//allows use of necessary libraries
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;

skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;

skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_08_091617_create_feedbacks.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_09_081037_alter_feedbacks.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_09_081126_alter_washing_reservations.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_24_064840_create_external_links.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_29_065007_create_contact.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_29_091545_create_events.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_07_01_061911_create_resource_category.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_07_01_062544_create_resource.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php

@@ -1,5 +1,7 @@
 <?php
+//Migrations acts as a version control for the database allowing you to modify the app's database schema
 
+//allows use of necessary libraries
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -13,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();
-        });
+        });*/
     }
 
     /**

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');
+    }
+}

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);
         }