fix(SW-779): replace css module with .css file to work with parallel route
This commit is contained in:
committed by
Christel Westerberg
parent
0f97757e31
commit
628f79929c
@@ -1,6 +1,7 @@
|
|||||||
/**
|
/**
|
||||||
* Due to css import issues with parallel routes we are forced to
|
* Due to css import issues with parallel routes we are forced to
|
||||||
* use a regular css file and import it in the page.tsx
|
* use a regular css file and import it in the page.tsx
|
||||||
|
* This is addressed in Next 15: https: //github.com/vercel/next.js/pull/66300
|
||||||
*/
|
*/
|
||||||
.profile-layout {
|
.profile-layout {
|
||||||
background-color: var(--Main-Grey-White);
|
background-color: var(--Main-Grey-White);
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
.layout {
|
/**
|
||||||
|
* Due to css import issues with parallel routes we are forced to
|
||||||
|
* use a regular css file and import it in the page.tsx
|
||||||
|
* This is addressed in Next 15: https://github.com/vercel/next.js/pull/66300
|
||||||
|
*/
|
||||||
|
|
||||||
|
.enter-details-layout {
|
||||||
background-color: var(--Scandic-Brand-Warm-White);
|
background-color: var(--Scandic-Brand-Warm-White);
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.enter-details-layout__content {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: var(--Spacing-x3) var(--Spacing-x9);
|
gap: var(--Spacing-x3) var(--Spacing-x9);
|
||||||
grid-template-columns: 1fr 340px;
|
grid-template-columns: 1fr 340px;
|
||||||
@@ -15,12 +21,12 @@
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.summaryContainer {
|
.enter-details-layout__summaryContainer {
|
||||||
grid-column: 2 / 3;
|
grid-column: 2 / 3;
|
||||||
grid-row: 1/-1;
|
grid-row: 1/-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.summary {
|
.enter-details-layout__summary {
|
||||||
background-color: var(--Main-Grey-White);
|
background-color: var(--Main-Grey-White);
|
||||||
|
|
||||||
border-color: var(--Primary-Light-On-Surface-Divider-subtle);
|
border-color: var(--Primary-Light-On-Surface-Divider-subtle);
|
||||||
@@ -31,22 +37,22 @@
|
|||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hider {
|
.enter-details-layout__hider {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shadow {
|
.enter-details-layout__shadow {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 950px) {
|
@media screen and (min-width: 950px) {
|
||||||
.summaryContainer {
|
.enter-details-layout__summaryContainer {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: auto auto 1fr;
|
grid-template-rows: auto auto 1fr;
|
||||||
margin-top: calc(0px - var(--Spacing-x9));
|
margin-top: calc(0px - var(--Spacing-x9));
|
||||||
}
|
}
|
||||||
|
|
||||||
.summary {
|
.enter-details-layout__summary {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: calc(
|
top: calc(
|
||||||
var(--booking-widget-desktop-height) +
|
var(--booking-widget-desktop-height) +
|
||||||
@@ -57,7 +63,7 @@
|
|||||||
border-radius: var(--Corner-radius-Large) var(--Corner-radius-Large) 0 0;
|
border-radius: var(--Corner-radius-Large) var(--Corner-radius-Large) 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hider {
|
.enter-details-layout__hider {
|
||||||
display: block;
|
display: block;
|
||||||
background-color: var(--Scandic-Brand-Warm-White);
|
background-color: var(--Scandic-Brand-Warm-White);
|
||||||
position: sticky;
|
position: sticky;
|
||||||
@@ -69,7 +75,7 @@
|
|||||||
height: 40px;
|
height: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shadow {
|
.enter-details-layout__shadow {
|
||||||
display: block;
|
display: block;
|
||||||
background-color: var(--Main-Grey-White);
|
background-color: var(--Main-Grey-White);
|
||||||
border-color: var(--Primary-Light-On-Surface-Divider-subtle);
|
border-color: var(--Primary-Light-On-Surface-Divider-subtle);
|
||||||
@@ -82,14 +88,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 1367px) {
|
@media screen and (min-width: 1367px) {
|
||||||
.summary {
|
.enter-details-layout__summary {
|
||||||
top: calc(
|
top: calc(
|
||||||
var(--booking-widget-desktop-height) + var(--Spacing-x2) +
|
var(--booking-widget-desktop-height) + var(--Spacing-x2) +
|
||||||
var(--Spacing-x-half)
|
var(--Spacing-x-half)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.hider {
|
.enter-details-layout__hider {
|
||||||
top: calc(var(--booking-widget-desktop-height) - 6px);
|
top: calc(var(--booking-widget-desktop-height) - 6px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,10 @@
|
|||||||
import {
|
import { getProfileSafely } from "@/lib/trpc/memoizedRequests"
|
||||||
getCreditCardsSafely,
|
|
||||||
getProfileSafely,
|
|
||||||
} from "@/lib/trpc/memoizedRequests"
|
|
||||||
|
|
||||||
import EnterDetailsProvider from "@/components/HotelReservation/EnterDetails/Provider"
|
import EnterDetailsProvider from "@/components/HotelReservation/EnterDetails/Provider"
|
||||||
import { setLang } from "@/i18n/serverContext"
|
import { setLang } from "@/i18n/serverContext"
|
||||||
|
|
||||||
import { preload } from "./_preload"
|
import { preload } from "./_preload"
|
||||||
|
|
||||||
import styles from "./layout.module.css"
|
|
||||||
|
|
||||||
import { StepEnum } from "@/types/components/hotelReservation/enterDetails/step"
|
import { StepEnum } from "@/types/components/hotelReservation/enterDetails/step"
|
||||||
import type { LangParams, LayoutArgs } from "@/types/params"
|
import type { LangParams, LayoutArgs } from "@/types/params"
|
||||||
|
|
||||||
@@ -31,14 +26,14 @@ export default async function StepLayout({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<EnterDetailsProvider step={params.step} isMember={!!user}>
|
<EnterDetailsProvider step={params.step} isMember={!!user}>
|
||||||
<main className={styles.layout}>
|
<main className="enter-details-layout__layout">
|
||||||
{hotelHeader}
|
{hotelHeader}
|
||||||
<div className={styles.content}>
|
<div className={"enter-details-layout__content"}>
|
||||||
{children}
|
{children}
|
||||||
<aside className={styles.summaryContainer}>
|
<aside className="enter-details-layout__summaryContainer">
|
||||||
<div className={styles.hider} />
|
<div className="enter-details-layout__hider" />
|
||||||
<div className={styles.summary}>{summary}</div>
|
<div className="enter-details-layout__summary">{summary}</div>
|
||||||
<div className={styles.shadow} />
|
<div className="enter-details-layout__shadow" />
|
||||||
</aside>
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import "./enterDetailsLayout.css"
|
||||||
|
|
||||||
import { notFound } from "next/navigation"
|
import { notFound } from "next/navigation"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
|||||||
Reference in New Issue
Block a user