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/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/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 3bb9211..b4c0d0b 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -135,7 +135,7 @@ class FeedbackController extends Controller "Dato". "Feedback Besked". "Ris el. Ros". - "\"Delete\"". + "\"Delete\"". ""; //$value = Feedbacks::query('feedbacks')->select('suggestion_form ')->dump(); @@ -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/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 3093eec..66717cc 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -24,8 +24,8 @@ class UserController extends Controller { $this->middleware([ "auth" ])->only(["accountupdate", "accountedit", "accounteditpass", "account", "logout"]); - $this->middleware([ "guest" ])->only(["login", "signup"]); - $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot","signup"]); + $this->middleware([ "guest" ])->only(["login", "signup", "signupStore"]); + $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot", "signup", "nameCheck", "signupStore"]); $this->middleware([ "check.auth:user.show" ])->only("show", "index"); $this->middleware([ "check.auth:user.create" ])->only("create"); @@ -645,10 +645,27 @@ class UserController extends Controller } } - public function signup(){ //return redirect()->route("users.signup"); return Response::detect("users.signup"); } + public function signupStore(Request $request){ + $data = $request->validate([ + "name_first" => "required|max:255", + "name_last" => "required|max:255", + "email" => "required", + "password" => "required|max:60", + "phone" => "required|max:8|min:8", + ]); + + + $user = new User($data); + + $user->assignRole("Bruger"); + $user->save(); + + return redirect()->route('users.login'); + } + } 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 "Vaskemaskine". "Tidspunkt". "Bruger". - "\"Delete\"". + "\"Delete\"". ""; 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/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/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 @@ -
+
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 @@ - diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 9a0d0cb..6a4f722 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -21,7 +21,7 @@ - +
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/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 @@
-
+
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>
diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index 3f62ebd..544ea92 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

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

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

-

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

+ @endsection 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/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 475e41d..a6c4c4c 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -76,7 +76,6 @@ @endif border-bottom: 1px solid rgba(0, 0, 0, .1); width: 100%; - height: 25px; } .information2{ @@ -87,7 +86,6 @@ background-color: rgba(240,240,240,0.8); @endif width: 100%; - height: 25px; } .card > .img > a > img, .card > .img > img { 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 diff --git a/skolehjem/resources/views/app/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php index 6eda6c7..ca75b58 100644 --- a/skolehjem/resources/views/app/users/login.blade.php +++ b/skolehjem/resources/views/app/users/login.blade.php @@ -26,6 +26,7 @@ {!! session()->get('error#wrongcredentials') !!} {!! session()->get('success#loggedout') !!} + Forgot password? diff --git a/skolehjem/resources/views/app/users/signup.blade.php b/skolehjem/resources/views/app/users/signup.blade.php index 1b72a9b..bf85d5e 100644 --- a/skolehjem/resources/views/app/users/signup.blade.php +++ b/skolehjem/resources/views/app/users/signup.blade.php @@ -5,51 +5,99 @@ @endsection @section("content") -
Syddansk Erhvervsskole
-
+ @csrf + + + - - - + + - - - + + - + - + + -
- - @endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 1c595b5..9bceeed 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -40,7 +40,9 @@ 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::get("/signup", "UserController@signup")->name("users.signup"); +Route::post("/feedbacks/store", "FeedbackController@storeajax")->name("feedbacks.storeajax"); +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");