diff --git a/components/certif/List.vue b/components/certif/List.vue index 42c01ac40da0fd2e1bf15bcd24b523ebb9111a84..570fd3efaf235cb64989effe683a812c324abbbc 100644 --- a/components/certif/List.vue +++ b/components/certif/List.vue @@ -57,6 +57,7 @@ </th> <th class="position-relative" @click="sort('expires_on')"> <BtnSort + class="justify-content-end" :title="$t('expire')" fieldName="expires_on" :currentSort="currentSort" @@ -78,15 +79,13 @@ <th scope="row" class="py-1"> <div> <span v-if="$favourites.list.includes(certif.uid)">★ </span> - {{ certif.uid }} + <div class="uid inline-block text-truncate">{{ certif.uid }}</div> <BadgeDanger :limitDate="certif.received_certifications.limit" :memberStatus="certif.status" /> <BadgeQuality :quality="certif.quality.ratio" v-if="certif.status != 'REVOKED'" /> - </div> - <div> <BadgeStatus :membre="certif" /> <BadgeDispo :isDispo="certif.minDatePassed" @@ -96,7 +95,7 @@ </div> </th> <td class="text-right py-1"> - <BadgeDate :date="certif.expires_on" styleDate="long" /> + <BadgeDate :date="certif.expires_on" styleDate="short" /> </td> </tr> </tbody> @@ -186,4 +185,16 @@ thead th:last-child { padding-right: 1.5rem; text-align: right; } + +.uid { + max-width: 130px; + + @media (min-width: 576px) { + max-width: 255px; + } + + @media (min-width: 992px) { + max-width: 205px; + } +} </style> diff --git a/graphql/queries.js b/graphql/queries.js index ac7d22d71cc54439f3887534d29779610df2afa1..d7a563c4fc068a54e11a9e25fe91b486b3fd87c9 100644 --- a/graphql/queries.js +++ b/graphql/queries.js @@ -107,6 +107,10 @@ export const SEARCH_MEMBERS = gql` __typename limit } + sent_certifications { + __typename + pending + } } } } diff --git a/i18n/locales/dateTimeFormats.js b/i18n/locales/dateTimeFormats.js index 5ba91d1bb1ca1527c9d72cb5788187a7fc7c8bf3..9ad7bccbdf3f6268c0f63334dd673b65d11af2c1 100644 --- a/i18n/locales/dateTimeFormats.js +++ b/i18n/locales/dateTimeFormats.js @@ -1,7 +1,7 @@ const objTime = { short: { - day: "numeric", - month: "short", + day: "2-digit", + month: "2-digit", year: "2-digit" }, long: { diff --git a/i18n/locales/en.json b/i18n/locales/en.json index abece6ef2549ebca71b1d7595c255e3e8bc91818..3d115939399a5e70088e74a20c963313687029b8 100644 --- a/i18n/locales/en.json +++ b/i18n/locales/en.json @@ -73,7 +73,7 @@ "desc": "Cryptocurrency software using a blockchain, compliant with the Relative Theory of Money (RTM) and using the web of trust for the identification of the co-producing members of the currency", "title": "Duniter" }, - "expire": "Expires", + "expire": "Expiry", "favoris": { "enregistre": "Saved to favorites !", "none": "You don't have any favorites yet", diff --git a/i18n/locales/es.json b/i18n/locales/es.json index 8ef0f7bb21ecce970277ba3edf8b22f4b5123135..c4cd4344a3931249090555c37ef06814b3a3b8ea 100644 --- a/i18n/locales/es.json +++ b/i18n/locales/es.json @@ -73,7 +73,7 @@ "desc": "Software de criptomonedas que utiliza una cadena de bloques, que cumple con la TeorÃa Relativa del Dinero (TRD) y utiliza la red de confianza para la identificación de los miembros coproductores de la moneda", "title": "Duniter" }, - "expire": "Expira el", + "expire": "Expiración", "favoris": { "enregistre": "¡Guardado en favoritos!", "none": "Aún no tienes favoritos", diff --git a/i18n/locales/fr.json b/i18n/locales/fr.json index 9ab92d4f5e08aecec7aceea434e5000c9b0c0b89..df72ff4931557d219a1973a69854ddb2474b0bde 100644 --- a/i18n/locales/fr.json +++ b/i18n/locales/fr.json @@ -73,7 +73,7 @@ "desc": "Logiciel de crypto-monnaie utilisant une blockchain, conforme à la Théorie Relative de la Monnaie (TRM) et utilisant la toile de confiance pour l'identification des membres co-producteurs de la monnaie", "title": "Duniter" }, - "expire": "Expire le", + "expire": "Expiration", "favoris": { "enregistre": "Enregistré dans les favoris !", "none": "Vous n'avez pas encore de favoris", diff --git a/pages/membre.vue b/pages/membre.vue index 9fcab21fbfaac5347085d33b6f628005d4725813..c9e18ef42e85d123c83d176746919f23bb0dca78 100644 --- a/pages/membre.vue +++ b/pages/membre.vue @@ -15,7 +15,7 @@ </div> <div class="container"> <div class="row mt-3" v-if="idFromHash.status != 'REVOKED'"> - <div class="col-sm-10 col-md-7 col-lg-5 mb-3 mx-auto"> + <div class="col-sm-10 col-md-8 col-lg-5 mb-3 mx-auto"> <h3 class="h4 text-center" :class="{ @@ -41,7 +41,7 @@ type="received" /> </div> <div - class="col-sm-10 col-md-7 col-lg-5 mx-auto" + class="col-sm-10 col-md-8 col-lg-5 mx-auto" v-if="['MISSING', 'MEMBER'].includes(idFromHash.status)"> <h3 class="h4 text-center"> {{ $t("certification.envoyees") }} ({{ nbCertifsSent