diff --git a/assets/css/_bootstrap.scss b/assets/css/_bootstrap.scss
index 8b120fc5e3a1fabed32fa6d871d8b0a2647211ef..e89fec6cd229c8747667afe3a13825bbc93dac5d 100644
--- a/assets/css/_bootstrap.scss
+++ b/assets/css/_bootstrap.scss
@@ -21,7 +21,7 @@
@import "~bootstrap/scss/breadcrumb";
// @import "~bootstrap/scss/pagination";
@import "~bootstrap/scss/badge";
-// @import "~bootstrap/scss/jumbotron";
+@import "~bootstrap/scss/jumbotron";
@import "~bootstrap/scss/alert";
// @import "~bootstrap/scss/progress";
// @import "~bootstrap/scss/media";
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 591a6cd7d5080c0b5a7fb284228fc2a022b5b913..78eaaf5736218623931240bc87d1bb8425d55259 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -28,7 +28,6 @@ $list-group-active-bg: rgba(0, 0, 255, 0.075);
$list-group-active-color: var(--text-primary-color);
$list-group-action-hover-color: var(--text-secondary-color);
$list-group-action-color: var(--text-primary-color);
-$list-group-border-width: 0;
// Cards
$card-bg: var(--background-color-secondary);
@@ -41,6 +40,9 @@ $close-font-weight: 500;
$mark-padding: 0.2em 0;
$mark-bg: yellow;
+// Jumbotron
+$jumbotron-bg: var(--background-color-secondary);
+
// Colors
$info: #0a8299;
@@ -57,3 +59,27 @@ thead.sortable th {
vertical-align: middle;
}
}
+
+.list-group-item {
+ &-action:not(.active) {
+ &:hover {
+ background: rgba(0, 0, 255, 0.075);
+ color: var(--text-primary-color);
+ }
+ }
+
+ div {
+ transition: left 0.3s ease-in-out;
+ left: 0;
+
+ &::before {
+ content: "›";
+ position: relative;
+ left: -0.5em;
+ }
+
+ &:hover {
+ left: 0.5em;
+ }
+ }
+}
diff --git a/components/navigation/Bar.vue b/components/navigation/Bar.vue
index 9dc8a6d71243ea38a893e2aa8456c5cca68651cb..6f7f05ea65be19b4a4597afcd34739845693c674 100644
--- a/components/navigation/Bar.vue
+++ b/components/navigation/Bar.vue
@@ -154,32 +154,6 @@ nav.breadcrumb-wrapper {
color: var(--text-primary-color);
}
- .list-group-item {
- &-action:not(.active) {
- background: transparent;
-
- &:hover {
- background: rgba(0, 0, 255, 0.075);
- color: var(--text-primary-color);
- }
- }
-
- div {
- transition: left 0.3s ease-in-out;
- left: 0;
-
- &::before {
- content: "›";
- position: relative;
- left: -0.5em;
- }
-
- &:hover {
- left: 0.5em;
- }
- }
- }
-
.open & {
left: 0;
}
diff --git a/components/navigation/menu/Group.vue b/components/navigation/menu/Group.vue
index 66bbcac92d3ff3d296d13bf6bb6e13194bc1da6a..76e9f1afd0bd59f1d0bcc99343ff0d659db080b1 100644
--- a/components/navigation/menu/Group.vue
+++ b/components/navigation/menu/Group.vue
@@ -5,7 +5,7 @@
</h2>
<div class="nav navbar-nav list-group list-group-flush">
<NuxtLink
- class="list-group-item list-group-item-action p-0 pl-3"
+ class="list-group-item list-group-item-action p-0 pl-3 border-0"
:to="localePath(item.path)"
v-for="item in menu.items"
:key="item.path"
diff --git a/components/navigation/menu/Sidebar.vue b/components/navigation/menu/Sidebar.vue
index 0c72e4b9a750fafb19d08a5dfcd4917570ab3983..abf3157a2923c8872c12c72a48a71f9b67f3af11 100644
--- a/components/navigation/menu/Sidebar.vue
+++ b/components/navigation/menu/Sidebar.vue
@@ -10,7 +10,7 @@
</nuxt-link>
<div
class="d-flex text-info justify-content-between align-items-baseline mt-3 mx-2">
- <div class="">v0.07</div>
+ <div class="">v0.08</div>
<div class="small" v-if="countMax">
{{ $t("bloc.title") }} n°<span class="font-weight-bold">{{
countMax.number
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index ad003f2a3ddeff07538d37c22e77315a7b5c2f39..600d6c6197949adfd75038f5303e8d492171b37c 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -4,6 +4,17 @@
"desc": "Registration in the web of trust. Membership is valid for one year and must be renewed if you wish to continue to co-produce your Universal Dividend",
"title": "Membership"
},
+ "apropos": {
+ "bienvenue": "Welcome to Wotwizard !",
+ "contribuer": "The source code of the application is on <a href=\"https://git.duniter.org/clients/wotwizard-ui\" target=\"_blank\">our Gitlab server</a>. Don't hesitate to report bugs or suggestions for improvement in <a href=\"https://git.duniter.org/clients/wotwizard-ui/-/issues\" target=\"_blank\">the <b>Tickets</b> section</a>.",
+ "deploiement": "Deployment :",
+ "desc": "This tool allows you to track entries and exits from the Äž1 free currency web of trust and is the result of a collaboration between various developers and users of the currency. Do not hesitate to thank them by making a donation on the following public key:",
+ "developpeurs": "Developers :",
+ "participants": "List of project participants :",
+ "title": "About",
+ "testeurs": "Testers :",
+ "traducteurs": "Translators :"
+ },
"aurevoir": "Goodbye to",
"bienvenue": "Welcome to",
"bloc": {
diff --git a/i18n/locales/es.json b/i18n/locales/es.json
index ea6f6846bd58b44fae8abaeb3a335808864934d9..75e3c04fa24aab4875cbb34f57e0a78195481731 100644
--- a/i18n/locales/es.json
+++ b/i18n/locales/es.json
@@ -4,6 +4,17 @@
"desc": "Registro en la red de confianza. La membresÃa es válida por un año y debe renovarse si desea continuar coproduciendo su Universal Dividend",
"title": "MembresÃa"
},
+ "apropos": {
+ "bienvenue": "¡Bienvenido a Wotwizard!",
+ "contribuer": "El código fuente de la aplicación está en <a href=\"https://git.duniter.org/clients/wotwizard-ui\" target=\"_blank\">nuestro servidor Gitlab</a>. No dudes en reportar errores o sugerencias de mejora en <a href=\"https://git.duniter.org/clients/wotwizard-ui/-/issues\" target=\"_blank\">la sección de <b>Tickets</b></a>.",
+ "deploiement": "Despliegue :",
+ "desc": "Esta herramienta le permite realizar un seguimiento de las entradas y salidas de la red de confianza de moneda libre Ğ1 y es el resultado de una colaboración entre varios desarrolladores y usuarios de la moneda. No dude en agradecerles haciendo una donación en la siguiente clave pública:",
+ "developpeurs": "Desarrolladores :",
+ "participants": "Lista de participantes del proyecto :",
+ "title": "A propósito",
+ "testeurs": "Probadores :",
+ "traducteurs": "Traductores :"
+ },
"aurevoir": "Salen",
"bienvenue": "Entran",
"bloc": {
diff --git a/i18n/locales/fr.json b/i18n/locales/fr.json
index 6e1812c8d8774173e6b0fc9cd3a1cb7d072e1eaa..55cc52b214fe9f460e8a7ea758339f86fcbf5411 100644
--- a/i18n/locales/fr.json
+++ b/i18n/locales/fr.json
@@ -4,6 +4,17 @@
"desc": "Inscription dans la toile de confiance. L'adhésion est valable un an et doit être renouvelée si on souhaite continuer à co-produire son Dividende Universel",
"title": "Adhésion"
},
+ "apropos": {
+ "bienvenue": "Bienvenue dans Wotwizard !",
+ "contribuer": "Le code source de l'application se trouve sur <a href=\"https://git.duniter.org/clients/wotwizard-ui\" target=\"_blank\">notre serveur Gitlab</a>. N'hésitez pas à y remonter les bugs ou les propositions d'amélioration dans <a href=\"https://git.duniter.org/clients/wotwizard-ui/-/issues\" target=\"_blank\">la section <b>Tickets</b></a>.",
+ "deploiement": "Déploiement :",
+ "desc": "Cet outil vous permet de suivre les entrées et les sorties de la toile de confiance de la monnaie libre Ğ1 et est le fruit d'une collaboration entre différents développeurs et utilisateurs de la monnaie. N'hésitez pas à les remercier en faisant un don sur la clé publique suivante:",
+ "developpeurs": "Développeurs :",
+ "participants": "Liste des participants au projet :",
+ "title": "À propos",
+ "testeurs": "Testeurs :",
+ "traducteurs": "Traducteurs :"
+ },
"aurevoir": "Au revoir à ",
"bienvenue": "Bienvenue à ",
"bloc": {
diff --git a/layouts/default.vue b/layouts/default.vue
index 2b9c67dfa6e3ae29522acaf655658c414a504a8c..fa5bfdad9ec136f181ade9fda0b8e501c9f5e92a 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -30,7 +30,8 @@ export default {
title: "infos",
items: [
{ path: "/lexique", title: "lexique" },
- { path: "/parametres", title: "params.title" }
+ { path: "/parametres", title: "params.title" },
+ { path: "/a-propos", title: "apropos.title" }
]
}
]
@@ -70,15 +71,15 @@ export default {
transition: margin 0.5s ease-in-out;
}
main {
- --paddingTop: 85px;
+ --paddingTop: 100px;
padding-top: var(--paddingTop);
position: relative;
@media (min-width: 576px) {
- --paddingTop: 115px;
+ --paddingTop: 130px;
}
@media (min-width: 768px) {
- --paddingTop: 85px;
+ --paddingTop: 100px;
}
}
diff --git a/pages/a-propos.vue b/pages/a-propos.vue
new file mode 100644
index 0000000000000000000000000000000000000000..88859b55dc4d409c260c75f1cd3c712b150d82e6
--- /dev/null
+++ b/pages/a-propos.vue
@@ -0,0 +1,151 @@
+<template>
+ <main class="container">
+ <div class="jumbotron">
+ <h2 class="display-5">{{ $t("apropos.bienvenue") }}</h2>
+ <p class="lead">
+ {{ $t("apropos.desc") }}
+ </p>
+ <BtnClipboard
+ textContent="78ZwwgpgdH5uLZLbThUQH7LKwPgjMunYfLiCfUCySkM8" />
+ <hr class="my-4" />
+ <h3 class="h4 mb-4">{{ $t("apropos.participants") }}</h3>
+ <div class="row">
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <h4 class="h5">{{ $t("apropos.developpeurs") }}</h4>
+ <div class="list-group mb-4">
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Paidge
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ CaTasTrOOf
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Manutopik
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Hugo
+ </NuxtLink>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <h4 class="h5">{{ $t("apropos.traducteurs") }}</h4>
+ <div class="list-group mb-4">
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Paidge
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Kapis
+ </NuxtLink>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <h4 class="h5">{{ $t("apropos.testeurs") }}</h4>
+ <div class="list-group mb-4">
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Maaltir
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Hypericum
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Tchois
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Jean-Pierre13
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ GULLANDES
+ </NuxtLink>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <h4 class="h5">API GraphQL :</h4>
+ <div class="list-group mb-4">
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Hugo
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Gerard94
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Cgeek
+ </NuxtLink>
+ </div>
+ </div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <h4 class="h5">{{ $t("apropos.deploiement") }}</h4>
+ <div class="list-group mb-4">
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Poka
+ </NuxtLink>
+ <NuxtLink
+ class="list-group-item list-group-item-action"
+ :to="localePath('/')">
+ Manutopik
+ </NuxtLink>
+ </div>
+ </div>
+ </div>
+ <p v-html="$t('apropos.contribuer')"></p>
+ </div>
+ </main>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ breadcrumb: [
+ {
+ text: this.$t("accueil"),
+ to: "/"
+ },
+ {
+ text: this.$t("apropos.title"),
+ active: true
+ }
+ ]
+ }
+ },
+ nuxtI18n: {
+ paths: {
+ fr: "/a-propos",
+ en: "/about",
+ es: "/a-proposito"
+ }
+ },
+ mounted() {
+ $nuxt.$emit("changeRoute", this.breadcrumb)
+ }
+}
+</script>
diff --git a/pages/favoris.vue b/pages/favoris.vue
index 1ff65ba97dfbb80a9b644f6c66e331b86bb596b4..65c4353d624f75f885831422b3f631fa8f242c1a 100644
--- a/pages/favoris.vue
+++ b/pages/favoris.vue
@@ -17,7 +17,9 @@
<transition name="fade">
<div
class="alert alert-info"
- v-if="!$apollo.queries.favoris.loading && favoris.length == 0">
+ v-if="
+ !$apollo.queries.favoris.loading && favoris && favoris.length == 0
+ ">
{{ $t("favoris.none") }}
</div>
</transition>