From 3b6b20f934eebae95def70268b2888c5006cb3a7 Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 25 Aug 2020 14:48:52 +0200 Subject: [PATCH 01/14] v0.10.15c - Changed error message when changing password (removed quotes). Added placeholder to email & phone number + added pattern to phone number --- skolehjem/app/Http/Controllers/UserController.php | 12 ++++++------ skolehjem/resources/views/app/users/edit.blade.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 28bf856..3ecb4c0 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -315,18 +315,18 @@ class UserController extends Controller $data = $request->only(['name_first', 'name_last', 'email', 'phone', 'password']); if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message. if (request()->cookie('languagesSetting') == "dk") - return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i `Nyt Password` & `Confirm Password`!

'); + return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i Nyt Password & Confirm Password!

'); elseif (request()->cookie('languagesSetting') == "en") - return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

`New Password` & `Confirm Password` was not the same!

'); + return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

New Password & Confirm Password was not the same!

'); else - return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i `Nyt Password` & `Confirm Password`!

'); + return redirect()->route("users.accounteditpass")->with('error#notsamepass', '

Der stod ikke det samme i Nyt Password & Confirm Password!

'); } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message. if (request()->cookie('languagesSetting') == "dk") - return redirect()->route("users.accounteditpass")->with('error#oldpass', '

Det indtastede password i `Nuværende Password` er ikke dit nuværende password!

'); + return redirect()->route("users.accounteditpass")->with('error#oldpass', '

Det indtastede password i Nuværende Password er ikke dit nuværende password!

'); elseif (request()->cookie('languagesSetting') == "en") - return redirect()->route("users.accounteditpass")->with('error#oldpass', '

The entered `Current Password` was not the same as your current password!

'); + return redirect()->route("users.accounteditpass")->with('error#oldpass', '

The entered Current Password was not the same as your current password!

'); else - return redirect()->route("users.accounteditpass")->with('error#oldpass', '

Det indtastede password i `Nuværende Password` er ikke dit nuværende password!

'); + return redirect()->route("users.accounteditpass")->with('error#oldpass', '

Det indtastede password i Nuværende Password er ikke dit nuværende password!

'); } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout. /** @var User $user */ $user->update($data); diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php index 4260367..57e37b5 100644 --- a/skolehjem/resources/views/app/users/edit.blade.php +++ b/skolehjem/resources/views/app/users/edit.blade.php @@ -13,9 +13,9 @@ {{__('msg.navn')}}: name_last }}" disabled> {{__('msg.email')}}: - + {{__('msg.telefon')}} Nr.: - + {{__('msg.tilbage')}} From f33cf609da96d98113e62c0531114450b63a2c52 Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 25 Aug 2020 15:08:54 +0200 Subject: [PATCH 02/14] v0.10.15d - Changed remember password to remember me Added pattern to user edit on admin site --- skolehjem/resources/views/admin/users/edit.blade.php | 4 ++-- skolehjem/resources/views/admin/users/login.blade.php | 2 +- skolehjem/resources/views/app/users/login.blade.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index a3e74f2..717ccd2 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -20,7 +20,7 @@ - +
@@ -34,7 +34,7 @@
- + - Remember password + Remember me {!! session()->get('success#passwordchange') !!} diff --git a/skolehjem/resources/views/app/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php index 9caa410..6eda6c7 100644 --- a/skolehjem/resources/views/app/users/login.blade.php +++ b/skolehjem/resources/views/app/users/login.blade.php @@ -19,7 +19,7 @@ {!! session()->get('success#passwordchange') !!} From a9608bdf3a5b8f27d7552679e959d6c985a3f58f Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 26 Aug 2020 08:56:18 +0200 Subject: [PATCH 03/14] v0.10.15e - Administration can now changes a users profile images --- skolehjem/app/Http/Controllers/UserController.php | 7 +++++++ skolehjem/resources/views/admin/users/edit.blade.php | 4 +++- skolehjem/resources/views/admin/users/index.blade.php | 1 - 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 3ecb4c0..876ffa1 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -76,6 +76,7 @@ class UserController extends Controller "phone" => "required|max:8|min:8", ]); + $allUsersEmail = User::query()->where('email', '=', $request->email)->get(); $allUsersPhone = User::query()->where('phone', '=', $request->phone)->get(); @@ -140,6 +141,12 @@ class UserController extends Controller { $user = User::find($id); + if($request->file("resource")) { + $user->resource_id = ResourceController::store($request)->id; + } + + $user->save(); + $allUsersEmail = User::query()->where('email', '=', $request->email)->where('id', '!=', $id)->get(); $allUsersPhone = User::query()->where('phone', '=', $request->phone)->where('id', '!=', $id)->get(); diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index 717ccd2..03bbfb1 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -11,7 +11,7 @@ @section("content")

Rediger Bruger:

-
$user]) }}" onsubmit="return checkInputs()"> + $user]) }}" onsubmit="return checkInputs()" enctype="multipart/form-data"> @csrf @method("put") @@ -57,6 +57,8 @@ @endforeach @endif + +
@endsection diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index acb160e..d7d1270 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -29,7 +29,6 @@ text-align: center; border-radius: 6px; padding: 5px 0; - /* Position the tooltip */ position: absolute; z-index: 10; top: -5px; From b72ca3fbde5b3f3833b202f23b35329484368c90 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 26 Aug 2020 10:49:11 +0200 Subject: [PATCH 04/14] v0.10.15f - Added video to guides (Still in need of to be removed on news site) --- skolehjem/resources/views/admin/guides/create.blade.php | 2 +- skolehjem/resources/views/admin/guides/edit.blade.php | 2 +- skolehjem/resources/views/app/events/index.blade.php | 4 ++++ skolehjem/resources/views/app/events/show.blade.php | 4 ++++ skolehjem/resources/views/app/news/index.blade.php | 4 ++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index a6ff02f..ac8a3ce 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -54,7 +54,7 @@ [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], - [ 'link' ], + [ 'link', 'video' ], [ 'clean' ] ], }, diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index 0c24983..603ece5 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -54,7 +54,7 @@ [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], - [ 'link' ], + [ 'link', 'video' ], [ 'clean' ] ], }, diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index a0473a9..283daed 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -5,6 +5,10 @@ @section("content")

Opret Rolle:

@csrf @@ -18,6 +23,136 @@ + + + + + + + + + + + + + + + + + + + +
KontoBeskrivelseSe AccountÆndre BilledeÆndre OplysningerÆndre PasswordForgot Password
KontoEmpty
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SideBeskrivelseCreateReadUpdateDeleteFuld Kontrol
Brugere

Empty

Roller

Empty

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

Lokation

Empty

Vaskemaskiner

Empty

Resevationer

Empty

Kontakter

Empty

Vejledning

Empty

Feedback

Empty

@endsection From c0669d6eda1156b0c511278c48b65df5c4e8cab2 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 27 Aug 2020 10:59:19 +0200 Subject: [PATCH 06/14] v0.10.15h - Fixed admin access --- skolehjem/app/Helpers/Detector.php | 10 ++++++---- skolehjem/app/Providers/DetectorServiceProvider.php | 7 ++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/skolehjem/app/Helpers/Detector.php b/skolehjem/app/Helpers/Detector.php index 6b9481d..a79887b 100644 --- a/skolehjem/app/Helpers/Detector.php +++ b/skolehjem/app/Helpers/Detector.php @@ -3,9 +3,7 @@ namespace App\Helpers; - - - +use Illuminate\Support\Facades\Auth; use Jenssegers\Agent\Agent; class Detector @@ -16,7 +14,11 @@ class Detector if($agent->isMobile()) { return view(config("detector.mobilePath") . "." . $viewName, $args); + } else if(Auth()->user() !== null) { + if (Auth()->user()->can('admin.panel.show') == true) + return view(config("detector.defaultPath") . "." . $viewName, $args); } - return view(config("detector.defaultPath") . "." . $viewName, $args); + + return view(config("detector.mobilePath") . "." . $viewName, $args); } } diff --git a/skolehjem/app/Providers/DetectorServiceProvider.php b/skolehjem/app/Providers/DetectorServiceProvider.php index c34f089..49e00ac 100644 --- a/skolehjem/app/Providers/DetectorServiceProvider.php +++ b/skolehjem/app/Providers/DetectorServiceProvider.php @@ -3,6 +3,7 @@ namespace App\Providers; use Illuminate\Http\Response; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\ServiceProvider; use Jenssegers\Agent\Facades\Agent; @@ -28,8 +29,12 @@ class DetectorServiceProvider extends ServiceProvider Response::macro("detect", function ($view, $args = []) { if(Agent::isMobile()) { return view(config("detector.mobilePath") . "." . $view, $args); + } else if(Auth()->user() !== null){ + if(Auth()->user()->can('admin.panel.show') == true) + return view(config("detector.defaultPath") . "." . $view, $args); } - return view(config("detector.defaultPath") . "." . $view, $args); + + return view(config("detector.mobilePath") . "." . $view, $args); }); } } From fc91a2f06b2db4c08bf545c19490132ae7b1258f Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 27 Aug 2020 11:12:43 +0200 Subject: [PATCH 07/14] v0.10.15i - Fixed admin access --- skolehjem/app/Helpers/Detector.php | 2 +- .../app/Providers/DetectorServiceProvider.php | 2 +- skolehjem/resources/lang/dk/msg.php | 1 + skolehjem/resources/lang/en/msg.php | 1 + .../resources/views/errors/403.blade.php | 78 +++++++++++++++++++ 5 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 skolehjem/resources/views/errors/403.blade.php diff --git a/skolehjem/app/Helpers/Detector.php b/skolehjem/app/Helpers/Detector.php index a79887b..6b231a5 100644 --- a/skolehjem/app/Helpers/Detector.php +++ b/skolehjem/app/Helpers/Detector.php @@ -19,6 +19,6 @@ class Detector return view(config("detector.defaultPath") . "." . $viewName, $args); } - return view(config("detector.mobilePath") . "." . $viewName, $args); + return view("errors.403", $args); } } diff --git a/skolehjem/app/Providers/DetectorServiceProvider.php b/skolehjem/app/Providers/DetectorServiceProvider.php index 49e00ac..6aa319d 100644 --- a/skolehjem/app/Providers/DetectorServiceProvider.php +++ b/skolehjem/app/Providers/DetectorServiceProvider.php @@ -34,7 +34,7 @@ class DetectorServiceProvider extends ServiceProvider return view(config("detector.defaultPath") . "." . $view, $args); } - return view(config("detector.mobilePath") . "." . $view, $args); + return view("errors.403", $args); }); } } diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 1cb10fb..56023e0 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -63,6 +63,7 @@ return[ "infoomappen" => "Denne app er udviklet til Odense erhvervskollegie.", "error" => "Fejl", "404" => "Denne side findes ikke.", + "403" => "Du har ikke rettigheder til denne side.", "canceled" => "Aflyst" diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 587823e..87ebfc8 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -70,5 +70,6 @@ return[ "infoomappen" => "The app is developed and designed for 'Odense erhvervskollegie'.", "error" => "Error", "404" => "This page doesn't exist.", + "403" => "You don't have permissions to access this page.", "canceled" => "Canceled" ]; diff --git a/skolehjem/resources/views/errors/403.blade.php b/skolehjem/resources/views/errors/403.blade.php new file mode 100644 index 0000000..cd86941 --- /dev/null +++ b/skolehjem/resources/views/errors/403.blade.php @@ -0,0 +1,78 @@ + + + + @yield("title") + + @if(request()->cookie("mode") == "dark") + + @else + + @endif + + + + + +
+

{{__("msg.error")}}

+

{{__("msg.403")}}

+
+ + +@if(request()->cookie("mode") == "dark") + +@endif +@yield("scripts") + + + From 033d8f7c15f4f21e7274a34be76e384ce9894ae0 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 27 Aug 2020 12:46:07 +0200 Subject: [PATCH 08/14] v0.10.15j - Fixed admin access --- skolehjem/app/Helpers/Detector.php | 2 ++ skolehjem/app/Providers/DetectorServiceProvider.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/skolehjem/app/Helpers/Detector.php b/skolehjem/app/Helpers/Detector.php index 6b231a5..7c6312a 100644 --- a/skolehjem/app/Helpers/Detector.php +++ b/skolehjem/app/Helpers/Detector.php @@ -18,6 +18,8 @@ class Detector if (Auth()->user()->can('admin.panel.show') == true) return view(config("detector.defaultPath") . "." . $viewName, $args); } + if($viewName == "users.login" || $viewName == "users.logout") + return view(config("detector.mobilePath") . "." . $viewName, $args); return view("errors.403", $args); } diff --git a/skolehjem/app/Providers/DetectorServiceProvider.php b/skolehjem/app/Providers/DetectorServiceProvider.php index 6aa319d..93a05fc 100644 --- a/skolehjem/app/Providers/DetectorServiceProvider.php +++ b/skolehjem/app/Providers/DetectorServiceProvider.php @@ -33,6 +33,8 @@ class DetectorServiceProvider extends ServiceProvider if(Auth()->user()->can('admin.panel.show') == true) return view(config("detector.defaultPath") . "." . $view, $args); } + if($view == "users.login" || $view == "users.logout") + return view(config("detector.mobilePath") . "." . $view, $args); return view("errors.403", $args); }); From 78794074b2f163c7cd9e01fbec0e118e2e5b40e1 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 27 Aug 2020 13:59:11 +0200 Subject: [PATCH 09/14] v0.10.15k - Fixed admin access --- skolehjem/app/Http/Controllers/RootController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index 76670a6..d34cb52 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -19,16 +19,16 @@ class RootController extends Controller if(auth()->user()->can('admin.panel.show')) { if(Response::detect("root.index")->name() == "admin.root.index") - return Response::detect("root.index"); + return view("admin.root.index"); else { $news = News::query()->orderBy('id', 'desc')->paginate($perPage); - return Response::detect("root.index", ["news" => $news]); + return view("app.root.index", ["news" => $news]); } } else { $news = News::query()->orderBy('id', 'desc')->paginate($perPage, ['*'], "page"); - return view('app.root.index', ["news" => $news]); + return Response::detect('root.index', ["news" => $news]); } } } From a766bfea95d46fcaef717b2035620eb90f522dde Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 27 Aug 2020 15:29:59 +0200 Subject: [PATCH 10/14] v0.10.15l - Made role permissions semi done, sometimes it works sometimes it doesn't, it needs some touch up --- .../app/Http/Controllers/RolesController.php | 17 +- .../views/admin/roles/create.blade.php | 375 ++++++++++++------ 2 files changed, 260 insertions(+), 132 deletions(-) diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 83b4143..53794c2 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -6,6 +6,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use Spatie\Permission\Models\Role; +use Illuminate\Database\Eloquent\Collection; class rolesController extends Controller { @@ -57,6 +58,13 @@ class rolesController extends Controller "description" => "required|max:255" ]); + $brugerPermissions = new Collection(); + if (!$request->value === null) { + foreach ($request->value as $valuee) { + $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", $valuee)->first()); + } + } + $role = new Role($requestRole); $allRoles = Role::query()->where('name', '=', $request->name)->get(); @@ -66,11 +74,16 @@ class rolesController extends Controller return redirect()->route("roles.store"); else { // Else - Create it $role->save(); + + if (!$brugerPermissions->isEmpty()) { + foreach ($brugerPermissions as $permission) { + \Spatie\Permission\Models\Role::query()->find($role->id)->givePermissionTo($permission); + } + } + $roles = Role::query()->paginate($request->input("limit", 20)); return redirect()->route("roles.index", ['roles' => $roles]); } - - } /** diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index a4c9a4b..51a9d07 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -14,6 +14,18 @@ td > p, td > input { margin: 0; } + + small { + font-size: 16px; + } + + .form-text { + display: block; + } + + .text-muted { + color: #6c757d !important; + }

Opret Rolle:

@@ -23,136 +35,208 @@ - - - - - - - - - - - - - - - - - - - -
KontoBeskrivelseSe AccountÆndre BilledeÆndre OplysningerÆndre PasswordForgot Password
KontoEmpty
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SideBeskrivelseCreateReadUpdateDeleteFuld Kontrol
Brugere

Empty

Roller

Empty

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

Lokation

Empty

Vaskemaskiner

Empty

Resevationer

Empty

Kontakter

Empty

Vejledning

Empty

Feedback

Empty

+ + +
+ + +
+ + +
+ Her kan alle basale rettigheder for appens forbrugere slås til eller fra. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KontoBeskrivelseCreateReadDelete
Konto

Egen bruger

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

ReservationerEmpty
Kontakter

Empty

Vejledning

Empty

FeedbackEmpty
+
+ + + +
+ Her kan alle rettigheder for administrationssiden slås til eller fra. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SideBeskrivelseCreateReadUpdateDeleteFuld Kontrol
Admin Panel

Adgang til admin panelet

Brugere

Empty

Roller

Empty

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

Lokation

Empty

Vaskemaskiner

Empty

ReservationerEmpty
Kontakter

Empty

Vejledning

Empty

Feedback

Empty

+
+
@endsection @@ -216,5 +300,36 @@ } }); }) + + //User hide permissions + + $('#konto').hide(); + $('#admin').hide(); + + + //Show konto settings + $("#kontoButton").click(function(){ + var value = $('#kontoButton').text(); + if(value === 'Konto rettigheder'){ + $('#konto').slideDown('slow'); + $('#kontoButton').html('Luk konto rettigheder') + }else{ + $('#konto').slideUp('slow'); + $('#kontoButton').html('Konto rettigheder') + } + }); + + + //Show admin permissions + $("#adminButton").click(function(){ + var value = $('#adminButton').text(); + if(value === 'Admin rettigheder'){ + $('#admin').slideDown('slow'); + $('#adminButton').html('Luk admin rettigheder') + }else{ + $('#admin').slideUp('slow'); + $('#adminButton').html('Admin rettigheder') + } + }); @endsection From b6d819e5f83440fdc7ba8243e7cdc06019d39502 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 27 Aug 2020 16:40:46 +0200 Subject: [PATCH 11/14] v0.10.15m - added the last value to roles permissions --- .../views/admin/roles/create.blade.php | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index 51a9d07..037d309 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -71,42 +71,42 @@ Menuplan

Empty

- + Aktiviteter

Empty

- + Reservationer Empty - - - + + + Kontakter

Empty

- + Vejledning

Empty

- + Feedback Empty - - + + @@ -130,7 +130,7 @@ Admin Panel

Adgang til admin panelet

- + @@ -138,20 +138,20 @@ Brugere

Empty

- - - - - + + + + + Roller

Empty

- - - - - + + + + + Nyheder @@ -165,74 +165,74 @@ Menuplan

Empty

- - - - - + + + + + Aktiviteter

Empty

- - - - - + + + + + Lokation

Empty

- - - - - + + + + + Vaskemaskiner

Empty

- - - - - + + + + + Reservationer Empty - - - - - + + + + + Kontakter

Empty

- - - - - + + + + + Vejledning

Empty

- - - - - + + + + + Feedback

Empty

- - - - - + + + + + From e0af87ba973701fcb1861a736362fd8a1d82c03e Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 28 Aug 2020 08:26:32 +0200 Subject: [PATCH 12/14] v0.10.15n - Added a functional Full Control button to roles.create --- .../views/admin/roles/create.blade.php | 131 ++++++++++-------- 1 file changed, 76 insertions(+), 55 deletions(-) diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index 037d309..a5cf8a0 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -138,101 +138,101 @@ Brugere

Empty

- - - - - + + + + + Roller

Empty

- - - - - + + + + + Nyheder

Empty

- - - - - + + + + + Menuplan

Empty

- - - - - + + + + + Aktiviteter

Empty

- - - - - + + + + + Lokation

Empty

- - - - - + + + + + Vaskemaskiner

Empty

- - - - - + + + + + Reservationer Empty - - - - - + + + + + Kontakter

Empty

- - - - - + + + + + Vejledning

Empty

- - - - - + + + + + Feedback

Empty

- - - - - + + + + + @@ -331,5 +331,26 @@ $('#adminButton').html('Admin rettigheder') } }); + + function FullControl(FC) { //FC == Full Controll + var Create = $(FC).attr('id') + 'C'; // Takes FC's ID Name and puts C at the back of it + var Read = $(FC).attr('id') + 'R'; // Takes FC's ID Name and puts R at the back of it + var Update = $(FC).attr('id') + 'U'; // Takes FC's ID Name and puts U at the back of it + var Delete = $(FC).attr('id') + 'D'; // Takes FC's ID Name and puts D at the back of it + + $(FC).prop('checked', false); + + if ($('#' + Create).prop('checked') == true && $('#' + Read).prop('checked') == true && $('#' + Update).prop('checked') == true && $('#' + Delete).prop('checked') == true) { + $('#' + Create).prop('checked', false); + $('#' + Read).prop('checked', false); + $('#' + Update).prop('checked', false); + $('#' + Delete).prop('checked', false); + } else { + $('#' + Create).prop('checked', true); + $('#' + Read).prop('checked', true); + $('#' + Update).prop('checked', true); + $('#' + Delete).prop('checked', true); + } + } @endsection From 3235cea505b3500785dc423f696bc048a3eb3fe2 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Fri, 28 Aug 2020 08:28:32 +0200 Subject: [PATCH 13/14] v0.10.15o - Permissions semi works --- .idea/codeStyles/Project.xml | 1 - .idea/codeStyles/codeStyleConfig.xml | 5 + .../app/Http/Controllers/RolesController.php | 2 +- .../views/admin/roles/create.blade.php | 3 +- .../views/admin/roles/edit.blade.php | 254 ++++++++++++++++++ 5 files changed, 261 insertions(+), 4 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 681f41a..264b222 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -94,7 +94,6 @@ http://schemas.android.com/apk/res/android - ANDROID_ATTRIBUTE_ORDER
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 53794c2..ccb5fee 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -59,7 +59,7 @@ class rolesController extends Controller ]); $brugerPermissions = new Collection(); - if (!$request->value === null) { + if ($request->value !== null) { foreach ($request->value as $valuee) { $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", $valuee)->first()); } diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index 037d309..c078dd4 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -301,8 +301,7 @@ }); }) - //User hide permissions - + // hide permissions $('#konto').hide(); $('#admin').hide(); diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index 777f39e..114334b 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -10,6 +10,23 @@ @endsection @section("content") +

Rediger Rolle:

$role]) }}"> @csrf @@ -19,6 +36,209 @@ + + +
+ + +
+ + +
+ Her kan alle basale rettigheder for appens forbrugere slås til eller fra. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KontoBeskrivelseCreateReadDelete
Konto

Egen bruger

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

ReservationerEmpty
Kontakter

Empty

Vejledning

Empty

FeedbackEmpty
+
+ + + +
+ Her kan alle rettigheder for administrationssiden slås til eller fra. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SideBeskrivelseCreateReadUpdateDeleteFuld Kontrol
Admin Panel

Adgang til admin panelet

Brugere

Empty

Roller

Empty

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

Lokation

Empty

Vaskemaskiner

Empty

ReservationerEmpty
Kontakter

Empty

Vejledning

Empty

Feedback

Empty

+
+ +
@endsection @@ -82,5 +302,39 @@ } }); }) + + + // hide permissions + $('#konto').hide(); + $('#admin').hide(); + + + //Show konto settings + $("#kontoButton").click(function(){ + var value = $('#kontoButton').text(); + if(value === 'Rediger konto rettigheder'){ + $('#konto').slideDown('slow'); + $('#kontoButton').html('Luk konto rettigheder') + }else{ + $('#konto').slideUp('slow'); + $('#kontoButton').html('Rediger konto rettigheder') + } + }); + + + //Show admin permissions + $("#adminButton").click(function(){ + var value = $('#adminButton').text(); + if(value === 'Rediger admin rettigheder'){ + $('#admin').slideDown('slow'); + $('#adminButton').html('Luk admin rettigheder') + }else{ + $('#admin').slideUp('slow'); + $('#adminButton').html('Rediger admin rettigheder') + } + }); + + + @endsection From c86b8eba0350c7b4742e25174ca5539dafd8a314 Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 28 Aug 2020 12:54:39 +0200 Subject: [PATCH 14/14] v0.10.15p - Fixed 'msg.telefontid' --- skolehjem/resources/lang/dk/msg.php | 1 + 1 file changed, 1 insertion(+) diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 56023e0..da07a73 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -21,6 +21,7 @@ return[ "dereringenvaskemaskiner" => "Der er ikke nogen vaskemaskiner", "lokation" => "Lokation", "kontakter" => "Kontakt", + "telefontid" => "Telefontider", "navn" => "Navn", "email"=> "E-mail", "ring" => "Ring",