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

 Conflicts:

	skolehjem/routes/web.php

skolehjem/app/Http/Controllers/ContactController.php

@@ -113,9 +113,10 @@ class ContactController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Exception
      */
-    public function destroy(Contact $id)
+    public function destroy($id)
     {
-        $id->delete();
+        $contact = Contact::find($id);
+        $contact->delete();
         return redirect()->route("contacts.index");
     }
 }

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -52,6 +52,7 @@ class MenuPlanController extends Controller
     public function store(Request $request)
     {
         $requestMenuPlanCreate = $request->validate([
+            "week" => "required|max:2",
             "monday" => "required|max:255",
             "tuesday" => "required|max:255",
             "wednesday" => "required|max:255",

skolehjem/app/Http/Controllers/RolesController.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Spatie\Permission\Models\Role;
+
+class rolesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $roles = Role::query()->paginate($request->input("limit", 20));
+
+        return Response::detect("roles.index", [ "roles" => $roles]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return Response::detect("roles.create");
+
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $requestRole = $request->validate([
+            "name" => "required|max:255",
+            "description" => "required|max:255"
+        ]);
+
+        $role = new Role($requestRole);
+        $role->save();
+
+        return Response::detect("roles.store");
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        return Response::detect("roles.show", [ "role" => $id]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        $role = Role::find($id);
+        return Response::detect("roles.edit", ["role" => $role]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $data = $request->all();
+        $role = Role::find($id);
+        $role->update($data);
+        $role->save();
+
+        return Response::detect("roles.update", [ "role" => $role ]);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $role = Role::find($id);
+        $role->delete();
+        return redirect()->route("roles.index");
+    }
+}

skolehjem/app/Http/Controllers/UserController.php

@@ -8,6 +8,7 @@ use Illuminate\Http\Response;
 use App\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
+use Spatie\Permission\Models\Role;
 
 
 class UserController extends Controller
@@ -44,7 +45,9 @@ class UserController extends Controller
      */
     public function create()
     {
-        return Response::detect("users.create");
+        $roles = Role::all();
+        return Response::detect("users.create", ['roles' => $roles]);
+
     }
 
     /**
@@ -63,6 +66,7 @@ class UserController extends Controller
             "email" => "required|email|unique:users",
             "password" => "required|max:60",
             "phone" => "required|unique:users",
+            "roles" => "max:255"
 
         ]);
 
@@ -102,10 +106,12 @@ class UserController extends Controller
      */
     public function edit($id)
     {
+        $roles = Role::all();
         $user = User::find($id);
 
         return Response::detect("users.edit", [
-            "user" => $user
+            "user" => $user,
+            "roles" => $roles,
         ]);
     }
 
@@ -147,6 +153,13 @@ class UserController extends Controller
             /** @var User $user */
             $user->update($data);
 
+            $user->roles()->detach();
+            $user->forgetCachedPermissions();
+
+            foreach ($request->roles as $role){
+                $user->assignRole($role);
+            }
+
             $user->save();
 //        }
 
@@ -224,5 +237,13 @@ class UserController extends Controller
         return redirect()->route('users.login');
     }
 
+    public function account()
+    {
+        return Response::detect("users.account");
+    }
 
+    public function accountedit()
+    {
+        return Response::detect("users.edit");
+    }
 }