fix: refactor breadcrumbs to take page type variants to better match margins

This commit is contained in:
Christel Westerberg
2025-01-03 11:39:24 +01:00
parent 053ef4a1c9
commit 5901cab440
46 changed files with 286 additions and 175 deletions

View File

@@ -1,5 +1,3 @@
import { ValueOf } from "next/dist/shared/lib/constants"
import {
GetAccountPageSettings,
GetCollectionPageSettings,
@@ -15,11 +13,13 @@ import { generateTag } from "@/utils/generateTag"
import {
validateBookingWidgetToggleSchema,
ValidateBookingWidgetToggleType,
type ValidateBookingWidgetToggleType,
} from "./output"
import { affix as bookingwidgetAffix } from "./utils"
import { ContentTypeEnum } from "@/types/requests/contentType"
import type { ValueOf } from "next/dist/shared/lib/constants"
import { PageContentTypeEnum } from "@/types/requests/contentType"
export const bookingwidgetQueryRouter = router({
toggle: router({
@@ -33,27 +33,27 @@ export const bookingwidgetQueryRouter = router({
return failedResponse
}
let GetPageSettings = ""
const contentTypeCMS = <ValueOf<typeof ContentTypeEnum>>(
const contentTypeCMS = <ValueOf<typeof PageContentTypeEnum>>(
contentType.replaceAll("-", "_")
)
switch (contentTypeCMS) {
case ContentTypeEnum.accountPage:
case PageContentTypeEnum.accountPage:
GetPageSettings = GetAccountPageSettings
break
case ContentTypeEnum.loyaltyPage:
case PageContentTypeEnum.loyaltyPage:
GetPageSettings = GetLoyaltyPageSettings
break
case ContentTypeEnum.collectionPage:
case PageContentTypeEnum.collectionPage:
GetPageSettings = GetCollectionPageSettings
break
case ContentTypeEnum.contentPage:
case PageContentTypeEnum.contentPage:
GetPageSettings = GetContentPageSettings
break
case ContentTypeEnum.hotelPage:
case PageContentTypeEnum.hotelPage:
GetPageSettings = GetHotelPageSettings
break
case ContentTypeEnum.currentBlocksPage:
case PageContentTypeEnum.currentBlocksPage:
GetPageSettings = GetCurrentBlocksPageSettings
break
}

View File

@@ -28,7 +28,7 @@ import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
import { breadcrumbsRefsSchema, breadcrumbsSchema } from "./output"
import { getTags } from "./utils"
import { PageTypeEnum } from "@/types/requests/pageType"
import { PageContentTypeEnum } from "@/types/requests/contentType"
import type {
BreadcrumbsRefsSchema,
RawBreadcrumbsSchema,
@@ -170,7 +170,7 @@ export const breadcrumbsQueryRouter = router({
}
switch (ctx.contentType) {
case PageTypeEnum.accountPage:
case PageContentTypeEnum.accountPage:
return await getBreadcrumbs<{
account_page: RawBreadcrumbsSchema
}>(
@@ -181,7 +181,7 @@ export const breadcrumbsQueryRouter = router({
},
variables
)
case PageTypeEnum.collectionPage:
case PageContentTypeEnum.collectionPage:
return await getBreadcrumbs<{
collection_page: RawBreadcrumbsSchema
}>(
@@ -192,7 +192,7 @@ export const breadcrumbsQueryRouter = router({
},
variables
)
case PageTypeEnum.contentPage:
case PageContentTypeEnum.contentPage:
return await getBreadcrumbs<{
content_page: RawBreadcrumbsSchema
}>(
@@ -203,7 +203,7 @@ export const breadcrumbsQueryRouter = router({
},
variables
)
case PageTypeEnum.hotelPage:
case PageContentTypeEnum.hotelPage:
return await getBreadcrumbs<{
hotel_page: RawBreadcrumbsSchema
}>(
@@ -214,7 +214,7 @@ export const breadcrumbsQueryRouter = router({
},
variables
)
case PageTypeEnum.loyaltyPage:
case PageContentTypeEnum.loyaltyPage:
return await getBreadcrumbs<{
loyalty_page: RawBreadcrumbsSchema
}>(

View File

@@ -35,11 +35,11 @@ import { generateTag } from "@/utils/generateTag"
import { validateLanguageSwitcherData } from "./output"
import { languageSwitcherAffix } from "./utils"
import { PageContentTypeEnum } from "@/types/requests/contentType"
import type {
LanguageSwitcherData,
LanguageSwitcherQueryDataRaw,
} from "@/types/requests/languageSwitcher"
import { PageTypeEnum } from "@/types/requests/pageType"
interface LanguageSwitcherVariables {
contentType: string
@@ -72,27 +72,27 @@ async function getLanguageSwitcher(options: LanguageSwitcherVariables) {
let daDeEnDocument = null
let fiNoSvDocument = null
switch (options.contentType) {
case PageTypeEnum.accountPage:
case PageContentTypeEnum.accountPage:
daDeEnDocument = GetDaDeEnUrlsAccountPage
fiNoSvDocument = GetFiNoSvUrlsAccountPage
break
case PageTypeEnum.currentBlocksPage:
case PageContentTypeEnum.currentBlocksPage:
daDeEnDocument = GetDaDeEnUrlsCurrentBlocksPage
fiNoSvDocument = GetFiNoSvUrlsCurrentBlocksPage
break
case PageTypeEnum.loyaltyPage:
case PageContentTypeEnum.loyaltyPage:
daDeEnDocument = GetDaDeEnUrlsLoyaltyPage
fiNoSvDocument = GetFiNoSvUrlsLoyaltyPage
break
case PageTypeEnum.hotelPage:
case PageContentTypeEnum.hotelPage:
daDeEnDocument = GetDaDeEnUrlsHotelPage
fiNoSvDocument = GetFiNoSvUrlsHotelPage
break
case PageTypeEnum.contentPage:
case PageContentTypeEnum.contentPage:
daDeEnDocument = GetDaDeEnUrlsContentPage
fiNoSvDocument = GetFiNoSvUrlsContentPage
break
case PageTypeEnum.collectionPage:
case PageContentTypeEnum.collectionPage:
daDeEnDocument = GetDaDeEnUrlsCollectionPage
fiNoSvDocument = GetFiNoSvUrlsCollectionPage
break

View File

@@ -16,7 +16,7 @@ import { getHotelData } from "../../hotels/query"
import { metadataSchema } from "./output"
import { affix } from "./utils"
import { PageTypeEnum } from "@/types/requests/pageType"
import { PageContentTypeEnum } from "@/types/requests/contentType"
import type { RawMetadataSchema } from "@/types/trpc/routers/contentstack/metadata"
import type { Lang } from "@/constants/languages"
@@ -121,27 +121,27 @@ export const metadataQueryRouter = router({
}
switch (ctx.contentType) {
case PageTypeEnum.accountPage:
case PageContentTypeEnum.accountPage:
const accountPageResponse = await fetchMetadata<{
account_page: RawMetadataSchema
}>(GetAccountPageMetadata, variables)
return getTransformedMetadata(accountPageResponse.account_page)
case PageTypeEnum.collectionPage:
case PageContentTypeEnum.collectionPage:
const collectionPageResponse = await fetchMetadata<{
collection_page: RawMetadataSchema
}>(GetCollectionPageMetadata, variables)
return getTransformedMetadata(collectionPageResponse.collection_page)
case PageTypeEnum.contentPage:
case PageContentTypeEnum.contentPage:
const contentPageResponse = await fetchMetadata<{
content_page: RawMetadataSchema
}>(GetContentPageMetadata, variables)
return getTransformedMetadata(contentPageResponse.content_page)
case PageTypeEnum.loyaltyPage:
case PageContentTypeEnum.loyaltyPage:
const loyaltyPageResponse = await fetchMetadata<{
loyalty_page: RawMetadataSchema
}>(GetLoyaltyPageMetadata, variables)
return getTransformedMetadata(loyaltyPageResponse.loyalty_page)
case PageTypeEnum.hotelPage:
case PageContentTypeEnum.hotelPage:
const hotelPageResponse = await fetchMetadata<{
hotel_page: RawMetadataSchema
}>(GetHotelPageMetadata, variables)