From 4650d0e1cb01e5d5cc2257f17b3cac54455c3f06 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 5 Jan 2023 15:24:24 +0100 Subject: [PATCH] (ui) Add missing cta --- .../reservations/prepaid-packs-panel.tsx | 5 +++ .../reservations/prepaid-packs-panel.scss | 12 +++++- .../reservations/reservations-panel.scss | 4 +- config/locales/app.logged.de.yml | 2 + config/locales/app.logged.en.yml | 2 + config/locales/app.logged.es.yml | 2 + config/locales/app.logged.fr.yml | 2 + config/locales/app.logged.no.yml | 2 + config/locales/app.logged.pt.yml | 2 + config/locales/app.logged.zu.yml | 40 ++++++++++--------- 10 files changed, 51 insertions(+), 22 deletions(-) diff --git a/app/frontend/src/javascript/components/dashboard/reservations/prepaid-packs-panel.tsx b/app/frontend/src/javascript/components/dashboard/reservations/prepaid-packs-panel.tsx index e29edfcf9..89f5f897e 100644 --- a/app/frontend/src/javascript/components/dashboard/reservations/prepaid-packs-panel.tsx +++ b/app/frontend/src/javascript/components/dashboard/reservations/prepaid-packs-panel.tsx @@ -41,6 +41,11 @@ const PrepaidPacksPanel: React.FC = () => { +
+

{t('app.logged.dashboard.reservations_dashboard.prepaid_packs_panel.cta_info')}

+ +
+ ); }; diff --git a/app/frontend/src/stylesheets/modules/dashboard/reservations/prepaid-packs-panel.scss b/app/frontend/src/stylesheets/modules/dashboard/reservations/prepaid-packs-panel.scss index 424a9e0bf..539ee4368 100644 --- a/app/frontend/src/stylesheets/modules/dashboard/reservations/prepaid-packs-panel.scss +++ b/app/frontend/src/stylesheets/modules/dashboard/reservations/prepaid-packs-panel.scss @@ -17,7 +17,7 @@ .prepaid-packs-list { display: grid; - grid-template-columns: 2fr 1fr max-content; + grid-template-columns: 2fr 1fr minmax(25%, max-content); gap: 0 1.6rem; .name { grid-column: 1 / 2; } .end { grid-column: 2 / 3; } @@ -43,4 +43,14 @@ } .prepaid-packs-list-item { font-weight: 400; } } + + .prepaid-packs-cta { + padding: 1.6rem; + display: flex; + justify-content: space-between; + align-items: center; + gap:2.4rem; + background-color: var(--gray-soft-lightest); + border-radius: var(--border-radius); + } } \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/dashboard/reservations/reservations-panel.scss b/app/frontend/src/stylesheets/modules/dashboard/reservations/reservations-panel.scss index 2b6643edd..5f49ea2d3 100644 --- a/app/frontend/src/stylesheets/modules/dashboard/reservations/reservations-panel.scss +++ b/app/frontend/src/stylesheets/modules/dashboard/reservations/reservations-panel.scss @@ -13,7 +13,7 @@ .reservations-list { display: grid; - grid-template-columns: 1fr max-content; + grid-template-columns: 1fr minmax(25%, max-content); gap: 0 1.6rem; .name { grid-column: 1 / 2; } .date { grid-column: 2 / 3; } @@ -26,7 +26,7 @@ display: contents; @include text-base(600); .date{ - margin-bottom: 0.4rem; + margin-bottom: 1.6rem; display: flex; flex-direction: column; align-items: flex-end; diff --git a/config/locales/app.logged.de.yml b/config/locales/app.logged.de.yml index c950d5a07..8383d82c1 100644 --- a/config/locales/app.logged.de.yml +++ b/config/locales/app.logged.de.yml @@ -166,6 +166,8 @@ de: countdown: "Countdown" history: "History" consumed_hours: "H consumed" + cta_info: "You can buy prepaid hours packs to book machines and benefit from discounts" + cta_button: "Buy a pack" #public profil of a member members_show: members_list: "Mitgliederliste" diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index acbad3354..6d2e3e052 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -166,6 +166,8 @@ en: countdown: "Countdown" history: "History" consumed_hours: "H consumed" + cta_info: "You can buy prepaid hours packs to book machines and benefit from discounts" + cta_button: "Buy a pack" #public profil of a member members_show: members_list: "Members list" diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml index 9efeb8f82..0c26e71ac 100644 --- a/config/locales/app.logged.es.yml +++ b/config/locales/app.logged.es.yml @@ -166,6 +166,8 @@ es: countdown: "Countdown" history: "History" consumed_hours: "H consumed" + cta_info: "You can buy prepaid hours packs to book machines and benefit from discounts" + cta_button: "Buy a pack" #public profil of a member members_show: members_list: "Lista de miembros" diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 9ef2cbe23..bfd063ce2 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -166,6 +166,8 @@ fr: countdown: "Décompte" history: "Historique" consumed_hours: "H consommée(s)" + cta_info: "Vous pouvez acheter des packs d'heures prépayées pour les machines. Ces packs vous permettent de bénéficier de remises." + cta_button: "Acheter un pack" #public profil of a member members_show: members_list: "Liste des membres" diff --git a/config/locales/app.logged.no.yml b/config/locales/app.logged.no.yml index cc1fa3003..c3fb10c91 100644 --- a/config/locales/app.logged.no.yml +++ b/config/locales/app.logged.no.yml @@ -166,6 +166,8 @@ countdown: "Countdown" history: "History" consumed_hours: "H consumed" + cta_info: "You can buy prepaid hours packs to book machines and benefit from discounts" + cta_button: "Buy a pack" #public profil of a member members_show: members_list: "Medlemsliste" diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml index 5fe138ec9..57a693ac5 100644 --- a/config/locales/app.logged.pt.yml +++ b/config/locales/app.logged.pt.yml @@ -166,6 +166,8 @@ pt: countdown: "Countdown" history: "History" consumed_hours: "H consumed" + cta_info: "You can buy prepaid hours packs to book machines and benefit from discounts" + cta_button: "Buy a pack" #public profil of a member members_show: members_list: "Lista de membros" diff --git a/config/locales/app.logged.zu.yml b/config/locales/app.logged.zu.yml index 06bd3bd1b..26ce7b2db 100644 --- a/config/locales/app.logged.zu.yml +++ b/config/locales/app.logged.zu.yml @@ -144,28 +144,30 @@ zu: browse: "crwdns27630:0crwdne27630:0" edit: "crwdns27632:0crwdne27632:0" reservations_dashboard: - machine_section_title: "crwdns36291:0crwdne36291:0" - space_section_title: "crwdns36293:0crwdne36293:0" + machine_section_title: "crwdns36357:0crwdne36357:0" + space_section_title: "crwdns36359:0crwdne36359:0" reservations_panel: - title: "crwdns36295:0crwdne36295:0" - upcoming: "crwdns36297:0crwdne36297:0" - date: "crwdns36299:0crwdne36299:0" - history: "crwdns36301:0crwdne36301:0" - no_reservation: "crwdns36329:0crwdne36329:0" - show_more: "crwdns36305:0crwdne36305:0" + title: "crwdns36361:0crwdne36361:0" + upcoming: "crwdns36363:0crwdne36363:0" + date: "crwdns36365:0crwdne36365:0" + history: "crwdns36367:0crwdne36367:0" + no_reservation: "crwdns36369:0crwdne36369:0" + show_more: "crwdns36371:0crwdne36371:0" credits_panel: - title: "crwdns36307:0crwdne36307:0" - info: "crwdns36309:0crwdne36309:0" - remaining_credits_html: "crwdns36311:0REMAINING={REMAINING}crwdnd36311:0REMAINING={REMAINING}crwdne36311:0" - used_credits_html: "crwdns36313:0USED={USED}crwdnd36313:0USED={USED}crwdne36313:0" - no_credits: "crwdns36315:0crwdne36315:0" + title: "crwdns36373:0crwdne36373:0" + info: "crwdns36375:0crwdne36375:0" + remaining_credits_html: "crwdns36377:0REMAINING={REMAINING}crwdnd36377:0REMAINING={REMAINING}crwdne36377:0" + used_credits_html: "crwdns36379:0USED={USED}crwdnd36379:0USED={USED}crwdne36379:0" + no_credits: "crwdns36381:0crwdne36381:0" prepaid_packs_panel: - title: "crwdns36317:0crwdne36317:0" - name: "crwdns36319:0crwdne36319:0" - end: "crwdns36331:0crwdne36331:0" - countdown: "crwdns36323:0crwdne36323:0" - history: "crwdns36325:0crwdne36325:0" - consumed_hours: "crwdns36327:0crwdne36327:0" + title: "crwdns36383:0crwdne36383:0" + name: "crwdns36385:0crwdne36385:0" + end: "crwdns36387:0crwdne36387:0" + countdown: "crwdns36389:0crwdne36389:0" + history: "crwdns36391:0crwdne36391:0" + consumed_hours: "crwdns36393:0crwdne36393:0" + cta_info: "crwdns36395:0crwdne36395:0" + cta_button: "crwdns36397:0crwdne36397:0" #public profil of a member members_show: members_list: "crwdns27656:0crwdne27656:0"