diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index f592fe5..88c5c9b 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -115,7 +115,7 @@ "serviceActivityPrice": "Price of the activity", "serviceActivityPricePlaceholder": "Enter the price of the activity", "serviceActivityPriceUnit": "€", - "serviceActivityDurationMinutes": "Duration of activity (minutes)", + "serviceActivityDurationMinutes": "Duration of activity", "serviceActivityDurationMinutesPlaceholder": "Enter the duration of the activity in minutes", "serviceActivityDurationMinutesUnit": "Minutes", "serviceActivityResponsible": "Responsible employees", diff --git a/src/App.css b/src/App.css index b517c0b..6c3915e 100644 --- a/src/App.css +++ b/src/App.css @@ -1,56 +1,3 @@ -/*.CompanyNameContainer { - padding: 12px 12px 0 12px; - color: #e67e22; - font-weight: bold; - font-size: 24px; - text-align: center; - letter-spacing: 6px; -} - -.CompanyNameContainer span { - animation: light 10s infinite; -} - -@keyframes light { - 20% { - color: #e67e22; - } - 25% { - color: #ffd700; - } - 30% { - color: #e67e22; - } -} - -.CompanyNameContainer span:nth-child(1) { - animation-delay: 200ms; -} - -.CompanyNameContainer span:nth-child(2) { - animation-delay: 400ms; -} - -.CompanyNameContainer span:nth-child(3) { - animation-delay: 600ms; -} - -.CompanyNameContainer span:nth-child(4) { - animation-delay: 800ms; -} - -.CompanyNameContainer span:nth-child(5) { - animation-delay: 1000ms; -} - */ -.Subtitle { - text-align: center; - color: #9b59b6; - font-weight: bold; - font-size: 14px; - padding-bottom: 20px; -} - /* full screen ant modal for an screen size smaller than 576px */ @media (max-width: 575px) { .ant-modal { @@ -67,7 +14,3 @@ content: unset; } } - -.mdx-editor { - background: #f4f5f4; -} diff --git a/src/Pages/Store/Services/index.js b/src/Pages/Store/Services/index.js index e1c7da8..0c6f6e0 100644 --- a/src/Pages/Store/Services/index.js +++ b/src/Pages/Store/Services/index.js @@ -255,10 +255,10 @@ function Service({ > {isRequestingActivities ? ( - -

Desc

-

Preis: €

-

Dauer: Minuten

+ +

loading

+

loading

+

loading

) : ( @@ -306,7 +306,7 @@ function Service({ > {user.username.charAt(0)} @@ -350,14 +350,33 @@ function Service({ } > -

{activity.description}

-

Preis: {activity.price} €

-

- Dauer: {activity.duration} Minuten{" "} + + {t("storeServices.serviceActivityDescription")} + + + + {activity.description} + + + + {t("storeServices.serviceActivityPrice")} + + +

{activity.price} €

+ + + {t("storeServices.serviceActivityDurationMinutes")} + + + + {activity.duration}{" "} + {activity.duration === 1 + ? t("common.unit.minute") + : t("common.unit.minutes")}{" "} {durationToHoursAndMinutes(t, activity.duration)} -

+
); }) @@ -847,6 +866,9 @@ function ServiceActivityDescriptionFormInput({ return (