From 4da3f0dd141970ade5e92885da8a79cf14f3a7ba Mon Sep 17 00:00:00 2001 From: fabienSvstr Date: Mon, 23 Dec 2024 13:59:58 +0100 Subject: [PATCH 1/2] [MS] Added style orders OrdersPage --- .../client-area/OrderInProgress.vue | 172 +++++++++ client/src/locales/en-US.json | 4 + client/src/locales/fr-FR.json | 4 + client/src/theme/components/action-bar.scss | 2 +- client/src/views/client-area/BmsLogin.vue | 4 - .../views/client-area/orders/OrdersPage.vue | 336 +++++++++++++++++- .../views/sidebar-menu/SidebarMenuPage.vue | 4 + 7 files changed, 502 insertions(+), 24 deletions(-) create mode 100644 client/src/components/client-area/OrderInProgress.vue diff --git a/client/src/components/client-area/OrderInProgress.vue b/client/src/components/client-area/OrderInProgress.vue new file mode 100644 index 00000000000..e4362c4116d --- /dev/null +++ b/client/src/components/client-area/OrderInProgress.vue @@ -0,0 +1,172 @@ + + + + + + + diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json index 6e0eeb0bdf7..e6c459e9ecc 100644 --- a/client/src/locales/en-US.json +++ b/client/src/locales/en-US.json @@ -1727,6 +1727,10 @@ }, "connectionFailure": "An error occured (Failed to contact the server).", "serverFailure": "An error occured (server request refused." + }, + "progress": { + "orderNumber": "Order n°{number}", + "noOrder": "You don't have any order yet" } } }, diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json index 43418946150..e8c054a25ac 100644 --- a/client/src/locales/fr-FR.json +++ b/client/src/locales/fr-FR.json @@ -1727,6 +1727,10 @@ }, "connectionFailure": "Un problème est survenu (connexion au serveur impossible).", "serverFailure": "Un problème est survenu (requête serveur refusée)." + }, + "progress": { + "orderNumber": "Commande n°{number}", + "noOrder": "Vous n'avez pas de commande en cours." } } }, diff --git a/client/src/theme/components/action-bar.scss b/client/src/theme/components/action-bar.scss index 7bdc7d93493..58a0db1cbaa 100644 --- a/client/src/theme/components/action-bar.scss +++ b/client/src/theme/components/action-bar.scss @@ -2,7 +2,7 @@ /* contextual menu button */ -.contextual-menu { +.action-bar { .counter { flex-shrink: 0; } diff --git a/client/src/views/client-area/BmsLogin.vue b/client/src/views/client-area/BmsLogin.vue index b805fbbc3f1..ced02e8ca52 100644 --- a/client/src/views/client-area/BmsLogin.vue +++ b/client/src/views/client-area/BmsLogin.vue @@ -363,10 +363,6 @@ async function onLoginClicked(): Promise { height: 2.5rem; border-radius: var(--parsec-radius-6); border: 1px solid transparent; - - &:hover { - border: 1px solid var(--parsec-color-light-secondary-contrast); - } } .skeleton-login-button { diff --git a/client/src/views/client-area/orders/OrdersPage.vue b/client/src/views/client-area/orders/OrdersPage.vue index e72a932483b..4bc00187a2d 100644 --- a/client/src/views/client-area/orders/OrdersPage.vue +++ b/client/src/views/client-area/orders/OrdersPage.vue @@ -16,18 +16,130 @@ + + + + +
+ + {{ $msTranslate('Commandes passées') }} + {{ '4' }} + +
+ + + + {{ $msTranslate('Numéro de commande') }} + + + {{ $msTranslate('Période') }} + + + {{ $msTranslate('Nombre de membres') }} + + + {{ $msTranslate('Stockage') }} + + + {{ $msTranslate('Statut') }} + + + + + + + {{ $msTranslate('1234567') }} + + + {{ $msTranslate('17 Nov. 2024') }} + + {{ $msTranslate('28 Fév. 2024') }} + + {{ $msTranslate('XXX membres') }} + {{ $msTranslate('350 Go') }} + + + {{ $msTranslate('Terminée') }} + + + + +
+
+ + + + + + + + {{ $msTranslate(error) }} + - -