From b74ab2fa0e277cd027a416a05e0e7a47f694b7fc Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 20 Nov 2023 11:52:56 +0100
Subject: [PATCH] Fix date typing issue

---
 .../vuejs/HomepageWidget/DashboardWidgets/News.vue   | 12 +++++++-----
 .../Resources/public/vuejs/_js/i18n.ts               |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
index 5c360e937..3c8fcb295 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
@@ -16,7 +16,9 @@
                         <p class="news-title">{{ item.title }}</p>
                     </template>
                     <template #body>
-                        <p class="news-date">{{ formatDate(item.startdate) }}</p>
+                        <p class="news-date">
+                            {{ $t('widget.news.date') }}: <span>{{ formatDate(item.startdate.date) }}</span>
+                        </p>
                         <div v-html="convertMarkdownToHtml(item.content)"></div>
                     </template>
                 </modal>
@@ -31,7 +33,7 @@ import { makeFetch } from '../../../lib/api/apiMethods';
 import Modal from '../../_components/Modal.vue'; // Adjust the import path
 import { marked } from 'marked';
 import DOMPurify from 'dompurify';
-import { NewsItem } from '../../../types';
+import {DateTime, NewsItem} from '../../../types';
 
 const newsItems = ref<NewsItem[]>([])
 const selectedArticle = ref<NewsItem | null>(null);
@@ -69,13 +71,13 @@ const prepareContent = (content: string, maxLength = 100): string => {
     return convertMarkdownToHtml(truncatedContent);
 };
 
-const formatDate = (datetime: { date: string }): string => {
-    return new Date(datetime.date).toDateString()
+const formatDate = (datetime: DateTime): string => {
+    return new Date(datetime.toString()).toLocaleDateString()
 }
 
 onMounted(() => {
     makeFetch('GET', '/api/1.0/main/news.json')
-        .then((response: {results: NewsItem[]}) => {
+        .then((response: { results: NewsItem[] }) => {
             // console.log('news articles', response.results)
             newsItems.value = response.results
         })
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
index 54e136e08..05b115928 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
@@ -55,7 +55,8 @@ const messages = {
        widget: {
           news: {
               title: "Actualités",
-              readMore: "Lire la suite"
+              readMore: "Lire la suite",
+              date: "Date"
           }
        }
    }