From 66762efb8a4c24eae00cacb3365a238d389c6c62 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 7 Sep 2020 14:21:59 +0200 Subject: [PATCH 1/8] v0.12.2 - Added feedback storing to ajax instead of backend --- .../Http/Controllers/FeedbackController.php | 10 +++++ skolehjem/resources/lang/dk/msg.php | 9 ++-- skolehjem/resources/lang/en/msg.php | 4 +- .../views/app/feedbacks/create.blade.php | 44 ++++++++++++++++--- skolehjem/routes/web.php | 1 + 5 files changed, 56 insertions(+), 12 deletions(-) diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 3bb9211..bc15970 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -166,5 +166,15 @@ class FeedbackController extends Controller } } + public function storeajax(Request $request) { + $requestBody = $request->validate([ + "message" => "required", + "suggestion_form" => "required|max:255" + ]); + + $feedbacks = new Feedbacks($requestBody); + $feedbacks->save(); + } + } diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index da07a73..bb30c98 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -65,10 +65,7 @@ return[ "error" => "Fejl", "404" => "Denne side findes ikke.", "403" => "Du har ikke rettigheder til denne side.", - "canceled" => "Aflyst" - - - - - + "canceled" => "Aflyst", + "feedbacksendt" => "Tak for din feedback!", + "feedbackerror" => "Du skal skrive en besked." ]; diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 87ebfc8..d75823c 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -71,5 +71,7 @@ return[ "error" => "Error", "404" => "This page doesn't exist.", "403" => "You don't have permissions to access this page.", - "canceled" => "Canceled" + "canceled" => "Canceled", + "feedbacksendt" => "Thank you for your feedback!", + "feedbackerror" => "You have to write a feedback message." ]; diff --git a/skolehjem/resources/views/app/feedbacks/create.blade.php b/skolehjem/resources/views/app/feedbacks/create.blade.php index 91e4a25..7f0c9ad 100644 --- a/skolehjem/resources/views/app/feedbacks/create.blade.php +++ b/skolehjem/resources/views/app/feedbacks/create.blade.php @@ -11,15 +11,49 @@ }
-
+
@csrf Ris el. Ros? - - - - + Besked: + + +
+
@endsection +@section("scripts") + +@endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 1c595b5..e3de331 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -40,6 +40,7 @@ Route::get("/about", "AboutController@index")->name("about.index"); Route::post("/events/cancelsignup", "UserEventController@createajaxcancel")->name("userevents.createajaxcancel"); Route::post("/account/cancelmailwants", "UserController@createajaxcancel")->name("users.createajaxcancel"); Route::delete("/notifications/delete", "EventController@deleteNotifications")->name("notifications.delete"); +Route::post("/feedbacks/store", "FeedbackController@storeajax")->name("feedbacks.storeajax"); //Route::get("/signup", "UserController@signup")->name("users.signup"); //Search/Filter From 6c4fceb697c0f0f635f416d82b2026a068f8c1e6 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 8 Sep 2020 08:48:30 +0200 Subject: [PATCH 2/8] v0.12.3 - Fixed reset password and email charset --- skolehjem/app/Helpers.php | 6 ++++-- skolehjem/resources/views/admin/users/forgot.blade.php | 2 +- skolehjem/resources/views/app/users/forgot.blade.php | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/skolehjem/app/Helpers.php b/skolehjem/app/Helpers.php index f419636..e3701ba 100644 --- a/skolehjem/app/Helpers.php +++ b/skolehjem/app/Helpers.php @@ -27,6 +27,9 @@ class Helpers } public static function sendNewsNotification(News $news, Collection $users){ + $headers = 'Content-Transfer-Encoding: 8bit'. "\r\n". + 'Content-Type: text/html; charset="UTF-8"'; + foreach ($users as $user) { $email = $user->email; @@ -35,10 +38,9 @@ class Helpers else $subject = $news->subname; - $msg = "Hej " . $user->name_first . " ". $user->name_last . ".\n\nDer er kommet en ny nyhed i skolehjems appen! "; - mail($email, $subject, $msg); + mail($email, $subject, $msg, $headers); } } } diff --git a/skolehjem/resources/views/admin/users/forgot.blade.php b/skolehjem/resources/views/admin/users/forgot.blade.php index ae29260..4fe1936 100644 --- a/skolehjem/resources/views/admin/users/forgot.blade.php +++ b/skolehjem/resources/views/admin/users/forgot.blade.php @@ -12,7 +12,7 @@
@csrf - +
diff --git a/skolehjem/resources/views/app/users/forgot.blade.php b/skolehjem/resources/views/app/users/forgot.blade.php index 617cf4d..310de27 100644 --- a/skolehjem/resources/views/app/users/forgot.blade.php +++ b/skolehjem/resources/views/app/users/forgot.blade.php @@ -12,8 +12,7 @@
@csrf - {!! session()->get('errornosuchuser') !!} - + Tilbage
From 720faac2ff5a1ea19fe00a09f27238e4637814a0 Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 8 Sep 2020 14:12:22 +0200 Subject: [PATCH 3/8] v1.0.0 - Version 1 [Open Beta] Open for launch! Added tooltips for roles.create & roles.edit #900Commits --- .idea/encodings.xml | 1 + .../public/images/icons/questionmark.svg | 49 ++++++++++++ .../views/admin/roles/create.blade.php | 75 ++++++++++++------- .../views/admin/roles/edit.blade.php | 75 ++++++++++++------- 4 files changed, 142 insertions(+), 58 deletions(-) create mode 100644 skolehjem/public/images/icons/questionmark.svg diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 648e66d..79ca184 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -8,6 +8,7 @@ + diff --git a/skolehjem/public/images/icons/questionmark.svg b/skolehjem/public/images/icons/questionmark.svg new file mode 100644 index 0000000..e67ada8 --- /dev/null +++ b/skolehjem/public/images/icons/questionmark.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index 410b966..64f04f2 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -26,6 +26,44 @@ .text-muted { color: #6c757d !important; } + + .question-mark, .question-mark-div { + float: right; + width: 24px; + vertical-align: sub; + } + + .question-mark-div { + position: relative; + display: inline-block; + } + + .question-mark-div .question-mark-tooltip { + visibility: hidden; + width: 150px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 6px 6px; + + /* Position the tooltip */ + position: absolute; + z-index: 1; + top: -5px; + right: 105%; + } + + .question-mark-div:hover .question-mark-tooltip { + visibility: visible; + } + + th { + overflow: visible !important; + text-overflow: unset !important; + white-space: unset !important; + word-break: break-word !important; + }

Opret Rolle:

@@ -48,56 +86,48 @@ - - - - + + + - - - - - - - @@ -112,22 +142,19 @@
App-sideBeskrivelse kan fjernes?Opret/TilmeldSeSlet/AfmeldOpret/Tilmeld
Giver tilladelse til at oprette el. tilmelde Reservationer, Aktiviteter & Feedback
Se
Giver tilladelse til at se diverse sider
Slet/Afmeld
Giver tilladelse til at slette el. afmelde Reservationer & Aktiviteter
Nyheder

Empty
Menuplan

Empty
Aktiviteter

Empty
ReservationerEmpty
Kontakter

Empty
Vejledning

Empty
FeedbackEmpty
- - - - - - + + + + + - - @@ -136,7 +163,6 @@ - @@ -145,7 +171,6 @@ - @@ -154,7 +179,6 @@ - @@ -163,7 +187,6 @@ - @@ -172,7 +195,6 @@ - @@ -181,7 +203,6 @@ - @@ -190,7 +211,6 @@ - @@ -199,7 +219,6 @@ - @@ -208,7 +227,6 @@ - @@ -217,7 +235,6 @@ - diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index 82ccd69..7118213 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -26,6 +26,44 @@ .text-muted { color: #6c757d !important; } + + .question-mark, .question-mark-div { + float: right; + width: 24px; + vertical-align: sub; + } + + .question-mark-div { + position: relative; + display: inline-block; + } + + .question-mark-div .question-mark-tooltip { + visibility: hidden; + width: 150px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 6px 6px; + + /* Position the tooltip */ + position: absolute; + z-index: 1; + top: -5px; + right: 105%; + } + + .question-mark-div:hover .question-mark-tooltip { + visibility: visible; + } + + th { + overflow: visible !important; + text-overflow: unset !important; + white-space: unset !important; + word-break: break-word !important; + }

Rediger Rolle:

$role]) }}"> @@ -48,56 +86,48 @@
Admin-sideBeskrivelse kan fjernes?OpretSeRedigerSletFuld KontrolOpret
Giver tilladelse til at oprette Menuplaner, Aktiviteter, Brugere m.v.
Se
Giver tilladelse til at se alle Menuplaner, Aktiviteter, Brugere m.v.
Rediger
Giver tilladelse til at kunne redigere Menuplaner, Aktiviteter, Brugere m.v.
Slet
Giver tilladelse til at kunne slette Menuplaner, Aktiviteter, Brugere m.v.
Fuld Kontrol
Giver alle rettigheder som beskrevet i hhv. 'Opret', 'Se', 'Rediger' & 'Slet'
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
- - - - + + + - - - - - - - @@ -112,22 +142,19 @@
App-sideBeskrivelse kan fjernes?Opret/TilmeldSeSlet/AfmeldOpret/Tilmeld
Giver tilladelse til at oprette el. tilmelde Reservationer, Aktiviteter & Feedback
Se
Giver tilladelse til at se diverse sider
Slet/Afmeld
Giver tilladelse til at slette el. afmelde Reservationer & Aktiviteter
Nyheder

Empty

 hasPermissionTo("news.show")) checked @endif>
Menuplan

Empty

 hasPermissionTo("menuplan.show")) checked @endif>
Aktiviteter

Empty

 hasPermissionTo("userevent.create")) checked @endif> hasPermissionTo("event.show")) checked @endif> hasPermissionTo("userevent.delete")) checked @endif>
ReservationerEmpty hasPermissionTo("washing.machine.reservation.create")) checked @endif> hasPermissionTo("washing.machine.reservation.show")) checked @endif> hasPermissionTo("washing.machine.reservation.delete")) checked @endif>
Kontakter

Empty

 hasPermissionTo("contact.show")) checked @endif>
Vejledning

Empty

 hasPermissionTo("guides.show")) checked @endif>
FeedbackEmpty hasPermissionTo("feedback.create")) checked @endif>
- - - - - - + + + + + - - @@ -136,7 +163,6 @@ - @@ -145,7 +171,6 @@ - @@ -154,7 +179,6 @@ - @@ -163,7 +187,6 @@ - @@ -172,7 +195,6 @@ - @@ -181,7 +203,6 @@ - @@ -190,7 +211,6 @@ - @@ -199,7 +219,6 @@ - @@ -208,7 +227,6 @@ - @@ -217,7 +235,6 @@ - From 5d82e7251b9f47da15a9136b71343f75d644dc15 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 9 Sep 2020 09:15:17 +0200 Subject: [PATCH 4/8] v1.0.0a - Edited CSS & Controller img's --- skolehjem/app/Http/Controllers/FeedbackController.php | 2 +- skolehjem/app/Http/Controllers/WashingReservationController.php | 2 +- skolehjem/resources/views/admin/contacts/index.blade.php | 2 +- skolehjem/resources/views/admin/users/index.blade.php | 2 +- skolehjem/resources/views/app/about/index.blade.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index bc15970..b4c0d0b 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -135,7 +135,7 @@ class FeedbackController extends Controller "". "". "". - "". + "". ""; //$value = Feedbacks::query('feedbacks')->select('suggestion_form ')->dump(); diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index ccabb00..d4a7c02 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -211,7 +211,7 @@ class WashingReservationController extends Controller "". "". "". - "". + "". ""; diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 4f2c314..60f2ba3 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -32,7 +32,7 @@ -
+
Admin-sideBeskrivelse kan fjernes?OpretSeRedigerSletFuld KontrolOpret
Giver tilladelse til at oprette Menuplaner, Aktiviteter, Brugere m.v.
Se
Giver tilladelse til at se alle Menuplaner, Aktiviteter, Brugere m.v.
Rediger
Giver tilladelse til at kunne redigere Menuplaner, Aktiviteter, Brugere m.v.
Slet
Giver tilladelse til at kunne slette Menuplaner, Aktiviteter, Brugere m.v.
Fuld Kontrol
Giver alle rettigheder som beskrevet i hhv. 'Opret', 'Se', 'Rediger' & 'Slet'
Admin Panel

Adgang til admin panelet

 hasPermissionTo("admin.panel.show")) checked @endif>
Brugere

Empty

 hasPermissionTo("user.create")) checked @endif> hasPermissionTo("user.show")) checked @endif> hasPermissionTo("user.edit")) checked @endif>
Roller

Empty

 hasPermissionTo("roles.create")) checked @endif> hasPermissionTo("roles.show")) checked @endif> hasPermissionTo("roles.edit")) checked @endif>
Nyheder

Empty

 hasPermissionTo("news.create")) checked @endif> hasPermissionTo("news.show")) checked @endif> hasPermissionTo("news.edit")) checked @endif>
Menuplan

Empty

 hasPermissionTo("menuplan.create")) checked @endif> hasPermissionTo("menuplan.show")) checked @endif> hasPermissionTo("menuplan.edit")) checked @endif>
Aktiviteter

Empty

 hasPermissionTo("event.create")) checked @endif> hasPermissionTo("event.show")) checked @endif> hasPermissionTo("event.edit")) checked @endif>
Lokation

Empty

 hasPermissionTo("locations.create")) checked @endif> hasPermissionTo("locations.show")) checked @endif> hasPermissionTo("locations.edit")) checked @endif>
Vaskemaskiner

Empty

 hasPermissionTo("washing.machine.create")) checked @endif> hasPermissionTo("washing.machine.show")) checked @endif> hasPermissionTo("washing.machine.edit")) checked @endif>
ReservationerEmpty hasPermissionTo("washing.machine.reservation.show")) checked @endif>
Kontakter

Empty

 hasPermissionTo("contact.create")) checked @endif> hasPermissionTo("contact.show")) checked @endif> hasPermissionTo("contact.edit")) checked @endif>
Vejledning

Empty

 hasPermissionTo("guides.create")) checked @endif> hasPermissionTo("guides.show")) checked @endif> hasPermissionTo("guides.edit")) checked @endif>
Feedback

Empty

 hasPermissionTo("feedback.show")) checked @endif> DatoFeedback BeskedRis el. Ros\"Delete\"\"Delete\"
VaskemaskineTidspunktBruger\"Delete\"\"Delete\"
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 2793053..dca8dfc 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -73,7 +73,7 @@ -
+
diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index 3f62ebd..6726312 100644 --- a/skolehjem/resources/views/app/about/index.blade.php +++ b/skolehjem/resources/views/app/about/index.blade.php @@ -7,7 +7,7 @@

{{ __('msg.omkring') }}

Version:

-

1.0

+

1.0.0-a

{{__("msg.omappen")}}:

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

{{__("msg.programmedby")}}:

From cc49bf42525f78b9cee17a6025c30ca1423d6397 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 9 Sep 2020 09:16:56 +0200 Subject: [PATCH 5/8] v1.0.0b - Removed name + emails (Only commented out) --- skolehjem/resources/views/app/about/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index 6726312..c1cba97 100644 --- a/skolehjem/resources/views/app/about/index.blade.php +++ b/skolehjem/resources/views/app/about/index.blade.php @@ -10,11 +10,11 @@

1.0.0-a

{{__("msg.omappen")}}:

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

-

{{__("msg.programmedby")}}:

+
@endsection From a1cda94b131dde34662913fcc5491e0d6afda75a Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 9 Sep 2020 09:20:50 +0200 Subject: [PATCH 6/8] Small change for ekapp (No need for comit number) --- skolehjem/resources/views/app/about/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index c1cba97..7f52fc1 100644 --- a/skolehjem/resources/views/app/about/index.blade.php +++ b/skolehjem/resources/views/app/about/index.blade.php @@ -7,7 +7,7 @@

{{ __('msg.omkring') }}

Version:

-

1.0.0-a

+

1.0.0-b

{{__("msg.omappen")}}:

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

- + - + + -
- - @endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index e3de331..9bceeed 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -41,7 +41,8 @@ Route::post("/events/cancelsignup", "UserEventController@createajaxcancel")->nam Route::post("/account/cancelmailwants", "UserController@createajaxcancel")->name("users.createajaxcancel"); Route::delete("/notifications/delete", "EventController@deleteNotifications")->name("notifications.delete"); Route::post("/feedbacks/store", "FeedbackController@storeajax")->name("feedbacks.storeajax"); -//Route::get("/signup", "UserController@signup")->name("users.signup"); +Route::get("/signup", "UserController@signup")->name("users.signup"); +Route::post("/signupStore", "UserController@signupStore")->name("users.signupStore"); //Search/Filter Route::get("/contactsapi", "ContactController@search")->name("contacts.search");