feat(SW-186): Some small changes and cleanup

This commit is contained in:
Erik Tiekstra
2024-09-05 11:06:11 +02:00
parent 55fdbc527b
commit a8cca69438
6 changed files with 20 additions and 61 deletions

View File

@@ -19,6 +19,7 @@ import type { MobileMenuProps } from "@/types/components/header/mobileMenu"
export default function MobileMenu({ export default function MobileMenu({
menuItems, menuItems,
languageUrls, languageUrls,
topLink,
}: MobileMenuProps) { }: MobileMenuProps) {
const intl = useIntl() const intl = useIntl()
const { const {
@@ -71,10 +72,12 @@ export default function MobileMenu({
<SearchIcon width={20} height={20} color="burgundy" /> <SearchIcon width={20} height={20} color="burgundy" />
{intl.formatMessage({ id: "Find booking" })} {intl.formatMessage({ id: "Find booking" })}
</HeaderLink> </HeaderLink>
<HeaderLink href="#"> {topLink ? (
<HeaderLink href={topLink.href}>
<GiftIcon width={20} height={20} color="burgundy" /> <GiftIcon width={20} height={20} color="burgundy" />
{intl.formatMessage({ id: "Join Scandic Friends" })} {topLink.title}
</HeaderLink> </HeaderLink>
) : null}
<HeaderLink href="#"> <HeaderLink href="#">
<ServiceIcon width={20} height={20} color="burgundy" /> <ServiceIcon width={20} height={20} color="burgundy" />
{intl.formatMessage({ id: "Customer service" })} {intl.formatMessage({ id: "Customer service" })}

View File

@@ -21,6 +21,7 @@ import type { MainMenuProps } from "@/types/components/header/mainMenu"
export default async function MainMenu({ export default async function MainMenu({
languageUrls, languageUrls,
menuItems, menuItems,
topLink,
}: MainMenuProps) { }: MainMenuProps) {
const intl = await getIntl() const intl = await getIntl()
const lang = getLang() const lang = getLang()
@@ -46,9 +47,7 @@ export default async function MainMenu({
/> />
</NextLink> </NextLink>
<div className={styles.menus}> <div className={styles.menus}>
{menuItems?.length ? (
<NavigationMenu items={menuItems} isMobile={false} /> <NavigationMenu items={menuItems} isMobile={false} />
) : null}
{user ? ( {user ? (
<> <>
<MyPagesMenu <MyPagesMenu
@@ -74,9 +73,11 @@ export default async function MainMenu({
</span> </span>
</Link> </Link>
)} )}
{menuItems?.length ? ( <MobileMenu
<MobileMenu languageUrls={languageUrls} menuItems={menuItems} /> languageUrls={languageUrls}
) : null} menuItems={menuItems}
topLink={topLink}
/>
</div> </div>
</nav> </nav>
</div> </div>

View File

@@ -19,6 +19,7 @@ export default async function Header() {
<MainMenu <MainMenu
languageUrls={languages.urls} languageUrls={languages.urls}
menuItems={headerData.menuItems} menuItems={headerData.menuItems}
topLink={headerData.topLink}
/> />
</header> </header>
) )

View File

@@ -1,48 +0,0 @@
#import "../System.graphql"
fragment HotelPageBreadcrumbsRefs on HotelPage {
web {
breadcrumbs {
title
parentsConnection {
edges {
node {
... on ContentPage {
web {
breadcrumbs {
title
}
}
system {
...System
}
}
... on HotelPage {
web {
breadcrumbs {
title
}
}
system {
...System
}
}
... on LoyaltyPage {
web {
breadcrumbs {
title
}
}
system {
...System
}
}
}
}
}
}
}
system {
...System
}
}

View File

@@ -1,7 +1,8 @@
import { MenuItem } from "@/types/header" import { Header, MenuItem } from "@/types/header"
import type { LanguageSwitcherData } from "@/types/requests/languageSwitcher" import type { LanguageSwitcherData } from "@/types/requests/languageSwitcher"
export interface MainMenuProps { export interface MainMenuProps {
languageUrls: LanguageSwitcherData languageUrls: LanguageSwitcherData
menuItems: MenuItem[] | null menuItems: MenuItem[]
topLink: Header["topLink"]
} }

View File

@@ -1,7 +1,8 @@
import { MenuItem } from "@/types/header" import { Header, MenuItem } from "@/types/header"
import type { LanguageSwitcherData } from "@/types/requests/languageSwitcher" import type { LanguageSwitcherData } from "@/types/requests/languageSwitcher"
export interface MobileMenuProps { export interface MobileMenuProps {
languageUrls: LanguageSwitcherData languageUrls: LanguageSwitcherData
menuItems: MenuItem[] menuItems: MenuItem[]
topLink: Header["topLink"]
} }