diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/contactInformation.module.css b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/contactInformation.module.css index b616382ab..6cfb50913 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/contactInformation.module.css +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/contactInformation.module.css @@ -1,13 +1,13 @@ .wrapper { display: flex; flex-direction: column; - gap: var(--Spacing-x-one-and-half); + gap: var(--Space-x15); } .information { display: grid; grid-template-columns: 1fr 1fr; - gap: var(--Spacing-x2); + gap: var(--Space-x2); grid-template-areas: "address drivingDirections" "contact socials" @@ -33,7 +33,7 @@ .socialIcons { display: flex; - gap: var(--Spacing-x1); + gap: var(--Space-x1); align-items: center; } @@ -44,5 +44,6 @@ .ecoLabel { grid-area: ecoLabel; display: flex; - gap: var(--Spacing-x-one-and-half); + gap: var(--Space-x15); + color: var(--Text-Secondary); } diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/index.tsx index 443eb9d8c..1f455255b 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/AboutTheHotel/ContactInformation/index.tsx @@ -1,12 +1,9 @@ -import Body from "@scandic-hotels/design-system/Body" -import Caption from "@scandic-hotels/design-system/Caption" import FacebookIcon from "@scandic-hotels/design-system/Icons/FacebookIcon" import InstagramIcon from "@scandic-hotels/design-system/Icons/InstagramIcon" -import Subtitle from "@scandic-hotels/design-system/Subtitle" -import Title from "@scandic-hotels/design-system/Title" -import { Country } from "@scandic-hotels/trpc/types/country" +import { Typography } from "@scandic-hotels/design-system/Typography" import Image from "@/components/Image" +import LocalCallCharges from "@/components/LocalCallCharges" import Link from "@/components/TempDesignSystem/Link" import { getIntl } from "@/i18n" import { getLang } from "@/i18n/serverContext" @@ -29,29 +26,37 @@ export default async function ContactInformation({ return (
- - + <Typography variant="Title/Subtitle/lg"> + <h3> {intl.formatMessage({ defaultMessage: "Practical information", })} - - + +
- - {intl.formatMessage({ - defaultMessage: "Address", - })} - - {hotelAddress.streetAddress} - {hotelAddress.city} + +

+ {intl.formatMessage({ + defaultMessage: "Address", + })} +

+ + + +

{hotelAddress.streetAddress}

+

{hotelAddress.city}

+ +
- - {intl.formatMessage({ - defaultMessage: "Driving directions", - })} - + +

+ {intl.formatMessage({ + defaultMessage: "Driving directions", + })} +

+
- - {intl.formatMessage({ - defaultMessage: "Contact us", - })} - - - - {contact.phoneNumber} - - - {hotelAddress.country === Country.Finland ? ( - + +

{intl.formatMessage({ - defaultMessage: "Price 0,16 €/min + local call charges", + defaultMessage: "Contact us", })} - - ) : null} +

+ + + {contact.phoneNumber} + +
-
- - {intl.formatMessage({ - defaultMessage: "Follow us", - })} - -
- {socials.instagram && ( - - - - )} - {socials.facebook && ( - - - - )} + {socials.instagram || socials.facebook ? ( +
+ +

+ {intl.formatMessage({ + defaultMessage: "Follow us", + })} +

+ +
+ {socials.instagram && ( + + + + )} + {socials.facebook && ( + + + + )} +
-
+ ) : null}
- - {intl.formatMessage({ - defaultMessage: "Email", - })} - + +

+ {intl.formatMessage({ + defaultMessage: "Email", + })} +

+
- - {intl.formatMessage({ - defaultMessage: "Nordic Swan Ecolabel", - })} - - - {ecoLabels.svanenEcoLabelCertificateNumber} - + + +

+ {intl.formatMessage({ + defaultMessage: "Nordic Swan Ecolabel", + })} +

+

{ecoLabels.svanenEcoLabelCertificateNumber}

+ +
)} diff --git a/apps/scandic-web/components/ContentType/HotelPage/data.tsx b/apps/scandic-web/components/ContentType/HotelPage/data.tsx index 4cdef7fcb..2845d859f 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/data.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/data.tsx @@ -184,7 +184,7 @@ const facilityToIconMap: Record = { [FacilityEnum.MeetingRooms]: IconName.Business, [FacilityEnum.MinibarInRoom]: IconName.Minibar, [FacilityEnum.MobileLift]: IconName.StarFilled, - [FacilityEnum.Mountains0To1Km]: IconName.StarFilled, + [FacilityEnum.Mountains0To1Km]: IconName.Landscape, [FacilityEnum.MovieChannelsInRoomAllScandic]: IconName.TVRemote, [FacilityEnum.MultipleExitsOnEachFloor]: IconName.StarFilled, [FacilityEnum.NonSmokingRoomsAllScandic]: IconName.NonSmoking, diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx index 7a91d3cca..0f8e6676a 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx +++ b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx @@ -1,6 +1,6 @@ import { Typography } from "@scandic-hotels/design-system/Typography" -import { Country } from "@scandic-hotels/trpc/types/country" +import LocalCallCharges from "@/components/LocalCallCharges" import Link from "@/components/TempDesignSystem/Link" import { getIntl } from "@/i18n" @@ -31,18 +31,7 @@ export default async function MeetingsSidebar({
{phoneNumber} - {country === Country.Finland ? ( - -

- {intl.formatMessage({ - defaultMessage: "Price 0,16 €/min + local call charges", - })} -

- - ) : null} + {email && ( {email} diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/ParkingSidebar.tsx b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/ParkingSidebar.tsx index 5e28c6350..73ee27d07 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/ParkingSidebar.tsx +++ b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/ParkingSidebar.tsx @@ -1,6 +1,6 @@ import { Typography } from "@scandic-hotels/design-system/Typography" -import { Country } from "@scandic-hotels/trpc/types/country" +import LocalCallCharges from "@/components/LocalCallCharges" import Link from "@/components/TempDesignSystem/Link" import { getIntl } from "@/i18n" @@ -53,18 +53,7 @@ export default async function ParkingSidebar({ {contactInformation.phoneNumber} - {address.country === Country.Finland ? ( - -

- {intl.formatMessage({ - defaultMessage: "Price 0,16 €/min + local call charges", - })} -

- - ) : null} + {phoneNumber} - {hotelAddress.country === Country.Finland ? ( - -

- {intl.formatMessage({ - defaultMessage: "Price 0,16 €/min + local call charges", - })} -

- - ) : null} + )} {email && ( diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/WellnessSidebar.tsx b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/WellnessSidebar.tsx index b228bc936..a0cd30c49 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/WellnessSidebar.tsx +++ b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/WellnessSidebar.tsx @@ -1,6 +1,6 @@ import { Typography } from "@scandic-hotels/design-system/Typography" -import { Country } from "@scandic-hotels/trpc/types/country" +import LocalCallCharges from "@/components/LocalCallCharges" import Link from "@/components/TempDesignSystem/Link" import { getIntl } from "@/i18n" @@ -80,18 +80,7 @@ export default async function WellnessSidebar({ {contactInformation.phoneNumber} - {address.country === Country.Finland ? ( - -

- {intl.formatMessage({ - defaultMessage: "Price 0,16 €/min + local call charges", - })} -

- - ) : null} +
diff --git a/apps/scandic-web/components/Icons/IconByIconName.tsx b/apps/scandic-web/components/Icons/IconByIconName.tsx index 5b8807955..5bc2aa11c 100644 --- a/apps/scandic-web/components/Icons/IconByIconName.tsx +++ b/apps/scandic-web/components/Icons/IconByIconName.tsx @@ -260,6 +260,8 @@ export function IconByIconName({ return case IconName.Kettle: return + case IconName.Landscape: + return case IconName.Lamp: return case IconName.LaundryMachine: diff --git a/apps/scandic-web/components/Icons/iconName.ts b/apps/scandic-web/components/Icons/iconName.ts index c2bd24456..2a53d1df9 100644 --- a/apps/scandic-web/components/Icons/iconName.ts +++ b/apps/scandic-web/components/Icons/iconName.ts @@ -106,6 +106,7 @@ export enum IconName { Kettle = "Kettle", Kids = "Kids", KidsMocktail = "KidsMocktail", + Landscape = "Landscape", Lamp = "Lamp", LaptopSafe = "LaptopSafe", LaundryMachine = "LaundryMachine", diff --git a/apps/scandic-web/components/LocalCallCharges/index.tsx b/apps/scandic-web/components/LocalCallCharges/index.tsx new file mode 100644 index 000000000..ad8027750 --- /dev/null +++ b/apps/scandic-web/components/LocalCallCharges/index.tsx @@ -0,0 +1,23 @@ +import { Typography } from "@scandic-hotels/design-system/Typography" +import { Country } from "@scandic-hotels/trpc/types/country" + +import { getIntl } from "@/i18n" + +interface LocalCallChargesProps { + country: string +} +export default async function LocalCallCharges({ + country, +}: LocalCallChargesProps) { + const intl = await getIntl() + + return country === Country.Finland ? ( + +

+ {intl.formatMessage({ + defaultMessage: "Price 0,16 €/min + local call charges", + })} +

+ + ) : null +} diff --git a/apps/scandic-web/components/ParkingInformation/index.tsx b/apps/scandic-web/components/ParkingInformation/index.tsx index ec618e985..694f38c0f 100644 --- a/apps/scandic-web/components/ParkingInformation/index.tsx +++ b/apps/scandic-web/components/ParkingInformation/index.tsx @@ -79,7 +79,11 @@ export default function ParkingInformation({
{parking.externalParkingUrl && showExternalParkingButton && ( - + {intl.formatMessage({ defaultMessage: "Book parking" })}