feat: add ability to add a comment after you rate your day

.eslintrc.js

@@ -68,6 +68,7 @@ module.exports = {
                 }
             }
         ],
+        "vue/no-v-html" : 0,
         "vue/max-attributes-per-line": [
             // https://vuejs.org/v2/style-guide/#Multi-attribute-elements-strongly-recommended
             "error",

CHANGELOG

@@ -2,6 +2,7 @@ UNRELEASED CHANGES:
 
 New features:
 
+* Add ability to add a comment when rating your day in the journal
 * Add API methods to manage genders
 * Breaking change: rewrite API methods to manage contacts
 

app/Http/Controllers/JournalController.php

@@ -88,6 +88,7 @@ public function storeDay(DaysRequest $request)
         $day = auth()->user()->account->days()->create([
             'date' => now(DateHelper::getTimezone()),
             'rate' => $request->get('rate'),
+            'comment' => $request->get('comment'),
         ]);
 
         // Log a journal entry

public/changelog.json

@@ -1,5 +1,10 @@
 {
     "entries": [
+        {
+            "date": "Jan 06, 2019",
+            "title": "Enhancement: comment when rating your day",
+            "description": "In the Journal, you can now add a comment after you rate your day. ![image](/img/changelogs/2019-01-06-rate-day-comment.png)"
+        },
         {
             "date": "Jan 02, 2019",
             "title": "Enhancement: number of life events",

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/manifest.js": "/js/manifest.js?id=01c8731923a46c30aaed",
-    "/js/app.js": "/js/app.js?id=f77c863e6dac8e5ae34e",
+    "/js/app.js": "/js/app.js?id=e1df87b13ad76b60c2bf",
     "/css/app-ltr.css": "/css/app-ltr.css?id=d1a924515047b23cda18",
     "/css/app-rtl.css": "/css/app-rtl.css?id=6cd44baa52797bd315d6",
     "/css/stripe.css": "/css/stripe.css?id=2de4e0ce557016a0327e",

resources/assets/js/app.js

@@ -213,6 +213,11 @@ Vue.component(
   require('./components/journal/JournalList.vue').default
 );
 
+Vue.component(
+  'journal-rate-day',
+  require('./components/journal/RateDay.vue').default
+);
+
 Vue.component(
   'journal-calendar',
   require('./components/journal/partials/JournalCalendar.vue').default

resources/assets/js/components/journal/partials/JournalContentRate.vue

@@ -23,7 +23,10 @@
 
           <!-- Log content -->
           <div class="flex-auto flex items-center">
-            <p class="mb2">
+            <p v-if="day.comment" class="mb2">
+              {{ day.comment }}
+            </p>
+            <p v-if="!day.comment" class="mb2">
               {{ $t('journal.journal_entry_rate') }}
             </p>
           </div>
@@ -83,29 +86,6 @@
               </g>
             </svg>
           </div>
-
-          <!-- Show comment -->
-          <div v-if="day.comment" class="flex-none w-5">
-            <div class="flex justify-center items-center h-100">
-              <svg width="16px" height="13px" viewBox="0 0 16 13" version="1.1" xmlns="http://www.w3.org/2000/svg"
-                   xmlns:xlink="http://www.w3.org/1999/xlink" class="flex-none"
-              >
-                <defs />
-                <g id="App" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"
-                   stroke-linecap="square"
-                >
-                  <g id="Desktop" transform="translate(-839.000000, -279.000000)" stroke="#979797">
-                    <g id="Group-4" transform="translate(839.000000, 278.000000)">
-                      <path id="Line-2" d="M0.5,1.5 L15.5,1.5" />
-                      <path id="Line-2" d="M0.5,9.5 L15.5,9.5" />
-                      <path id="Line-2" d="M0.5,5.5 L13.5,5.5" />
-                      <path id="Line-2" d="M0.5,13.5 L10.5,13.5" />
-                    </g>
-                  </g>
-                </g>
-              </svg>
-            </div>
-          </div>
         </div>
 
         <!-- Edit/Delete -->
@@ -115,6 +95,9 @@
           </div>
           <div class="flex-none w-90 mt2 pt0 pr3 pb2">
             <ul class="f7">
+              <li class="di">
+                {{ $t('journal.journal_entry_rate') }}
+              </li>
               <li class="di">
                 <a class="pointer" :cy-name="'entry-delete-button-' + journalEntry.id" @click="destroy()">
                   {{ $t('app.delete') }}

resources/lang/en/journal.php

@@ -9,6 +9,7 @@
     'journal_entry_type_journal' => 'Journal entry',
     'journal_entry_type_activity' => 'Activity',
     'journal_entry_rate' => 'You rated your day.',
+    'journal_add_comment' => 'Care to add a comment (optional)?',
     'entry_delete_success' => 'The journal entry has been successfully deleted.',
     'journal_add_title' => 'Title (optional)',
     'journal_add_date' => 'Date',