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

feat(sw-589): cleanups and PR comment fixes

Browse Source
This commit is contained in:
Pontus Dreij
2024-10-15 10:28:32 +02:00
parent 0f27d3b2b5
commit cd5b9e7648
5 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx
View File

@@ -8,41 +8,33 @@ import styles from "./rateSummary.module.css"
import { RateSummaryProps } from "@/types/components/hotelReservation/selectRate/rateSummary" import { RateSummaryProps } from "@/types/components/hotelReservation/selectRate/rateSummary"
export default function RateSummary({ rateSummary, user }: RateSummaryProps) { export default function RateSummary({
rateSummary,
isUserLoggedIn,
}: RateSummaryProps) {
const intl = useIntl() const intl = useIntl()
const priceToShow = isUserLoggedIn ? rateSummary.member : rateSummary.public
return ( return (
<div className={styles.summary}> <div className={styles.summary}>
<div className={styles.summaryText}> <div className={styles.summaryText}>
<Subtitle>{rateSummary.roomType}</Subtitle> <Subtitle color="uiTextHighContrast">{rateSummary.roomType}</Subtitle>
<Body>{rateSummary.priceName}</Body> <Body color="uiTextMediumContrast">{rateSummary.priceName}</Body>
</div> </div>
<div className={styles.summaryPrice}> <div className={styles.summaryPrice}>
<div className={styles.summaryPriceText}> <div className={styles.summaryPriceText}>
{user ? ( <>
<> <Subtitle color={isUserLoggedIn ? "red" : "uiTextHighContrast"}>
<Subtitle color="red"> {priceToShow?.localPrice.pricePerStay}{" "}
{rateSummary.member?.localPrice.pricePerStay}{" "} {priceToShow?.localPrice.currency}
{rateSummary.member?.localPrice.currency} </Subtitle>
</Subtitle> <Body color="uiTextMediumContrast">
<Body> {intl.formatMessage({ id: "Approx." })}{" "}
{intl.formatMessage({ id: "Approx." })}{" "} {priceToShow?.requestedPrice?.pricePerStay}{" "}
{rateSummary.member?.requestedPrice?.pricePerStay}{" "} {priceToShow?.requestedPrice?.currency}
{rateSummary.member?.requestedPrice?.currency} </Body>
</Body> </>
</>
) : (
<>
<Subtitle>
{rateSummary.public?.localPrice.pricePerStay}{" "}
{rateSummary.public?.localPrice.currency}
</Subtitle>
<Body>
{intl.formatMessage({ id: "Approx." })}{" "}
{rateSummary.public?.requestedPrice?.pricePerStay}{" "}
{rateSummary.public?.requestedPrice?.currency}
</Body>
</>
)}
</div> </div>
<Button type="submit" theme="base"> <Button type="submit" theme="base">
{intl.formatMessage({ id: "Continue" })} {intl.formatMessage({ id: "Continue" })}

4
components/HotelReservation/SelectRate/RoomSelection/index.tsx
View File

@@ -47,7 +47,9 @@ export default function RoomSelection({
</li> </li>
))} ))}
</ul> </ul>
{rateSummary && <RateSummary rateSummary={rateSummary} user={user} />} {rateSummary && (
<RateSummary rateSummary={rateSummary} isUserLoggedIn={!!user} />
)}
</form> </form>
</div> </div>
) )

4
components/TempDesignSystem/Text/Body/body.module.css
View File

@@ -96,6 +96,10 @@
color: var(--UI-Text-High-contrast); color: var(--UI-Text-High-contrast);
} }
.uiTextMediumContrast {
color: var(--UI-Text-Medium-contrast);
}
.uiTextPlaceholder { .uiTextPlaceholder {
color: var(--UI-Text-Placeholder); color: var(--UI-Text-Placeholder);
} }

1
components/TempDesignSystem/Text/Body/variants.ts
View File

@@ -17,6 +17,7 @@ const config = {
peach50: styles.peach50, peach50: styles.peach50,
peach80: styles.peach80, peach80: styles.peach80,
uiTextHighContrast: styles.uiTextHighContrast, uiTextHighContrast: styles.uiTextHighContrast,
uiTextMediumContrast: styles.uiTextMediumContrast,
uiTextPlaceholder: styles.uiTextPlaceholder, uiTextPlaceholder: styles.uiTextPlaceholder,
}, },
textAlign: { textAlign: {

4
types/components/hotelReservation/selectRate/rateSummary.ts
View File

@@ -1,8 +1,6 @@
import { Rate } from "./selectRate" import { Rate } from "./selectRate"
import { User } from "@/types/user"
export interface RateSummaryProps { export interface RateSummaryProps {
rateSummary: Rate rateSummary: Rate
user: User | null isUserLoggedIn: boolean
} }