From c8cce1505b24c45887c2e464e25657d6a53df4a2 Mon Sep 17 00:00:00 2001
From: Pierre-Jean CHANCELLIER <paidge_cs@hotmail.com>
Date: Sat, 8 Jan 2022 20:24:29 +0100
Subject: [PATCH] remove date filters and dayjs for i18n
---
components/certif/List.vue | 2 +-
components/member/Card.vue | 2 +-
i18n/locales/en.json | 1 +
i18n/locales/es.json | 1 +
i18n/locales/fr.json | 1 +
package.json | 1 -
pages/previsions/futurs_membres.vue | 2 +-
plugins/filters.js | 14 +-------------
8 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/components/certif/List.vue b/components/certif/List.vue
index 378a7d0..4f0d703 100644
--- a/components/certif/List.vue
+++ b/components/certif/List.vue
@@ -11,7 +11,7 @@
<BadgeQuality :quality="getNeighbor(certif).quality.ratio" v-if="getNeighbor(certif).status != 'REVOKED'" />
</th>
<td class="text-right">
- <small><span class="badge" :class="'badge-'+ $options.filters.dateStatus(certif.expires_on)">Expire le {{ certif.expires_on | formatDate }}</span></small>
+ <small><span class="badge" :class="'badge-'+ $options.filters.dateStatus(certif.expires_on)">{{ $t('expire') }} {{ $d(new Date(certif.expires_on*1000), 'long') }}</span></small>
</td>
</tr>
</tbody>
diff --git a/components/member/Card.vue b/components/member/Card.vue
index 876a431..fb91a51 100644
--- a/components/member/Card.vue
+++ b/components/member/Card.vue
@@ -39,7 +39,7 @@
<td :class="{
'list-group-item-success': hash.minDatePassed,
'list-group-item-danger': !hash.minDatePassed,
- }">{{ hash.minDatePassed ? $t('oui') : $t('non') }} <small v-if="!hash.minDatePassed">( > {{ hash.minDate | formatDate }} )</small></td>
+ }">{{ hash.minDatePassed ? $t('oui') : $t('non') }} <small v-if="!hash.minDatePassed">( > {{ $d(new Date(hash.minDate*1000), 'long') }} )</small></td>
</tr>
<tr v-if="hash.status == 'MEMBER'">
<th scope="row">{{ $t('membre.nb_certifs') }} :</th>
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 7bbde18..5449a41 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -8,6 +8,7 @@
},
"chargement" : "Loading",
"dev": "In development",
+ "expire": "Expires",
"futuremembers": "Future members",
"inout": "Entries and exits of the web of trust for the last 2 days",
"inpreparation": "In preparation",
diff --git a/i18n/locales/es.json b/i18n/locales/es.json
index 3c36da8..fc21560 100644
--- a/i18n/locales/es.json
+++ b/i18n/locales/es.json
@@ -8,6 +8,7 @@
},
"chargement" : "Cargando",
"dev": "En desarrollo",
+ "expire": "Expira el",
"futuremembers": "Futuros miembros",
"inout": "Entradas y salidas de la web de confianza de los últimos 2 dÃas",
"inpreparation": "En preparación",
diff --git a/i18n/locales/fr.json b/i18n/locales/fr.json
index 3dbf2b3..7b76b09 100644
--- a/i18n/locales/fr.json
+++ b/i18n/locales/fr.json
@@ -8,6 +8,7 @@
},
"chargement" : "Chargement",
"dev": "En Développement",
+ "expire": "Expire le",
"futuremembers": "Futurs membres",
"inout": "Entrées et sorties de la toile de confiance des 2 derniers jours",
"inpreparation": "En préparation",
diff --git a/package.json b/package.json
index 7c6fdf6..d4d7c14 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
"bootstrap": "^4.6.1",
"chart.js": "^3.6.2",
"core-js": "^3.15.1",
- "dayjs": "^1.10.7",
"graphql-tag": "^2.12.6",
"nuxt": "^2.15.8",
"vue": "^2.6.14"
diff --git a/pages/previsions/futurs_membres.vue b/pages/previsions/futurs_membres.vue
index 9a90ad8..4e75e42 100644
--- a/pages/previsions/futurs_membres.vue
+++ b/pages/previsions/futurs_membres.vue
@@ -56,7 +56,7 @@
<table class="table table-striped">
<tbody>
<tr v-for="forecast in wwResult.forecastsByDates" :key="forecast.date">
- <th scope="row">{{ forecast.date | formatDateHeure }}</th>
+ <th scope="row">{{ $d(new Date(forecast.date*1000), 'long') }} {{ $t('time.a') }} {{ $d(new Date(forecast.date*1000), 'hour') }}</th>
<td class="p-0">
<div class="list-group rounded-0">
<nuxt-link class="list-group-item list-group-item-action border-0 d-flex justify-content-between" :to="'/previsions/' + member.member.hash" v-for="member in forecast.forecasts" :key="member.member.uid">
diff --git a/plugins/filters.js b/plugins/filters.js
index e586ee3..d66a273 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -1,19 +1,7 @@
import Vue from 'vue'
-import dayjs from 'dayjs'
-import 'dayjs/locale/fr'
-
-dayjs.locale('fr')
-
-Vue.filter('formatDate', (val) => {
- return dayjs(val*1000).format('D MMMM YYYY')
-})
-
-Vue.filter('formatDateHeure', (val) => {
- return dayjs(val*1000).format('D MMMM YYYY [Ã ] H[h]')
-})
Vue.filter('dateStatus', (val) => {
- const diff = val - dayjs().unix()
+ const diff = val - (Date.now()/1000)
switch (true) {
case diff<0:
return 'danger'
--
GitLab