Merged in fix/mypages-clientside-menu (pull request #1344)
Fix/mypages clientside menu * feat: move mypages menu to client side * Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu * wip * wip * wip * refactor: reorganize MyPages navigation logic and improve type definitions * refactor: enhance MyPagesMobileDropdown with loading states and skeletons * refactor: clean up header component and improve myPagesNavigation query structure * Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu Approved-by: Linus Flood
This commit is contained in:
committed by
Linus Flood
parent
ef1d3ee065
commit
2791f07f67
@@ -1,6 +1,7 @@
|
||||
import "@/app/globals.css"
|
||||
import "@scandic-hotels/design-system/style.css"
|
||||
|
||||
import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
|
||||
import Script from "next/script"
|
||||
import { SessionProvider } from "next-auth/react"
|
||||
|
||||
@@ -70,6 +71,7 @@ export default async function RootLayout({
|
||||
<SessionRefresher />
|
||||
<StorageCleaner />
|
||||
<CookieBotConsent />
|
||||
<ReactQueryDevtools initialIsOpen={false} />
|
||||
</TrpcProvider>
|
||||
</ServerIntlProvider>
|
||||
</SessionProvider>
|
||||
|
||||
@@ -71,10 +71,11 @@ export function MainMenu({
|
||||
if (!isMyPagesMobileMenuOpen) {
|
||||
trackClick("profile picture icon")
|
||||
}
|
||||
|
||||
toggleDropdown(DropdownTypeEnum.MyPagesMobileMenu)
|
||||
}
|
||||
|
||||
console.log("isMyPagesMobileMenuOpen", isMyPagesMobileMenuOpen)
|
||||
|
||||
return (
|
||||
<div className={styles.mainMenu}>
|
||||
<div
|
||||
@@ -230,9 +231,6 @@ export function MainMenu({
|
||||
}
|
||||
|
||||
export function MainMenuSkeleton() {
|
||||
const intl = useIntl()
|
||||
|
||||
const links = new Array(5).fill("")
|
||||
return (
|
||||
<div className={styles.mainMenu}>
|
||||
<div
|
||||
@@ -264,7 +262,7 @@ export function MainMenuSkeleton() {
|
||||
</a>
|
||||
|
||||
<ul className={styles.listWrapper}>
|
||||
{links.map((link, i) => (
|
||||
{Array.from({ length: 5 }, () => "").map((_, i) => (
|
||||
<li className={`${styles.li} ${styles.skeletonWrapper}`} key={i}>
|
||||
<SkeletonShimmer height="22px" width="130px" />
|
||||
</li>
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
"use client"
|
||||
|
||||
import { useIntl } from "react-intl"
|
||||
|
||||
import { logout } from "@/constants/routes/handleAuth"
|
||||
import { trpc } from "@/lib/trpc/client"
|
||||
import useDropdownStore from "@/stores/main-menu"
|
||||
|
||||
import SkeletonShimmer from "@/components/SkeletonShimmer"
|
||||
import Divider from "@/components/TempDesignSystem/Divider"
|
||||
import Link from "@/components/TempDesignSystem/Link"
|
||||
import Title from "@/components/TempDesignSystem/Text/Title"
|
||||
@@ -14,22 +17,13 @@ import styles from "./my-pages-mobile-dropdown.module.css"
|
||||
import type { ReactNode } from "react"
|
||||
|
||||
import { DropdownTypeEnum } from "@/types/components/dropdown/dropdown"
|
||||
import type { MyPagesLink } from "@/components/MyPages/menuItems"
|
||||
|
||||
export default function MyPagesMobileDropdown({
|
||||
primaryLinks,
|
||||
secondaryLinks,
|
||||
}: {
|
||||
primaryLinks: MyPagesLink[]
|
||||
secondaryLinks: MyPagesLink[]
|
||||
}) {
|
||||
export default function MyPagesMobileDropdown() {
|
||||
const { data: myPagesNavigation } = useMyPagesNavigation()
|
||||
|
||||
const intl = useIntl()
|
||||
const { toggleDropdown, isMyPagesMobileMenuOpen } = useDropdownStore()
|
||||
|
||||
if (primaryLinks.length === 0 && secondaryLinks.length === 0) {
|
||||
return null
|
||||
}
|
||||
|
||||
const handleOnClick = () => toggleDropdown(DropdownTypeEnum.MyPagesMobileMenu)
|
||||
|
||||
return (
|
||||
@@ -43,16 +37,10 @@ export default function MyPagesMobileDropdown({
|
||||
</Title>
|
||||
|
||||
<List>
|
||||
<PrimaryLinks
|
||||
primaryLinks={primaryLinks}
|
||||
handleOnClick={handleOnClick}
|
||||
/>
|
||||
<PrimaryLinks handleOnClick={handleOnClick} />
|
||||
</List>
|
||||
<List>
|
||||
<SecondaryLinks
|
||||
secondaryLinks={secondaryLinks}
|
||||
handleOnClick={handleOnClick}
|
||||
/>
|
||||
<SecondaryLinks handleOnClick={handleOnClick} />
|
||||
</List>
|
||||
</nav>
|
||||
)
|
||||
@@ -71,58 +59,64 @@ function List({ children }: { children: ReactNode }) {
|
||||
)
|
||||
}
|
||||
|
||||
function PrimaryLinks({
|
||||
primaryLinks,
|
||||
handleOnClick,
|
||||
}: {
|
||||
primaryLinks: MyPagesLink[]
|
||||
handleOnClick: () => void
|
||||
}) {
|
||||
function PrimaryLinks({ handleOnClick }: { handleOnClick: () => void }) {
|
||||
const {
|
||||
data: myPagesNavigation,
|
||||
isLoading,
|
||||
isSuccess,
|
||||
} = useMyPagesNavigation()
|
||||
|
||||
const primaryLinks = myPagesNavigation?.primaryLinks ?? []
|
||||
return (
|
||||
<>
|
||||
{primaryLinks.map((link, i) => (
|
||||
<li key={link.href + i}>
|
||||
<Link
|
||||
href={link.href}
|
||||
partialMatch
|
||||
size={"regular"}
|
||||
variant="myPageMobileDropdown"
|
||||
color="burgundy"
|
||||
onClick={handleOnClick}
|
||||
>
|
||||
{link.text}
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
{isLoading && <Skeletons count={4} />}
|
||||
{isSuccess &&
|
||||
primaryLinks.map((link, i) => (
|
||||
<li key={link.href + i}>
|
||||
<Link
|
||||
href={link.href}
|
||||
partialMatch
|
||||
size={"regular"}
|
||||
variant="myPageMobileDropdown"
|
||||
color="burgundy"
|
||||
onClick={handleOnClick}
|
||||
>
|
||||
{link.text}
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
</>
|
||||
)
|
||||
}
|
||||
function SecondaryLinks({
|
||||
secondaryLinks,
|
||||
handleOnClick,
|
||||
}: {
|
||||
secondaryLinks: MyPagesLink[]
|
||||
handleOnClick: () => void
|
||||
}) {
|
||||
function SecondaryLinks({ handleOnClick }: { handleOnClick: () => void }) {
|
||||
const {
|
||||
data: myPagesNavigation,
|
||||
isLoading,
|
||||
isSuccess,
|
||||
} = useMyPagesNavigation()
|
||||
|
||||
const secondaryLinks = myPagesNavigation?.secondaryLinks ?? []
|
||||
const intl = useIntl()
|
||||
const lang = useLang()
|
||||
|
||||
return (
|
||||
<>
|
||||
{secondaryLinks.map((link, i) => (
|
||||
<li key={link.href + i}>
|
||||
<Link
|
||||
href={link.href}
|
||||
partialMatch
|
||||
size={"small"}
|
||||
variant="myPageMobileDropdown"
|
||||
color="burgundy"
|
||||
onClick={handleOnClick}
|
||||
>
|
||||
{link.text}
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
{isLoading && <Skeletons count={3} />}
|
||||
{isSuccess &&
|
||||
secondaryLinks.map((link, i) => (
|
||||
<li key={link.href + i}>
|
||||
<Link
|
||||
href={link.href}
|
||||
partialMatch
|
||||
size={"small"}
|
||||
variant="myPageMobileDropdown"
|
||||
color="burgundy"
|
||||
onClick={handleOnClick}
|
||||
>
|
||||
{link.text}
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
<li>
|
||||
<Link
|
||||
href={logout[lang]}
|
||||
@@ -137,3 +131,20 @@ function SecondaryLinks({
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function Skeletons({ count }: { count: number }) {
|
||||
return (
|
||||
<>
|
||||
{Array.from({ length: count }).map((_, i) => (
|
||||
<li key={i} className={styles.skeletonItem}>
|
||||
<SkeletonShimmer width="100px" height="20px" />
|
||||
</li>
|
||||
))}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function useMyPagesNavigation() {
|
||||
const lang = useLang()
|
||||
return trpc.navigation.myPages.useQuery({ lang })
|
||||
}
|
||||
|
||||
@@ -61,3 +61,7 @@
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.skeletonItem {
|
||||
padding: var(--Spacing-x1);
|
||||
}
|
||||
|
||||
@@ -6,10 +6,6 @@ import {
|
||||
getName,
|
||||
} from "@/lib/trpc/memoizedRequests"
|
||||
|
||||
import {
|
||||
getPrimaryLinks,
|
||||
getSecondaryLinks,
|
||||
} from "@/components/MyPages/menuItems"
|
||||
import { getLang } from "@/i18n/serverContext"
|
||||
|
||||
import LanguageSwitcher from "./LanguageSwitcher"
|
||||
@@ -22,14 +18,11 @@ import styles from "./header.module.css"
|
||||
|
||||
export default async function Header() {
|
||||
const lang = getLang()
|
||||
const [data, user, languages, primaryLinks, secondaryLinks] =
|
||||
await Promise.all([
|
||||
getCurrentHeader(lang),
|
||||
getName(),
|
||||
getLanguageSwitcher(),
|
||||
getPrimaryLinks({ lang }),
|
||||
getSecondaryLinks({ lang }),
|
||||
])
|
||||
const [data, user, languages] = await Promise.all([
|
||||
getCurrentHeader(lang),
|
||||
getName(),
|
||||
getLanguageSwitcher(),
|
||||
])
|
||||
|
||||
if (!languages || !data?.header) {
|
||||
return null
|
||||
@@ -58,12 +51,7 @@ export default async function Header() {
|
||||
logo={logo}
|
||||
topMenuMobileLinks={topMenuMobileLinks}
|
||||
languageSwitcher={<LanguageSwitcher urls={languages.urls} />}
|
||||
myPagesMobileDropdown={
|
||||
<MyPagesMobileDropdown
|
||||
primaryLinks={primaryLinks}
|
||||
secondaryLinks={secondaryLinks}
|
||||
/>
|
||||
}
|
||||
myPagesMobileDropdown={<MyPagesMobileDropdown />}
|
||||
bookingHref={homeHref}
|
||||
user={user}
|
||||
/>
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
import { useRef } from "react"
|
||||
import { useIntl } from "react-intl"
|
||||
|
||||
import { MembershipLevelEnum } from "@/constants/membershipLevels"
|
||||
import { trpc } from "@/lib/trpc/client"
|
||||
import useDropdownStore from "@/stores/main-menu"
|
||||
|
||||
import { ChevronDownSmallIcon } from "@/components/Icons"
|
||||
@@ -10,7 +12,7 @@ import SkeletonShimmer from "@/components/SkeletonShimmer"
|
||||
import Body from "@/components/TempDesignSystem/Text/Body"
|
||||
import useClickOutside from "@/hooks/useClickOutside"
|
||||
import { useHandleKeyUp } from "@/hooks/useHandleKeyUp"
|
||||
import {type FriendsMembership,getInitials } from "@/utils/user"
|
||||
import { type FriendsMembership, getInitials } from "@/utils/user"
|
||||
|
||||
import Avatar from "../Avatar"
|
||||
import MainMenuButton from "../MainMenuButton"
|
||||
@@ -20,22 +22,17 @@ import styles from "./myPagesMenu.module.css"
|
||||
|
||||
import { DropdownTypeEnum } from "@/types/components/dropdown/dropdown"
|
||||
import type { User } from "@/types/user"
|
||||
import type { MyPagesLink } from "@/components/MyPages/menuItems"
|
||||
import type { LoyaltyLevel } from "@/server/routers/contentstack/loyaltyLevel/output"
|
||||
|
||||
export type MyPagesMenuProps = {
|
||||
primaryLinks: MyPagesLink[]
|
||||
secondaryLinks: MyPagesLink[]
|
||||
user: Pick<User, "firstName" | "lastName">
|
||||
membership?: FriendsMembership | null
|
||||
membershipLevel: LoyaltyLevel | null
|
||||
}
|
||||
|
||||
export default function MyPagesMenu({
|
||||
membership,
|
||||
primaryLinks,
|
||||
secondaryLinks,
|
||||
user,
|
||||
membership,
|
||||
membershipLevel,
|
||||
}: MyPagesMenuProps) {
|
||||
const intl = useIntl()
|
||||
@@ -76,8 +73,6 @@ export default function MyPagesMenu({
|
||||
<div className={styles.dropdown}>
|
||||
<MyPagesMenuContent
|
||||
membershipLevel={membershipLevel}
|
||||
primaryLinks={primaryLinks}
|
||||
secondaryLinks={secondaryLinks}
|
||||
user={user}
|
||||
membership={membership}
|
||||
toggleOpenStateFn={() =>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { useIntl } from "react-intl"
|
||||
|
||||
import { logout } from "@/constants/routes/handleAuth"
|
||||
import { trpc } from "@/lib/trpc/client"
|
||||
|
||||
import { ArrowRightIcon } from "@/components/Icons"
|
||||
import Divider from "@/components/TempDesignSystem/Divider"
|
||||
@@ -20,14 +21,17 @@ type Props = MyPagesMenuProps & { toggleOpenStateFn: () => void }
|
||||
|
||||
export default function MyPagesMenuContent({
|
||||
membership,
|
||||
primaryLinks,
|
||||
secondaryLinks,
|
||||
toggleOpenStateFn,
|
||||
user,
|
||||
membershipLevel,
|
||||
}: Props) {
|
||||
const lang = useLang()
|
||||
const intl = useIntl()
|
||||
const myPagesMenuContentRef = useTrapFocus()
|
||||
const { data: myPagesNavigation } = useMyPagesNavigation()
|
||||
|
||||
const primaryLinks = myPagesNavigation?.primaryLinks ?? []
|
||||
const secondaryLinks = myPagesNavigation?.secondaryLinks ?? []
|
||||
|
||||
const membershipPoints = membership?.currentPoints
|
||||
const introClassName =
|
||||
@@ -65,16 +69,10 @@ export default function MyPagesMenuContent({
|
||||
<li>
|
||||
<Divider color="subtle" className={styles.divider} />
|
||||
|
||||
<PrimaryLinks
|
||||
primaryLinks={primaryLinks}
|
||||
toggleOpenStateFn={toggleOpenStateFn}
|
||||
/>
|
||||
<PrimaryLinks toggleOpenStateFn={toggleOpenStateFn} />
|
||||
|
||||
<Divider color="subtle" className={styles.divider} />
|
||||
<SecondaryLinks
|
||||
secondaryLinks={secondaryLinks}
|
||||
toggleOpenStateFn={toggleOpenStateFn}
|
||||
/>
|
||||
<SecondaryLinks toggleOpenStateFn={toggleOpenStateFn} />
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
@@ -82,9 +80,14 @@ export default function MyPagesMenuContent({
|
||||
}
|
||||
|
||||
function PrimaryLinks({
|
||||
primaryLinks,
|
||||
toggleOpenStateFn,
|
||||
}: Pick<Props, "primaryLinks"> & { toggleOpenStateFn: () => void }) {
|
||||
}: {
|
||||
toggleOpenStateFn: () => void
|
||||
}) {
|
||||
const { data: myPagesNavigation } = useMyPagesNavigation()
|
||||
|
||||
const primaryLinks = myPagesNavigation?.primaryLinks ?? []
|
||||
|
||||
return (
|
||||
<ul className={styles.menuItems}>
|
||||
{primaryLinks.map((link, i) => (
|
||||
@@ -106,11 +109,15 @@ function PrimaryLinks({
|
||||
}
|
||||
|
||||
function SecondaryLinks({
|
||||
secondaryLinks,
|
||||
toggleOpenStateFn,
|
||||
}: Pick<Props, "secondaryLinks"> & { toggleOpenStateFn: () => void }) {
|
||||
}: {
|
||||
toggleOpenStateFn: () => void
|
||||
}) {
|
||||
const intl = useIntl()
|
||||
const lang = useLang()
|
||||
const { data: myPagesNavigation } = useMyPagesNavigation()
|
||||
|
||||
const secondaryLinks = myPagesNavigation?.secondaryLinks ?? []
|
||||
|
||||
return (
|
||||
<ul className={styles.menuItems}>
|
||||
@@ -140,3 +147,10 @@ function SecondaryLinks({
|
||||
</ul>
|
||||
)
|
||||
}
|
||||
|
||||
const useMyPagesNavigation = () => {
|
||||
const lang = useLang()
|
||||
return trpc.navigation.myPages.useQuery({
|
||||
lang: lang,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
"use client"
|
||||
|
||||
import { useIntl } from "react-intl"
|
||||
|
||||
import { MembershipLevelEnum } from "@/constants/membershipLevels"
|
||||
import { getMembershipLevelSafely, getName } from "@/lib/trpc/memoizedRequests"
|
||||
import { serverClient } from "@/lib/trpc/server"
|
||||
import { trpc } from "@/lib/trpc/client"
|
||||
|
||||
import LoginButton from "@/components/LoginButton"
|
||||
import {
|
||||
getPrimaryLinks,
|
||||
getSecondaryLinks,
|
||||
} from "@/components/MyPages/menuItems"
|
||||
import { getIntl } from "@/i18n"
|
||||
import { getLang } from "@/i18n/serverContext"
|
||||
import useLang from "@/hooks/useLang"
|
||||
|
||||
import Avatar from "../Avatar"
|
||||
import MyPagesMenu, { MyPagesMenuSkeleton } from "../MyPagesMenu"
|
||||
@@ -18,39 +16,41 @@ import MyPagesMobileMenu, {
|
||||
|
||||
import styles from "./myPagesMenuWrapper.module.css"
|
||||
|
||||
export default async function MyPagesMenuWrapper() {
|
||||
const lang = getLang()
|
||||
const [intl, user, membership, primaryLinks, secondaryLinks] =
|
||||
await Promise.all([
|
||||
getIntl(),
|
||||
getName(),
|
||||
getMembershipLevelSafely(),
|
||||
getPrimaryLinks({ lang }),
|
||||
getSecondaryLinks({ lang }),
|
||||
])
|
||||
export default function MyPagesMenuWrapper() {
|
||||
const intl = useIntl()
|
||||
const lang = useLang()
|
||||
|
||||
const membershipLevel = membership?.membershipLevel
|
||||
? await serverClient().contentstack.loyaltyLevels.byLevel({
|
||||
level: MembershipLevelEnum[membership.membershipLevel],
|
||||
})
|
||||
: null
|
||||
const { data: user, isLoading: isLoadingUser } = trpc.user.name.useQuery()
|
||||
const { data: membership, isLoading: isLoadingMembership } =
|
||||
trpc.user.safeMembershipLevel.useQuery()
|
||||
|
||||
const { data: membershipLevel, isLoading: isLoadingMembershipLevel } =
|
||||
trpc.contentstack.loyaltyLevels.byLevel.useQuery(
|
||||
{
|
||||
lang: lang,
|
||||
level: MembershipLevelEnum[membership?.membershipLevel ?? "L1"],
|
||||
},
|
||||
{
|
||||
enabled: !!membership?.membershipLevel,
|
||||
}
|
||||
)
|
||||
|
||||
if (isLoadingUser || isLoadingMembership || isLoadingMembershipLevel) {
|
||||
return <MyPagesMenuWrapperSkeleton />
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{user ? (
|
||||
<>
|
||||
<MyPagesMenu
|
||||
membershipLevel={membershipLevel}
|
||||
membershipLevel={membershipLevel ?? null}
|
||||
membership={membership}
|
||||
primaryLinks={primaryLinks}
|
||||
secondaryLinks={secondaryLinks}
|
||||
user={user}
|
||||
/>
|
||||
<MyPagesMobileMenu
|
||||
membershipLevel={membershipLevel}
|
||||
membershipLevel={membershipLevel ?? null}
|
||||
membership={membership}
|
||||
primaryLinks={primaryLinks}
|
||||
secondaryLinks={secondaryLinks}
|
||||
user={user}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -22,8 +22,6 @@ import type { MyPagesMenuProps } from "../MyPagesMenu"
|
||||
export default function MyPagesMobileMenu({
|
||||
membershipLevel,
|
||||
membership,
|
||||
primaryLinks,
|
||||
secondaryLinks,
|
||||
user,
|
||||
}: MyPagesMenuProps) {
|
||||
const intl = useIntl()
|
||||
@@ -66,8 +64,6 @@ export default function MyPagesMobileMenu({
|
||||
<MyPagesMenuContent
|
||||
membershipLevel={membershipLevel}
|
||||
membership={membership}
|
||||
primaryLinks={primaryLinks}
|
||||
secondaryLinks={secondaryLinks}
|
||||
user={user}
|
||||
toggleOpenStateFn={() =>
|
||||
toggleDropdown(DropdownTypeEnum.MyPagesMobileMenu)
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import { logout } from "@/constants/routes/handleAuth"
|
||||
import { serverClient } from "@/lib/trpc/server"
|
||||
|
||||
import {
|
||||
getPrimaryLinks,
|
||||
getSecondaryLinks,
|
||||
} from "@/components/MyPages/menuItems"
|
||||
import Divider from "@/components/TempDesignSystem/Divider"
|
||||
import Link from "@/components/TempDesignSystem/Link"
|
||||
import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
|
||||
@@ -30,14 +27,13 @@ export default async function SidebarMyPages() {
|
||||
}
|
||||
|
||||
async function PrimaryLinks() {
|
||||
const lang = getLang()
|
||||
const links = await getPrimaryLinks({ lang })
|
||||
const nav = await serverClient().navigation.myPages({})
|
||||
|
||||
return (
|
||||
<>
|
||||
<Divider color="beige" />
|
||||
<ul className={styles.list}>
|
||||
{links.map((link) => (
|
||||
{nav?.primaryLinks.map((link) => (
|
||||
<li key={link.href}>
|
||||
<Link
|
||||
color="burgundy"
|
||||
@@ -58,14 +54,15 @@ async function PrimaryLinks() {
|
||||
|
||||
async function SecondaryLinks() {
|
||||
const lang = getLang()
|
||||
const links = await getSecondaryLinks({ lang })
|
||||
|
||||
const nav = await serverClient().navigation.myPages({})
|
||||
const intl = await getIntl()
|
||||
|
||||
return (
|
||||
<>
|
||||
<Divider color="beige" />
|
||||
<ul className={styles.list}>
|
||||
{links.map((link) => (
|
||||
{nav?.secondaryLinks.map((link) => (
|
||||
<li key={link.href}>
|
||||
<Link
|
||||
color="burgundy"
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
import * as routes from "@/constants/routes/myPages"
|
||||
import { env } from "@/env/server"
|
||||
|
||||
import { getIntl } from "@/i18n"
|
||||
import { safeTry } from "@/utils/safeTry"
|
||||
|
||||
import type { ReactNode } from "react"
|
||||
|
||||
import type { Lang } from "../../constants/languages"
|
||||
|
||||
export type MyPagesLink = {
|
||||
text: ReactNode
|
||||
href: string
|
||||
}
|
||||
|
||||
type Args = {
|
||||
lang: Lang
|
||||
}
|
||||
|
||||
export async function getPrimaryLinks({ lang }: Args): Promise<MyPagesLink[]> {
|
||||
const intl = await getIntl()
|
||||
const scandicSasPromise = safeTry(isScandicXSASActive())
|
||||
const teamMemberPromise = safeTry(showTeamMemberCard())
|
||||
|
||||
const [showSASLink] = await scandicSasPromise
|
||||
const [showTeamMemberLink] = await teamMemberPromise
|
||||
|
||||
const menuItems: MyPagesLink[] = [
|
||||
{
|
||||
text: intl.formatMessage({ id: "Overview" }),
|
||||
href: routes.overview[lang],
|
||||
},
|
||||
{
|
||||
text: intl.formatMessage({ id: "My Points" }),
|
||||
href: routes.points[lang],
|
||||
},
|
||||
{
|
||||
text: intl.formatMessage({ id: "My Stays" }),
|
||||
href: routes.stays[lang],
|
||||
},
|
||||
{
|
||||
text: intl.formatMessage({ id: "My Benefits" }),
|
||||
href: routes.benefits[lang],
|
||||
},
|
||||
]
|
||||
|
||||
if (showSASLink) {
|
||||
menuItems.push({
|
||||
text: intl.formatMessage({ id: "Scandic ♥ SAS" }),
|
||||
href: routes.scandicXSAS[lang],
|
||||
})
|
||||
}
|
||||
|
||||
if (showTeamMemberLink) {
|
||||
menuItems.push({
|
||||
text: intl.formatMessage({ id: "Team Member Card" }),
|
||||
href: "#",
|
||||
})
|
||||
}
|
||||
|
||||
return menuItems
|
||||
}
|
||||
|
||||
export async function getSecondaryLinks({
|
||||
lang,
|
||||
}: Args): Promise<MyPagesLink[]> {
|
||||
const intl = await getIntl()
|
||||
const menuItems: MyPagesLink[] = [
|
||||
{
|
||||
text: intl.formatMessage({ id: "About Scandic Friends" }),
|
||||
href: routes.scandicFriends[lang],
|
||||
},
|
||||
{
|
||||
text: intl.formatMessage({ id: "My Profile" }),
|
||||
href: routes.profile[lang],
|
||||
},
|
||||
]
|
||||
|
||||
return menuItems
|
||||
}
|
||||
|
||||
async function isScandicXSASActive() {
|
||||
async function checkIfLinked() {
|
||||
// TODO: Implement this check
|
||||
return true
|
||||
}
|
||||
|
||||
const isLinked = await checkIfLinked()
|
||||
|
||||
return env.SAS_ENABLED && isLinked
|
||||
}
|
||||
|
||||
async function showTeamMemberCard() {
|
||||
async function getIsTeamMember() {
|
||||
// TODO: Implement this check
|
||||
return false
|
||||
}
|
||||
|
||||
const isTeamMember = await getIsTeamMember()
|
||||
return isTeamMember
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
import { bookingRouter } from "./routers/booking"
|
||||
import { contentstackRouter } from "./routers/contentstack"
|
||||
import { hotelsRouter } from "./routers/hotels"
|
||||
import { navitaionRouter } from "./routers/navigation"
|
||||
import { partnerRouter } from "./routers/partners"
|
||||
import { userRouter } from "./routers/user"
|
||||
import { router } from "./trpc"
|
||||
@@ -12,6 +13,7 @@ export const appRouter = router({
|
||||
hotel: hotelsRouter,
|
||||
user: userRouter,
|
||||
partner: partnerRouter,
|
||||
navigation: navitaionRouter,
|
||||
})
|
||||
|
||||
export type AppRouter = typeof appRouter
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import { z } from "zod"
|
||||
|
||||
import { MembershipLevelEnum } from "@/constants/membershipLevels"
|
||||
import { Lang } from "@/constants/languages"
|
||||
|
||||
export const loyaltyLevelInput = z.object({
|
||||
level: z.nativeEnum(MembershipLevelEnum),
|
||||
lang: z.nativeEnum(Lang).optional(),
|
||||
})
|
||||
|
||||
5
server/routers/navigation/index.ts
Normal file
5
server/routers/navigation/index.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
import { router } from "@/server/trpc"
|
||||
|
||||
import { myPagesNavigation } from "./mypages/index"
|
||||
|
||||
export const navitaionRouter = router({ myPages: myPagesNavigation })
|
||||
10
server/routers/navigation/mypages/MyPagesLink.ts
Normal file
10
server/routers/navigation/mypages/MyPagesLink.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
type BaseLink = {
|
||||
type: "link" | "withbadge"
|
||||
text: string
|
||||
href: string
|
||||
}
|
||||
|
||||
type NormalLink = BaseLink & { type: "link" }
|
||||
type LinkWithBadge = BaseLink & { type: "withbadge"; number: number }
|
||||
|
||||
export type MyPagesLink = NormalLink | LinkWithBadge
|
||||
83
server/routers/navigation/mypages/getPrimaryLinks.ts
Normal file
83
server/routers/navigation/mypages/getPrimaryLinks.ts
Normal file
@@ -0,0 +1,83 @@
|
||||
import { cache } from "react"
|
||||
|
||||
import * as routes from "@/constants/routes/myPages"
|
||||
import { env } from "@/env/server"
|
||||
|
||||
import { getIntl } from "@/i18n"
|
||||
import { safeTry } from "@/utils/safeTry"
|
||||
|
||||
import type { Lang } from "@/constants/languages"
|
||||
import type { MyPagesLink } from "./MyPagesLink"
|
||||
|
||||
export const getPrimaryLinks = cache(
|
||||
async ({ lang }: { lang: Lang }): Promise<MyPagesLink[]> => {
|
||||
const intl = await getIntl(lang)
|
||||
const scandicSasPromise = safeTry(isScandicXSASActive())
|
||||
const teamMemberPromise = safeTry(showTeamMemberCard())
|
||||
|
||||
const [showSASLink] = await scandicSasPromise
|
||||
const [showTeamMemberLink] = await teamMemberPromise
|
||||
|
||||
const menuItems: MyPagesLink[] = [
|
||||
{
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "Overview" }),
|
||||
href: routes.overview[lang],
|
||||
},
|
||||
{
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "My Points" }),
|
||||
href: routes.points[lang],
|
||||
},
|
||||
{
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "My Stays" }),
|
||||
href: routes.stays[lang],
|
||||
},
|
||||
{
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "My Benefits" }),
|
||||
href: routes.benefits[lang],
|
||||
},
|
||||
]
|
||||
|
||||
if (showSASLink) {
|
||||
menuItems.push({
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "Scandic ♥ SAS" }),
|
||||
href: routes.scandicXSAS[lang],
|
||||
})
|
||||
}
|
||||
|
||||
if (showTeamMemberLink) {
|
||||
menuItems.push({
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "Team Member Card" }),
|
||||
href: "#",
|
||||
})
|
||||
}
|
||||
|
||||
return menuItems
|
||||
}
|
||||
)
|
||||
|
||||
const isScandicXSASActive = cache(async () => {
|
||||
async function checkIfLinked() {
|
||||
// TODO: Implement this check
|
||||
return true
|
||||
}
|
||||
|
||||
const isLinked = await checkIfLinked()
|
||||
|
||||
return env.SAS_ENABLED && isLinked
|
||||
})
|
||||
|
||||
const showTeamMemberCard = cache(async () => {
|
||||
async function getIsTeamMember() {
|
||||
// TODO: Implement this check
|
||||
return false
|
||||
}
|
||||
|
||||
const isTeamMember = await getIsTeamMember()
|
||||
return isTeamMember
|
||||
})
|
||||
28
server/routers/navigation/mypages/getSecondaryLinks.ts
Normal file
28
server/routers/navigation/mypages/getSecondaryLinks.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
import * as routes from "@/constants/routes/myPages"
|
||||
|
||||
import { getIntl } from "@/i18n"
|
||||
|
||||
import type { Lang } from "@/constants/languages"
|
||||
import type { MyPagesLink } from "./MyPagesLink"
|
||||
|
||||
export async function getSecondaryLinks({
|
||||
lang,
|
||||
}: {
|
||||
lang: Lang
|
||||
}): Promise<MyPagesLink[]> {
|
||||
const intl = await getIntl()
|
||||
const menuItems: MyPagesLink[] = [
|
||||
{
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "About Scandic Friends" }),
|
||||
href: routes.scandicFriends[lang],
|
||||
},
|
||||
{
|
||||
type: "link",
|
||||
text: intl.formatMessage({ id: "My Profile" }),
|
||||
href: routes.profile[lang],
|
||||
},
|
||||
]
|
||||
|
||||
return menuItems
|
||||
}
|
||||
49
server/routers/navigation/mypages/index.ts
Normal file
49
server/routers/navigation/mypages/index.ts
Normal file
@@ -0,0 +1,49 @@
|
||||
import { TRPCError } from "@trpc/server"
|
||||
import { z } from "zod"
|
||||
|
||||
import { Lang } from "@/constants/languages"
|
||||
import { safeProtectedProcedure } from "@/server/trpc"
|
||||
|
||||
import { getPrimaryLinks } from "./getPrimaryLinks"
|
||||
import { getSecondaryLinks } from "./getSecondaryLinks"
|
||||
|
||||
import type { MyPagesLink } from "./MyPagesLink"
|
||||
|
||||
export const myPagesNavigation = safeProtectedProcedure
|
||||
.input(
|
||||
z.object({
|
||||
lang: z.nativeEnum(Lang).optional(),
|
||||
})
|
||||
)
|
||||
.query(
|
||||
async ({
|
||||
ctx,
|
||||
input,
|
||||
}): Promise<{
|
||||
primaryLinks: MyPagesLink[]
|
||||
secondaryLinks: MyPagesLink[]
|
||||
} | null> => {
|
||||
if (!ctx.session) {
|
||||
return null
|
||||
}
|
||||
|
||||
const lang = input.lang || ctx.lang
|
||||
|
||||
if (!lang) {
|
||||
throw new TRPCError({
|
||||
code: "BAD_REQUEST",
|
||||
message: "Language must be provided.",
|
||||
})
|
||||
}
|
||||
|
||||
const [primaryLinks, secondaryLinks] = await Promise.all([
|
||||
getPrimaryLinks({ lang }),
|
||||
getSecondaryLinks({ lang }),
|
||||
])
|
||||
|
||||
return {
|
||||
primaryLinks,
|
||||
secondaryLinks,
|
||||
}
|
||||
}
|
||||
)
|
||||
Reference in New Issue
Block a user