From 20cdec20d260b66bf3a3b9b1634400494647f614 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 16 Aug 2021 20:25:09 +0200
Subject: [PATCH] accompanyingCourse: ckeditor for comment bloc + sass color
 variables in app.vue

---
 .../Resources/public/chill/chillmain.scss     | 11 +++++
 .../public/vuejs/AccompanyingCourse/App.vue   | 14 +++---
 .../AccompanyingCourse/components/Comment.vue | 47 ++++++++++---------
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index bb98596a0..67c0af59c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -265,6 +265,17 @@ table.table-bordered {
    }
 }
 
+div.metadata {
+   font-size: smaller;
+   color: $gray-600;
+   span.user, span.date {
+      text-decoration: underline dotted;
+      &:hover {
+         color: $gray-700;
+      }
+   }
+}
+
 /// when there is no data
 .custom_field_no_data,
 .chill-no-data-statement {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 215888a8b..c2d7d3946 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -54,6 +54,9 @@ export default {
 </script>
 
 <style lang="scss">
+   @import 'ChillMainAssets/module/bootstrap/shared';
+   $chill-accourse-context: #718596;
+
    div#accompanying-course {
       div.vue-component {
          h2 {
@@ -63,7 +66,7 @@ export default {
                position: absolute;
                content: "\f142";  //ellipsis-v
                font-family: "ForkAwesome";
-               color: #718596ab;
+               color: tint-color($chill-accourse-context, 10%);
                left: -22px;
                top: 4px;
             }
@@ -74,10 +77,10 @@ export default {
          }
          padding: 0em 0em;
          margin: 1em 0;
-         border: 1px dotted #718596ab;
+         border: 1px dotted tint-color($chill-accourse-context, 10%);
          border-radius: 5px;
-         border-left: 1px dotted #718596ab;
-         border-right: 1px dotted #718596ab;
+         border-left: 1px dotted tint-color($chill-accourse-context, 10%);
+         border-right: 1px dotted tint-color($chill-accourse-context, 10%);
          dd {
             margin-left: 1em;
          }
@@ -87,6 +90,5 @@ export default {
          table {
          }
       }
-
-}
+   }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 046f7b08a..9a16efd3e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -10,23 +10,22 @@
       <div>
          <form @submit.prevent="submitform">
 
-            <label for="content">{{ $t('comment.label') }}</label>
+            <label class="col-form-label" for="content">{{ $t('comment.label') }}</label>
 
-            <div v-if="initialComment">
-               {{ $t('comment.created_by', [
-                  initialComment.creator.text,
-                  $d(initialComment.createdAt.datetime, 'long')
-               ]) }}
-            </div>
-
-            <textarea
+            <ckeditor
                name="content"
                v-bind:placeholder="$t('comment.content')"
-               rows="8"
-               cols="80"
-               ckeditor="ckeditor"
-               v-model="content">
-            </textarea>
+               :editor="editor"
+               v-model="content"
+               tag-name="textarea">
+            </ckeditor>
+
+            <div v-if="initialComment" class="metadata">
+               {{ $t('comment.created_by', [
+               initialComment.creator.text,
+               $d(initialComment.createdAt.datetime, 'long')
+            ]) }}
+            </div>
 
             <ul class="record_actions">
                <li>
@@ -47,10 +46,17 @@
 </template>
 
 <script>
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+
 export default {
    name: "Comment",
+   components: {
+      ckeditor: CKEditor.component,
+   },
    data() {
       return {
+         editor: ClassicEditor,
          formdata: {
             type: "accompanying_period_comment",
             content: ''
@@ -66,7 +72,7 @@ export default {
             this.formdata.content = value;
          },
          get() {
-            return (this.initialComment)? this.initialComment.content : null;
+            return (this.initialComment)? this.initialComment.content : {};
          }
       },
       errors() {
@@ -80,7 +86,7 @@ export default {
       },
       removeComment() {
          console.log('remove');
-         this.$store.dispatch('postFirstComment', null);
+         this.$store.dispatch('postFirstComment', {});
       }
    }
 }
@@ -88,12 +94,11 @@ export default {
 * TODO
 * - [x] delete button in ul record_actions, but not in form
 * - [ ] display updatedAt => initialComment fetch PATCH content changes MUST NOT change object id !!
-* - [ ] ckeditor integration
 */
 </script>
 
-<style lang="scss" scoped>
-   div.vue-component > div {
-      //margin: 1em;
-   }
+<style lang="scss">
+div.ck-editor.ck-reset {
+   margin: 0.6em 0;
+}
 </style>