From ddfcf3570be2f492d3be3c3bb0205018003acaf7 Mon Sep 17 00:00:00 2001
From: Arthur DANJOU <arthurdanjou@outlook.fr>
Date: Mon, 21 Dec 2020 12:49:41 +0100
Subject: [PATCH] Working

---
 components/Experience.vue | 8 ++++++--
 components/Formation.vue  | 2 +-
 content/experiences.json  | 2 +-
 content/formations.json   | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/Experience.vue b/components/Experience.vue
index 4480cb7..5395c8d 100644
--- a/components/Experience.vue
+++ b/components/Experience.vue
@@ -7,7 +7,8 @@
       <span v-else class="inline absolute rounded-full h-4 w-4 bg-gray-500"></span>
     </div>
     <div class="leading-7">
-      <p class="text-base dark:text-dark-100 text-gray-800 leading-6">{{ formatDate(begin) }} - {{ formatDate(end) }} <span class="px-3">|</span> {{location}}</p>
+      <p v-if="isSameDate" class="text-base dark:text-dark-100 text-gray-800 leading-6">{{ formatDate(begin) }} <span class="px-3">|</span> {{location}}</p>
+      <p v-else class="text-base dark:text-dark-100 text-gray-800 leading-6">{{ formatDate(begin) }} - {{ formatDate(end) }} <span class="px-3">|</span> {{location}}</p>
       <h1 class="text-2xl font-bold">{{ $t(title) }}</h1>
       <h2 class="text-xl">{{ company }}</h2>
     </div>
@@ -42,7 +43,10 @@ export default {
   methods: {
     formatDate(date) {
       const dateFormat = date.split('-')
-      return date === 'Today' ? 'Today' : this.$t('month.' + dateFormat[0]) + " " + dateFormat[1]
+      return date === 'Today' ? this.$t('date.today') : this.$t('month.' + dateFormat[0]) + " " + dateFormat[1]
+    },
+    isSameDate() {
+      return this.begin === this.end
     }
   }
 }
diff --git a/components/Formation.vue b/components/Formation.vue
index 8181212..2b9a05f 100644
--- a/components/Formation.vue
+++ b/components/Formation.vue
@@ -42,7 +42,7 @@ export default {
   methods: {
     formatDate(date) {
       const dateFormat = date.split('-')
-      return date === 'Today' ? 'Today' : this.$t('month.' + dateFormat[0]) + " " + dateFormat[1]
+      return date === 'Today' ? this.$t('date.today') : this.$t('month.' + dateFormat[0]) + " " + dateFormat[1]
     }
   }
 }
diff --git a/content/experiences.json b/content/experiences.json
index 5679d12..426e1ab 100644
--- a/content/experiences.json
+++ b/content/experiences.json
@@ -13,7 +13,7 @@
     "company": "ArtDanjProduction",
     "location": "France",
     "begin_date": "09-2015",
-    "end_date": "date.today"
+    "end_date": "Today"
   },
   {
     "slug": "idemia",
diff --git a/content/formations.json b/content/formations.json
index 4f98e0d..211b00a 100644
--- a/content/formations.json
+++ b/content/formations.json
@@ -5,7 +5,7 @@
     "description": "formations.freelance.description",
     "location": "Remote",
     "begin_date": "04-2015",
-    "end_date": "date.today"
+    "end_date": "Today"
   },
   {
     "slug": "dnb",
@@ -21,6 +21,6 @@
     "description": "formations.bac.description",
     "location": "France",
     "begin_date": "09-2020",
-    "end_date": "date.today"
+    "end_date": "Today"
   }
 ]