From 4b571781a545a7a4f861b30b75dc78226448b25e Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 27 Jul 2020 10:31:57 +0200
Subject: [PATCH 1/4] Worked on base.blade.php

---
 skolehjem/database/seeds/UserSeeder.php             | 4 ++--
 skolehjem/resources/views/app/layout/base.blade.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php
index 029d2d4..01822ab 100644
--- a/skolehjem/database/seeds/UserSeeder.php
+++ b/skolehjem/database/seeds/UserSeeder.php
@@ -22,10 +22,10 @@ class UserSeeder extends Seeder
         Log::debug("YEET");
 
 
-        if(User::where("name_first", "admin"))
+        /*if(User::where("name_first", "admin"))
         {
             return;
-        }
+        }*/
 
 
         Log::debug("OPRET");
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 7c60cef..ed3c8fa 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -33,7 +33,7 @@
         Reservationer
     </a>
 {{--  MÅ IKKE SLETTES!!!!  --}}
-{{--    <a href="#">--}}
+{{--    <a href="#  ">--}}
 {{--        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">--}}
 {{--        Galleri--}}
 {{--    </a>--}}

From 4558e8d9588dfc13f3ac8314cf1e3e92133204cb Mon Sep 17 00:00:00 2001
From: Vedran Zelen <zelenvedran@gmail.com>
Date: Mon, 27 Jul 2020 12:40:45 +0200
Subject: [PATCH 2/4] added more comments removed silly debug.

---
 skolehjem/app/Album.php                 | 3 ++-
 skolehjem/app/CalendarDate.php          | 1 +
 skolehjem/app/CalendarEvent.php         | 1 +
 skolehjem/app/Contact.php               | 2 ++
 skolehjem/app/Event.php                 | 2 ++
 skolehjem/app/ExternalLink.php          | 2 ++
 skolehjem/app/Feedbacks.php             | 1 +
 skolehjem/app/MenuPlan.php              | 2 ++
 skolehjem/app/Resource.php              | 1 +
 skolehjem/app/ResourceCategory.php      | 1 +
 skolehjem/app/ResourceExtension.php     | 1 +
 skolehjem/app/User.php                  | 2 ++
 skolehjem/app/WashingMachine.php        | 2 ++
 skolehjem/app/WashingReservation.php    | 2 ++
 skolehjem/database/seeds/UserSeeder.php | 2 +-
 15 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/skolehjem/app/Album.php b/skolehjem/app/Album.php
index 5842567..0465646 100644
--- a/skolehjem/app/Album.php
+++ b/skolehjem/app/Album.php
@@ -1,7 +1,7 @@
 <?php
 
 //The Model to a certain Controller, should contain a class with Controller name to which it belongs.
-// Allows needed strings to passed onto the database. if there is none. class should appear empty.
+// Allows needed strings to passed onto the database. if there is none needed. the class should appear empty.
 
 //Reference to where the file belongs.
 namespace App;
@@ -12,6 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 //Class of which should extend Model Library
 class Album extends Model
 {
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'name'
     ];
diff --git a/skolehjem/app/CalendarDate.php b/skolehjem/app/CalendarDate.php
index 0392479..74ec905 100644
--- a/skolehjem/app/CalendarDate.php
+++ b/skolehjem/app/CalendarDate.php
@@ -9,6 +9,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class CalendarDate extends Model
 {
     //
diff --git a/skolehjem/app/CalendarEvent.php b/skolehjem/app/CalendarEvent.php
index b68b3bb..88f997e 100644
--- a/skolehjem/app/CalendarEvent.php
+++ b/skolehjem/app/CalendarEvent.php
@@ -10,6 +10,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class CalendarEvent extends Model
 {
     //
diff --git a/skolehjem/app/Contact.php b/skolehjem/app/Contact.php
index 1cf2ccd..4aebacc 100644
--- a/skolehjem/app/Contact.php
+++ b/skolehjem/app/Contact.php
@@ -10,8 +10,10 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class Contact extends Model
 {
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'name_first', "name_last", 'email', 'phone'
     ];
diff --git a/skolehjem/app/Event.php b/skolehjem/app/Event.php
index 3e12725..734570a 100644
--- a/skolehjem/app/Event.php
+++ b/skolehjem/app/Event.php
@@ -10,6 +10,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class Event extends Model
 {
     /**
@@ -17,6 +18,7 @@ class Event extends Model
      *
      * @var array
      */
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         "name", "description", "date"
     ];
diff --git a/skolehjem/app/ExternalLink.php b/skolehjem/app/ExternalLink.php
index 481c6dd..7a0076a 100644
--- a/skolehjem/app/ExternalLink.php
+++ b/skolehjem/app/ExternalLink.php
@@ -10,6 +10,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class ExternalLink extends Model
 {
     /**
@@ -17,6 +18,7 @@ class ExternalLink extends Model
      *
      * @var array
      */
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'name', "link"
     ];
diff --git a/skolehjem/app/Feedbacks.php b/skolehjem/app/Feedbacks.php
index e82552b..b9f6557 100644
--- a/skolehjem/app/Feedbacks.php
+++ b/skolehjem/app/Feedbacks.php
@@ -10,6 +10,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class Feedbacks extends Model
 {
     protected $fillable = [
diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php
index 65c1c59..77dc688 100644
--- a/skolehjem/app/MenuPlan.php
+++ b/skolehjem/app/MenuPlan.php
@@ -10,8 +10,10 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class MenuPlan extends Model
 {
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'week', 'monday', "tuesday", 'wednesday', 'thursday'
     ];
diff --git a/skolehjem/app/Resource.php b/skolehjem/app/Resource.php
index 97431b9..68e13c6 100644
--- a/skolehjem/app/Resource.php
+++ b/skolehjem/app/Resource.php
@@ -9,6 +9,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class Resource extends Model
 {
     public function resourceExtension() {
diff --git a/skolehjem/app/ResourceCategory.php b/skolehjem/app/ResourceCategory.php
index 7d88dda..b664f08 100644
--- a/skolehjem/app/ResourceCategory.php
+++ b/skolehjem/app/ResourceCategory.php
@@ -9,6 +9,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class ResourceCategory extends Model
 {
     public function resourceExtensions() {
diff --git a/skolehjem/app/ResourceExtension.php b/skolehjem/app/ResourceExtension.php
index 9651943..8936f7f 100644
--- a/skolehjem/app/ResourceExtension.php
+++ b/skolehjem/app/ResourceExtension.php
@@ -9,6 +9,7 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class ResourceExtension extends Model
 {
     public function resources() {
diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php
index 11e4f0c..0db07bf 100644
--- a/skolehjem/app/User.php
+++ b/skolehjem/app/User.php
@@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Spatie\Permission\Traits\HasRoles;
 
+//Class of which should extend Model Library
 class User extends Authenticatable
 {
     use Notifiable;
@@ -25,6 +26,7 @@ class User extends Authenticatable
      *
      * @var array
      */
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'name_first', "name_last", 'email', 'password', "phone"
     ];
diff --git a/skolehjem/app/WashingMachine.php b/skolehjem/app/WashingMachine.php
index eec852e..c847392 100644
--- a/skolehjem/app/WashingMachine.php
+++ b/skolehjem/app/WashingMachine.php
@@ -9,8 +9,10 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class WashingMachine extends Model
 {
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'name'
     ];
diff --git a/skolehjem/app/WashingReservation.php b/skolehjem/app/WashingReservation.php
index cf446c2..8afd30c 100644
--- a/skolehjem/app/WashingReservation.php
+++ b/skolehjem/app/WashingReservation.php
@@ -9,8 +9,10 @@ namespace App;
 //allows the use of Model library
 use Illuminate\Database\Eloquent\Model;
 
+//Class of which should extend Model Library
 class WashingReservation extends Model
 {
+    //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
         'time', 'machine'
     ];
diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php
index 029d2d4..9eb654c 100644
--- a/skolehjem/database/seeds/UserSeeder.php
+++ b/skolehjem/database/seeds/UserSeeder.php
@@ -19,7 +19,7 @@ class UserSeeder extends Seeder
 //        } catch (Exception $e) {
 //        }
 
-        Log::debug("YEET");
+    
 
 
         if(User::where("name_first", "admin"))

From 52a9c6ba1acb22f4197c7f89116b0e0e3fd8152f Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 27 Jul 2020 13:09:51 +0200
Subject: [PATCH 3/4] User can now change password

---
 .../app/Http/Controllers/UserController.php   | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 1a5bf7b..f76b2d1 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Spatie\Permission\Models\Role;
 
@@ -151,26 +152,38 @@ class UserController extends Controller
 //        else if(Auth::user()->hasPermissionTo("user.edit")) {
             $user = User::find($id);
 
-            /** @var User $user */
-            $user->update($data);
-
             if ($request->roles != null) {
+                /** @var User $user */
+                $user->update($data);
                 $user->roles()->detach();
                 $user->forgetCachedPermissions();
 
                 foreach ($request->roles as $role){
                     $user->assignRole($role);
                 }
+
+                //$user->save();
+            } else {
+                if ($request->input('password') != $request->input('confirmpassword')) {
+                    return Response::detect("users.editpass");
+                } elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
+                    return Response::detect("users.editpass");
+                } else {
+                    /** @var User $user */
+                    $user->update($data);
+                    Auth::logout();
+
+                    return redirect()->route("users.login");
+                }
             }
 
-            $user->save();
 //        }
 
-        $users = User::query()->paginate(20);
+        //$users = User::query()->paginate(20);
 
-        return Response::detect("users.index", [
-            "users" => $users
-        ]);
+        //return Response::detect("users.index", [
+        //    "users" => $users
+        //]);
     }
 
     /**

From 39af9758ee6d7be038dc9350b979b47710f097a9 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 27 Jul 2020 13:22:45 +0200
Subject: [PATCH 4/4] User can now change password

---
 .../app/Http/Controllers/UserController.php   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index f76b2d1..e03049e 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -164,26 +164,31 @@ class UserController extends Controller
 
                 //$user->save();
             } else {
-                if ($request->input('password') != $request->input('confirmpassword')) {
-                    return Response::detect("users.editpass");
-                } elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
-                    return Response::detect("users.editpass");
-                } else {
-                    /** @var User $user */
-                    $user->update($data);
-                    Auth::logout();
+                if ($request->input('password') != null) {
+                    if ($request->input('password') != $request->input('confirmpassword')) {
+                        return Response::detect("users.editpass");
+                    } elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
+                        return Response::detect("users.editpass");
+                    } else {
+                        /** @var User $user */
+                        $user->update($data);
+                        Auth::logout();
 
-                    return redirect()->route("users.login");
+                        return redirect()->route("users.login");
+                    }
+                } else {
+                    $user->update($data);
                 }
+
             }
 
 //        }
 
-        //$users = User::query()->paginate(20);
+        $users = User::query()->paginate(20);
 
-        //return Response::detect("users.index", [
-        //    "users" => $users
-        //]);
+        return Response::detect("users.index", [
+            "users" => $users
+        ]);
     }
 
     /**