diff --git a/components/member/List.vue b/components/member/List.vue index df23d52dd11f83b61b0c647189a33d3d2e364c0c..b6e7fc5fdee1651db3794fd8fe2ed758f275f003 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 18a79cdeff87ddb3ab520d8b70151a3f7650a268..d32a319ec8dbe547ed006d3c8ebad30b9a70dbb6 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 869cc13bb26f39a253585af7e9e5f8ff6cc01ad6..dbf87acb79219804db7e5d9fe09f9fc9ab18801d 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 99fad3e8b8d2bf9eba4bcb7eada091b8756afb9e..a8520c319a6aadcb2d6ea2696f76dd60b6b4c955 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 5aa977c03433401ba90b247ddb86bbf3b9f82d8e..a48d8307da9da5e6cd76218ee05e83728a284ada 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 ccf811d6916c6ad01cbc127ed99a7c0eb2ecebc0..673524140ab17551244b64c1478433b47c7ab5d2 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 d891a59e37a34cf33b20964e426171eba310640f..a43d7c3752a37f169028509d97be5fe208fab448 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 666ea81579b1d71a067ee4a824b40fec92ac4041..69a87c44724f2e3a18eb6663bf07fd2a172e1509 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 1156b06d012faf0858ebd43e6b8653b2ddac52a0..c4e16296eadbbe4e10148cb471d803c2abcf5893 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 36ce28fbc35c80fb0e3825394d4b571281862ccb..28c4d5c047eadd2c3563f7e48d153a5b0ba8d4e7 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 7ac030ded17ba151968107c3409a7f57c0440de0..a60f2d88d8f19482f27da50082a6f92e3ac7e240 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 4d70742984029caa0269b8b01954fef1df41e8f4..d5579742e8488432b4e0488421dde11d756fc9db 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 53a116ab46df56ff6ebf1aebf87d07fae1f578bd..69da8a041a1fb2a5dcedc3df25a35e1478b862a6 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 17f5010b44fe50adfcbe387e68c64d09da27e113..5b4306a728f9d89b73753efa1e16d5e49aa5eb3e 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