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

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/EventController.php

@@ -114,8 +114,8 @@ class EventController extends Controller
      */
     public function destroy($id)
     {
-        $link = Event::find($id);
-        $link->delete();
+        $event = Event::find($id);
+        $event->delete();
         return redirect()->route("events.index");
     }
 }

skolehjem/app/Http/Controllers/ResourceExtensionController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\ResourceExtension;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -23,9 +24,11 @@ class ResourceExtensionController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
-        //
+        $extensions = ResourceExtension::query()->paginate($request->input("limit", 20));
+
+        return Response::detect("resource-extensions.index", ["extension" => $extensions]);
     }
 
     /**
@@ -35,7 +38,7 @@ class ResourceExtensionController extends Controller
      */
     public function create()
     {
-        //
+        return Response::detect("resource-extensions.create");
     }
 
     /**
@@ -46,7 +49,16 @@ class ResourceExtensionController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $requestBody = $request->validate([
+            "extension" => "unique|required|max:255",
+            "description" => "required|max:255"
+        ]);
+
+        $event = new ResourceExtension($requestBody);
+
+        $event->save();
+
+        return Response::detect("events.store");
     }
 
     /**
@@ -55,9 +67,9 @@ class ResourceExtensionController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(ResourceExtension $id)
     {
-        //
+        return Response::detect("resource-extensions.show", ["extension" => $id]);
     }
 
     /**
@@ -68,7 +80,8 @@ class ResourceExtensionController extends Controller
      */
     public function edit($id)
     {
-        //
+        $extension = ResourceExtension::find($id);
+        return Response::detect("resource-extensions.edit", ["extension" => $extension]);
     }
 
     /**
@@ -80,7 +93,14 @@ class ResourceExtensionController extends Controller
      */
     public function update(Request $request, $id)
     {
-        //
+        $data = $request->all();
+
+        $extension = ResourceExtension::find($id);
+        $extension->update($data);
+        $extension->save();
+
+        return Response::detect("resource-extensions.update", [ "extension" => $extension]);
+
     }
 
     /**
@@ -91,6 +111,8 @@ class ResourceExtensionController extends Controller
      */
     public function destroy($id)
     {
-        //
+        $extension = ResourceExtension::find($id);
+        $extension->delete();
+        return redirect()->route("resource-extensions.index");
     }
 }

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