diff --git a/pages/hash/_hash.vue b/pages/hash/_hash.vue index 8f84c30576bb8b03273f315afd039a4e98d2c6d5..1db9d20a6b77230d097e26c4e4b0b29128250bfb 100644 --- a/pages/hash/_hash.vue +++ b/pages/hash/_hash.vue @@ -10,9 +10,9 @@ <div class="row mt-3" v-if="idFromHash.status != 'REVOKED' && idFromHash.status != 'NEWCOMER'"> <div class="col-12 col-md-6 mb-3"> <h3>Certifications reçues - <span v-if="($options.filters.dateStatus(idFromHash.received_certifications.limit) == 'warning')">⚠- <span class="sr-only" v-if="idFromHash.status == 'MEMBER'">Bientôt en manque de certifications</span> - <span class="sr-only" v-else>En manque de certifications</span> + <span :class="'text-'+$options.filters.dateStatus(idFromHash.received_certifications.limit)" v-if="($options.filters.dateStatus(idFromHash.received_certifications.limit) == 'warning')">⚠+ <span class="sr-only" v-if="$options.filters.dateStatus(idFromHash.received_certifications.limit) == 'danger'">En manque de certifications</span> + <span class="sr-only" v-else>Bientôt en manque de certifications</span> </span> </h3> <CertifList :certifs="idFromHash.received_certifications.certifications" type="recieved" /> diff --git a/pages/index.vue b/pages/index.vue index bf21331308ad8fd51d8af61a935004122cf96aa4..cc0338871fc586ebedb9ff7f019b5d43f57f6b7e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -4,11 +4,11 @@ <div class="row"> <div class="col-6 m-auto text-center"> <button class="btn btn-primary mb-3" @click="helloWorld($event)" data-response="Hello world !">Hello ?</button> - <p class="badge-warning">{{ hello }}</p> - <p class="badge-danger">{{ hello }}</p> - <p class="badge-secondary">{{ hello }}</p> - <p class="badge-success">{{ hello }}</p> - <p class="badge-info">{{ hello }}</p> + <p class="badge-warning text-warning">{{ hello }}</p> + <p class="badge-danger text-danger">{{ hello }}</p> + <p class="badge-secondary text-secondary">{{ hello }}</p> + <p class="badge-success text-success">{{ hello }}</p> + <p class="badge-info text-info">{{ hello }}</p> </div> </div> </main> diff --git a/plugins/filters.js b/plugins/filters.js index 6e78a2e7d3daa39cfaf511775c713c31da3837a9..28e33b2d7131a177c0097d3efdb9ada8079bfe4b 100644 --- a/plugins/filters.js +++ b/plugins/filters.js @@ -11,6 +11,8 @@ Vue.filter('formatDate', (val) => { Vue.filter('dateStatus', (val) => { const diff = val - dayjs().unix() switch (true) { + case diff<0: + return 'danger' case diff<5184000: return 'warning' case diff>=5184000: