From 06bab0a1204d0ab35e13fb4bba7782322143e273 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 18 Jun 2020 08:01:42 +0200 Subject: [PATCH 01/11] Working on controllers --- skolehjem/app/Event.php | 9 +- .../Controllers/CalendarDateController.php | 177 ++++++++++-------- .../app/Http/Controllers/EventController.php | 49 +++-- 3 files changed, 133 insertions(+), 102 deletions(-) diff --git a/skolehjem/app/Event.php b/skolehjem/app/Event.php index 64fb4c2..7ccc3ac 100644 --- a/skolehjem/app/Event.php +++ b/skolehjem/app/Event.php @@ -6,5 +6,12 @@ use Illuminate\Database\Eloquent\Model; class Event extends Model { - // + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + "name", "description" + ]; } diff --git a/skolehjem/app/Http/Controllers/CalendarDateController.php b/skolehjem/app/Http/Controllers/CalendarDateController.php index f47373f..e32daba 100644 --- a/skolehjem/app/Http/Controllers/CalendarDateController.php +++ b/skolehjem/app/Http/Controllers/CalendarDateController.php @@ -1,84 +1,95 @@ paginate($request->input("limit", 20)); +// +// return view("calendar-date.index", [ +// "calendarDates" => $calendarDates +// ]); +// } +// +// /** +// * Show the form for creating a new resource. +// * +// * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View +// */ +// public function create() +// { +// return view("calendar-date.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) +// { +// $fields = $request->validate([ +// "" => "" +// ]); +// +// $calendarDate = new CalendarDate() +// +// return view("calendar-date.store"); +// } +// +// /** +// * Display the specified resource. +// * +// * @param int $id +// * @return \Illuminate\Http\Response +// */ +// public function show($id) +// { +// // +// } +// +// /** +// * Show the form for editing the specified resource. +// * +// * @param int $id +// * @return \Illuminate\Http\Response +// */ +// public function edit($id) +// { +// // +// } +// +// /** +// * Update the specified resource in storage. +// * +// * @param \Illuminate\Http\Request $request +// * @param int $id +// * @return \Illuminate\Http\Response +// */ +// public function update(Request $request, $id) +// { +// // +// } +// +// /** +// * Remove the specified resource from storage. +// * +// * @param int $id +// * @return \Illuminate\Http\Response +// */ +// public function destroy($id) +// { +// // +// } +//} diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 881efd2..ad285cb 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Event; use App\User; use Illuminate\Http\Request; @@ -10,56 +11,65 @@ class EventController extends Controller /** * Display a listing of the resource.. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index(Request $request) { - $users = User::query()->paginate($request->query("limit", 20)); + $events = Event::query()->paginate($request->input("limit", 20)); - return view("user.index", [ "users" => $users]); + return view("admin.event.index", [ "events" => $events]); } /** * 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("user.create"); + return view("admin.event.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) { - // + $requestBody = $request->validate([ + "name" => "required|unique:events|max:255", + "description" => "required|max:255" + ]); + + $event = new Event($requestBody); + + $event->save(); + + return view("admin.event.store"); } /** * Display the specified resource. * - * @param int $id - * @return \Illuminate\Http\Response + * @param Event $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function show($id) + public function show(Event $id) { - // + return view("admin.event.show", [ "event" => $id ]); } /** * 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) + public function edit(Event $id) { - // + return view("admin.event.edit", [ "event" => $id ]); } /** @@ -77,11 +87,14 @@ class EventController extends Controller /** * Remove the specified resource from storage. * - * @param int $id - * @return \Illuminate\Http\Response + * @param Event $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @throws \Exception */ - public function destroy($id) + public function destroy(Event $id) { - // + $id->delete(); + + return view("admin.event.destroy"); } } From e056567f57d0b4f333ebdf70112f8b57b60e9373 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 19 Jun 2020 08:15:24 +0200 Subject: [PATCH 02/11] Fixed UserController.php --- .../app/Http/Controllers/EventController.php | 14 +++++++++++--- .../app/Http/Controllers/UserController.php | 18 +++++++++--------- skolehjem/routes/web.php | 14 ++++++-------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index ad285cb..8c50905 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -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"); } /** diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index d7126a2..06fc2ca 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -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); diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 487021b..3f157d8 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -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"); From 9c3796220f300d2317696e74cc29f8e37af6fe93 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 22 Jun 2020 10:08:18 +0200 Subject: [PATCH 03/11] Fixed blade references. --- .../Http/Controllers/ExternalLinkController.php | 10 +++++++--- .../app/Http/Controllers/UserController.php | 2 +- .../Controllers/WashingMachineController.php | 14 +++++++------- skolehjem/app/User.php | 6 ++++++ .../views/admin/layout/header.blade.php | 4 ++-- .../resources/views/admin/users/create.blade.php | 1 + .../resources/views/admin/users/edit.blade.php | 1 + .../resources/views/admin/users/index.blade.php | 16 +++++++++------- .../resources/views/admin/users/login.blade.php | 1 + 9 files changed, 35 insertions(+), 20 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index 1a71828..4580fa6 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\ExternalLink; use Illuminate\Http\Request; class ExternalLinkController extends Controller @@ -9,11 +10,14 @@ class ExternalLinkController 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) { - // + $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); + + return view("external-link.index", [ "externalLink" => $externalLink ]); } /** diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 06fc2ca..0791163 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -169,7 +169,7 @@ class UserController extends Controller if(Auth::attempt($data)) { //TODO: Implement home? - return view("admin.users.home", [ "user" => Auth::user() ]); + return view("admin.users.index", [ "user" => Auth::user() ]); } return redirect()->back(303); diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index f39aca5..931a28c 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -18,7 +18,7 @@ class WashingMachineController extends Controller { $machines = WashingMachine::query()->paginate($request->query("page", 1)); - return view("washing-machine.index", [ "machines" => $machines ]); + return view("admin.washing-machines.index", [ "machines" => $machines ]); } /** @@ -28,7 +28,7 @@ class WashingMachineController extends Controller */ public function create() { - return view("washing-machine.create"); + return view("admin.washing-machines.create"); } /** @@ -46,7 +46,7 @@ class WashingMachineController extends Controller $machine = new WashingMachine($data); $machine->save(); - return view("washing-machine.store"); + return view("admin.washing-machines.store"); } /** @@ -59,7 +59,7 @@ class WashingMachineController extends Controller { $machine = WashingMachine::find($id); - return view("washing-machine.show", [ + return view("admin.washing-machines.show", [ "machine" => $machine ]); } @@ -74,7 +74,7 @@ class WashingMachineController extends Controller { $machine = WashingMachine::find($id); - return view("washing-machine.edit", [ + return view("admin.washing-machines.edit", [ "machine" => $machine ]); } @@ -98,7 +98,7 @@ class WashingMachineController extends Controller $machine->save(); - return view("washing-machine.edit", [ + return view("admin.washing-machines.edit", [ "machine" => $machine ]); } @@ -114,6 +114,6 @@ class WashingMachineController extends Controller $machine = WashingMachine::find($id); $machine->delete(); - return view("washing-machine.destroy"); + return view("admin.washing-machines.destroy"); } } diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php index 061c7ba..ac8b735 100644 --- a/skolehjem/app/User.php +++ b/skolehjem/app/User.php @@ -6,6 +6,8 @@ use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Hash; use Spatie\Permission\Traits\HasRoles; class User extends Authenticatable @@ -39,4 +41,8 @@ class User extends Authenticatable protected $casts = [ 'email_verified_at' => 'datetime', ]; + + public function setPasswordAttribute($password) { + $this->attributes["password"] = Hash::make($password); + } } diff --git a/skolehjem/resources/views/admin/layout/header.blade.php b/skolehjem/resources/views/admin/layout/header.blade.php index d3ab485..a093951 100644 --- a/skolehjem/resources/views/admin/layout/header.blade.php +++ b/skolehjem/resources/views/admin/layout/header.blade.php @@ -4,9 +4,9 @@ @auth User: {{ Auth::user()->name }} - Log ud + Log ud @else - Log ind + Log ind @endauth diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 7976d5d..487b3a8 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -12,6 +12,7 @@ @section("content")

Opret Bruger:

+ @csrf diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index 6377d40..d6a45a3 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -12,6 +12,7 @@ @section("content")

Rediger Bruger:

+ @csrf diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index d9b22ee..83626c9 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -21,13 +21,15 @@ Delete - {ID} - {Fornavn} - {Efternavn} - {Email} - {TLF} - Update - Delete + @foreach($users as $user) + {{ $user->id }} + {{ $user->name_first }} + {{ $user->name_last }} + {{ $user->email }} + {{ $user->phone }} + Update + Delete + @endforeach @endsection diff --git a/skolehjem/resources/views/admin/users/login.blade.php b/skolehjem/resources/views/admin/users/login.blade.php index 5d9ade1..5accdac 100644 --- a/skolehjem/resources/views/admin/users/login.blade.php +++ b/skolehjem/resources/views/admin/users/login.blade.php @@ -10,6 +10,7 @@ Syddansk Erhvervsskole + @csrf