Merged in feat/profile-consent-feature-branch (pull request #2900)

feat(LOY-268): Feature branch for profiling consent work

* feat: Add feature branch for profile and consent work

* Merged in feat/LOY-268-profile-consent-banner-comp (pull request #2908)

Feat/LOY-358 profile consent banner component

* feat: Add feature branch for profile and consent work

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component


Approved-by: Chuma Mcphoy (We Ahead)

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* Merged in feat/profile-consent-contentstack (pull request #2921)

Feat(LOY-389): Profile consent in Contentstack

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* chore(LOY-348): add profiling consent as CS entry

* chore(LOY-348): add banner as dynamic content

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901)

Feat(LOY-347): Profiling Consent Modal (phase 1)

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Icons

* feat(LOY-347): Implement ability to open modal from banner

* fix(LOY-347): minor fixes

* fix(LOY-347): replace old spa icon

* fix(LOY-347): re-add env vars

* fix(LOY-347): File renaming and cleanup

* chore(LOY-347): Update readme

* fix(LOY-347): use correct space var

* fix(LOY-347): Add TODO comment for adding link to accordion

Approved-by: Matilda Landström

* Merged in fix/LOY-386-profiling-consent-modal-contentstack (pull request #2930)

Fix(LOY-386): profiling consent modal contentstack

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Icons

* feat(LOY-347): Implement ability to open modal from banner

* fix(LOY-347): minor fixes

* fix(LOY-347): replace old spa icon

* fix(LOY-347): re-add env vars

* fix(LOY-347): File renaming and cleanup

* fix(LOY-386): Use contentstack content for profile consent modal

* fix(LOY-386): beneift cards schema transform

* chore(LOY-386): remove usememo

* fix(LOY-386): fix modalcontent check

* fix(LOY-386): remove uneeded vars


Approved-by: Matilda Landström

* Merged in feat/LOY-412-profiling-consent-in-signup (pull request #2976)

Feat(LOY-412): profiling consent in signup

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* Merged in feat/profile-consent-contentstack (pull request #2921)

Feat(LOY-389): Profile consent in Contentstack

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* chore(LOY-348): add profiling consent as CS entry

* chore(LOY-348): add banner as dynamic content

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901)

Feat(LOY-347): Profiling Consent Modal (phase 1)

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Ico…
* Merged in fix/lokalise-ids (pull request #3013)

fix: add ids to translations in Profiling Consent

* fix: add ids to translations


Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)

* Merged in LOY-436-my-pages-profiling-consent (pull request #3011)

LOY-436: Profiling Consent on My Profile, no api

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-418-profiling-consent-ui-text-update (pull request #3080)

Feat/LOY-418: Profiling consent ui and text update

* chore(LOY-418): update /consent buttons

* chore(LOY-418): update legal texts


Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-268-profiling-consent-api (pull request #3088)

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-413-Signup-API-Profiling-Consent (pull request #3105)

Feat/LOY-413 Signup API Profiling Consent

* feat(LOY-413): signup profiling consent

* chore(LOY-413): remove todo

* fix(LOY-413): only pass in profilingConsent if true

* fix(LOY-413): proper spread of profilingConsent in signup input


Approved-by: Christel Westerberg

* Merged in fix/LOY-413-use-v2-for-signup-call (pull request #3112)

fix(LOY-413): use v2 endpoint for profile POST in signup

* fix(LOY-413): use v2 endpoint for profile POST in signup


Approved-by: Erik Tiekstra

* Merged in feat/LOY-268-profiling-consent-improvements (pull request #3094)

Feat/LOY-268: Profiling consent improvements

* Merged in feat/profile-consent-contentstack (pull request #2921)

Feat(LOY-389): Profile consent in Contentstack

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* chore(LOY-348): add profiling consent as CS entry

* chore(LOY-348): add banner as dynamic content

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901)

Feat(LOY-347): Profiling Consent Modal (phase 1)

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Icons

* feat(LOY-347): Implement ability to open modal from banner

* fix(LOY-347): min…
* Merged in fix/update-graphql (pull request #3130)

fix: update graphql

* fix: update graphql


Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-414-prof-consent-tracking (pull request #3127)

Feat/LOY-414 profile consent tracking + credit card ui update

* chore(LOY-414): create track link function

* chore(LOY-414): add cta tracking

* chore(LOY-414): add profileConsent to userInfo datalayer

* chore(LOY-414): update credit card ui

* chore(LOY-414): update tracking specs

* chore(LOY-414): add pageView tracking to modal

Approved-by: Chuma Mcphoy (We Ahead)

* fix: remove old flag

* Merged in fix/LOY-268-prof-consent-button-fix (pull request #3162)

fix(LOY-268): add button as link

* fix(LOY-268): add button as link


Approved-by: Chuma Mcphoy (We Ahead)


Approved-by: Matilda Landström
This commit is contained in:
Chuma Mcphoy (We Ahead)
2025-11-14 13:28:56 +00:00
parent 9260cc0f81
commit 494bfe10f3
79 changed files with 9332 additions and 268 deletions
@@ -1,34 +1,35 @@
import { Typography } from "@scandic-hotels/design-system/Typography"
import ManagePreferencesButton from "@/components/Profile/ManagePreferencesButton"
import ManageEmailPreferencesButton from "@/components/Profile/ManageEmailPreferencesButton"
import { getIntl } from "@/i18n"
import styles from "./communication.module.css"
import styles from "./slots.module.css"
export default async function CommunicationSlot() {
export default async function EmailSlot() {
const intl = await getIntl()
return (
<section className={styles.container}>
<div className={styles.content}>
<Typography variant="Title/Subtitle/md">
<h3>
{intl.formatMessage({
id: "myPages.myCommunicationPreferences",
defaultMessage: "My communication preferences",
id: "profile.emailPreferences",
defaultMessage: "E-mail preferences",
})}
</h3>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>
{intl.formatMessage({
id: "myPages.tellUsWhatInfoYouWouldLikeToReceive",
id: "profile.manageEmailsAndUpdates",
defaultMessage:
"Tell us what information and updates you'd like to receive, and how, by clicking the link below.",
"Manage what e-mails and updates you'd like to receive, and how, by clicking the link below.",
})}
</p>
</Typography>
</div>
<ManagePreferencesButton />
<ManageEmailPreferencesButton />
</section>
)
}
@@ -0,0 +1,59 @@
"use client"
import { useIntl } from "react-intl"
import { profileConsent } from "@scandic-hotels/common/constants/routes/myPages"
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
import { TextLink } from "@scandic-hotels/design-system/TextLink"
import { Typography } from "@scandic-hotels/design-system/Typography"
import useLang from "@/hooks/useLang"
import { trackLinkClick } from "@/utils/tracking/profilingConsent"
import styles from "./slots.module.css"
export default function PersonalizationSlot() {
const intl = useIntl()
const lang = useLang()
return (
<section className={styles.container}>
<div className={styles.content}>
<Typography variant="Title/Subtitle/md">
<h3>
{intl.formatMessage({
id: "profile.personalization&profiling",
defaultMessage: "Personalization & Profiling",
})}
</h3>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>
{intl.formatMessage({
id: "profile.reviewUpdateConsent",
defaultMessage:
"Review and update your consent settings to control how we personalize your experience.",
})}
</p>
</Typography>
</div>
<TextLink
href={profileConsent[lang]}
color="Text/Interactive/Secondary"
typography="Link/md"
onClick={() =>
trackLinkClick({
position: "profile",
name: "manage profiling consent",
})
}
>
<MaterialIcon size={24} icon="arrow_forward" color="CurrentColor" />
{intl.formatMessage({
id: "profile.mangeProfilingConsent",
defaultMessage: "Manage profiling consent",
})}
</TextLink>
</section>
)
}
@@ -0,0 +1,15 @@
.content {
display: grid;
gap: var(--Space-x1);
}
.container {
justify-items: left;
}
@media screen and (min-width: 768px) {
.container {
display: grid;
gap: var(--Space-x15);
}
}
@@ -0,0 +1,21 @@
import { getIntl } from "@/i18n"
import { Section } from "../Section"
import EmailSlot from "./Slots/Email"
import PersonalizationSlot from "./Slots/Personalization"
export async function CommunicationSettings() {
const intl = await getIntl()
return (
<Section
title={intl.formatMessage({
id: "profile.communicationSettings",
defaultMessage: "Communication settings",
})}
>
<EmailSlot />
<PersonalizationSlot />
</Section>
)
}
@@ -1,22 +0,0 @@
.container {
display: grid;
gap: var(--Space-x2);
justify-items: flex-start;
max-width: 510px;
}
.content {
display: grid;
gap: var(--Space-x1);
}
.cardContainer {
display: grid;
gap: var(--Space-x1);
}
@media screen and (min-width: 768px) {
.container {
gap: var(--Space-x3);
}
}
@@ -1,41 +0,0 @@
import { Typography } from "@scandic-hotels/design-system/Typography"
import { serverClient } from "@/lib/trpc/server"
import AddCreditCardButton from "@/components/Profile/AddCreditCardButton"
import CreditCardList from "@/components/Profile/CreditCardList"
import { getIntl } from "@/i18n"
import styles from "./creditCards.module.css"
export default async function CreditCardSlot() {
const intl = await getIntl()
const caller = await serverClient()
const creditCards = await caller.user.creditCards()
return (
<section className={styles.container}>
<div className={styles.content}>
<Typography variant="Title/Subtitle/md">
<h3>
{intl.formatMessage({
id: "myPages.myPaymentCards",
defaultMessage: "My payment cards",
})}
</h3>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>
{intl.formatMessage({
id: "myPages.checkOutCardsSavedToProfile",
defaultMessage:
"Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.",
})}
</p>
</Typography>
</div>
<CreditCardList initialData={creditCards} />
<AddCreditCardButton />
</section>
)
}
@@ -0,0 +1,50 @@
import { Typography } from "@scandic-hotels/design-system/Typography"
import { serverClient } from "@/lib/trpc/server"
import AddCreditCardButton from "@/components/Profile/AddCreditCardButton"
import CreditCardList from "@/components/Profile/CreditCardList"
import { getIntl } from "@/i18n"
import { Section } from "../Section"
import styles from "./payment.module.css"
export async function Payment() {
const intl = await getIntl()
const caller = await serverClient()
const creditCards = await caller.user.creditCards()
return (
<Section
title={intl.formatMessage({
id: "profile.payment",
defaultMessage: "Payment",
})}
>
<div className={styles.container}>
<span className={styles.content}>
<Typography variant="Title/Subtitle/md">
<h3>
{intl.formatMessage({
id: "profile.myPaymentCards",
defaultMessage: "My payment cards",
})}
</h3>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>
{intl.formatMessage({
id: "profile.checkOutSavedCreditCards",
defaultMessage:
"Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.",
})}
</p>
</Typography>
</span>
<CreditCardList initialData={creditCards} />
<AddCreditCardButton />
</div>
</Section>
)
}
@@ -1,10 +1,9 @@
.container {
display: grid;
gap: var(--Space-x3);
max-width: 510px;
}
.content {
display: grid;
gap: var(--Space-x1);
}
.container {
display: grid;
gap: var(--Space-x3);
}
@@ -0,0 +1,19 @@
import { Typography } from "@scandic-hotels/design-system/Typography"
import styles from "./section.module.css"
import type { PropsWithChildren } from "react"
interface SectionProps extends PropsWithChildren {
title: string
}
export function Section({ children, title }: SectionProps) {
return (
<section className={styles.section}>
<Typography variant="Title/smLowCase">
<h2>{title}</h2>
</Typography>
<div className={styles.content}>{children}</div>
</section>
)
}
@@ -0,0 +1,19 @@
.content {
display: grid;
grid-auto-flow: row;
gap: var(--Space-x5);
}
.section {
display: grid;
gap: var(--Space-x3);
}
@media screen and (min-width: 950px) {
.content {
grid-auto-flow: column;
grid-auto-columns: calc(50% - var(--Space-x9) / 2)
calc(50% - var(--Space-x9) / 2);
gap: var(--Space-x9);
}
}
@@ -3,20 +3,23 @@ import { profileEdit } from "@scandic-hotels/common/constants/routes/myPages"
import { isValidLang } from "@scandic-hotels/common/utils/languages"
import ButtonLink from "@scandic-hotels/design-system/ButtonLink"
import { Divider } from "@scandic-hotels/design-system/Divider"
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
import {
MaterialIcon,
type MaterialIconProps,
} from "@scandic-hotels/design-system/Icons/MaterialIcon"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { countriesMap } from "@scandic-hotels/trpc/constants/countries"
import { getProfile } from "@/lib/trpc/memoizedRequests"
import CommunicationSlot from "@/components/MyPages/Profile/Communication"
import CreditCardSlot from "@/components/MyPages/Profile/CreditCards"
import Header from "@/components/Profile/Header"
import { getIntl } from "@/i18n"
import { getLang } from "@/i18n/serverContext"
import { isValidCountry } from "@/utils/countries"
import ChangeNameDisclaimer from "./ChangeNameDisclaimer"
import { CommunicationSettings } from "./CommunicationSettings"
import { Payment } from "./Payment"
import styles from "./profile.module.css"
@@ -67,6 +70,61 @@ export default async function Profile() {
? localizedLanguage.charAt(0).toUpperCase() + localizedLanguage.slice(1)
: languages[userLang]
const userDataItems: {
icon: MaterialIconProps["icon"]
label: string
value: string
}[] = [
{
icon: "calendar_month",
label: intl.formatMessage({
id: "profile.dateOfBirth",
defaultMessage: "Date of birth",
}),
value: user.dateOfBirth,
},
{
icon: "phone",
label: intl.formatMessage({
id: "common.phoneNumber",
defaultMessage: "Phone number",
}),
value: user.phoneNumber ?? "",
},
{
icon: "globe",
label: intl.formatMessage({
id: "profile.language",
defaultMessage: "Language",
}),
value: normalizedLanguage,
},
{
icon: "mail",
label: intl.formatMessage({
id: "common.email",
defaultMessage: "Email",
}),
value: user.email,
},
{
icon: "location_on",
label: intl.formatMessage({
id: "common.address",
defaultMessage: "Address",
}),
value: addressOutput,
},
{
icon: "lock",
label: intl.formatMessage({
id: "profile.password",
defaultMessage: "Password",
}),
value: "**********",
},
]
return (
<section className={styles.container}>
<Header>
@@ -95,102 +153,25 @@ export default async function Profile() {
</ButtonLink>
</Header>
<div className={styles.info}>
<div className={styles.item}>
<MaterialIcon
icon="calendar_month"
color="Icon/Interactive/Default"
/>
<Typography variant="Body/Paragraph/mdBold">
<p>
{intl.formatMessage({
id: "myPages.dateOfBirth",
defaultMessage: "Date of birth",
})}
</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>{user.dateOfBirth}</p>
</Typography>
</div>
<div className={styles.item}>
<MaterialIcon icon="phone" color="Icon/Interactive/Default" />
<Typography variant="Body/Paragraph/mdBold">
<p>
{intl.formatMessage({
id: "common.phoneNumber",
defaultMessage: "Phone number",
})}
</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>{user.phoneNumber}</p>
</Typography>
</div>
<div className={styles.item}>
<MaterialIcon icon="globe" color="Icon/Interactive/Default" />
<Typography variant="Body/Paragraph/mdBold">
<p>
{intl.formatMessage({
id: "common.language",
defaultMessage: "Language",
})}
</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>{normalizedLanguage}</p>
</Typography>
</div>
<div className={styles.item}>
<MaterialIcon icon="mail" color="Icon/Interactive/Default" />
<Typography variant="Body/Paragraph/mdBold">
<p>
{intl.formatMessage({
id: "common.email",
defaultMessage: "Email",
})}
</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>{user.email}</p>
</Typography>
</div>
<div className={styles.item}>
<MaterialIcon icon="location_on" color="Icon/Interactive/Default" />
<Typography variant="Body/Paragraph/mdBold">
<p>
{intl.formatMessage({
id: "common.address",
defaultMessage: "Address",
})}
</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>{addressOutput}</p>
</Typography>
</div>
<div className={styles.item}>
<MaterialIcon icon="lock" color="Icon/Interactive/Default" />
<Typography variant="Body/Paragraph/mdBold">
<p>
{intl.formatMessage({
id: "common.password",
defaultMessage: "Password",
})}
</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
<p>**********</p>
</Typography>
</div>
{userDataItems.map(({ icon, label, value }) => (
<div className={styles.item} key={label}>
<MaterialIcon icon={icon} color="Icon/Interactive/Default" />
<Typography variant="Body/Paragraph/mdBold">
<p>{label}</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p>{value}</p>
</Typography>
</div>
))}
</div>
<ChangeNameDisclaimer />
<Divider />
<CreditCardSlot />
<CommunicationSettings />
<Payment />
{/* <MembershipCardSlot /> */}
<CommunicationSlot />
</section>
)
}