vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anders
2020-07-01 10:13:57 +02:00
parent 03b7f4236a 6ecc96ef55
commit b4f79c6f5e
30 changed files with 233 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/ContactController.php
+17 -4
View File
@@ -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
+16 -4
View File
@@ -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
+16 -4
View File
@@ -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
+15 -4
View File
@@ -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/ResourceCategoryController.php
+29 -9
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\ResourceCategory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -23,9 +24,11 @@ class ResourceCategoryController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(Request $request)
{
//
$categories = ResourceCategory::query()->paginate($request->input("limit", 20));
return Response::detect("resource-categories.index", ["category"=> $categories]);
}
/**
@@ -35,7 +38,7 @@ class ResourceCategoryController extends Controller
*/
public function create()
{
//
return Response::detect("resource-categories.create");
}
/**
@@ -46,7 +49,15 @@ class ResourceCategoryController extends Controller
*/
public function store(Request $request)
{
//
$requestBody = $request->validate([
"name" => "unique|required|max:255",
"description" => "required|max:255",
"slug" => "unique|required|max:255"
]);
$category = new ResourceCategory($requestBody);
$category->save();
return Response::detect("resource-categories.store");
}
/**
@@ -55,9 +66,9 @@ class ResourceCategoryController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
public function show(ResourceCategory $id)
{
//
return Response::detect("resource-categories.show", ["category" => $id]);
}
/**
@@ -68,7 +79,8 @@ class ResourceCategoryController extends Controller
*/
public function edit($id)
{
//
$category = ResourceCategory::find($id);
return Response::detect("resource-categories.edit", ["category" => $category]);
}
/**
@@ -80,7 +92,13 @@ class ResourceCategoryController extends Controller
*/
public function update(Request $request, $id)
{
//
$data = $request->all();
$category = ResourceCategory::find($id);
$category->update($data);
$category->save();
return Response::detect("resource-categories.update", ["category" => $category]);
}
/**
@@ -91,6 +109,8 @@ class ResourceCategoryController extends Controller
*/
public function destroy($id)
{
//
$category = ResourceCategory::find($id);
$category->delete();
return redirect()->route("resource-categories.index");
}
}
skolehjem/app/Http/Controllers/RolesController.php
+17 -4
View File
@@ -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 ]);
}
/**