scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in refactor/small-cleanup (pull request #3252)

Browse Source 
fix: some cleanup

* fix: some cleanup


Approved-by: Emma Zettervall
This commit is contained in:
Matilda Landström
2025-11-28 13:57:30 +00:00
parent 9294f0958b
commit c29b724317
6 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/scandic-web/components/Dialog/dialog.module.css
View File

@@ -48,6 +48,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: var(--Space-x2); gap: var(--Space-x2);
align-items: center;
} }
.footer { .footer {

43
apps/scandic-web/components/Dialog/index.tsx
View File

@@ -6,11 +6,10 @@ import {
ModalOverlay, ModalOverlay,
} from "react-aria-components" } from "react-aria-components"
import Body from "@scandic-hotels/design-system/Body" import { Button } from "@scandic-hotels/design-system/Button"
import ButtonLink from "@scandic-hotels/design-system/ButtonLink"
import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner" import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner"
import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton" import { Typography } from "@scandic-hotels/design-system/Typography"
import Link from "@scandic-hotels/design-system/OldDSLink"
import Subtitle from "@scandic-hotels/design-system/Subtitle"
import styles from "./dialog.module.css" import styles from "./dialog.module.css"
@@ -35,40 +34,42 @@ export default function Dialog({
{({ close }) => ( {({ close }) => (
<section className={styles.modal}> <section className={styles.modal}>
<header className={styles.header}> <header className={styles.header}>
<Subtitle textAlign="center">{titleText}</Subtitle> <Typography variant="Title/Subtitle/md">
<Body textAlign="center">{bodyText}</Body> <p>{titleText}</p>
</Typography>
<Typography>
<p>{bodyText}</p>
</Typography>
</header> </header>
{proceedIsPending ? ( {proceedIsPending ? (
<LoadingSpinner /> <LoadingSpinner />
) : ( ) : (
<footer className={styles.footer}> <footer className={styles.footer}>
<Button <Button
intent="secondary" variant="Secondary"
onPress={close} onPress={close}
size="medium" size="Medium"
theme="base" color="Primary"
> >
{cancelButtonText} {cancelButtonText}
</Button> </Button>
{proceedHref ? ( {proceedHref ? (
<Button <ButtonLink
asChild variant="Primary"
intent="primary" color="Primary"
size="medium" size="Medium"
theme="base" href={proceedHref}
> >
<Link color="none" href={proceedHref}> {proceedText}
{proceedText} </ButtonLink>
</Link>
</Button>
) : ( ) : (
<Button <Button
intent="primary" variant="Primary"
color="Primary"
onPress={() => { onPress={() => {
proceedOnClick(close) proceedOnClick(close)
}} }}
size="medium" size="Medium"
theme="base"
> >
{proceedText} {proceedText}
</Button> </Button>

4
apps/scandic-web/components/Forms/Signup/index.tsx
View File

@@ -41,7 +41,9 @@ import { trackLinkClick } from "@/utils/tracking/profilingConsent"
import styles from "./form.module.css" import styles from "./form.module.css"
import type { SignUpFormProps } from "@/types/components/form/signupForm" interface SignUpFormProps {
title: string
}
export default function SignupForm({ title }: SignUpFormProps) { export default function SignupForm({ title }: SignUpFormProps) {
const intl = useIntl() const intl = useIntl()

34
apps/scandic-web/components/MyPages/Profile/ChangeNameDisclaimer/index.tsx
View File

@@ -3,7 +3,7 @@
import { useIntl } from "react-intl" import { useIntl } from "react-intl"
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
import Link from "@scandic-hotels/design-system/OldDSLink" import { TextLink } from "@scandic-hotels/design-system/TextLink"
import { Typography } from "@scandic-hotels/design-system/Typography" import { Typography } from "@scandic-hotels/design-system/Typography"
import styles from "./changeNameDisclaimer.module.css" import styles from "./changeNameDisclaimer.module.css"
@@ -25,28 +25,24 @@ export default function ChangeNameDisclaimer() {
{ {
phone([str]) { phone([str]) {
return ( return (
<Typography variant="Body/Supporting text (caption)/smBold"> <TextLink
<Link href={`tel:${str.replaceAll(" ", "")}`}
href={`tel:${str.replaceAll(" ", "")}`} typography="Body/Supporting text (caption)/smBold"
textDecoration="underline" isInline
size="none" >
> {str}
{str} </TextLink>
</Link>
</Typography>
) )
}, },
email(str) { email(str) {
return ( return (
<Typography variant="Body/Supporting text (caption)/smBold"> <TextLink
<Link href={`mailto:${str}`}
href={`mailto:${str}`} typography="Body/Supporting text (caption)/smBold"
textDecoration="underline" isInline
size="none" >
> {str}
{str} </TextLink>
</Link>
</Typography>
) )
}, },
} }

3
apps/scandic-web/types/components/form/signupForm.ts
View File

@@ -1,3 +0,0 @@
export type SignUpFormProps = {
title: string
}

1
packages/trpc/lib/routers/types.ts
View File

@@ -59,7 +59,6 @@ type UserDataEurobonusLoggedIn = {
memberId?: string memberId?: string
membershipNumber?: string membershipNumber?: string
memberLevel?: MembershipLevel memberLevel?: MembershipLevel
profileConsent?: boolean
} }
export type TrackingUserData = export type TrackingUserData =