Merged in feat/env-cleanup (pull request #3076)
feat(SW-3594): webviews - remove unused "Back to overview" link * feat(SW-3594): remove unused component Approved-by: Bianca Widstam
This commit is contained in:
@@ -1,13 +1,10 @@
|
|||||||
import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
|
import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
|
||||||
|
|
||||||
import { overview } from "@/constants/routes/webviews"
|
|
||||||
import { serverClient } from "@/lib/trpc/server"
|
import { serverClient } from "@/lib/trpc/server"
|
||||||
|
|
||||||
import MaxWidth from "@/components/MaxWidth"
|
import MaxWidth from "@/components/MaxWidth"
|
||||||
import Surprises from "@/components/MyPages/Surprises"
|
import Surprises from "@/components/MyPages/Surprises"
|
||||||
import Blocks from "@/components/Webviews/AccountPage/Blocks"
|
import Blocks from "@/components/Webviews/AccountPage/Blocks"
|
||||||
import LinkToOverview from "@/components/Webviews/LinkToOverview"
|
|
||||||
import { getLang } from "@/i18n/serverContext"
|
|
||||||
|
|
||||||
import styles from "./accountPage.module.css"
|
import styles from "./accountPage.module.css"
|
||||||
|
|
||||||
@@ -21,13 +18,9 @@ export default async function AccountPage() {
|
|||||||
|
|
||||||
const { tracking, accountPage } = accountPageRes
|
const { tracking, accountPage } = accountPageRes
|
||||||
|
|
||||||
const lang = await getLang()
|
|
||||||
const linkToOverview = `/${lang}/webview${accountPage.url}` !== overview[lang]
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<MaxWidth className={styles.blocks} tag="main">
|
<MaxWidth className={styles.blocks} tag="main">
|
||||||
{linkToOverview ? <LinkToOverview /> : null}
|
|
||||||
<Blocks content={accountPage.content} />
|
<Blocks content={accountPage.content} />
|
||||||
</MaxWidth>
|
</MaxWidth>
|
||||||
|
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
import { ArrowLeft } from "react-feather"
|
|
||||||
|
|
||||||
import Link from "@scandic-hotels/design-system/OldDSLink"
|
|
||||||
|
|
||||||
import { overview } from "@/constants/routes/webviews"
|
|
||||||
import { env } from "@/env/server"
|
|
||||||
|
|
||||||
import { getIntl } from "@/i18n"
|
|
||||||
import { getLang } from "@/i18n/serverContext"
|
|
||||||
import { webviewSearchParams } from "@/utils/webviews"
|
|
||||||
|
|
||||||
import styles from "./linkToOverview.module.css"
|
|
||||||
|
|
||||||
export default async function LinkToOverview() {
|
|
||||||
if (!env.WEBVIEW_SHOW_OVERVIEW) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
const intl = await getIntl()
|
|
||||||
const searchParams = await webviewSearchParams()
|
|
||||||
|
|
||||||
const lang = await getLang()
|
|
||||||
const overviewHref = `${overview[lang]}?${searchParams.toString()}`
|
|
||||||
return (
|
|
||||||
<Link className={styles.overviewLink} href={overviewHref}>
|
|
||||||
<ArrowLeft height={20} width={20} />
|
|
||||||
{intl.formatMessage({
|
|
||||||
id: "webviews.goBackToOverview",
|
|
||||||
defaultMessage: "Go back to overview",
|
|
||||||
})}
|
|
||||||
</Link>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
.overviewLink {
|
|
||||||
align-items: center;
|
|
||||||
color: var(--Scandic-Brand-Burgundy);
|
|
||||||
display: flex;
|
|
||||||
font-size: var(--Spacing-x2);
|
|
||||||
gap: var(--Spacing-x1);
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
|
|||||||
import { serverClient } from "@/lib/trpc/server"
|
import { serverClient } from "@/lib/trpc/server"
|
||||||
|
|
||||||
import MaxWidth from "@/components/MaxWidth"
|
import MaxWidth from "@/components/MaxWidth"
|
||||||
import LinkToOverview from "@/components/Webviews/LinkToOverview"
|
|
||||||
|
|
||||||
import Blocks from "./Blocks"
|
import Blocks from "./Blocks"
|
||||||
|
|
||||||
@@ -22,7 +21,6 @@ export default async function AboutScandicFriends() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<section className={styles.content}>
|
<section className={styles.content}>
|
||||||
<LinkToOverview />
|
|
||||||
<MaxWidth tag="main" className={styles.blocks}>
|
<MaxWidth tag="main" className={styles.blocks}>
|
||||||
<Title>{loyaltyPage.heading}</Title>
|
<Title>{loyaltyPage.heading}</Title>
|
||||||
<Blocks blocks={loyaltyPage.blocks} />
|
<Blocks blocks={loyaltyPage.blocks} />
|
||||||
|
|||||||
6
apps/scandic-web/env/server.ts
vendored
6
apps/scandic-web/env/server.ts
vendored
@@ -146,11 +146,6 @@ export const env = createEnv({
|
|||||||
.refine((s) => s === "1" || s === "0")
|
.refine((s) => s === "1" || s === "0")
|
||||||
.transform((s) => s === "1")
|
.transform((s) => s === "1")
|
||||||
.default("0"),
|
.default("0"),
|
||||||
WEBVIEW_SHOW_OVERVIEW: z
|
|
||||||
.string()
|
|
||||||
.refine((s) => s === "1" || s === "0")
|
|
||||||
.transform((s) => s === "1")
|
|
||||||
.default("1"),
|
|
||||||
CHATBOT_LIVE_LANGS: z
|
CHATBOT_LIVE_LANGS: z
|
||||||
.string()
|
.string()
|
||||||
.optional()
|
.optional()
|
||||||
@@ -233,7 +228,6 @@ export const env = createEnv({
|
|||||||
DTMC_ENTRA_ID_ISSUER: process.env.DTMC_ENTRA_ID_ISSUER,
|
DTMC_ENTRA_ID_ISSUER: process.env.DTMC_ENTRA_ID_ISSUER,
|
||||||
DTMC_ENTRA_ID_SECRET: process.env.DTMC_ENTRA_ID_SECRET,
|
DTMC_ENTRA_ID_SECRET: process.env.DTMC_ENTRA_ID_SECRET,
|
||||||
HOTEL_BRANDING: process.env.HOTEL_BRANDING,
|
HOTEL_BRANDING: process.env.HOTEL_BRANDING,
|
||||||
WEBVIEW_SHOW_OVERVIEW: process.env.WEBVIEW_SHOW_OVERVIEW,
|
|
||||||
CHATBOT_LIVE_LANGS: process.env.CHATBOT_LIVE_LANGS,
|
CHATBOT_LIVE_LANGS: process.env.CHATBOT_LIVE_LANGS,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user