From 8cfae6bfce01992e519e7485af790f2df4236351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?= Date: Tue, 24 Oct 2023 15:56:35 +0200 Subject: [PATCH 01/13] =?UTF-8?q?THE-922-NUXT=20impl=C3=A9mentation=20tiro?= =?UTF-8?q?irs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- components/theses/ButtonsList.vue | 105 ++++++++++++++++++++------ components/theses/TheseView.vue | 14 ++-- components/theses/ThesisComponent.vue | 11 ++- package-lock.json | 19 +---- 5 files changed, 98 insertions(+), 53 deletions(-) diff --git a/.env b/.env index e8b5fe86..8fa646f6 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -NUXT_APP_API=https://beta.theses.fr/api/v1/ +NUXT_APP_API=https://v2-test.theses.fr/api/v1/ NUXT_APP_APIREF=https://apicom.sudoc.fr/wsReferentiels/v1/ NUXT_APP_RECAPTCHA= diff --git a/components/theses/ButtonsList.vue b/components/theses/ButtonsList.vue index 9ea577c1..2a98f5e3 100644 --- a/components/theses/ButtonsList.vue +++ b/components/theses/ButtonsList.vue @@ -1,33 +1,71 @@ \ No newline at end of file diff --git a/components/theses/ButtonsList.vue b/components/theses/ButtonsList.vue index 59a821c1..28ebc804 100644 --- a/components/theses/ButtonsList.vue +++ b/components/theses/ButtonsList.vue @@ -31,11 +31,11 @@ target="_blank" :title="b.libelle" :aria-label="b.libelle">{{ b.libelle }} - + + {{ $t("theseView.embargo") }} {{ b.dateFin }} - {{ $t("theseView.confidentialite") }} {{ b.dateFin - }} - + {{ $t("theseView.confidentialite") }} {{ b.dateFin }} + @@ -50,17 +50,17 @@ {{ $t("theseView.others") }} -
- - {{ $t("theseView.embargo") }} {{ b.dateFin }} - {{ $t("theseView.confidentialite") }} {{ b.dateFin - }} - - + {{ b.libelle }} + + + {{ $t("theseView.embargo") }} {{ b.dateFin }} + {{ $t("theseView.confidentialite") }} {{ b.dateFin }} +
@@ -221,14 +221,43 @@ function putEmbargoTextAndESRButtonBeforeEveryhting() { } } -.sous-categorie-header, .texte-embargo { +.sous-categorie-header { overflow: hidden; padding: 0 1em; - margin-bottom: 0.3em; + margin-bottom: 0.8em; font-size: 16px; text-align: start; } +.texte-embargo { + width: 80%; + padding: 0.8em 0; + margin-bottom: 1em; + + display: inline-grid; + grid-template-columns: 25fr 75fr; + + .icon-alert { + align-self: center; + justify-self: center; + margin: 10px; + } + + .icon-alert path { + fill: rgb(var(--v-theme-orange-abes)); + } + + span { + font-family: Roboto, sans-serif; + font-size: 16px; + font-weight: 600; + padding-right: 1em; + align-self: center; + justify-self: center; + word-break: break-word; + } +} + .sous-categorie-header { font-weight: 500; } diff --git a/components/theses/results/ResultCard.vue b/components/theses/results/ResultCard.vue index a08210e6..0d68ab11 100644 --- a/components/theses/results/ResultCard.vue +++ b/components/theses/results/ResultCard.vue @@ -1,6 +1,6 @@