Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/MenuPlan.php
This commit is contained in:
Anders
2020-06-30 12:40:02 +02:00
70 changed files with 990 additions and 504 deletions
@@ -0,0 +1,85 @@
<?php
namespace App\Http\Controllers;
use App\Album;
use Illuminate\Http\Request;
class AlbumController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function show(Album $album)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function edit(Album $album)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Album $album)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function destroy(Album $album)
{
//
}
}
@@ -8,6 +8,17 @@ use App\Contact;
class ContactController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:contact.list" ])->only("index");
$this->middleware([ "check.auth:contact.show" ])->only("show");
$this->middleware([ "check.auth:contact.create" ])->only("create", "store");
$this->middleware([ "check.auth:contact.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:contact.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -102,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");
}
}
@@ -10,6 +10,17 @@ use Illuminate\Http\Response;
class EventController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:event.list" ])->only("index");
$this->middleware([ "check.auth:event.show" ])->only("show");
$this->middleware([ "check.auth:event.create" ])->only("create", "store");
$this->middleware([ "check.auth:event.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:event.delete" ])->only("delete");
}
/**
* Display a listing of the resource..
*
@@ -70,9 +81,10 @@ class EventController extends Controller
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit(Event $id)
public function edit($id)
{
return Response::detect("events.edit", [ "event" => $id ]);
$event = Event::find($id);
return Response::detect("events.edit", [ "event" => $event ]);
}
/**
@@ -82,17 +94,15 @@ class EventController extends Controller
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function update(Request $request, Event $id)
public function update(Request $request, $id)
{
$requestBody = $request->validate([
"name" => "unique:events|max:255",
"description" => "max:255"
]);
$data = $request->all();
$id->update($requestBody);
$id->save();
$event = Event::find($id);
$event->update($data);
$event->save();
return Response::detect("events.update");
return Response::detect("events.update", [ "event" => $event]);
}
/**
@@ -104,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");
}
}
@@ -9,6 +9,15 @@ use Illuminate\Http\Response;
class ExternalLinkController extends Controller
{
function __construct()
{
$this->middleware("permission:link.external.list")->only("index");
$this->middleware("permission:link.external.create")->only(["create", "store"]);
$this->middleware("permission:link.external.show")->only("show");
$this->middleware("permission:link.external.edit")->only(["edit", "update"]);
$this->middleware("permission:link.external.delete")->only("destroy");
}
/**
* Display a listing of the resource.
*
@@ -9,6 +9,17 @@ use Illuminate\Http\Response;
class FeedbackController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:feedback.list" ])->only("index");
$this->middleware([ "check.auth:feedback.show" ])->only("show");
$this->middleware([ "check.auth:feedback.create" ])->only("create", "store");
$this->middleware([ "check.auth:feedback.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:feedback.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -10,6 +10,17 @@ use Illuminate\Http\Response;
class MenuPlanController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:menuplan.list" ])->only("index");
$this->middleware([ "check.auth:menuplan.show" ])->only("show");
$this->middleware([ "check.auth:menuplan.create" ])->only("create", "store");
$this->middleware([ "check.auth:menuplan.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:menuplan.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -100,7 +111,7 @@ class MenuPlanController extends Controller
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy($id)
{
@@ -0,0 +1,13 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class PhoneController extends Controller
{
function index() {
return Response::detect("vagttelefons.index");
}
}
@@ -7,6 +7,17 @@ use Illuminate\Http\Response;
class ResourceCategoryController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:resource.category.list" ])->only("index");
$this->middleware([ "check.auth:resource.category.show" ])->only("show");
$this->middleware([ "check.auth:resource.category.create" ])->only("create", "store");
$this->middleware([ "check.auth:resource.category.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:resource.category.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -7,6 +7,17 @@ use Illuminate\Http\Response;
class ResourceController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:resource.list" ])->only("index");
$this->middleware([ "check.auth:resource.show" ])->only("show");
$this->middleware([ "check.auth:resource.create" ])->only("create", "store");
$this->middleware([ "check.auth:resource.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:resource.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -14,7 +25,7 @@ class ResourceController extends Controller
*/
public function index()
{
//
}
/**
@@ -2,19 +2,33 @@
namespace App\Http\Controllers;
use App\ResourceExtension;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class ResourceExtensionController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:resource.extension.list" ])->only("index");
$this->middleware([ "check.auth:resource.extension.show" ])->only("show");
$this->middleware([ "check.auth:resource.extension.create" ])->only("create", "store");
$this->middleware([ "check.auth:resource.extension.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:resource.extension.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
* @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]);
}
/**
@@ -24,7 +38,7 @@ class ResourceExtensionController extends Controller
*/
public function create()
{
//
return Response::detect("resource-extensions.create");
}
/**
@@ -35,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");
}
/**
@@ -44,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]);
}
/**
@@ -57,7 +80,8 @@ class ResourceExtensionController extends Controller
*/
public function edit($id)
{
//
$extension = ResourceExtension::find($id);
return Response::detect("resource-extensions.edit", ["extension" => $extension]);
}
/**
@@ -69,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]);
}
/**
@@ -80,6 +111,8 @@ class ResourceExtensionController extends Controller
*/
public function destroy($id)
{
//
$extension = ResourceExtension::find($id);
$extension->delete();
return redirect()->route("resource-extensions.index");
}
}
@@ -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");
}
}
@@ -7,6 +7,11 @@ use Illuminate\Http\Response;
class RootController extends Controller
{
function __construct()
{
$this->middleware("auth");
}
public function index() {
return Response::detect("root.index");
}
@@ -1,185 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Staff;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
class StaffController extends Controller
{
public function __construct()
{
// $this->middleware([ "auth" ])->only("logout");
// $this->middleware([ "guest" ])->only("login");
//
// $this->middleware([ "permission:staff.list", "role:admin" ])->only("index");
// $this->middleware([ "permission:staff.show", "role:admin" ])->only("show");
// $this->middleware([ "permission:staff.edit", "role:admin" ])->only([ "edit", "update" ]);
// $this->middleware([ "permission:staff.delete", "role:admin" ])->only("delete");
}
/**
* Display a listing of the resource.
*
* @param Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
$staffs = Staff::query()->paginate($request->query("page", 20));
return Response::detect("staff.index", [ "staffs" => $staffs ]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create()
{
return Response::detect("staff.create");
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function store(Request $request)
{
$data = $request->validate([
"name_first" => "required|max:255",
"name_last" => "required|max:255",
"email" => "required|email|unique:staff",
"password" => "required|max:60",
"phone" => "required|unique:staff"
]);
$staff = new Staff($data);
$staff->save();
return Response::detect("staff.store");
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function show($id)
{
$staff = Staff::find($id);
return Response::detect("staff.show", [
"staff" => $staff
]);
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit($id)
{
$staff = Staff::find($id);
return Response::detect("staff.edit", [
"staff" => $staff
]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function update(Request $request, $id)
{
$data = $request->all();
// $data = $request->validate([
// "name_first" => "max:255",
// "name_last" => "max:255",
// "email" => "email|unique:staff",
// "password" => "max:60",
// "phone" => "unique:staff",
// ]);
// Validates if the staff is updating itself or another staff.
// if($id === Auth::id()) {
// $staff = Auth::staff();
//
// $staff->update($data);
//
// $staff->save();
// return Response::detect("staff.edit", [
// "staff" => $staff
// ]);
// }
//TODO: Implement when security's ready!!!
// else if(Auth::staff()->hasPermissionTo("staff.edit")) {
$staff = Staff::find($id);
/** @var Staff $staff */
$staff->update($data);
$staff->save();
// }
$staffs = Staff::query()->paginate(20);
return Response::detect("staff.index", [
"staffs" => $staffs
]);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function destroy(Staff $id)
{
$id->delete();
return redirect()->route("staff.index");
}
/*******************************************/
/* Authentication */
/*******************************************/
public function showLogin() {
return view("admin.staff.login");
}
public function login(Request $request) {
$data = $request->only("email", "password");
if(Auth::attempt($data)) {
//TODO: Implement home?
return redirect()->route("staff.index");
}
return redirect()->back(303);
}
public function logout(Request $request) {
Auth::logout();
return redirect()->to("/");
}
}
@@ -8,19 +8,21 @@ 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
{
public function __construct()
{
// $this->middleware([ "auth" ])->only("logout");
// $this->middleware([ "guest" ])->only("login");
//
// $this->middleware([ "permission:user.list", "role:admin" ])->only("index");
// $this->middleware([ "permission:user.show", "role:admin" ])->only("show");
// $this->middleware([ "permission:user.edit", "role:admin" ])->only([ "edit", "update" ]);
// $this->middleware([ "permission:user.delete", "role:admin" ])->only("delete");
$this->middleware([ "auth" ])->only("logout");
$this->middleware([ "guest" ])->only("login");
$this->middleware([ "check.auth:user.list" ])->only("index");
$this->middleware([ "check.auth:user.show" ])->only("show");
$this->middleware([ "check.auth:user.create" ])->only("create");
$this->middleware([ "check.auth:user.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:user.delete" ])->only("delete");
}
/**
@@ -43,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]);
}
/**
@@ -54,7 +58,7 @@ class UserController extends Controller
*/
public function store(Request $request)
{
Log::debug("STORE FUNCTION");
// Log::debug("STORE FUNCTION");
$data = $request->validate([
"name_first" => "required|max:255",
@@ -62,18 +66,19 @@ class UserController extends Controller
"email" => "required|email|unique:users",
"password" => "required|max:60",
"phone" => "required|unique:users",
"roles" => "max:255"
]);
Log::debug("FINISHED VALIDATION?");
// Log::debug("FINISHED VALIDATION?");
$user = new User($data);
Log::debug("CREATED USER [NOT PERSISTED YET]");
// Log::debug("CREATED USER [NOT PERSISTED YET]");
$user->save();
Log::debug("SAVED USER");
// Log::debug("SAVED USER");
return Response::detect("users.store");
}
@@ -101,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,
]);
}
@@ -182,7 +189,7 @@ class UserController extends Controller
/*******************************************/
public function showLogin() {
return view("admin.users.login");
return Response::detect("users.login");
}
public function login(Request $request) {
@@ -190,7 +197,7 @@ class UserController extends Controller
if(Auth::attempt($data)) {
//TODO: Implement home?
return redirect()->route("users.index");
return redirect()->route("root.index");
}
return redirect()->back(303);
@@ -199,6 +206,29 @@ class UserController extends Controller
public function logout(Request $request) {
Auth::logout();
return redirect()->to("/");
return redirect()->route("users.login");
}
/*******************************************/
/* Forgot password */
/*******************************************/
public function showForgot(){
return Response::detect('users.forgot');
}
public function forgot(Request $request){
$user = User::query()->where('email', '=', $request->email)->first();
if($user == null){
return redirect()->back();
}
//Send email
//TODO: Implement mail.
return redirect()->route('users.login');
}
}
@@ -9,6 +9,17 @@ use App\WashingMachine;
class WashingMachineController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:washing.machine.list" ])->only("index");
$this->middleware([ "check.auth:washing.machine.show" ])->only("show");
$this->middleware([ "check.auth:washing.machine.create" ])->only("create", "store");
$this->middleware([ "check.auth:washing.machine.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:washing.machine.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -9,6 +9,17 @@ use App\WashingReservation;
class WashingReservationController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:washing.machine.reservation.list" ])->only("index");
$this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show");
$this->middleware([ "check.auth:washing.machine.reservation.create" ])->only("create", "store");
$this->middleware([ "check.auth:washing.machine.reservation.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:washing.machine.reservation.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*