Merged develop into feat/hotel-pages-intro-section

components/Current/Header/TopMenu/index.tsx

@@ -1,7 +1,6 @@
 import { logout } from "@/constants/routes/handleAuth"
 import { serverClient } from "@/lib/trpc/server"
 
-import { auth } from "@/auth"
 import Link from "@/components/TempDesignSystem/Link"
 import { getIntl } from "@/i18n"
 
@@ -23,9 +22,7 @@ export default async function TopMenu({
   lang,
 }: TopMenuProps) {
   const { formatMessage } = await getIntl()
-  const session = await auth()
-  const user = session ? await serverClient().user.get() : null
-
+  const user = await serverClient().user.name()
   return (
     <div className={styles.topMenu}>
       <div className={styles.container}>
@@ -46,7 +43,7 @@ export default async function TopMenu({
             </li>
           ))}
           <li className={styles.sessionContainer}>
-            {session ? (
+            {user ? (
               <>
                 {user ? (
                   <Link

components/Current/Header/index.tsx

@@ -19,14 +19,11 @@ export default async function Header({
 }: LangParams & { languageSwitcher: React.ReactNode } & {
   myPagesMobileDropdown: React.ReactNode
 }) {
-  const [data, session] = await Promise.all([
-    serverClient().contentstack.base.header({
-      lang,
-    }),
-    auth(),
-  ])
+  const data = await serverClient().contentstack.base.header({
+    lang,
+  })
 
-  const user = !!session ? await serverClient().user.get() : null
+  const user = await serverClient().user.name()
 
   if (!data) {
     return null

components/JsonToHtml/jsontohtml.module.css

@@ -14,20 +14,20 @@
   gap: var(--Spacing-x1);
 }
 
-.ol:has(li:nth-last-child(n + 4)),
-.ul:has(li:nth-last-child(n + 4)) {
+.ol:has(li:nth-last-child(n + 5)),
+.ul:has(li:nth-last-child(n + 5)) {
   grid-template-columns: 1fr 1fr;
-  grid-auto-flow: column;
 }
 
 .ol > li::marker {
   color: var(--Primary-Light-On-Surface-Accent);
 }
 
-.ul:has(.heart),
-.ul:has(.check) {
+.li:has(.heart),
+.li:has(.check) {
   list-style: none;
 }
+
 .li:has(.heart),
 .li:has(.check) {
   display: flex;
@@ -54,7 +54,7 @@
 }
 
 .container {
-  display: "grid";
+  display: grid;
   gap: var(--Spacing-x3);
   max-width: 1197px;
 }

components/JsonToHtml/renderOptions.tsx

@@ -497,7 +497,10 @@ export const renderOptions: RenderOptions = {
         className={styles.ul}
         style={
           numberOfRows
-            ? { gridTemplateRows: `repeat(${numberOfRows}, auto)` }
+            ? {
+                gridTemplateRows: `repeat(${numberOfRows}, auto)`,
+                gridAutoFlow: "column",
+              }
             : {}
         }
       >

components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx

@@ -124,13 +124,15 @@ function reducer(state: any, action: OverviewTableReducerAction) {
   }
 }
 
-export default function OverviewTable({ user }: OverviewTableProps) {
+export default function OverviewTable({
+  activeMembership,
+}: OverviewTableProps) {
   const intl = useIntl()
   const lang = Lang.en
   const levelsData = levelsTranslations[lang]
   const [selectionState, dispatch] = useReducer(
     reducer,
-    { user, lang },
+    { activeMembership, lang },
     getInitialState
   )
 
@@ -150,10 +152,6 @@ export default function OverviewTable({ user }: OverviewTableProps) {
     value: level.level,
   }))
 
-  const activeMembership = user?.memberships
-    ? getMembership(user.memberships)
-    : null
-
   let activeMembershipLevel: membershipLevels | null = null
   if (activeMembership?.membershipLevel) {
     activeMembershipLevel = membershipLevels[activeMembership?.membershipLevel]

components/Loyalty/Blocks/DynamicContent/index.tsx

@@ -21,9 +21,7 @@ import type {
 import { LoyaltyComponentEnum } from "@/types/components/loyalty/enums"
 
 async function DynamicComponentBlock({ component }: DynamicComponentProps) {
-  const session = await auth()
-
-  const user = session ? await serverClient().user.get() : null
+  const membershipLevel = await serverClient().user.membershipLevel()
 
   switch (component) {
     case LoyaltyComponentEnum.how_it_works:
@@ -31,7 +29,7 @@ async function DynamicComponentBlock({ component }: DynamicComponentProps) {
     case LoyaltyComponentEnum.loyalty_levels:
       return <LoyaltyLevels />
     case LoyaltyComponentEnum.overview_table:
-      return <OverviewTable user={user} />
+      return <OverviewTable activeMembership={membershipLevel} />
     default:
       return null
   }

components/Loyalty/Sidebar/JoinLoyalty/index.tsx

@@ -1,6 +1,5 @@
-import { login } from "@/constants/routes/handleAuth"
+import { serverClient } from "@/lib/trpc/server"
 
-import { auth } from "@/auth"
 import ArrowRight from "@/components/Icons/ArrowRight"
 import { ScandicFriends } from "@/components/Levels"
 import Button from "@/components/TempDesignSystem/Button"
@@ -21,9 +20,10 @@ export default async function JoinLoyaltyContact({
   lang,
 }: JoinLoyaltyContactProps & LangParams) {
   const { formatMessage } = await getIntl()
-  const session = await auth()
+  const user = await serverClient().user.name()
 
-  if (session) {
+  // Check if we have user, that means we are logged in.
+  if (user) {
     return null
   }
   return (

components/Loyalty/Sidebar/MyPagesNavigation/index.tsx

@@ -1,12 +1,14 @@
-import { auth } from "@/auth"
+import { serverClient } from "@/lib/trpc/server"
+
 import MyPagesSidebar from "@/components/MyPages/Sidebar"
 
 import { LangParams } from "@/types/params"
 
 export default async function MyPagesNavigation({ lang }: LangParams) {
-  const session = await auth()
+  const user = await serverClient().user.name()
 
-  if (!session) {
+  // Check if we have user, that means we are logged in.
+  if (!user) {
     return null
   }