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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	skolehjem/app/Http/Controllers/MenuPlanController.php
#	skolehjem/resources/views/admin/external-links/index.blade.php
This commit is contained in:
Vedde
2020-06-26 13:56:47 +02:00
parent 89082b281b b56f3d2a34
commit 578dd8d522
31 changed files with 347 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/EventController.php
+7 -7
View File
@@ -19,7 +19,7 @@ class EventController extends Controller
{
$events = Event::query()->paginate($request->input("limit", 20));
return Response::detect("bookings.index", [ "events" => $events]);
return Response::detect("events.index", [ "events" => $events]);
}
/**
@@ -29,7 +29,7 @@ class EventController extends Controller
*/
public function create()
{
return Response::detect("bookings.create");
return Response::detect("events.create");
}
/**
@@ -49,7 +49,7 @@ class EventController extends Controller
$event->save();
return Response::detect("bookings.store");
return Response::detect("events.store");
}
/**
@@ -60,7 +60,7 @@ class EventController extends Controller
*/
public function show(Event $id)
{
return Response::detect("bookings.show", [ "event" => $id ]);
return Response::detect("events.show", [ "event" => $id ]);
}
/**
@@ -71,7 +71,7 @@ class EventController extends Controller
*/
public function edit(Event $id)
{
return Response::detect("bookings.edit", [ "event" => $id ]);
return Response::detect("events.edit", [ "event" => $id ]);
}
/**
@@ -91,7 +91,7 @@ class EventController extends Controller
$id->update($requestBody);
$id->save();
return Response::detect("bookings.update");
return Response::detect("events.update");
}
/**
@@ -105,6 +105,6 @@ class EventController extends Controller
{
$id->delete();
return Response::detect("bookings.destroy");
return Response::detect("events.destroy");
}
}
skolehjem/app/Http/Controllers/MenuPlanController.php
+13 -10
View File
@@ -6,7 +6,6 @@ use App\ExternalLink;
use App\MenuPlan;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Log;
class MenuPlanController extends Controller
@@ -41,16 +40,19 @@ class MenuPlanController extends Controller
*/
public function store(Request $request)
{
Log::debug("SAVED Menuplan");
$requestMenuPlanCreate = $request->validate([
"name" => "required|max:255",
"link" => "required|max:255"
"monday" => "required|max:255",
"tuesday" => "required|max:255",
"wednesday" => "required|max:255",
"thursday" => "required|max:255",
"friday" => "required|max:255",
"saturday" => "required|max:255",
"sunday" => "required|max:255"
]);
$menuPlans = new MenuPlan($requestMenuPlanCreate);
$menuPlans->save();
return Response::detect("menuplans.store");
}
@@ -60,9 +62,9 @@ class MenuPlanController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
public function show(MenuPlan $id)
{
return Response::detect("menuplans.show", [ "menuplans" => $id]);
return Response::detect("menuplans.show", [ "menuplan" => $id]);
}
/**
@@ -73,7 +75,8 @@ class MenuPlanController extends Controller
*/
public function edit($id)
{
return Response::detect("menuplans.edit", ["menuplans" => $id]);
$editLink = MenuPlan::find($id);
return Response::detect("menuplans.edit", ["menu-plans" => $editLink]);
}
/**
@@ -93,7 +96,7 @@ class MenuPlanController extends Controller
$id->update($data);
$id->save();
return Response::detect("menu-plans.update");
return Response::detect("menuplans.update");
}
/**
@@ -105,6 +108,6 @@ class MenuPlanController extends Controller
public function destroy($id)
{
$id->delete();
return Response::detect("menu-plans.destroy");
return Response::detect("menuplans.destroy");
}
}