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

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

Browse Source 
 Conflicts:
	skolehjem/public/css/admin.css
This commit is contained in:
Sebastian Davaris
2020-07-27 08:25:42 +02:00
parent a755fd9680 6eb198011f
commit 79e5e95695
46 changed files with 7081 additions and 207 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
+21 -4
View File
@@ -28,8 +28,11 @@ class EventController extends Controller
*/
public function index(Request $request)
{
$events = Event::query()->paginate($request->input("limit", 20));
//returns the function with events index page and a parameter of events.
//also Response::detect checks screen size to determine if user is on a computer or mobile.
return Response::detect("events.index", [ "events" => $events]);
}
@@ -40,6 +43,7 @@ class EventController extends Controller
*/
public function create()
{
//returns "create event" blade
return Response::detect("events.create");
}
@@ -57,11 +61,18 @@ class EventController extends Controller
"date" => "required"
]);
//creates a new Event model with the given parameter
$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 +111,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 ]);
}
/**
skolehjem/app/Http/Controllers/UserController.php
+11 -4
View File
@@ -154,11 +154,13 @@ class UserController extends Controller
/** @var User $user */
$user->update($data);
$user->roles()->detach();
$user->forgetCachedPermissions();
if ($request->roles != null) {
$user->roles()->detach();
$user->forgetCachedPermissions();
foreach ($request->roles as $role){
$user->assignRole($role);
foreach ($request->roles as $role){
$user->assignRole($role);
}
}
$user->save();
@@ -247,4 +249,9 @@ class UserController extends Controller
{
return Response::detect("users.edit");
}
public function accounteditpass()
{
return Response::detect("users.editpass");
}
}
skolehjem/app/Http/Controllers/WashingMachineController.php
+33 -18
View File
@@ -2,10 +2,13 @@
namespace App\Http\Controllers;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\WashingMachine;
use Illuminate\View\View;
class WashingMachineController extends Controller
{
@@ -24,11 +27,11 @@ class WashingMachineController extends Controller
* Display a listing of the resource.
*
* @param Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function index(Request $request)
{
$machines = WashingMachine::query()->paginate($request->query("page", 1));
$machines = WashingMachine::query()->paginate($request->query("limit", 20));
return Response::detect("washing-machines.index", [ "machines" => $machines ]);
}
@@ -36,7 +39,7 @@ class WashingMachineController extends Controller
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function create()
{
@@ -47,25 +50,30 @@ class WashingMachineController extends Controller
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function store(Request $request)
{
$data = $request->validate([
"time" => "required"
"name" => "required"
]);
$machine = new WashingMachine($data);
$machine->save();
$saved = $machine->save();
return Response::detect("washing-machines.store");
if(!$saved){
return Response::detect("washing-machines.store");
}else{
$machines = WashingMachine::query()->paginate($request->input("limit", 20));
return Response::detect("washing-machines.index", ['machines' => $machines]);
}
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function show($id)
{
@@ -80,7 +88,7 @@ class WashingMachineController extends Controller
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function edit($id)
{
@@ -96,36 +104,43 @@ class WashingMachineController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function update(Request $request, $id)
{
$data = $request->validate([
"time" => "required"
"name" => "required"
]);
$machine = WashingMachine::find($id);
$machine->update($data);
$machine->save();
$saved = $machine->save();
return Response::detect("washing-machines.edit", [
"machine" => $machine
]);
if(!$saved){
return Response::detect("washing-machines.update", [
"machine" => $machine
]);
} else {
$machines = WashingMachine::query()->paginate($request->input("limit", 20));
return Response::detect("washing-machines.index", [
"machines" => $machines
]);
}
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @param $id
* @return Response
*/
public function destroy($id)
{
$machine = WashingMachine::find($id);
$machine->delete();
return Response::detect("washing-machines.destroy");
return redirect()->route("washing-machines.index");
}
}
skolehjem/app/Http/Controllers/WashingReservationController.php
+47 -18
View File
@@ -2,10 +2,15 @@
namespace App\Http\Controllers;
use App\WashingMachine;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\WashingReservation;
use Illuminate\View\View;
class WashingReservationController extends Controller
{
@@ -24,11 +29,11 @@ class WashingReservationController extends Controller
* Display a listing of the resource.
*
* @param Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function index(Request $request)
{
$reservations = WashingReservation::query()->paginate($request->query("page", 1));
$reservations = WashingReservation::query()->paginate($request->query("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}
@@ -36,36 +41,48 @@ class WashingReservationController extends Controller
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function create()
{
return Response::detect("washing-reservations.create");
$machines = WashingMachine::all();
return Response::detect("washing-reservations.create", [ 'machines' => $machines ]);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function store(Request $request)
{
$data = $request->validate([
"time" => "required"
"time" => "required",
"machine" => "required"
]);
$machineReservation = new WashingReservation($data);
$machineReservation->save();
return Response::detect("washing-reservations.store");
$saved = $machineReservation->save();
if(!$saved){
return Response::detect("washing-reservations.store", [
"washing_reservation" => $machineReservation
]);
}else{
$reservations = WashingReservation::query()->paginate($request->input("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function show($id)
{
@@ -80,11 +97,14 @@ class WashingReservationController extends Controller
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function edit($id)
{
return Response::detect("washing-reservations.edit");
$reservation = WashingReservation::query()->find($id);
$machines = WashingMachine::all();
return Response::detect("washing-reservations.edit", ['washing_reservation' => $reservation, 'machines' => $machines ]);
}
/**
@@ -92,36 +112,45 @@ class WashingReservationController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Application|Factory|View
*/
public function update(Request $request, $id)
{
$data = $request->validate([
"time" => "required"
"time" => "required",
"machine" => "required"
]);
$machineReservation = WashingReservation::find($id);
$machineReservation->update($data);
$machineReservation->save();
$saved = $machineReservation->save();
return Response::detect("washing-reservations.edit", [
"washingReservation" => $machineReservation
]);
if(!$saved){
return Response::detect("washing-reservations.update", [
"washing_reservation" => $machineReservation
]);
}else{
$reservations = WashingReservation::query()->paginate($request->query("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return RedirectResponse
*/
public function destroy($id)
{
$machineReservation = WashingReservation::find($id);
$machineReservation->delete();
return Response::detect("washing-reservations.delete");
$reservations = WashingReservation::query()->paginate( 20);
return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]);
}
}