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

skolehjem/app/Http/Controllers/ContactController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Contact;
+use phpDocumentor\Reflection\Types\Context;
 
 class ContactController extends Controller
 {
@@ -59,9 +60,15 @@ class ContactController extends Controller
         ]);
 
         $contact = new Contact($requestContact);
-        $contact->save();
+        $saved = $contact->save();
+
+        if(!$saved){
+            return Response::detect("contacts.store");
+        }else{
+            $contact = Contact::query()->paginate($request->input("limit", 20));
+            return Response::detect("contacts.index", ['contacts' => $contact]);
+        }
 
-        return Response::detect("contacts.store");
     }
 
     /**
@@ -101,9 +108,15 @@ class ContactController extends Controller
         $data = $request->all();
         $contact = Contact::find($id);
         $contact->update($data);
-        $contact->save();
+        $saved = $contact->save();
+
+        if(!$saved){
+            return Response::detect("contacts.update", [ "contacts" => $contact ]);
+        }else{
+            $contact = Contact::query()->paginate($request->input("limit", 20));
+            return Response::detect("contacts.index", ['contacts' => $contact]);
+        }
 
-        return Response::detect("contacts.update", [ "contacts" => $contact ]);
     }
 
     /**

skolehjem/app/Http/Controllers/EventController.php

@@ -59,9 +59,15 @@ class EventController extends Controller
 
         $event = new Event($requestBody);
 
-        $event->save();
+        $saved = $event->save();
+
+        if(!$saved){
+            return Response::detect("events.store");
+        }else{
+            $event = Event::query()->paginate($request->input("limit", 20));
+            return Response::detect("events.index", ['events' => $event]);
+        }
 
-        return Response::detect("events.store");
     }
 
     /**
@@ -100,9 +106,15 @@ class EventController extends Controller
 
         $event = Event::find($id);
         $event->update($data);
-        $event->save();
+        $saved = $event->save();
+
+        if(!$saved){
+            return Response::detect("events.update", [ "event" => $event]);
+        }else{
+            $event = Event::query()->paginate($request->input("limit", 20));
+            return Response::detect("events.index", ['events' => $event]);
+        }
 
-        return Response::detect("events.update", [ "event" => $event]);
     }
 
     /**

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -55,9 +55,15 @@ class ExternalLinkController extends Controller
         ]);
 
         $externalLink = new ExternalLink($requestBody);
-        $externalLink->save();
+        $saved = $externalLink->save();
+
+        if(!$saved){
+            return Response::detect("external-links.store");
+        }else{
+            $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
+            return Response::detect("external-links.index", ['links' => $externalLink]);
+        }
 
-        return Response::detect("external-links.store");
     }
 
     /**
@@ -96,9 +102,15 @@ class ExternalLinkController extends Controller
 
         $link = ExternalLink::find($id);
         $link->update($data);
-        $link->save();
+        $saved = $link->save();
+
+        if(!$saved){
+            return Response::detect("external-links.update", [ "link" => $link]);
+        }else{
+            $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
+            return Response::detect("external-links.index", ['links' => $externalLink]);
+        }
 
-        return Response::detect("external-links.update", [ "link" => $link]);
     }
 
     /**

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -60,9 +60,14 @@ class MenuPlanController extends Controller
         ]);
 
         $menuPlans = new MenuPlan($requestMenuPlanCreate);
-        $menuPlans->save();
+        $saved = $menuPlans->save();
 
-        return Response::detect("menuplans.store");
+        if(!$saved){
+            return Response::detect("menuplans.store");
+        }else{
+            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]);
+        }
     }
 
     /**
@@ -102,9 +107,15 @@ class MenuPlanController extends Controller
 
         $menuplan = MenuPlan::find($id);
         $menuplan->update($data);
-        $menuplan->save();
+        $saved = $menuplan->save();
+
+        if(!$saved){
+            return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
+        }else{
+            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]);
+        }
 
-        return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
     }
 
     /**

skolehjem/app/Http/Controllers/RolesController.php

@@ -45,9 +45,16 @@ class rolesController extends Controller
         ]);
 
         $role = new Role($requestRole);
-        $role->save();
+        $saved = $role->save();
+
+        if(!$saved){
+            return Response::detect("roles.store");
+        }else{
+            $roles = Role::query()->paginate($request->input("limit", 20));
+            return Response::detect("roles.index", ['roles' => $roles]);
+        }
+
 
-        return Response::detect("roles.store");
     }
 
     /**
@@ -85,9 +92,15 @@ class rolesController extends Controller
         $data = $request->all();
         $role = Role::find($id);
         $role->update($data);
-        $role->save();
+        $saved = $role->save();
+
+        if(!$saved){
+            return Response::detect("roles.update", [ "role" => $role ]);
+        }else{
+            $roles = Role::query()->paginate($request->input("limit", 20));
+            return Response::detect("roles.index", ['roles' => $roles]);
+        }
 
-        return Response::detect("roles.update", [ "role" => $role ]);
     }
 
     /**

skolehjem/resources/views/admin/external-links/edit.blade.php

@@ -15,7 +15,7 @@
         @csrf
         @method("PUT")
         <label for="title">Titel:</label>
-        <input value="{{$link->name}}" type="text" name="title" id="title" required>
+        <input value="{{$link->name}}" type="text" name="name" id="title" required>
         <label for="link">Linket:</label>
         <input value="{{$link->link}}" type="text" name="link" id="link" required>
         <input type="submit" class="btn btn-dark text-white" value="Rediger">