From 708313a4b3456a3369cd2ba1f9a07ffcfc0e53eb Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 6 Aug 2020 14:47:22 +0200 Subject: [PATCH 1/8] v0.5.6 - Fixed Guide when destroying. Added accountable in Event table to see who is the accountable for the event. Changed description field to CKEditor --- skolehjem/app/Event.php | 2 +- .../app/Http/Controllers/EventController.php | 1 + .../app/Http/Controllers/GuideController.php | 7 +- .../2020_06_29_091545_create_events.php | 1 + skolehjem/package-lock.json | 118 +++++++++++++++++- skolehjem/package.json | 8 +- .../views/admin/events/create.blade.php | 46 ++++--- .../views/admin/events/edit.blade.php | 4 +- .../views/admin/events/index.blade.php | 4 +- .../views/admin/guides/edit.blade.php | 3 +- .../views/app/events/index.blade.php | 3 +- 11 files changed, 156 insertions(+), 41 deletions(-) diff --git a/skolehjem/app/Event.php b/skolehjem/app/Event.php index 734570a..b26291c 100644 --- a/skolehjem/app/Event.php +++ b/skolehjem/app/Event.php @@ -20,6 +20,6 @@ class Event extends Model */ //protected variable which contains name of database field(s) to be filled. protected $fillable = [ - "name", "description", "date" + "name", "accountable", "description", "date" ]; } diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 1e80482..399ec20 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -59,6 +59,7 @@ class EventController extends Controller { $requestBody = $request->validate([ "name" => "required|max:255", + "accountable" => "required|max:255", "description" => "required|max:255", "date" => "required" ]); diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index e25f5fd..0a85ad7 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -123,13 +123,14 @@ class GuideController extends Controller /** * Remove the specified resource from storage. * - * @param \App\Guide $guide + * @param Guide $guide * @return \Illuminate\Http\Response */ - public function destroy(Guide $guide) + public function destroy($guide) { - $guide = MenuPlan::find($guide); + $guide = Guide::find($guide); $guide->delete(); + return redirect()->route("guides.index"); } } diff --git a/skolehjem/database/migrations/2020_06_29_091545_create_events.php b/skolehjem/database/migrations/2020_06_29_091545_create_events.php index a6433b1..4e1c7dc 100644 --- a/skolehjem/database/migrations/2020_06_29_091545_create_events.php +++ b/skolehjem/database/migrations/2020_06_29_091545_create_events.php @@ -18,6 +18,7 @@ class CreateEvents extends Migration Schema::create('events', function (Blueprint $table) { $table->id(); $table->string("name"); + $table->string("accountable"); $table->string("description"); $table->dateTime("date"); $table->timestamps(); diff --git a/skolehjem/package-lock.json b/skolehjem/package-lock.json index 89c5c1a..f76da65 100644 --- a/skolehjem/package-lock.json +++ b/skolehjem/package-lock.json @@ -1008,6 +1008,103 @@ "to-fast-properties": "^2.0.0" } }, + "@ckeditor/ckeditor5-alignment": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-21.0.0.tgz", + "integrity": "sha512-jtUc7g+9TKgNS819UD23tJSTJosp+VAk/fk+p1HJEgrq5YuH/F3djVwW4fyyJRuepbvYOObhOa2YHET1gtOuFw==", + "requires": { + "@ckeditor/ckeditor5-core": "^21.0.0", + "@ckeditor/ckeditor5-ui": "^21.0.0" + } + }, + "@ckeditor/ckeditor5-build-classic": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-classic/-/ckeditor5-build-classic-21.0.0.tgz", + "integrity": "sha512-IYPXmc5Np7SzJVJbGNZk3OZEHnZ/WylbN1aFyfYdKMch9Be8mrCB9QQOqfsAEKD4SjXujYvn1jL0mM/EPZ8ECw==" + }, + "@ckeditor/ckeditor5-build-decoupled-document": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-build-decoupled-document/-/ckeditor5-build-decoupled-document-21.0.0.tgz", + "integrity": "sha512-JsZjOIDlRemRjvrvDwJEW2CoqBkzKD5d52nleGm+KmikBZiaAMxWYJfxDVcM7mn+iFMfYkF330+HrFnD2pPj3w==" + }, + "@ckeditor/ckeditor5-core": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-21.0.0.tgz", + "integrity": "sha512-qoBLE0dGaxYHN6zetYe5ct/w9E3+iX9T2oCgHNbCD/zaYhxfNTQ9uHp7x6Hn4Zq0xyieUhNIeq+ZR9CJlBEMwA==", + "requires": { + "@ckeditor/ckeditor5-engine": "^21.0.0", + "@ckeditor/ckeditor5-utils": "^21.0.0", + "lodash-es": "^4.17.15" + } + }, + "@ckeditor/ckeditor5-engine": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-21.0.0.tgz", + "integrity": "sha512-wa0Fmn62o1i4Jw0vHnCvtwqM2ARkIU2V2/6MUgWAez5gpAIFwSGu4kjUGeIbuHISAIGKIwtRIVAdL9EtqsTV/A==", + "requires": { + "@ckeditor/ckeditor5-utils": "^21.0.0", + "lodash-es": "^4.17.15" + } + }, + "@ckeditor/ckeditor5-inspector": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-inspector/-/ckeditor5-inspector-2.2.0.tgz", + "integrity": "sha512-2Y24+im+FzMu2VD7KjGTLMxR3RjDn8KwPtkqp/1gZY1+OxnKzWFwiQLGd71CMQ/JDhH19N+AKRL8JEfDrrnD2g==", + "dev": true + }, + "@ckeditor/ckeditor5-table": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-21.0.0.tgz", + "integrity": "sha512-JCoDuOtzq6MXHW2EV0ct6Dm/YLF2HRgJWPVJyc8O9oNGTt6IEXlV0p+mbVrDu/cdhKCAoYCxG7WScm4B7TX3vg==", + "requires": { + "@ckeditor/ckeditor5-core": "^21.0.0", + "@ckeditor/ckeditor5-ui": "^21.0.0", + "@ckeditor/ckeditor5-widget": "^21.0.0", + "lodash-es": "^4.17.15" + } + }, + "@ckeditor/ckeditor5-typing": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-21.0.0.tgz", + "integrity": "sha512-E38YTfhXzlbdlFX5zm0bofZn7SJyMWOryagI3w/N93f+0OXnyIMk/9JM7OWYwv4DD4MyU1jx1eOZkywQTl7LSQ==", + "requires": { + "@ckeditor/ckeditor5-core": "^21.0.0", + "@ckeditor/ckeditor5-engine": "^21.0.0", + "@ckeditor/ckeditor5-utils": "^21.0.0", + "lodash-es": "^4.17.15" + } + }, + "@ckeditor/ckeditor5-ui": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-21.0.0.tgz", + "integrity": "sha512-oACL96HUbHhQ5Me5WpOYq9qZ+zJw0Hfqe+f8/UtCfQ99zHcrfZ2odvNHSPdn16cZ5f8ED+zLJNHb8b8IMWwy2Q==", + "requires": { + "@ckeditor/ckeditor5-core": "^21.0.0", + "@ckeditor/ckeditor5-utils": "^21.0.0", + "lodash-es": "^4.17.15" + } + }, + "@ckeditor/ckeditor5-utils": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-21.0.0.tgz", + "integrity": "sha512-JDEFO/bC8uP/K6xHEJdN/Pm1G7EO2WG363CY3qGZc49eNvYeXrluniLHIh7pL3kUSIr0yqLjJGGdPKc/sZYsHQ==", + "requires": { + "lodash-es": "^4.17.15" + } + }, + "@ckeditor/ckeditor5-widget": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-21.0.0.tgz", + "integrity": "sha512-wS/msbkKYgOeJiMK3jxDTpbBJG9Nof0unTbc7rp4HMCLQ1OL9IZvGcowzpMwBDiVoXY+gwyWApeWAnrRwbNbnw==", + "requires": { + "@ckeditor/ckeditor5-core": "^21.0.0", + "@ckeditor/ckeditor5-engine": "^21.0.0", + "@ckeditor/ckeditor5-typing": "^21.0.0", + "@ckeditor/ckeditor5-ui": "^21.0.0", + "@ckeditor/ckeditor5-utils": "^21.0.0", + "lodash-es": "^4.17.15" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -2223,6 +2320,10 @@ "safe-buffer": "^5.0.1" } }, + "ckeditor": { + "version": "github:unisharp/laravel-ckeditor#e404f291734aef3ef049809e7be203de286920d2", + "from": "github:unisharp/laravel-ckeditor" + }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -3257,9 +3358,9 @@ "dev": true }, "elliptic": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", - "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -5273,11 +5374,16 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, + "lodash-es": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", + "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" + }, "lodash._baseassign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", diff --git a/skolehjem/package.json b/skolehjem/package.json index 6fd5e74..b5f5086 100644 --- a/skolehjem/package.json +++ b/skolehjem/package.json @@ -10,17 +10,23 @@ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { + "@ckeditor/ckeditor5-inspector": "^2.2.0", "axios": "^0.19", "cross-env": "^7.0", "jquery": "^3.5.1", "laravel-mix": "^5.0.1", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "resolve-url-loader": "^2.3.1", "sass": "^1.20.1", "sass-loader": "^8.0.0", "vue-template-compiler": "^2.6.11" }, "dependencies": { + "@ckeditor/ckeditor5-alignment": "^21.0.0", + "@ckeditor/ckeditor5-build-classic": "^21.0.0", + "@ckeditor/ckeditor5-build-decoupled-document": "^21.0.0", + "@ckeditor/ckeditor5-table": "^21.0.0", + "ckeditor": "github:unisharp/laravel-ckeditor", "moment": "^2.27.0" } } diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 78c2df2..e87292f 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -10,36 +10,34 @@ @endsection @section("content") + +

Opret Aktivitet:

@csrf - + - - - + + + + +
-{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{--
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
--}} + @endsection diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 0234b54..4007c19 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -16,8 +16,10 @@ @method("PUT") + + - + diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 536ef83..9ce8a1c 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ @foreach($events as $event) - + diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index 81bcd34..00ad48f 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -35,13 +35,12 @@ options: [ { model: 'paragraph', title: 'Paragraph', class: 'ck-heading_paragraph' }, { model: 'heading1', view: 'h3', title: 'Heading 1', class: 'sde-blue' }, - { model: 'heading2', view: 'h4', title: 'Heading 2', class: 'sde-blue' } + { model: 'heading2', view: 'h4', title: 'Heading 2', class: 'sde-blue' }, ] } } ) .catch( error => { console.log( error ); } ); - @endsection diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index b38e477..164d4ff 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -10,8 +10,9 @@ @foreach($events as $event)

{{$event->name}}

+

Af: {{ $event->accountable }}

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

-

{{$event->description}}

+ {!! $event->description !!} {!! session()->get('error#' . $event->id) !!} {!! session()->get('signup#' . $event->id) !!} From 6e2ffa8de447e6e0ba0cc3eca2585b9cef34dd1c Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 6 Aug 2020 14:50:07 +0200 Subject: [PATCH 2/8] v0.5.6a - Fixed description when seeing your events --- skolehjem/resources/views/app/events/yourevents.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index fa80589..035cc5b 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -14,7 +14,7 @@ @method("delete")

{{$userevent->name}}

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

-

{{$userevent->description}}

+

{!! $userevent->description !!}

@endforeach From 7cc871ae9077d2fa10c200fda8f7f0639e9c78ce Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 6 Aug 2020 15:31:38 +0200 Subject: [PATCH 3/8] v0.5.7 - Made multi language option --- .../Http/Controllers/ContactController.php | 1 + .../app/Http/Controllers/EventController.php | 1 + .../Http/Controllers/FeedbackController.php | 1 + .../app/Http/Controllers/GuideController.php | 1 + .../Http/Controllers/LocationController.php | 1 + .../Http/Controllers/MenuPlanController.php | 1 + .../Http/Controllers/PermissionController.php | 6 +++ .../app/Http/Controllers/PhoneController.php | 6 +++ .../ResourceCategoryController.php | 1 + .../Http/Controllers/ResourceController.php | 1 + .../ResourceExtensionController.php | 1 + .../app/Http/Controllers/RolesController.php | 1 + .../app/Http/Controllers/RootController.php | 1 + .../app/Http/Controllers/UserController.php | 21 ++++++++++ .../Http/Controllers/UserEventController.php | 5 +++ .../Controllers/WashingMachineController.php | 1 + .../WashingReservationController.php | 1 + skolehjem/app/Http/Kernel.php | 3 +- skolehjem/app/User.php | 5 +++ skolehjem/config/app.php | 4 +- .../views/app/events/index.blade.php | 6 +-- .../resources/views/app/layout/base.blade.php | 16 ++++---- .../views/app/menuplans/index.blade.php | 16 ++++---- .../views/app/users/account.blade.php | 39 +++++++++++++++++++ .../resources/views/app/users/index.blade.php | 12 +++--- skolehjem/routes/web.php | 2 + 26 files changed, 126 insertions(+), 28 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index e3e706c..204cbf9 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -13,6 +13,7 @@ class ContactController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:contact.list" ])->only("index"); $this->middleware([ "check.auth:contact.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 1e80482..b99b08d 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -15,6 +15,7 @@ class EventController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:event.list" ])->only("index"); $this->middleware([ "check.auth:event.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 5d39190..5bd25bc 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -13,6 +13,7 @@ class FeedbackController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:feedback.list" ])->only("index"); $this->middleware([ "check.auth:feedback.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index d38de56..65c18cb 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -13,6 +13,7 @@ class GuideController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:guides.list" ])->only("index"); $this->middleware([ "check.auth:guides.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/LocationController.php b/skolehjem/app/Http/Controllers/LocationController.php index d766b01..d6100bf 100644 --- a/skolehjem/app/Http/Controllers/LocationController.php +++ b/skolehjem/app/Http/Controllers/LocationController.php @@ -11,6 +11,7 @@ class LocationController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:locations.list" ])->only("index"); $this->middleware([ "check.auth:locations.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index f10fc7b..6219089 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -17,6 +17,7 @@ class MenuPlanController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:menuplan.list" ])->only("index"); $this->middleware([ "check.auth:menuplan.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/PermissionController.php b/skolehjem/app/Http/Controllers/PermissionController.php index 0b627f3..8d06041 100644 --- a/skolehjem/app/Http/Controllers/PermissionController.php +++ b/skolehjem/app/Http/Controllers/PermissionController.php @@ -8,6 +8,12 @@ use Spatie\Permission\Models\Permission; class PermissionController extends Controller { + public function __construct() + { + $this->middleware(["auth"]); + $this->middleware(["lang"]); + } + /** * Display a listing of the resource. * diff --git a/skolehjem/app/Http/Controllers/PhoneController.php b/skolehjem/app/Http/Controllers/PhoneController.php index e2c3466..6772654 100644 --- a/skolehjem/app/Http/Controllers/PhoneController.php +++ b/skolehjem/app/Http/Controllers/PhoneController.php @@ -7,6 +7,12 @@ use Illuminate\Http\Response; class PhoneController extends Controller { + public function __construct() + { + $this->middleware(["auth"]); + $this->middleware(["lang"]); + } + function index() { return Response::detect("vagttelefons.index"); } diff --git a/skolehjem/app/Http/Controllers/ResourceCategoryController.php b/skolehjem/app/Http/Controllers/ResourceCategoryController.php index 657c6ec..dcfdb71 100644 --- a/skolehjem/app/Http/Controllers/ResourceCategoryController.php +++ b/skolehjem/app/Http/Controllers/ResourceCategoryController.php @@ -11,6 +11,7 @@ class ResourceCategoryController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:resource.category.list" ])->only("index"); $this->middleware([ "check.auth:resource.category.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/ResourceController.php b/skolehjem/app/Http/Controllers/ResourceController.php index 7fe829d..20fe0ed 100644 --- a/skolehjem/app/Http/Controllers/ResourceController.php +++ b/skolehjem/app/Http/Controllers/ResourceController.php @@ -12,6 +12,7 @@ class ResourceController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:resource.list" ])->only("index"); $this->middleware([ "check.auth:resource.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/ResourceExtensionController.php b/skolehjem/app/Http/Controllers/ResourceExtensionController.php index 422ecc5..b13606e 100644 --- a/skolehjem/app/Http/Controllers/ResourceExtensionController.php +++ b/skolehjem/app/Http/Controllers/ResourceExtensionController.php @@ -11,6 +11,7 @@ class ResourceExtensionController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:resource.extension.list" ])->only("index"); $this->middleware([ "check.auth:resource.extension.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index ae68be2..8997ffd 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -12,6 +12,7 @@ class rolesController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:roles.list" ])->only("index"); $this->middleware([ "check.auth:roles.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index d147e5b..28112ee 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -10,6 +10,7 @@ class RootController extends Controller function __construct() { $this->middleware("auth"); + $this->middleware([ "lang" ]); } public function index() { diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 13b09b8..50074f7 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -6,6 +6,7 @@ use App\Helpers\Detector; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\User; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; @@ -20,6 +21,7 @@ class UserController extends Controller { $this->middleware([ "auth" ])->only("logout"); $this->middleware([ "guest" ])->only("login"); + $this->middleware([ "lang" ])->except(["login", "showLogin"]); $this->middleware([ "check.auth:user.list" ])->only("index"); $this->middleware([ "check.auth:user.show" ])->only("show"); @@ -462,4 +464,23 @@ class UserController extends Controller return Response($output); } } + + + + public function setLanguages(Request $request){ + if($request->ajax()){ + if($request->lang === "en"){ + $response = new Response('Set Cookie'); + $response->withCookie(cookie('languagesSetting', $request->lang, 5259488)); + + return $response; + }elseif($request->lang === "dk"){ + $response = new Response('Set Cookie'); + $response->withCookie(cookie('languagesSetting', $request->lang, 5259488)); + + return $response; + } + } + } + } diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index 4303acb..74e655b 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -8,6 +8,11 @@ use Illuminate\Http\Response; class UserEventController extends Controller { + public function __construct() + { + $this->middleware(["auth"]); + $this->middleware(["lang"]); + } /** * Update the specified resource in storage. * diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index 9ef3096..d4e30f3 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -17,6 +17,7 @@ class WashingMachineController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:washing.machine.list" ])->only("index"); $this->middleware([ "check.auth:washing.machine.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 4da0d9e..18d04b9 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -19,6 +19,7 @@ class WashingReservationController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:washing.machine.reservation.list" ])->only(["index", "appindex"]); $this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show"); diff --git a/skolehjem/app/Http/Kernel.php b/skolehjem/app/Http/Kernel.php index 3e1e21b..7b37d2d 100644 --- a/skolehjem/app/Http/Kernel.php +++ b/skolehjem/app/Http/Kernel.php @@ -2,6 +2,7 @@ namespace App\Http; +use App\Http\Middleware\SetLocale; use Illuminate\Foundation\Http\Kernel as HttpKernel; class Kernel extends HttpKernel @@ -67,7 +68,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, - + 'lang' => \App\Http\Middleware\SetLocale::class, "check.auth" => \App\Http\Middleware\CheckAuth::class ]; } diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php index 0db07bf..1f8aca1 100644 --- a/skolehjem/app/User.php +++ b/skolehjem/app/User.php @@ -7,6 +7,7 @@ namespace App; //allows the use of many libraries. +use http\Env\Request; use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; @@ -52,4 +53,8 @@ class User extends Authenticatable public function setPasswordAttribute($password) { $this->attributes["password"] = Hash::make($password); } + + public function getLocale(\Illuminate\Http\Request $request) { + return $request->cookie('languagesSetting'); + } } diff --git a/skolehjem/config/app.php b/skolehjem/config/app.php index b7644e6..2c1b451 100644 --- a/skolehjem/config/app.php +++ b/skolehjem/config/app.php @@ -80,7 +80,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => 'dk', /* |-------------------------------------------------------------------------- @@ -93,7 +93,7 @@ return [ | */ - 'fallback_locale' => 'en', + 'fallback_locale' => 'dk', /* |-------------------------------------------------------------------------- diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index b38e477..2e328b7 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -5,7 +5,7 @@ @section("content")
-

Aktiviteter

+

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

@if(!$events->isEmpty()) @foreach($events as $event)
@@ -19,8 +19,8 @@ @endforeach @else -

Der er ingen aktiviteter!

+

{{__('msg.dereringenaktiviteter')}}!

@endif - Se Tilmeldte Aktiviteter + {{__('msg.setilmeldteaktiviteter')}}
@endsection diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 7d29a33..efb0573 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -20,15 +20,15 @@ Menuplan - Menuplan + {{ __('msg.menuplan') }} Aktiviteter - Aktiviteter + {{ __('msg.aktiviteter') }} Reservationer - Reservationer + {{ __('msg.reservationer') }} {{-- MÅ IKKE SLETTES!!!! --}} {{-- --}} @@ -37,23 +37,23 @@ {{-- --}} Kontoret - Kontoret + {{ __('msg.kontoret') }} Vagttelefon - Vagttelefon + {{ __('msg.vagttelefon') }} Guide - Vejledninger + {{ __('msg.vejledning') }} Konto - Konto + {{ __('msg.konto') }} Logud - Log Ud + {{ __('msg.logud') }} diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php index 639ee20..8a620ae 100644 --- a/skolehjem/resources/views/app/menuplans/index.blade.php +++ b/skolehjem/resources/views/app/menuplans/index.blade.php @@ -11,31 +11,31 @@ @if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}} @foreach($menuPlans as $menuplan) @if($menuplan->week == $Week) -

Menuplan

- Uge: {{$menuplan->week}} +

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

+ {{ __('msg.uge') }}: {{$menuplan->week}}
-

Mandag

+

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

{{$menuplan->monday}}

-

Tirsdag

+

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

{{$menuplan->tuesday}}

-

Onsdag

+

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

{{$menuplan->wednesday}}

-

Torsdag

+

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

{{$menuplan->thursday}}

@endif @endforeach @else -

Menuplan

-

Der er ingen menuplaner denne uge!

+

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

+

{{__('msg.dereringenmenuplanerdenneuge')}}!

@endif {{ $menuPlans->links() }} diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php index 1f420db..0d983be 100644 --- a/skolehjem/resources/views/app/users/account.blade.php +++ b/skolehjem/resources/views/app/users/account.blade.php @@ -5,6 +5,7 @@ @endsection @section("content") +

Konto

Navn: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}

@@ -13,5 +14,43 @@ {!! session()->get('success#credentialschanged') !!} Rediger Oplysninger Ændre Password + + +
+ + + + + @endsection diff --git a/skolehjem/resources/views/app/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php index 256afe5..85379d2 100644 --- a/skolehjem/resources/views/app/users/index.blade.php +++ b/skolehjem/resources/views/app/users/index.blade.php @@ -3,12 +3,12 @@ @section('content')
- Menuplan - Aktiviteter - Reservationer - Kontoret - Vagttelefon - Vejledninger + {{ __('msg.menuplan') }} + {{ __('msg.aktiviteter') }} + {{ __('msg.reservationer') }} + {{ __('msg.kontoret') }} + {{ __('msg.vagttelefon') }} + {{ __('msg.vejledning') }}
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 8d3be43..0e3416b 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -39,6 +39,8 @@ Route::get("/userapi", "UserController@search")->name("users.search"); Route::get("/vaskeapi", "WashingReservationController@search")->name("washing-reservations.search"); Route::get("/risrosapi", "FeedbackController@search")->name("feedbacks.search"); +//languages +Route::get("/languages", "UserController@setLanguages")->name("users.setLanguages"); Route::resource("contacts", "ContactController"); From f96d23814b69742a989fb1a1898a12dc55f6c4dc Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 6 Aug 2020 15:32:21 +0200 Subject: [PATCH 4/8] v0.5.7 - Add msg English and msg Danish --- skolehjem/resources/lang/dk/msg.php | 15 +++++++++++++++ skolehjem/resources/lang/en/msg.php | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 skolehjem/resources/lang/dk/msg.php create mode 100644 skolehjem/resources/lang/en/msg.php diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php new file mode 100644 index 0000000..2111bc3 --- /dev/null +++ b/skolehjem/resources/lang/dk/msg.php @@ -0,0 +1,15 @@ + "Menuplan", + "aktiviteter" => "Aktiviteter", + "Home" => "Home", + "reservationer" => "Reservationer", + "kontoret" => "Kontoret", + "vagttelefon" => "Vagttelefon", + "vejledning" => "Vejledninger", + "konto" => "Konto", + "logud" => "Log ud", + + +]; diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php new file mode 100644 index 0000000..9dc5f50 --- /dev/null +++ b/skolehjem/resources/lang/en/msg.php @@ -0,0 +1,22 @@ + "Menu", + "aktiviteter" => "Activities", + "reservationer" => "Reservations", + "kontoret" => "The office", + "vagttelefon" => "Emergency phone", + "vejledning" => "Guide", + "home" => "Home", + "logud" => "Log out", + "konto" => "Account", + "mandag" => "Monday", + "trisdag" => "Tuesday", + "onsdag" => "Wednesday", + "torsdag" => "Thursday", + "dereringenmenuplanerdenneuge" => "There is no menu for this week", + "uge" => "week", + "dereringenaktiviteter" => "There is no activity this week", + "setilmeldteaktiviteter" => "See Registered Activities", + "tilmeld" => "Register Activities ", +]; From 23929310f7978a474ea827df01dbd5d75368b727 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 6 Aug 2020 20:33:46 +0200 Subject: [PATCH 5/8] v0.5.7 - Add the last support for english --- skolehjem/resources/lang/dk/msg.php | 32 ++++++++++++++ skolehjem/resources/lang/en/msg.php | 33 +++++++++++++++ .../views/app/contacts/index.blade.php | 16 +++---- .../views/app/events/index.blade.php | 2 +- .../views/app/events/yourevents.blade.php | 6 +-- .../views/app/guides/index.blade.php | 4 +- .../views/app/users/account.blade.php | 42 +++++++++---------- .../resources/views/app/users/edit.blade.php | 12 +++--- .../views/app/users/editpass.blade.php | 11 ++--- .../views/app/vagttelefons/index.blade.php | 8 ++-- .../app/washing-reservations/create.blade.php | 12 +++--- .../app/washing-reservations/index.blade.php | 10 ++--- 12 files changed, 126 insertions(+), 62 deletions(-) diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 2111bc3..8684692 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -10,6 +10,38 @@ return[ "vejledning" => "Vejledninger", "konto" => "Konto", "logud" => "Log ud", + "dereringenmenuplanerdenneuge" => "Der er ingen menuplaner denne uge", + "dereringenaktiviteter" => "Der er ingen aktiviteter", + "setilmeldteaktiviteter" => "Se tilmeldte aktiviteter", + "dinereservationer" => "Dine reservationer", + "duharingenreservationer" => "Du har ingen reservationer", + "reservervaskemaskine" => "Reserver vaskemaskine", + "kontakt" => "Kontakt", + "navn" => "Navn", + "email"=> "E-mail", + "ring" => "Ring", + "givfeedback" => "Giv feedback", + "sendfeedback" => "Send feedback omkring hvem el. hvad som helst", + "accepterer" => "Accepterer", + "dereringenvejledninger" => "Der er ingen vejledninger", + "telefon" => "Telefon", + "redigeroplysninger" => "Rediger Oplysninger", + "ændrepassword" => "Ænder Password", + "tilmeldteaktiviteter" => "Tilmeldte aktiviteter", + "duharikketilmeldtdignogenaktiviteter" => "Du har ikke tilmeldt dig nogen aktiviteter", + "tilbage" => "Tilbage", + "bookingliste" => "Bokking Liste", + "ugestor" => "Uge", + "maskiner" => "Maskiner", + "tilgængeligetider" => "Tilgængelige tider", + "reserver" => "Reserver", + "rediger" => "Rediger", + "nuværendepassword" => "Nuværende Password", + "nytpassword" => "Nyt password", + "confirmpassword" => "Gentag adgangskode", + + + ]; diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 9dc5f50..76c9e00 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -16,7 +16,40 @@ return[ "torsdag" => "Thursday", "dereringenmenuplanerdenneuge" => "There is no menu for this week", "uge" => "week", + "ugestor" => "Week", "dereringenaktiviteter" => "There is no activity this week", "setilmeldteaktiviteter" => "See Registered Activities", "tilmeld" => "Register Activities ", + "tilmeldteaktiviteter" => "Your Registered Activities", + "duharikketilmeldtdignogenaktiviteter" => "You have not signed up for any activities", + "tilbage" => "Go Back", + "dinereservationer" => "Your reservations", + "fjern" => "Remove", + "tid" => "Time", + "reservervaskemaskine" => "Reserve washing machine", + "duharingenreservationer" => "You have no reservations", + "bookingliste" => "Booking List", + "dereringenvaskemaskiner" => "There are no washing machines", + "tilgængeligetider" => "Available times", + "maskiner" => "Washing machine", + "reserver" => "Reserves", + "kontakt" => "Contacts", + "navn" => "Name", + "email" => "E-mail", + "telefontid" => "Telephone hours", + "ring" => "Call", + "givfeedback" => "Feedback", + "sendfeedback" => "Send us feedback about what you like and what you don't like", + "dereringenkontakter" => "There are no contacts", + "accepterer" => "Accept", + "dereringenvejledninger" => "There are no guides", + "tilmelde" => "Participating", + "telefon" => "Phone", + "redigeroplysninger" => "Edit information", + "ændrepassword" => "Change Password", + "rediger" => "Edit", + "nuværendepassword" => "Current password", + "nytpassword" => "New password", + "confirmpassword" => "Confirm password", + ]; diff --git a/skolehjem/resources/views/app/contacts/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php index 50a2741..816511d 100644 --- a/skolehjem/resources/views/app/contacts/index.blade.php +++ b/skolehjem/resources/views/app/contacts/index.blade.php @@ -5,25 +5,25 @@ @section("content")
-

Kontakt

+

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

@if(!$contacts->isEmpty()) @foreach($contacts as $contact) -

Navn: {{ $contact->contactname }}

-

Email: {{ $contact->email }}

+

{{__('msg.navn')}}: {{ $contact->contactname }}

+

{{__('msg.email')}}: {{ $contact->email }}

{{ $contact->title }}

@if($contact->phonetimes) -

Telefontid:

+

{{__('msg.telefontid')}}:

{!! $contact->phonetimes !!} @endif @if($contact->phone) +45 {{ chunk_split($contact->phone, 2, ' ') }} - Ring + {{__('msg.ring')}} @endif @endforeach @else -

Der er ingen kontakter!

+

{{__('msg.dereringenkontakter')}}!

@endif - Send feedback omkring hvem el. hvad som helst - Giv Feedback + {{__('msg.sendfeedback')}} + {{__('msg.givfeedback')}}
@endsection diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 2e328b7..4e62feb 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -15,7 +15,7 @@ {!! session()->get('error#' . $event->id) !!} {!! session()->get('signup#' . $event->id) !!} - + @endforeach @else diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index fa80589..fb24768 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -5,7 +5,7 @@ @section("content")
-

Tilmeldte Aktiviteter

+

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

{!! session()->get('eventunsubscribed') !!} @if(!$userevents->isEmpty()) @foreach($userevents as $userevent) @@ -19,8 +19,8 @@ @endforeach @else -

Du har ikke tilmeldt dig nogen aktiviteter!

+

{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!

@endif - Tilbage + {{__('msg.tilbage')}}
@endsection diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index 09a3303..2c17dd1 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -11,7 +11,7 @@ }
-

Vejledninger

+

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

@if(!$guides->isEmpty()) @foreach($guides as $guide)

{{ $guide->name }}

@@ -19,7 +19,7 @@
@endforeach @else -

Der er ingen vejledninger.

+

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

@endif
@endsection diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php index 0d983be..79bc768 100644 --- a/skolehjem/resources/views/app/users/account.blade.php +++ b/skolehjem/resources/views/app/users/account.blade.php @@ -7,28 +7,28 @@ @section("content")
-

Konto

-

Navn: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}

-

Email: {{ Auth::user()->email }}

-

Telefon Nr.: {{ Auth::user()->phone }}

+

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

+

{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}

+

{{__('msg.email')}}: {{ Auth::user()->email }}

+

{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}

{!! session()->get('success#credentialschanged') !!} - Rediger Oplysninger - Ændre Password + {{__('msg.redigeroplysninger')}} + {{__('msg.ændrepassword')}} - - + @if(request()->cookie('languagesSetting') == "dk") + + @else + + @endif + @if(request()->cookie('languagesSetting') == "en") + + @else + + @endif - +
- - @endsection diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php index 6cdbf83..5d24194 100644 --- a/skolehjem/resources/views/app/users/edit.blade.php +++ b/skolehjem/resources/views/app/users/edit.blade.php @@ -6,18 +6,18 @@ @section("content")
-

Konto

+

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

Auth::user()]) }}"> @csrf @method("put") - Navn: + {{__('msg.navn')}}: name_last }}" disabled> - Email: + {{__('msg.email')}}: - Telefon Nr.: + {{__('msg.telefon')}} Nr.: - - Tilbage + + {{__('msg.tilbage')}}
@endsection diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php index 9497b5d..a5c9559 100644 --- a/skolehjem/resources/views/app/users/editpass.blade.php +++ b/skolehjem/resources/views/app/users/editpass.blade.php @@ -6,29 +6,30 @@ @section("content")
-

Konto

+

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

Auth::user()]) }}"> @csrf @method("put") - Nuværende Password: + {{__('msg.nuværendepassword')}}:
- Nyt Password: + {{__('msg.nytpassword')}}:
- Confirm Password: + {{__('msg.confirmpassword')}}:
{!! session()->get('error#notsamepass') !!} {!! session()->get('error#oldpass') !!} - + + {{__('msg.tilbage')}}
Event NavnEvent BeskrivelseEvent Ansvarlig Event Dato Update Update
{{ $event->name }}{{ $event->description }}{{ $event->accountable }} {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }} $event ]) }}">Update $event ]) }}">Update