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

Began working on more controllers

This commit is contained in:
Sebastian Davaris 2020-06-10 12:30:44 +02:00
parent 9c6d8c04cd
commit 3c02963c24
3 changed files with 104 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
skolehjem/app/Http/Controllers/UserController.php
View File

@ -52,7 +52,7 @@ class UserController extends Controller
$user = new User($data);
$user->save();
return view("user.success");
return view("user.store");
}
/**
@ -90,22 +90,59 @@ class UserController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function update(Request $request, $id)
{
//
$data = $request->validate([
"name_first" => "max:255",
"name_last" => "max:255",
"email" => "email|unique:users",
"password" => "max:60",
"phone" => "unique:users",
]);
// Validates if the user is updating itself or another user.
if($id === Auth::id()) {
$user = Auth::user();
$user->update($data);
$user->save();
}
else if(Auth::user()->hasPermissionTo("user.edit")) {
$user = User::find($id);
/** @var User $user */
$user->update($data);
$user->save();
}
return view("user.edit", [
"user" => $user
]);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function destroy($id)
{
//
if($id === Auth::id()) {
$user = Auth::user();
$user->delete();
}
else if(Auth::user()->hasPermissionTo("user.delete")) {
$user = User::find($id);
$user->delete();
}
return view("user.delete");
}
/*******************************************/
@ -116,9 +153,16 @@ class UserController extends Controller
$data = $request->only("email", "password");
if(Auth::attempt($data)) {
//TODO: Implement home?
return view("user.home", [ "user" => Auth::user() ]);
}
return redirect()->back(400);
return redirect()->back(403);
}
public function logout(Request $request) {
Auth::logout();
return redirect()->to("/");
}
}

65
skolehjem/app/Http/Controllers/WashingMachineController.php
View File

@ -4,59 +4,79 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\WashingMachine;
class WashingMachineController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
* @param Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index()
public function index(Request $request)
{
//
$machines = WashingMachine::query()->paginate($request->query("page", 1));
return view("washing-machine.index", [ "machines" => $machines ]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create()
{
//
return view("washing-machine.create");
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function store(Request $request)
{
//
$data = $request->validate([
"time" => "required"
]);
$machine = new WashingMachine($data);
$machine->save();
return view("washing-machine.store");
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function show($id)
{
//
$machine = WashingMachine::find($id);
return view("washing-machine.show", [
"machine" => $machine
]);
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit($id)
{
//
$machine = WashingMachine::find($id);
return view("washing-machine.edit", [
"machine" => $machine
]);
}
/**
@ -64,21 +84,36 @@ class WashingMachineController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function update(Request $request, $id)
{
//
$data = $request->validate([
"time" => "required"
]);
$machine = WashingMachine::find($id);
$machine->update($data);
$machine->save();
return view("washing-machine.edit", [
"machine" => $machine
]);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function destroy($id)
{
//
$machine = WashingMachine::find($id);
$machine->delete();
return view("washing-machine.destroy");
}
}

4
skolehjem/routes/web.php
View File

@ -22,3 +22,7 @@ Route::middleware(["auth"])->group(function () {
});
Route::get("/", "RootController@index")->name("root.index");
Route::get("/login", "UserController@login")->name("user.login");
Route::get("/logout", "UserController@logout")->name("user.logout");