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

Fixed UserController.php

This commit is contained in:
Sebastian Davaris 2020-06-19 08:15:24 +02:00
parent ca4bcbd5be
commit e056567f57
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
skolehjem/app/Http/Controllers/EventController.php
View File

@ -77,11 +77,19 @@ class EventController 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)
public function update(Request $request, Event $id)
{
//
$requestBody = $request->validate([
"name" => "unique:events|max:255",
"description" => "max:255"
]);
$id->update($requestBody);
$id->save();
return view("admin.event.update");
}
/**

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

@ -30,7 +30,7 @@ class UserController extends Controller
{
$users = User::query()->paginate($request->query("page", 1));
return view("admin.user.index", [ "users" => $users ]);
return view("admin.users.index", [ "users" => $users ]);
}
/**
@ -40,7 +40,7 @@ class UserController extends Controller
*/
public function create()
{
return view("admin.user.create");
return view("admin.users.create");
}
/**
@ -63,7 +63,7 @@ class UserController extends Controller
$user = new User($data);
$user->save();
return view("admin.user.store");
return view("admin.users.store");
}
/**
@ -76,7 +76,7 @@ class UserController extends Controller
{
$user = User::find($id);
return view("admin.user.show", [
return view("admin.users.show", [
"user" => $user
]);
}
@ -91,7 +91,7 @@ class UserController extends Controller
{
$user = User::find($id);
return view("admin.user.edit", [
return view("admin.users.edit", [
"user" => $user
]);
}
@ -130,7 +130,7 @@ class UserController extends Controller
$user->save();
}
return view("admin.user.edit", [
return view("admin.users.edit", [
"user" => $user
]);
}
@ -153,7 +153,7 @@ class UserController extends Controller
$user->delete();
}
return view("admin.user.delete");
return view("admin.users.delete");
}
/*******************************************/
@ -161,7 +161,7 @@ class UserController extends Controller
/*******************************************/
public function showLogin() {
return view("admin.user.login");
return view("admin.users.login");
}
public function login(Request $request) {
@ -169,7 +169,7 @@ class UserController extends Controller
if(Auth::attempt($data)) {
//TODO: Implement home?
return view("admin.user.home", [ "user" => Auth::user() ]);
return view("admin.users.home", [ "user" => Auth::user() ]);
}
return redirect()->back(303);

14
skolehjem/routes/web.php
View File

@ -17,16 +17,14 @@ use Illuminate\Support\Facades\Route;
// return view('welcome');
//});
Route::middleware(["auth"])->group(function () {
Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");
});
Route::get("/", "RootController@index")->name("root.index");
Route::get("/login", "UserController@showLogin")->name("user.show-login");
Route::post("/login", "UserController@login")->name("user.login");
Route::get("/logout", "UserController@logout")->name("user.logout");
Route::get("/login", "UserController@showLogin")->name("users.show-login");
Route::post("/login", "UserController@login")->name("users.login");
Route::get("/logout", "UserController@logout")->name("users.logout");
Route::resource("users", "UserController");
Route::resource("events", "EventController");
Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");