From dbf8c2b13d8e8b2d8073c183bfccc625638fd7f2 Mon Sep 17 00:00:00 2001
From: paidge <paidge_cs@hotmail.com>
Date: Tue, 1 Feb 2022 12:18:39 +0100
Subject: [PATCH] v0.13 tag
---
components/member/List.vue | 14 +++++---
components/navigation/menu/Sidebar.vue | 2 +-
i18n/locales/de.json | 4 +--
i18n/locales/en.json | 4 +--
i18n/locales/es.json | 4 +--
i18n/locales/fr.json | 4 +--
pages/favoris.vue | 2 +-
pages/index.vue | 2 +-
pages/lexique.vue | 2 +-
pages/membres/index.vue | 2 +-
pages/parametres.vue | 2 +-
pages/previsions/futures_sorties.vue | 50 ++++++++++++++------------
pages/previsions/index.vue | 2 +-
pages/template.vue | 2 +-
14 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/components/member/List.vue b/components/member/List.vue
index df23d52..b6e7fc5 100644
--- a/components/member/List.vue
+++ b/components/member/List.vue
@@ -161,14 +161,18 @@ export default {
let modifier = this.currentSortDir === "desc" ? -1 : 1
if (this.currentSort == "uid") {
- sort(a["uid"].toLowerCase(), b["uid"].toLowerCase(), modifier)
+ this.sort(a["uid"].toLowerCase(), b["uid"].toLowerCase(), modifier)
} else if (this.currentSort == "pubkey") {
- sort(a["pubkey"].toLowerCase(), b["pubkey"].toLowerCase(), modifier)
+ this.sort(
+ a["pubkey"].toLowerCase(),
+ b["pubkey"].toLowerCase(),
+ modifier
+ )
} else if (this.currentSort == "date_sortie") {
if (this.adhesion) {
- sort(a["limitDate"], b["limitDate"], modifier)
+ this.sort(a["limitDate"], b["limitDate"], modifier)
} else if (this.certif) {
- sort(
+ this.sort(
a["received_certifications"]["limit"],
b["received_certifications"]["limit"],
modifier
@@ -182,7 +186,7 @@ export default {
b["limitDate"],
b["received_certifications"]["limit"]
)
- sort(minA, minB, modifier)
+ this.sort(minA, minB, modifier)
}
}
return 0
diff --git a/components/navigation/menu/Sidebar.vue b/components/navigation/menu/Sidebar.vue
index 18a79cd..d32a319 100644
--- a/components/navigation/menu/Sidebar.vue
+++ b/components/navigation/menu/Sidebar.vue
@@ -5,7 +5,7 @@
<img :src="$icon(512)" alt="Accueil" class="logo" />
<div>
<h1 class="h3">
- Wotwizard <small><span class="small">v0.12</span></small>
+ Wotwizard <small><span class="small">v0.13</span></small>
</h1>
<small class="text-muted">{{ $t("slogan") }}</small>
</div>
diff --git a/i18n/locales/de.json b/i18n/locales/de.json
index 869cc13..dbf87ac 100644
--- a/i18n/locales/de.json
+++ b/i18n/locales/de.json
@@ -79,14 +79,14 @@
"supprime": "Aus den Favoriten entfernt!",
"supprimer": "Aus den Favoriten entfernen",
"title": "Meine Favoriten",
- "use": "Verwenden Sie meine Favoriten"
+ "use": "Nur meine Favoriten"
},
"futuremembers": "Zukünftige Beitritte",
"futureexits": "Zukünfitge Austritte",
"infos": "Informationen",
"inout": "Bei- und Austritte des Vertrauensnetz in den 2 letzten Tagen",
"inpreparation": "In Vorbereitung",
- "jours": "0 Tage | 1 Tag | {n} Tage",
+ "jours": "Nächsten 24 Stunden | Nächsten {n} Tage",
"lexique": "Lexicon",
"membre": {
"calculant": {
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 99fad3e..a8520c3 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -80,14 +80,14 @@
"supprime": "Deleted from favourites !",
"supprimer": "Delete from favourites",
"title": "My favourites",
- "use": "Use my favourites"
+ "use": "My favorites only"
},
"futuremembers": "Future entries",
"futureexits": "Future exits",
"infos": "Informations",
"inout": "Entries and exits of the web of trust for the last 2 days",
"inpreparation": "In preparation",
- "jours": "0 days | 1 day | {n} days",
+ "jours": "Next 24h | Next {n} days",
"lexique": "Lexicon",
"membre": {
"calculant": {
diff --git a/i18n/locales/es.json b/i18n/locales/es.json
index 5aa977c..a48d830 100644
--- a/i18n/locales/es.json
+++ b/i18n/locales/es.json
@@ -80,14 +80,14 @@
"supprime": "¡Eliminado de favoritos!",
"supprimer": "Eliminar de favoritos",
"title": "Mis favoritos",
- "use": "Usar mis favoritos"
+ "use": "Solo mis favoritos"
},
"futuremembers": "Futuras entradas",
"futureexits": "Futuras salidas",
"infos": "Informaciones",
"inout": "Entradas y salidas de la red de confianza en los últimos 2 dÃas",
"inpreparation": "En preparación",
- "jours": "0 dÃas | 1 dÃa | {n} dÃas",
+ "jours": "Próximas 24 horas | Próximos {n} dÃas",
"lexique": "Léxico",
"membre": {
"calculant": {
diff --git a/i18n/locales/fr.json b/i18n/locales/fr.json
index ccf811d..6735241 100644
--- a/i18n/locales/fr.json
+++ b/i18n/locales/fr.json
@@ -80,14 +80,14 @@
"supprime": "Supprimé des favoris !",
"supprimer": "Supprimer des favoris",
"title": "Mes favoris",
- "use": "Utiliser mes favoris"
+ "use": "Mes favoris uniquement"
},
"futuremembers": "Futures entrées",
"futureexits": "Futures sorties",
"infos": "Informations",
"inout": "Entrées et sorties de la toile de confiance des 2 derniers jours",
"inpreparation": "En préparation",
- "jours": "0 jours | 1 jour | {n} jours",
+ "jours": "Prochaines 24h | {n} prochains jours",
"lexique": "Lexique",
"membre": {
"calculant": {
diff --git a/pages/favoris.vue b/pages/favoris.vue
index d891a59..a43d7c3 100644
--- a/pages/favoris.vue
+++ b/pages/favoris.vue
@@ -1,6 +1,6 @@
<template>
<main class="container">
- <h2 class="text-center my-4 font-weight-light">
+ <h2 class="text-center my-5 font-weight-light">
{{ $t("favoris.title") }}
</h2>
<NavigationLoader :isLoading="$apollo.queries.favoris.loading" />
diff --git a/pages/index.vue b/pages/index.vue
index 666ea81..69a87c4 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,6 +1,6 @@
<template>
<main class="container">
- <h2 class="text-center my-4 font-weight-light">{{ $t("inout") }}</h2>
+ <h2 class="text-center my-5 font-weight-light">{{ $t("inout") }}</h2>
<NavigationLoader :isLoading="$apollo.queries.newMembers.loading" />
<transition name="fade">
<div class="alert alert-danger" v-if="error">{{ error }}</div>
diff --git a/pages/lexique.vue b/pages/lexique.vue
index 1156b06..c4e1629 100644
--- a/pages/lexique.vue
+++ b/pages/lexique.vue
@@ -2,7 +2,7 @@
<main class="container">
<div class="rech-lexique row mb-4">
<div class="col-md-6 mx-auto">
- <h2 class="text-center my-4 font-weight-light">{{ $t("lexique") }}</h2>
+ <h2 class="text-center my-5 font-weight-light">{{ $t("lexique") }}</h2>
<div class="form-group">
<input
v-model="search"
diff --git a/pages/membres/index.vue b/pages/membres/index.vue
index 36ce28f..28c4d5c 100644
--- a/pages/membres/index.vue
+++ b/pages/membres/index.vue
@@ -1,6 +1,6 @@
<template>
<main class="container">
- <h2 class="text-center my-4 font-weight-light">{{ $t("membres") }}</h2>
+ <h2 class="text-center my-5 font-weight-light">{{ $t("membres") }}</h2>
<div class="row mb-4">
<div class="col-sm-8 col-md-6 col-lg-5 m-auto text-center">
<label for="rech" class="form-label">{{ $t("recherche.title") }}</label>
diff --git a/pages/parametres.vue b/pages/parametres.vue
index 7ac030d..a60f2d8 100644
--- a/pages/parametres.vue
+++ b/pages/parametres.vue
@@ -1,6 +1,6 @@
<template>
<main class="container">
- <h2 class="text-center my-4 font-weight-light">{{ $t("params.title") }}</h2>
+ <h2 class="text-center my-5 font-weight-light">{{ $t("params.title") }}</h2>
<NavigationLoader :isLoading="$apollo.queries.allParameters.loading" />
<transition name="fade">
<div class="alert alert-danger" v-if="error">{{ error }}</div>
diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue
index 4d70742..d557974 100644
--- a/pages/previsions/futures_sorties.vue
+++ b/pages/previsions/futures_sorties.vue
@@ -1,31 +1,35 @@
<template>
<main class="container">
- <h2 class="text-center my-4 font-weight-light">{{ $t("futureexits") }}</h2>
- <div class="row mb-4">
- <div class="col-6 m-auto text-center" v-if="!favoris">
- <label for="period" class="form-label">{{
- $t("previsions.period.title")
- }}</label>
- <select
- class="form-control"
- id="period"
- aria-describedby="periodHelp"
- v-model="period"
- @change="save">
- <option
- v-for="index in 30"
- :key="index"
- :value="index"
- v-html="$tc('jours', index)"></option>
- </select>
- <small id="periodHelp" class="form-text text-muted">{{
- $t("previsions.period.desc")
- }}</small>
- </div>
- <div class="col-6 m-auto text-center">
+ <h2 class="text-center my-5 font-weight-light">{{ $t("futureexits") }}</h2>
+ <div class="row flex-column align-items-center">
+ <div class="col-6 mb-4 text-center">
<input type="checkbox" id="favoris" v-model="favoris" />
<label for="favoris" class="form-label">{{ $t("favoris.use") }}</label>
</div>
+ <div class="col-6 mb-4" v-if="!favoris">
+ <div class="form-group row">
+ <label for="period" class="col-sm-6 col-form-label text-right">{{
+ $t("previsions.period.title") + " :"
+ }}</label>
+ <div class="col-sm-6">
+ <select
+ class="form-control"
+ id="period"
+ aria-describedby="periodHelp"
+ v-model="period"
+ @change="save">
+ <option
+ v-for="index in 30"
+ :key="index"
+ :value="index"
+ v-html="$tc('jours', index)"></option>
+ </select>
+ <small id="periodHelp" class="form-text text-muted">{{
+ $t("previsions.period.desc")
+ }}</small>
+ </div>
+ </div>
+ </div>
</div>
<NavigationLoader :isLoading="$apollo.queries.wwResult.loading" />
<transition name="fade">
diff --git a/pages/previsions/index.vue b/pages/previsions/index.vue
index 53a116a..69da8a0 100644
--- a/pages/previsions/index.vue
+++ b/pages/previsions/index.vue
@@ -6,7 +6,7 @@
</transition>
<transition name="fade">
<div v-if="wwResult">
- <h2 class="text-center my-4 font-weight-light">
+ <h2 class="text-center my-5 font-weight-light">
{{ $t("previsions.title") }}
<small
><span class="badge badge-secondary">{{
diff --git a/pages/template.vue b/pages/template.vue
index 17f5010..5b4306a 100644
--- a/pages/template.vue
+++ b/pages/template.vue
@@ -1,6 +1,6 @@
<template>
<main class="container">
- <h2 class="text-center my-4 font-weight-light">{{ myvar }}</h2>
+ <h2 class="text-center my-5 font-weight-light">{{ myvar }}</h2>
<code
>For internal links, use
<NuxtLink :to="localePath('path/page')">My link</NuxtLink></code
--
GitLab