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
This commit is contained in:
Sebastian Davaris
2020-06-29 14:28:17 +02:00
parent b5ede965fe 45a7302640
commit eb749e58a5
46 changed files with 764 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/ContactController.php
+31 -10
View File
@@ -18,7 +18,7 @@ class ContactController extends Controller
$contact = Contact::query()->paginate($request->input("limit", 20));
return Response::detect("contact.index", [ "contact" => $contact]);
return Response::detect("contacts.index", [ "contacts" => $contact]);
}
/**
@@ -28,7 +28,8 @@ class ContactController extends Controller
*/
public function create()
{
//
return Response::detect("contacts.create");
}
/**
@@ -39,7 +40,17 @@ class ContactController extends Controller
*/
public function store(Request $request)
{
//
$requestContact = $request->validate([
"name_first" => "required|max:255",
"name_last" => "required|max:255",
"email" => "required|max:255",
"phone" => "required|max:255",
]);
$contact = new Contact($requestContact);
$contact->save();
return Response::detect("contacts.store");
}
/**
@@ -50,7 +61,8 @@ class ContactController extends Controller
*/
public function show($id)
{
//
return Response::detect("contacts.show", [ "contacts" => $id]);
}
/**
@@ -61,7 +73,8 @@ class ContactController extends Controller
*/
public function edit($id)
{
//
$contact = Contact::find($id);
return Response::detect("contacts.edit", ["contact" => $contact]);
}
/**
@@ -73,17 +86,25 @@ class ContactController extends Controller
*/
public function update(Request $request, $id)
{
//
$data = $request->all();
$contact = Contact::find($id);
$contact->update($data);
$contact->save();
return Response::detect("contacts.update", [ "contacts" => $contact ]);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param int $id
* @return \Illuminate\Http\RedirectResponse
* @throws \Exception
*/
public function destroy($id)
public function destroy(Contact $id)
{
//
$id->delete();
return redirect()->route("contacts.index");
}
}
skolehjem/app/Http/Controllers/FeedbackController.php
+7 -7
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers;
use App\Feedback;
use App\Feedbacks;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -17,9 +17,9 @@ class FeedbackController extends Controller
*/
public function index(Request $request)
{
$feedback = Feedback::query()->paginate($request->input("limit", 20));
$feedback = Feedbacks::query()->paginate($request->input("limit", 20));
return Response::detect("feedback.index", [ "feedback" => $feedback ]);
return Response::detect("feedbacks.index", [ "feedback" => $feedback ]);
}
/**
@@ -45,7 +45,7 @@ class FeedbackController extends Controller
"link" => "required|max:255"
]);
$feedback = new Feedback($requestBody);
$feedback = new Feedbacks($requestBody);
$feedback->save();
return Response::detect("feedback.store");
@@ -70,7 +70,7 @@ class FeedbackController extends Controller
*/
public function edit($id)
{
$feedback = Feedback::find($id);
$feedback = Feedbacks::find($id);
return Response::detect("feedbacks.edit", [
"feedback" => $feedback
@@ -90,7 +90,7 @@ class FeedbackController extends Controller
"time" => "required"
]);
$feedback = Feedback::find($id);
$feedback = Feedbacks::find($id);
$feedback->update($data);
@@ -109,7 +109,7 @@ class FeedbackController extends Controller
*/
public function destroy($id)
{
$feedback = Feedback::find($id);
$feedback = Feedbacks::find($id);
$feedback->delete();
return Response::detect("feedbacks.destroy");
skolehjem/app/Http/Controllers/StaffController.php
+185
View File
@@ -0,0 +1,185 @@
<?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("/");
}
}