From 1eaa34516b3148d9efa872cf3693df76464c3997 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 29 Jun 2020 09:21:17 +0200 Subject: [PATCH 01/44] Fixed PhoneController.php --- .../app/Http/Controllers/PhoneController.php | 13 +++++++++++++ .../resources/views/app/layout/base.blade.php | 15 ++++++++++----- skolehjem/routes/web.php | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 skolehjem/app/Http/Controllers/PhoneController.php diff --git a/skolehjem/app/Http/Controllers/PhoneController.php b/skolehjem/app/Http/Controllers/PhoneController.php new file mode 100644 index 0000000..e2c3466 --- /dev/null +++ b/skolehjem/app/Http/Controllers/PhoneController.php @@ -0,0 +1,13 @@ + +
+

Eksterne Links

+
+ ReadVis Links +
+
+ CreateOpret Link +
+
From b5ede965fe44a74d8c93c90d11989526aa0fe838 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 29 Jun 2020 14:28:09 +0200 Subject: [PATCH 03/44] Began working on security. --- .../Controllers/ExternalLinkController.php | 9 ++++++ .../app/Http/Controllers/UserController.php | 31 ++++++++++--------- skolehjem/app/Http/Kernel.php | 2 ++ skolehjem/app/Http/Middleware/CheckAuth.php | 31 +++++++++++++++++++ skolehjem/database/seeds/DatabaseSeeder.php | 1 + skolehjem/database/seeds/PermissionSeeder.php | 4 +-- skolehjem/database/seeds/UserSeeder.php | 28 +++++++++++++++++ 7 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 skolehjem/app/Http/Middleware/CheckAuth.php create mode 100644 skolehjem/database/seeds/UserSeeder.php diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index 2a6eafa..8f99398 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php @@ -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. * diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 5880e1d..ac5c34d 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -14,13 +14,14 @@ 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"); } /** @@ -54,7 +55,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", @@ -65,17 +66,17 @@ class UserController extends Controller ]); - 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 view("users.store"); + return Response::detect("users.store"); } /** @@ -182,7 +183,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 +191,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 +200,6 @@ class UserController extends Controller public function logout(Request $request) { Auth::logout(); - return redirect()->to("/"); + return redirect()->route("root.index"); } } diff --git a/skolehjem/app/Http/Kernel.php b/skolehjem/app/Http/Kernel.php index 6a08dd6..3e1e21b 100644 --- a/skolehjem/app/Http/Kernel.php +++ b/skolehjem/app/Http/Kernel.php @@ -67,5 +67,7 @@ class Kernel extends HttpKernel 'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class, 'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class, 'role_or_permission' => \Spatie\Permission\Middlewares\RoleOrPermissionMiddleware::class, + + "check.auth" => \App\Http\Middleware\CheckAuth::class ]; } diff --git a/skolehjem/app/Http/Middleware/CheckAuth.php b/skolehjem/app/Http/Middleware/CheckAuth.php new file mode 100644 index 0000000..2c5df81 --- /dev/null +++ b/skolehjem/app/Http/Middleware/CheckAuth.php @@ -0,0 +1,31 @@ +user(); + + if(!isset($user)) + return redirect()->route("users.login"); + + if($user->hasAnyPermission($permissions)) { + return $next($request); + } + + return redirect()->route("users.login"); + } +} diff --git a/skolehjem/database/seeds/DatabaseSeeder.php b/skolehjem/database/seeds/DatabaseSeeder.php index 64479c8..624abbb 100644 --- a/skolehjem/database/seeds/DatabaseSeeder.php +++ b/skolehjem/database/seeds/DatabaseSeeder.php @@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder public function run() { $this->call(PermissionSeeder::class); + $this->call(UserSeeder::class); } } diff --git a/skolehjem/database/seeds/PermissionSeeder.php b/skolehjem/database/seeds/PermissionSeeder.php index bbd8c28..b2cd3f5 100644 --- a/skolehjem/database/seeds/PermissionSeeder.php +++ b/skolehjem/database/seeds/PermissionSeeder.php @@ -44,8 +44,8 @@ class PermissionSeeder extends Seeder ]; foreach ($permissions as $key => $value) { - if(Permission::findByName($key)) - continue; +// if(Permission::findByName($key)) +// continue; $permission = new Permission(); diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php new file mode 100644 index 0000000..0c11ea0 --- /dev/null +++ b/skolehjem/database/seeds/UserSeeder.php @@ -0,0 +1,28 @@ +name_first = "admin"; + $user->name_last = "admin"; + $user->email = "admin@admin.local"; + $user->setPasswordAttribute("1234"); + $user->phone = 12345678; + + foreach (\Spatie\Permission\Models\Permission::all() as $permission) { + $user->givePermissionTo($permission); + } + + $user->save(); + } +} From 988ceb7c8a3f191ae4205322258e030b9488fbf2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 29 Jun 2020 14:49:57 +0200 Subject: [PATCH 04/44] Fixed error AND 0x01 --- skolehjem/app/MenuPlan.php | 2 +- .../2014_10_12_000000_create_users_table.php | 3 ++ ..._06_08_080402_create_permission_tables.php | 18 +++++---- .../2020_06_23_070657_create_menu_plans.php | 6 +-- .../2020_06_29_112658_create_staff_table.php | 38 ------------------- .../views/admin/layout/base.blade.php | 18 ++++----- .../views/admin/users/index.blade.php | 9 ++++- skolehjem/routes/web.php | 2 +- 8 files changed, 36 insertions(+), 60 deletions(-) delete mode 100644 skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php index cce1492..c8131e1 100644 --- a/skolehjem/app/MenuPlan.php +++ b/skolehjem/app/MenuPlan.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class MenuPlan extends Model { protected $fillable = [ - 'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday" + 'monday', "tuesday", 'wednesday', 'thursday' ]; } diff --git a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php index 04e336e..9760e02 100644 --- a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php +++ b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php @@ -13,6 +13,9 @@ class CreateUsersTable extends Migration */ public function up() { + if(Schema::hasTable("users")) + return; + Schema::create('users', function (Blueprint $table) { $table->id(); $table->string('name_first'); diff --git a/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php b/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php index 81d91b2..8e7ae7b 100644 --- a/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php +++ b/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php @@ -20,13 +20,17 @@ class CreatePermissionTables extends Migration throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.'); } - Schema::create($tableNames['permissions'], function (Blueprint $table) { - $table->bigIncrements('id'); - $table->string('name'); - $table->string('description'); - $table->string('guard_name'); - $table->timestamps(); - }); + if(!Schema::hasTable("permissions")) + { + Schema::create($tableNames['permissions'], function (Blueprint $table) { + $table->bigIncrements('id'); + $table->string('name'); + $table->string('description'); + $table->string('guard_name'); + $table->timestamps(); + }); + } + Schema::create($tableNames['roles'], function (Blueprint $table) { $table->bigIncrements('id'); diff --git a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php index 9506908..d3a43d4 100644 --- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php +++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php @@ -19,9 +19,9 @@ class CreateMenuPlans extends Migration $table->string('tuesday', 255); $table->string('wednesday', 255); $table->string('thursday', 255); - $table->string('friday', 255); - $table->string('saturday', 255); - $table->string('sunday', 255); +// $table->string('friday', 255); +// $table->string('saturday', 255); +// $table->string('sunday', 255); $table->timestamps(); //$table->text('description'); }); diff --git a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php deleted file mode 100644 index 0ad0194..0000000 --- a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->string('name_first'); - $table->string('name_last'); - $table->string('email')->unique(); - $table->timestamp('email_verified_at')->nullable(); - $table->string('password'); - $table->integer("phone")->unique(); - $table->rememberToken(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('staff'); - } -} diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 9732280..5ef177c 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -61,15 +61,15 @@ CreateOpret Kontakt
-
-

Personale

-
- ReadVis Personale -
-
- CreateOpret Personal -
-
+{{--
--}} +{{--

Personale

--}} +{{--
--}} +{{-- ReadVis Personale--}} +{{--
--}} +{{--
--}} +{{-- CreateOpret Personal--}} +{{--
--}} +{{--
--}}

Feedback

diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index a6e15d1..3b2713b 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -26,7 +26,14 @@ {{ $user->email }} {{ $user->phone }} $user->id ]) }}">Update - $user ]) }}">Delete + + $user ]) }}" class="w-100"> + @csrf + @method("delete") + + + + @endforeach diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 4c9643f..97c63aa 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -31,7 +31,7 @@ Route::get("phones", "PhoneController@index")->name("phones.index"); Route::resource("contacts", "ContactController"); Route::resource("menu-plans", "MenuPlanController"); Route::resource("users", "UserController"); -Route::resource("staff", "StaffController"); +//Route::resource("staff", "StaffController"); Route::resource("events", "EventController"); Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-reservations", "WashingReservationController"); From 4a0840b104eef4d7542046e2e20c2839e45d4400 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 30 Jun 2020 08:24:29 +0200 Subject: [PATCH 05/44] Modified base.blade.php? --- PERMS.ods | Bin 4197 -> 4360 bytes .../views/admin/layout/base.blade.php | 3 --- 2 files changed, 3 deletions(-) diff --git a/PERMS.ods b/PERMS.ods index ebc91fe223d372645be8d3e89a9c770be6070bbf..735d1c364fd1090bab2b5a89dc4787a4bb97b78a 100644 GIT binary patch delta 3772 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 delta 3619 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 diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 5ef177c..616e97a 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -57,9 +57,6 @@
CreateOpret Link
-
- CreateOpret Kontakt -
{{--
--}} {{--

Personale

--}} From 223ba6dc410bcd3c77f55ad0ae8f19b7228cd8a0 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 08:48:51 +0200 Subject: [PATCH 06/44] Created files for gallery --- skolehjem/app/Album.php | 10 ++++++++++ skolehjem/app/Http/Controllers/AlbumController.php | 10 ++++++++++ skolehjem/app/Http/Controllers/ImageController.php | 10 ++++++++++ skolehjem/app/Http/Controllers/VideoController.php | 10 ++++++++++ skolehjem/app/Image.php | 10 ++++++++++ skolehjem/app/Video.php | 10 ++++++++++ 6 files changed, 60 insertions(+) create mode 100644 skolehjem/app/Album.php create mode 100644 skolehjem/app/Http/Controllers/AlbumController.php create mode 100644 skolehjem/app/Http/Controllers/ImageController.php create mode 100644 skolehjem/app/Http/Controllers/VideoController.php create mode 100644 skolehjem/app/Image.php create mode 100644 skolehjem/app/Video.php diff --git a/skolehjem/app/Album.php b/skolehjem/app/Album.php new file mode 100644 index 0000000..e8571ed --- /dev/null +++ b/skolehjem/app/Album.php @@ -0,0 +1,10 @@ + Date: Tue, 30 Jun 2020 08:49:39 +0200 Subject: [PATCH 07/44] Added more permissions to the seeder. --- skolehjem/database/seeds/PermissionSeeder.php | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/skolehjem/database/seeds/PermissionSeeder.php b/skolehjem/database/seeds/PermissionSeeder.php index b2cd3f5..8e2a639 100644 --- a/skolehjem/database/seeds/PermissionSeeder.php +++ b/skolehjem/database/seeds/PermissionSeeder.php @@ -40,19 +40,29 @@ class PermissionSeeder extends Seeder "link.external.edit" => "Allows editing of external links.", "link.external.delete" => "Allows deletion of external links", + "event.create" => "Create a new event", + "event.list" => "Shows all events", + "event.show" => "Shows event", + "event.edit" => "Edit event", + "event.delete" => "Deletes an event", + "contact.create" => "Creates a new contact", + "contact.list" => "" ]; foreach ($permissions as $key => $value) { -// if(Permission::findByName($key)) -// continue; - $permission = new Permission(); + try { + if(Permission::findByName($key)) + continue; + } catch (Exception $e) { + $permission = new Permission(); - $permission->name = $key; - $permission->description = $value; + $permission->name = $key; + $permission->description = $value; - $permission->save(); + $permission->save(); + } } } } From 20bfcb2c97f147f4050fce2e61c8c7c9f361db06 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 08:50:04 +0200 Subject: [PATCH 08/44] Made gallery, video, album, migrations --- ...2020_06_30_064605_create_gallery_album.php | 31 +++++++++++++++++++ ...2020_06_30_064640_create_gallery_video.php | 31 +++++++++++++++++++ ...2020_06_30_064737_create_gallery_image.php | 31 +++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php create mode 100644 skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php create mode 100644 skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php diff --git a/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php b/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php new file mode 100644 index 0000000..64ef7bb --- /dev/null +++ b/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('gallery_album'); + } +} diff --git a/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php b/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php new file mode 100644 index 0000000..47e1419 --- /dev/null +++ b/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('gallery_video'); + } +} diff --git a/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php b/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php new file mode 100644 index 0000000..ad0d012 --- /dev/null +++ b/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('gallery_image'); + } +} From 66e8b2e3d819ffc6a0ec83f6421ede4d1dfc7330 Mon Sep 17 00:00:00 2001 From: Vedde Date: Tue, 30 Jun 2020 08:52:11 +0200 Subject: [PATCH 09/44] Modified EventController.php. --- .../app/Http/Controllers/EventController.php | 19 +++++++++---------- .../views/admin/events/edit.blade.php | 13 ++++++++----- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index e5754f5..0dc11e7 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -70,9 +70,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 +83,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]); } /** diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 91118bc..8356c41 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Vis Events / + $event])}}" class="text-white">Vis Events / @endsection @section("content") @@ -14,10 +14,13 @@
$event])}}"> @csrf @method("PUT") - - - - + + + + + + +
@endsection From 8445a227325a2c26be786ae73554a6fe6b4566e5 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 08:52:46 +0200 Subject: [PATCH 10/44] Created files for gallery --- .../app/Http/Controllers/AlbumController.php | 77 ++++++++++++++++++- .../app/Http/Controllers/ImageController.php | 77 ++++++++++++++++++- .../app/Http/Controllers/VideoController.php | 77 ++++++++++++++++++- ...2020_06_30_065154_create_albums_table.php} | 6 +- ...2020_06_30_065200_create_images_table.php} | 6 +- ...2020_06_30_065206_create_videos_table.php} | 6 +- 6 files changed, 237 insertions(+), 12 deletions(-) rename skolehjem/database/migrations/{2020_06_30_064605_create_gallery_album.php => 2020_06_30_065154_create_albums_table.php} (72%) rename skolehjem/database/migrations/{2020_06_30_064640_create_gallery_video.php => 2020_06_30_065200_create_images_table.php} (72%) rename skolehjem/database/migrations/{2020_06_30_064737_create_gallery_image.php => 2020_06_30_065206_create_videos_table.php} (72%) diff --git a/skolehjem/app/Http/Controllers/AlbumController.php b/skolehjem/app/Http/Controllers/AlbumController.php index 840daf7..191d47b 100644 --- a/skolehjem/app/Http/Controllers/AlbumController.php +++ b/skolehjem/app/Http/Controllers/AlbumController.php @@ -2,9 +2,84 @@ 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) + { + // + } } diff --git a/skolehjem/app/Http/Controllers/ImageController.php b/skolehjem/app/Http/Controllers/ImageController.php index 820ed55..4aeb7c8 100644 --- a/skolehjem/app/Http/Controllers/ImageController.php +++ b/skolehjem/app/Http/Controllers/ImageController.php @@ -2,9 +2,84 @@ namespace App\Http\Controllers; +use App\Image; use Illuminate\Http\Request; class ImageController 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\Image $image + * @return \Illuminate\Http\Response + */ + public function show(Image $image) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\Image $image + * @return \Illuminate\Http\Response + */ + public function edit(Image $image) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\Image $image + * @return \Illuminate\Http\Response + */ + public function update(Request $request, Image $image) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param \App\Image $image + * @return \Illuminate\Http\Response + */ + public function destroy(Image $image) + { + // + } } diff --git a/skolehjem/app/Http/Controllers/VideoController.php b/skolehjem/app/Http/Controllers/VideoController.php index b760852..486395e 100644 --- a/skolehjem/app/Http/Controllers/VideoController.php +++ b/skolehjem/app/Http/Controllers/VideoController.php @@ -2,9 +2,84 @@ namespace App\Http\Controllers; +use App\Video; use Illuminate\Http\Request; class VideoController 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\Video $video + * @return \Illuminate\Http\Response + */ + public function show(Video $video) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\Video $video + * @return \Illuminate\Http\Response + */ + public function edit(Video $video) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\Video $video + * @return \Illuminate\Http\Response + */ + public function update(Request $request, Video $video) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param \App\Video $video + * @return \Illuminate\Http\Response + */ + public function destroy(Video $video) + { + // + } } diff --git a/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php similarity index 72% rename from skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php rename to skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php index 64ef7bb..5efab97 100644 --- a/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php +++ b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateGalleryAlbum extends Migration +class CreateAlbumsTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateGalleryAlbum extends Migration */ public function up() { - Schema::create('gallery_album', function (Blueprint $table) { + Schema::create('albums', function (Blueprint $table) { $table->id(); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateGalleryAlbum extends Migration */ public function down() { - Schema::dropIfExists('gallery_album'); + Schema::dropIfExists('albums'); } } diff --git a/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php b/skolehjem/database/migrations/2020_06_30_065200_create_images_table.php similarity index 72% rename from skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php rename to skolehjem/database/migrations/2020_06_30_065200_create_images_table.php index 47e1419..0ec15bd 100644 --- a/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php +++ b/skolehjem/database/migrations/2020_06_30_065200_create_images_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateGalleryVideo extends Migration +class CreateImagesTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateGalleryVideo extends Migration */ public function up() { - Schema::create('gallery_video', function (Blueprint $table) { + Schema::create('images', function (Blueprint $table) { $table->id(); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateGalleryVideo extends Migration */ public function down() { - Schema::dropIfExists('gallery_video'); + Schema::dropIfExists('images'); } } diff --git a/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php b/skolehjem/database/migrations/2020_06_30_065206_create_videos_table.php similarity index 72% rename from skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php rename to skolehjem/database/migrations/2020_06_30_065206_create_videos_table.php index ad0d012..fa4dc4d 100644 --- a/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php +++ b/skolehjem/database/migrations/2020_06_30_065206_create_videos_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateGalleryImage extends Migration +class CreateVideosTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateGalleryImage extends Migration */ public function up() { - Schema::create('gallery_image', function (Blueprint $table) { + Schema::create('videos', function (Blueprint $table) { $table->id(); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateGalleryImage extends Migration */ public function down() { - Schema::dropIfExists('gallery_image'); + Schema::dropIfExists('videos'); } } From 139e62dedf26854c668582666ec85db32effdd7b Mon Sep 17 00:00:00 2001 From: Vedde Date: Tue, 30 Jun 2020 08:55:41 +0200 Subject: [PATCH 11/44] Merge --- .../app/Http/Controllers/AlbumController.php | 77 ++++++++++++++++++- .../Controllers/ExternalLinkController.php | 9 +++ .../app/Http/Controllers/ImageController.php | 77 ++++++++++++++++++- .../app/Http/Controllers/UserController.php | 29 +++---- .../app/Http/Controllers/VideoController.php | 77 ++++++++++++++++++- skolehjem/app/Http/Kernel.php | 2 + skolehjem/app/MenuPlan.php | 2 +- .../2014_10_12_000000_create_users_table.php | 3 + ..._06_08_080402_create_permission_tables.php | 18 +++-- .../2020_06_29_112658_create_staff_table.php | 38 --------- ...2020_06_30_064605_create_gallery_album.php | 31 -------- ...2020_06_30_064640_create_gallery_video.php | 31 -------- ...2020_06_30_064737_create_gallery_image.php | 31 -------- skolehjem/database/seeds/DatabaseSeeder.php | 1 + skolehjem/database/seeds/PermissionSeeder.php | 22 ++++-- skolehjem/resources/js/calendar/calendar.js | 18 +++++ .../admin/external-links/index.blade.php | 4 +- .../views/admin/layout/base.blade.php | 24 +++--- .../resources/views/app/layout/base.blade.php | 15 ++-- skolehjem/routes/web.php | 4 +- swagger/dist/swagger-editor.js | 2 +- 21 files changed, 332 insertions(+), 183 deletions(-) delete mode 100644 skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php delete mode 100644 skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php delete mode 100644 skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php delete mode 100644 skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php diff --git a/skolehjem/app/Http/Controllers/AlbumController.php b/skolehjem/app/Http/Controllers/AlbumController.php index 840daf7..191d47b 100644 --- a/skolehjem/app/Http/Controllers/AlbumController.php +++ b/skolehjem/app/Http/Controllers/AlbumController.php @@ -2,9 +2,84 @@ 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) + { + // + } } diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index 2a6eafa..8f99398 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php @@ -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. * diff --git a/skolehjem/app/Http/Controllers/ImageController.php b/skolehjem/app/Http/Controllers/ImageController.php index 820ed55..4aeb7c8 100644 --- a/skolehjem/app/Http/Controllers/ImageController.php +++ b/skolehjem/app/Http/Controllers/ImageController.php @@ -2,9 +2,84 @@ namespace App\Http\Controllers; +use App\Image; use Illuminate\Http\Request; class ImageController 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\Image $image + * @return \Illuminate\Http\Response + */ + public function show(Image $image) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\Image $image + * @return \Illuminate\Http\Response + */ + public function edit(Image $image) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\Image $image + * @return \Illuminate\Http\Response + */ + public function update(Request $request, Image $image) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param \App\Image $image + * @return \Illuminate\Http\Response + */ + public function destroy(Image $image) + { + // + } } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 78a6be3..ac5c34d 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -14,13 +14,14 @@ 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"); } /** @@ -54,7 +55,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", @@ -65,15 +66,15 @@ class UserController extends Controller ]); - 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"); } @@ -182,7 +183,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 +191,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 +200,6 @@ class UserController extends Controller public function logout(Request $request) { Auth::logout(); - return redirect()->to("/"); + return redirect()->route("root.index"); } } diff --git a/skolehjem/app/Http/Controllers/VideoController.php b/skolehjem/app/Http/Controllers/VideoController.php index b760852..486395e 100644 --- a/skolehjem/app/Http/Controllers/VideoController.php +++ b/skolehjem/app/Http/Controllers/VideoController.php @@ -2,9 +2,84 @@ namespace App\Http\Controllers; +use App\Video; use Illuminate\Http\Request; class VideoController 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\Video $video + * @return \Illuminate\Http\Response + */ + public function show(Video $video) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\Video $video + * @return \Illuminate\Http\Response + */ + public function edit(Video $video) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\Video $video + * @return \Illuminate\Http\Response + */ + public function update(Request $request, Video $video) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param \App\Video $video + * @return \Illuminate\Http\Response + */ + public function destroy(Video $video) + { + // + } } diff --git a/skolehjem/app/Http/Kernel.php b/skolehjem/app/Http/Kernel.php index 6a08dd6..3e1e21b 100644 --- a/skolehjem/app/Http/Kernel.php +++ b/skolehjem/app/Http/Kernel.php @@ -67,5 +67,7 @@ class Kernel extends HttpKernel 'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class, 'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class, 'role_or_permission' => \Spatie\Permission\Middlewares\RoleOrPermissionMiddleware::class, + + "check.auth" => \App\Http\Middleware\CheckAuth::class ]; } diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php index cce1492..c8131e1 100644 --- a/skolehjem/app/MenuPlan.php +++ b/skolehjem/app/MenuPlan.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class MenuPlan extends Model { protected $fillable = [ - 'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday" + 'monday', "tuesday", 'wednesday', 'thursday' ]; } diff --git a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php index 04e336e..9760e02 100644 --- a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php +++ b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php @@ -13,6 +13,9 @@ class CreateUsersTable extends Migration */ public function up() { + if(Schema::hasTable("users")) + return; + Schema::create('users', function (Blueprint $table) { $table->id(); $table->string('name_first'); diff --git a/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php b/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php index 81d91b2..8e7ae7b 100644 --- a/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php +++ b/skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php @@ -20,13 +20,17 @@ class CreatePermissionTables extends Migration throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.'); } - Schema::create($tableNames['permissions'], function (Blueprint $table) { - $table->bigIncrements('id'); - $table->string('name'); - $table->string('description'); - $table->string('guard_name'); - $table->timestamps(); - }); + if(!Schema::hasTable("permissions")) + { + Schema::create($tableNames['permissions'], function (Blueprint $table) { + $table->bigIncrements('id'); + $table->string('name'); + $table->string('description'); + $table->string('guard_name'); + $table->timestamps(); + }); + } + Schema::create($tableNames['roles'], function (Blueprint $table) { $table->bigIncrements('id'); diff --git a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php b/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php deleted file mode 100644 index 0ad0194..0000000 --- a/skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->string('name_first'); - $table->string('name_last'); - $table->string('email')->unique(); - $table->timestamp('email_verified_at')->nullable(); - $table->string('password'); - $table->integer("phone")->unique(); - $table->rememberToken(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('staff'); - } -} diff --git a/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php b/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php deleted file mode 100644 index 64ef7bb..0000000 --- a/skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('gallery_album'); - } -} diff --git a/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php b/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php deleted file mode 100644 index 47e1419..0000000 --- a/skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('gallery_video'); - } -} diff --git a/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php b/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php deleted file mode 100644 index ad0d012..0000000 --- a/skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('gallery_image'); - } -} diff --git a/skolehjem/database/seeds/DatabaseSeeder.php b/skolehjem/database/seeds/DatabaseSeeder.php index 64479c8..624abbb 100644 --- a/skolehjem/database/seeds/DatabaseSeeder.php +++ b/skolehjem/database/seeds/DatabaseSeeder.php @@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder public function run() { $this->call(PermissionSeeder::class); + $this->call(UserSeeder::class); } } diff --git a/skolehjem/database/seeds/PermissionSeeder.php b/skolehjem/database/seeds/PermissionSeeder.php index bbd8c28..8e2a639 100644 --- a/skolehjem/database/seeds/PermissionSeeder.php +++ b/skolehjem/database/seeds/PermissionSeeder.php @@ -40,19 +40,29 @@ class PermissionSeeder extends Seeder "link.external.edit" => "Allows editing of external links.", "link.external.delete" => "Allows deletion of external links", + "event.create" => "Create a new event", + "event.list" => "Shows all events", + "event.show" => "Shows event", + "event.edit" => "Edit event", + "event.delete" => "Deletes an event", + "contact.create" => "Creates a new contact", + "contact.list" => "" ]; foreach ($permissions as $key => $value) { - if(Permission::findByName($key)) - continue; - $permission = new Permission(); + try { + if(Permission::findByName($key)) + continue; + } catch (Exception $e) { + $permission = new Permission(); - $permission->name = $key; - $permission->description = $value; + $permission->name = $key; + $permission->description = $value; - $permission->save(); + $permission->save(); + } } } } diff --git a/skolehjem/resources/js/calendar/calendar.js b/skolehjem/resources/js/calendar/calendar.js index b7faff0..3af9468 100644 --- a/skolehjem/resources/js/calendar/calendar.js +++ b/skolehjem/resources/js/calendar/calendar.js @@ -93,6 +93,7 @@ function generateCalendar(weekOffset = 0) { function onDateSelect(date) { let events; let machinez; + let buttonz; let container = document.getElementById("event-container"); @@ -129,6 +130,23 @@ function onDateSelect(date) { events = document.getElementById("events"); } + if(document.getElementById("create-reservation") != undefined) + buttonz = document.getElementById("create-reservation"); + else { + // let span = document.createElement("span"); + // span.classList.add("events__title"); + // span.innerText = "Tider"; + + let button = document.createElement("button"); + // button.classList.add("events__title"); + button.id = "create-reservation"; + button.innerText = "Reserver"; + + // container.appendChild(span); + container.appendChild(button); + + buttonz = document.getElementById("events"); + } // events.innerHTML = ""; diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index 88be850..e9f726b 100644 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ b/skolehjem/resources/views/admin/external-links/index.blade.php @@ -19,8 +19,8 @@ @foreach($links as $link) - {{$link->name}} - {{$link->link}} + {{$link->name}} + {{$link->link}} $link ]) }}">Update
$link ]) }}" class="w-100 nostyle"> @csrf diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index bb2b8c3..616e97a 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -50,23 +50,23 @@
-

Kontakter

+

Eksterne Links

- ReadVis Kontakter + ReadVis Links
- CreateOpret Kontakt -
-
-
-

Personale

-
- ReadVis Personale -
-
- CreateOpret Personal + CreateOpret Link
+{{--
--}} +{{--

Personale

--}} +{{--
--}} +{{-- ReadVis Personale--}} +{{--
--}} +{{--
--}} +{{-- CreateOpret Personal--}} +{{--
--}} +{{--
--}}

Feedback

diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 50fb89c..18a4713 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -16,6 +16,10 @@ --}} {{--
--}} +
+

Kontakter

+
+ ReadVis Kontakter +
+
+ CreateOpret Kontakt +
+

Feedback

diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index b371e91..434e4a6 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -18,7 +18,7 @@ use Illuminate\Support\Facades\Route; //}); Route::get("/", "RootController@index")->name("root.index"); - +Route::get("/home", "RootController@index")->name("root.index"); Route::get("/login", "UserController@showLogin")->name("users.show-login"); Route::post("/login", "UserController@login")->name("users.login"); From e0142bf97735b5c99e4a0f1652dd481300b098d5 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 11:45:54 +0200 Subject: [PATCH 29/44] Fixed deletion --- skolehjem/app/Http/Controllers/ContactController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 6cea983..f71dc01 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -113,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"); } } From 27414ade793a8c7691ff09c9f52b003c0e2a37f2 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 11:49:17 +0200 Subject: [PATCH 30/44] Role implementation --- skolehjem/resources/views/admin/layout/base.blade.php | 9 +++++++++ skolehjem/routes/web.php | 1 + 2 files changed, 10 insertions(+) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 3ab088e..41bb86b 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -19,6 +19,15 @@ CreateOpret Bruger
+
+

Roller

+
+ ReadVis Roller +
+
+ CreateOpret Rolle +
+

Menuplan

diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 434e4a6..0bf70be 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -39,3 +39,4 @@ Route::resource("washing-reservations", "WashingReservationController"); Route::resource("feedbacks", "FeedbackController"); Route::resource("external-links", "ExternalLinkController"); Route::resource("resource-extensions", "ResourceExtensionController"); +Route::resource("roles", "RolesController"); From c7c172c44b6c831d1bf487b1efe2bc99fca21c58 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 11:49:58 +0200 Subject: [PATCH 31/44] Controller fix small R --- .../Http/Controllers/{rolesController.php => RolesController.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename skolehjem/app/Http/Controllers/{rolesController.php => RolesController.php} (100%) diff --git a/skolehjem/app/Http/Controllers/rolesController.php b/skolehjem/app/Http/Controllers/RolesController.php similarity index 100% rename from skolehjem/app/Http/Controllers/rolesController.php rename to skolehjem/app/Http/Controllers/RolesController.php From e14ba7bdbd054604092c16cfc4019102f9691a7c Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 11:51:20 +0200 Subject: [PATCH 32/44] Added s --- skolehjem/app/Http/Controllers/RolesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 154e345..79e1e86 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -17,7 +17,7 @@ class rolesController extends Controller { $roles = Role::query()->paginate($request->input("limit", 20)); - return Response::detect("roles.index", [ "role" => $roles]); + return Response::detect("roles.index", [ "roles" => $roles]); } /** From 4b4b2b68de506eba171ede2649eb15a351ce99c0 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 11:54:17 +0200 Subject: [PATCH 33/44] Fix --- skolehjem/resources/views/admin/roles/index.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index 82a14c4..47d2d5e 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -32,6 +32,4 @@ @endforeach - - {{ $users->links() }} @endsection From af6222df97531526bcd582adf0c3c0ea495c3ce9 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 11:55:11 +0200 Subject: [PATCH 34/44] Fixed Store --- skolehjem/app/Http/Controllers/RolesController.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 79e1e86..0248cc3 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -40,10 +40,8 @@ class rolesController extends Controller public function store(Request $request) { $requestRole = $request->validate([ - "monday" => "required|max:255", - "tuesday" => "required|max:255", - "wednesday" => "required|max:255", - "thursday" => "required|max:255" + "name" => "required|max:255", + "description" => "required|max:255" ]); $role = new Role($requestRole); From 778315ff0b5a71dc94fa983d950167d153cfac53 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 11:56:31 +0200 Subject: [PATCH 35/44] Fix --- skolehjem/resources/views/admin/roles/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index ad4aa9c..5034a33 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -15,7 +15,7 @@ @csrf @method("put") - + From cab97f1c0a9e5bf7ed57c012f2ee6c5605ceda6a Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 11:58:00 +0200 Subject: [PATCH 36/44] Fix --- skolehjem/resources/views/admin/roles/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index 5034a33..976fdbc 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -17,7 +17,7 @@ - + @endsection From b586eceea9ec065f99f871e60836e471f2347e46 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 12:01:25 +0200 Subject: [PATCH 37/44] Fix --- skolehjem/resources/views/admin/roles/update.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/roles/update.blade.php b/skolehjem/resources/views/admin/roles/update.blade.php index 2d78b49..e9de582 100644 --- a/skolehjem/resources/views/admin/roles/update.blade.php +++ b/skolehjem/resources/views/admin/roles/update.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Rolle / + Rediger Rolle / @endsection @section("content") From 05ec4e0228d59e3c36199f7feac68108212ba089 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 12:02:32 +0200 Subject: [PATCH 38/44] Fixed idk kev --- skolehjem/app/Http/Controllers/RolesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 0248cc3..6f58467 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -83,7 +83,7 @@ class rolesController extends Controller public function update(Request $request, $id) { $data = $request->all(); - $role = MenuPlan::find($id); + $role = Role::find($id); $role->update($data); $role->save(); @@ -98,7 +98,7 @@ class rolesController extends Controller */ public function destroy($id) { - $role = MenuPlan::find($id); + $role = Role::find($id); $role->delete(); return redirect()->route("roles.index"); } From c49080f366ca39fa32501e00f771b51773832faf Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 12:07:38 +0200 Subject: [PATCH 39/44] Dynamic roles in user create/edit frontend --- skolehjem/resources/views/admin/users/create.blade.php | 6 +++--- skolehjem/resources/views/admin/users/edit.blade.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 8ebac49..2723896 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -27,9 +27,9 @@ diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index 502e8cd..a2ead59 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -28,9 +28,9 @@ From f46062a9c4e2352ceb7d59270d17cce01614e2fd Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 12:08:31 +0200 Subject: [PATCH 40/44] Made it so roles data --- skolehjem/app/Http/Controllers/UserController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index f84a7cf..783de73 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -8,6 +8,7 @@ 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 @@ -44,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]); + } /** From 5bd37db3e2cdc3d0aa5e59878b81cdc944fc5bb4 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 30 Jun 2020 12:11:18 +0200 Subject: [PATCH 41/44] Made it so roles data kev --- skolehjem/app/Http/Controllers/UserController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 783de73..3687f33 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -105,10 +105,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, ]); } From 2ab54da3839a74c86fe538350b1d944fa0f0812a Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 12:13:49 +0200 Subject: [PATCH 42/44] Fix --- skolehjem/resources/views/admin/users/create.blade.php | 1 + skolehjem/resources/views/admin/users/edit.blade.php | 1 + 2 files changed, 2 insertions(+) diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 2723896..6cc39a2 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -27,6 +27,7 @@