diff --git a/app/frontend/src/javascript/components/events/event-reservation-item.tsx b/app/frontend/src/javascript/components/events/event-reservation-item.tsx index cc3cc89e3..d9cd2ca4c 100644 --- a/app/frontend/src/javascript/components/events/event-reservation-item.tsx +++ b/app/frontend/src/javascript/components/events/event-reservation-item.tsx @@ -30,10 +30,10 @@ export const EventReservationItem: React.FC = ({ rese const buildTicket = (ticket) => { return ( <> -
{t('app.logged.event_reservation_item.NUMBER_of_NAME_places_reserved', { NUMBER: ticket.booked, NAME: ticket.price_category.name })}
+ {reservation.booking_users_attributes.filter(u => u.event_price_category_id === ticket.event_price_category_id).map(u => { return ( -
{u.name}
+

{u.name}

); })} @@ -58,25 +58,30 @@ export const EventReservationItem: React.FC = ({ rese return (
-
{t('app.logged.event_reservation_item.event')}
-
{reservation.event_title}
- {reservation.event_type === 'family' && - {t('app.logged.event_reservation_item.family')} - } - {reservation.event_type === 'nominative' && - {t('app.logged.event_reservation_item.nominative')} - } - {reservation.event_pre_registration && - {t('app.logged.event_reservation_item.pre_registration')} - } - {formatDate()} +
+ +

{reservation.event_title}

+ {formatDate()} +
+
+ {/* {reservation.event_type === 'family' && + {t('app.logged.event_reservation_item.family')} + } + {reservation.event_type === 'nominative' && + {t('app.logged.event_reservation_item.nominative')} + } */} + {reservation.event_pre_registration && + // eslint-disable-next-line fabmanager/no-bootstrap, fabmanager/no-utilities + {t('app.logged.event_reservation_item.pre_registration')} + } +
-
-
{t('app.logged.event_reservation_item.NUMBER_normal_places_reserved', { NUMBER: reservation.nb_reserve_places })}
+
+ {reservation.booking_users_attributes.filter(u => !u.event_price_category_id).map(u => { return ( -
{u.name}
+

{u.name}

); })} {reservation.tickets.map(ticket => { @@ -84,9 +89,9 @@ export const EventReservationItem: React.FC = ({ rese })}
{reservation.event_pre_registration && -
-
{t('app.logged.event_reservation_item.tracking_your_reservation')}
- {preRegistrationStatus()} +
+ +

{preRegistrationStatus()}

}
diff --git a/app/frontend/src/stylesheets/application.scss b/app/frontend/src/stylesheets/application.scss index cf9ff38aa..2d793e9d2 100644 --- a/app/frontend/src/stylesheets/application.scss +++ b/app/frontend/src/stylesheets/application.scss @@ -47,11 +47,13 @@ @import "modules/dashboard/reservations/prepaid-packs-panel"; @import "modules/dashboard/reservations/reservations-dashboard"; @import "modules/dashboard/reservations/reservations-panel"; -@import "modules/events/event"; -@import "modules/events/events"; @import "modules/events/event-form"; +@import "modules/events/event-reservation"; +@import "modules/events/event"; +@import "modules/events/events-dashboard"; +@import "modules/events/events-settings"; +@import "modules/events/events"; @import "modules/events/update-recurrent-modal"; -@import "modules/events/events-settings.scss"; @import "modules/family-account/child-form"; @import "modules/family-account/child-item"; @import "modules/family-account/children-dashboard"; diff --git a/app/frontend/src/stylesheets/modules/events/event-reservation.scss b/app/frontend/src/stylesheets/modules/events/event-reservation.scss new file mode 100644 index 000000000..eacfb1ec2 --- /dev/null +++ b/app/frontend/src/stylesheets/modules/events/event-reservation.scss @@ -0,0 +1,60 @@ +.event-reservation { + display: flex; + flex-direction: column; + gap: 1.6rem; + + &-item { + padding: 1.6rem 1.6rem 0; + display: flex; + flex-direction: column; + background-color: var(--gray-soft-lightest); + border-radius: var(--border-radius); + + label { + margin: 0; + @include text-xs; + color: var(--gray-hard-light); + } + p { + margin: 0; + @include text-base(600); + } + .date { @include text-sm; } + + &__event { + padding-bottom: 1.2rem; + display: flex; + justify-content: space-between; + align-items: center; + gap: 1.6rem; + border-bottom: 1px solid var(--gray-soft-dark); + } + + &__reservation { + display: flex; + + & > div { + padding: 1.2rem 1.6rem 1.2rem 0; + flex: 1; + } + .list { + display: flex; + flex-direction: column; + row-gap: 0.5rem; + label:not(:first-of-type) { + margin-top: 1rem; + } + } + .name { @include text-sm(500); } + + .status { + padding-left: 1.6rem; + display: flex; + flex-direction: column; + justify-content: center; + border-left: 1px solid var(--gray-soft-dark); + } + } + + } +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/events/events-dashboard.scss b/app/frontend/src/stylesheets/modules/events/events-dashboard.scss new file mode 100644 index 000000000..7c6c70bc9 --- /dev/null +++ b/app/frontend/src/stylesheets/modules/events/events-dashboard.scss @@ -0,0 +1,5 @@ +.events-dashboard { + max-width: 1600px; + margin: 0 auto; + padding-bottom: 6rem; +} \ No newline at end of file diff --git a/app/frontend/templates/dashboard/events.html b/app/frontend/templates/dashboard/events.html index c632dafa8..f9333495d 100644 --- a/app/frontend/templates/dashboard/events.html +++ b/app/frontend/templates/dashboard/events.html @@ -8,7 +8,7 @@ -
+
@@ -16,8 +16,8 @@

{{ 'app.logged.dashboard.events.your_next_events' | translate }}

-
-
+
+