From 708313a4b3456a3369cd2ba1f9a07ffcfc0e53eb Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 6 Aug 2020 14:47:22 +0200 Subject: [PATCH] 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) !!}
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