diff --git a/components/Forms/Register/form.module.css b/components/Forms/Register/form.module.css index 86c6513c4..612cbc8f8 100644 --- a/components/Forms/Register/form.module.css +++ b/components/Forms/Register/form.module.css @@ -1,41 +1,21 @@ -.container { - display: flex; - flex-direction: column; - gap: var(--Spacing-x3); -} - -.title { - grid-area: title; -} - .form { display: grid; gap: var(--Spacing-x5); grid-area: form; } -.btnContainer { +.title { + grid-area: title; +} + +.formWrapper { display: flex; - flex-direction: column-reverse; - gap: var(--Spacing-x1); - grid-area: buttons; -} - -@media screen and (min-width: 768px) { - .form { - grid-template-columns: 1fr; - } - - .btnContainer { - align-self: center; - flex-direction: row; - gap: var(--Spacing-x2); - justify-self: flex-end; - } + flex-direction: column; + gap: var(--Spacing-x3); } +.userInfo, .password, -.user, .terms { align-self: flex-start; display: grid; @@ -43,11 +23,27 @@ } .container { + display: flex; + flex-direction: column; + gap: var(--Spacing-x3); +} + +.nameInputs { + display: grid; gap: var(--Spacing-x2); } -@media (min-width: 768px) { - .divider { - display: none; +.dateField { + display: grid; + gap: var(--Spacing-x1); +} + +@media screen and (min-width: 1367px) { + .formWrapper { + gap: var(--Spacing-x5); + } + + .nameInputs { + grid-template-columns: 1fr 1fr; } } diff --git a/components/Forms/Register/index.tsx b/components/Forms/Register/index.tsx index 8ca880762..ed1387bdd 100644 --- a/components/Forms/Register/index.tsx +++ b/components/Forms/Register/index.tsx @@ -6,7 +6,6 @@ import { useIntl } from "react-intl" import { registerUser } from "@/actions/registerUser" import Button from "@/components/TempDesignSystem/Button" -import Divider from "@/components/TempDesignSystem/Divider" import Checkbox from "@/components/TempDesignSystem/Form/Checkbox" import CountrySelect from "@/components/TempDesignSystem/Form/Country" import DateSelect from "@/components/TempDesignSystem/Form/Date" @@ -15,6 +14,8 @@ import NewPassword from "@/components/TempDesignSystem/Form/NewPassword" import Phone from "@/components/TempDesignSystem/Form/Phone" import Link from "@/components/TempDesignSystem/Link" import Body from "@/components/TempDesignSystem/Text/Body" +import Caption from "@/components/TempDesignSystem/Text/Caption" +import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import Title from "@/components/TempDesignSystem/Text/Title" import { toast } from "@/components/TempDesignSystem/Toasts" @@ -65,7 +66,7 @@ export default function Form({ link, subtitle, title }: RegisterFormProps) { } return ( -
+
{title}
-
+
- - + + {intl.formatMessage({ id: "Contact information" })} + + +
+ + +
+
+
+
+ + {intl.formatMessage({ id: "Birth date" })} + +
+
-
-
- + {intl.formatMessage({ id: "Password" })} - +
- + {intl.formatMessage({ id: "Terms and conditions" })} - +
diff --git a/i18n/dictionaries/da.json b/i18n/dictionaries/da.json index 3bbbbf935..515cb88cc 100644 --- a/i18n/dictionaries/da.json +++ b/i18n/dictionaries/da.json @@ -29,6 +29,7 @@ "Back to scandichotels.com": "Tilbage til scandichotels.com", "Bar": "Bar", "Bed type": "Seng type", + "Birth date": "Fødselsdato", "Book": "Book", "Book reward night": "Book bonusnat", "Booking number": "Bookingnummer", @@ -63,6 +64,7 @@ "Coming up": "Er lige om hjørnet", "Compare all levels": "Sammenlign alle niveauer", "Complete booking & go to payment": "Udfyld booking & gå til betaling", + "Contact information": "Kontaktoplysninger", "Contact us": "Kontakt os", "Continue": "Blive ved", "Copyright all rights reserved": "Scandic AB Alle rettigheder forbeholdes", diff --git a/i18n/dictionaries/de.json b/i18n/dictionaries/de.json index b5d8c9a19..8d88a5baf 100644 --- a/i18n/dictionaries/de.json +++ b/i18n/dictionaries/de.json @@ -29,6 +29,7 @@ "Back to scandichotels.com": "Zurück zu scandichotels.com", "Bar": "Bar", "Bed type": "Bettentyp", + "Birth date": "Geburtsdatum", "Book": "Buchen", "Book reward night": "Bonusnacht buchen", "Booking number": "Buchungsnummer", @@ -63,6 +64,7 @@ "Coming up": "Demnächst", "Compare all levels": "Vergleichen Sie alle Levels", "Complete booking & go to payment": "Buchung abschließen & zur Bezahlung gehen", + "Contact information": "Kontaktinformationen", "Contact us": "Kontaktieren Sie uns", "Continue": "Weitermachen", "Copyright all rights reserved": "Scandic AB Alle Rechte vorbehalten", @@ -334,4 +336,3 @@ "{difference}{amount} {currency}": "{difference}{amount} {currency}", "{width} cm × {length} cm": "{width} cm × {length} cm" } - diff --git a/i18n/dictionaries/en.json b/i18n/dictionaries/en.json index bb1efdbcc..bcc340535 100644 --- a/i18n/dictionaries/en.json +++ b/i18n/dictionaries/en.json @@ -29,6 +29,7 @@ "Back to scandichotels.com": "Back to scandichotels.com", "Bar": "Bar", "Bed type": "Bed type", + "Birth date": "Birth date", "Book": "Book", "Book reward night": "Book reward night", "Booking number": "Booking number", @@ -63,6 +64,7 @@ "Coming up": "Coming up", "Compare all levels": "Compare all levels", "Complete booking & go to payment": "Complete booking & go to payment", + "Contact information": "Contact information", "Contact us": "Contact us", "Continue": "Continue", "Copyright all rights reserved": "Scandic AB All rights reserved", diff --git a/i18n/dictionaries/fi.json b/i18n/dictionaries/fi.json index 8bc29be79..70bc6d14c 100644 --- a/i18n/dictionaries/fi.json +++ b/i18n/dictionaries/fi.json @@ -29,6 +29,7 @@ "Back to scandichotels.com": "Takaisin scandichotels.com", "Bar": "Bar", "Bed type": "Vuodetyyppi", + "Birth date": "Syntymäaika", "Book": "Varaa", "Book reward night": "Kirjapalkinto-ilta", "Booking number": "Varausnumero", @@ -63,6 +64,7 @@ "Coming up": "Tulossa", "Compare all levels": "Vertaa kaikkia tasoja", "Complete booking & go to payment": "Täydennä varaus & siirry maksamaan", + "Contact information": "Yhteystiedot", "Contact us": "Ota meihin yhteyttä", "Continue": "Jatkaa", "Copyright all rights reserved": "Scandic AB Kaikki oikeudet pidätetään", diff --git a/i18n/dictionaries/no.json b/i18n/dictionaries/no.json index 04a21437c..47667622e 100644 --- a/i18n/dictionaries/no.json +++ b/i18n/dictionaries/no.json @@ -28,6 +28,7 @@ "Back to scandichotels.com": "Tilbake til scandichotels.com", "Bar": "Bar", "Bed type": "Seng type", + "Birth date": "Fødselsdato", "Book": "Bestill", "Book reward night": "Bestill belønningskveld", "Booking number": "Bestillingsnummer", @@ -61,6 +62,7 @@ "Coming up": "Kommer opp", "Compare all levels": "Sammenlign alle nivåer", "Complete booking & go to payment": "Fullfør bestilling & gå til betaling", + "Contact information": "Kontaktinformasjon", "Contact us": "Kontakt oss", "Continue": "Fortsette", "Copyright all rights reserved": "Scandic AB Alle rettigheter forbeholdt", diff --git a/i18n/dictionaries/sv.json b/i18n/dictionaries/sv.json index 0137f4e13..ce8afd41a 100644 --- a/i18n/dictionaries/sv.json +++ b/i18n/dictionaries/sv.json @@ -28,6 +28,7 @@ "Back to scandichotels.com": "Tillbaka till scandichotels.com", "Bar": "Bar", "Bed type": "Sängtyp", + "Birth date": "Födelsedatum", "Book": "Boka", "Book reward night": "Boka frinatt", "Booking number": "Bokningsnummer", @@ -62,6 +63,7 @@ "Coming up": "Kommer härnäst", "Compare all levels": "Jämför alla nivåer", "Complete booking & go to payment": "Fullför bokning & gå till betalning", + "Contact information": "Kontaktinformation", "Contact us": "Kontakta oss", "Continue": "Fortsätt", "Copyright all rights reserved": "Scandic AB Alla rättigheter förbehålls",