From 35666dce00d0dea36f40d56abb32374049a1f3af Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Thu, 12 Aug 2021 15:12:57 +0200
Subject: [PATCH] Feat: locale for date and button for adding next month

---
 src/components/CreateMonth.vue       | 66 +++++++++++++++++++++-------
 src/components/MonthPresentation.vue |  3 +-
 src/store/travail/index.js           |  4 ++
 src/style.css                        |  4 +-
 4 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/components/CreateMonth.vue b/src/components/CreateMonth.vue
index 97e724c..dd7abc5 100644
--- a/src/components/CreateMonth.vue
+++ b/src/components/CreateMonth.vue
@@ -1,12 +1,22 @@
 <template>
-    <div class="boxed-green month-presentation" id="new-month">
+<div class="toolbar">
+    <button  v-show='!addingMonth' @click='toggleAdding'>
+        Ajouter  {{ formatedDate }}
+    </button>
+</div>
+    <div class="boxed-green month-presentation" id="new-month" v-show='addingMonth'>
       <div class="date">
-          <input type="month" v-model="monthDate">
+        <div class="month">
+            {{ theMonth }} 
+        </div> 
+        <div class="year">
+            {{ theYear }} 
+        </div> 
 
-          <div class="actions">
-              <button class="validate" @click="save"> Valider </button>
-              <button class="cancel" @click="cancel"> Annuler </button>
-          </div>
+        <div class="actions">
+            <button class="validate" @click="save"> Valider </button>
+            <button class="cancel" @click="cancel"> Annuler </button>
+        </div>
       </div>
       <div class="datas">
         <li v-for="cara in monthDesc" :key='cara.name'> 
@@ -19,13 +29,8 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
-const today = new Date();
-function formatDate(date) {
-    var y = ''+date.getFullYear()
-    var m = ''+(date.getMonth()+1)
-    if (m.length < 2) { m = '0'+m}
-    return [y, m].join('-')
-}
+import {  parseISO, addMonths, format } from 'date-fns'
+import frLocal from 'date-fns/locale/fr'
 
 export default {
   name: 'NewMonth',
@@ -35,20 +40,41 @@ export default {
   },
   data () {
       return {
-            monthDate: formatDate(today),
+            monthDate: new Date(),
             monthCopy: Object,
+            addingMonth: false,
           }
   },
   mounted () {
       this.monthCopy = this.theEmptyMonth
   },
+  watch: {
+    lastMonthDate: function () {
+        if (this.lastMonthDate) {
+            this.monthDate = addMonths(parseISO(this.lastMonthDate, "yyyy-MM", new Date()), 1)
+        } else {
+            this.monthDate = new Date()
+        }
+         
+    },
+  },
   computed: {
     ...mapGetters('travail', {
         'theEmptyMonth': 'TheEmptyMonth',
+        'lastMonthDate': 'lastMonthDate',
     }),
     ...mapGetters('config', {
         'monthDesc': 'monthDesc',
     }),
+        formatedDate: function () {
+          return format(this.monthDate, "MMMM YYY", {locale: frLocal} )
+        },
+      theMonth: function () {
+          return format(this.monthDate, "MMM", {locale: frLocal})
+      },
+      theYear: function () {
+          return format(this.monthDate, "YYY", {locale: frLocal})
+      },
   },
   methods: {
     ...mapActions('travail', {
@@ -57,14 +83,19 @@ export default {
     ...mapActions('config', {
         'writeData': 'writeData',
     }),
+    toggleAdding: function () {
+        this.addingMonth = !this.addingMonth
+    },
     save: function () {
         console.log("save")
         console.log(this.monthCopy)
-        this.createMonth({date: this.monthDate, month: this.monthCopy})
+        this.createMonth({date: format(this.monthDate, "yyyy-MM"), month: this.monthCopy})
+        this.toggleAdding()
         this.writeData()
     },
     cancel: function () {
-      this.monthCopy = this.theEmptyMonth
+        this.toggleAdding()
+        this.monthCopy = this.theEmptyMonth
     },
   },
 }
@@ -104,4 +135,7 @@ export default {
     .value {
         font-weight: bold;
     }
+    .toolbar {
+        text-align: center;
+    }
 </style>
diff --git a/src/components/MonthPresentation.vue b/src/components/MonthPresentation.vue
index bbc7d51..4b6bbce 100644
--- a/src/components/MonthPresentation.vue
+++ b/src/components/MonthPresentation.vue
@@ -34,6 +34,7 @@
 <script>
 import { mapActions, mapGetters } from 'vuex'
 import {  parseISO, format } from 'date-fns'
+import frLocal from 'date-fns/locale/fr'
 export default {
   name: 'MonthPresentation',
   props: {
@@ -59,7 +60,7 @@ export default {
             return parseISO(this.TheDate, "yyyy-MM", new Date())
       },
       theMonth: function () {
-          return format(this.rawDate, "MMM", )
+          return format(this.rawDate, "MMM", {locale: frLocal})
       },
       theYear: function () {
           return format(this.rawDate, "YYY", )
diff --git a/src/store/travail/index.js b/src/store/travail/index.js
index 4ab5f1e..4711df2 100644
--- a/src/store/travail/index.js
+++ b/src/store/travail/index.js
@@ -34,6 +34,10 @@ const travail = {
             // Get all the months
             return Object.keys(state.months).sort().reverse()
         },
+        lastMonthDate(state) {
+            // Return the date of the last registered month
+            return Object.keys(state.months).sort().reverse()[0]
+        },
         months: (state, getters) => {
             // Get in range months
             const a = Object.keys(state.months)
diff --git a/src/style.css b/src/style.css
index af91fe6..98dc279 100644
--- a/src/style.css
+++ b/src/style.css
@@ -3,7 +3,7 @@ body {
 }
 
 button {
-    color: white;
+    color: black;
     padding: 4px;
     box-shadow: 1px 1px 2px gray;
     text-align: center;
@@ -17,6 +17,8 @@ button {
 }
 
 button:hover {
+    background-color: black;
+    color: white;
     transition: all 0.2s ease-out;
 }