Merge branch 'develop'

components/Current/Footer/index.tsx

@@ -1,4 +1,4 @@
-import { serverClient } from "@/lib/trpc/server"
+import { getCurrentFooter } from "@/lib/trpc/memoizedRequests"
 
 import Image from "@/components/Image"
 import { getLang } from "@/i18n/serverContext"
@@ -8,9 +8,7 @@ import Navigation from "./Navigation"
 import styles from "./footer.module.css"
 
 export default async function Footer() {
-  const footerData = await serverClient().contentstack.base.currentFooter({
-    lang: getLang(),
-  })
+  const footerData = await getCurrentFooter(getLang())
   if (!footerData) {
     return null
   }

components/Current/Header/LoginButton.tsx

@@ -1,49 +0,0 @@
-"use client"
-
-import { PropsWithChildren } from "react"
-
-import { login } from "@/constants/routes/handleAuth"
-
-import Link from "@/components/TempDesignSystem/Link"
-import { LinkProps } from "@/components/TempDesignSystem/Link/link"
-import useLang from "@/hooks/useLang"
-import { useLazyPathname } from "@/hooks/useLazyPathname"
-import { trackLoginClick } from "@/utils/tracking"
-
-import { TrackingPosition } from "@/types/components/tracking"
-
-export default function LoginButton({
-  className,
-  position,
-  trackingId,
-  children,
-  color = "black",
-  variant = "default",
-}: PropsWithChildren<{
-  className: string
-  trackingId: string
-  position: TrackingPosition
-  color?: LinkProps["color"]
-  variant?: "default" | "signupVerification"
-}>) {
-  const lang = useLang()
-  const pathName = useLazyPathname()
-
-  const href = pathName
-    ? `${login[lang]}?redirectTo=${encodeURIComponent(pathName)}`
-    : login[lang]
-
-  return (
-    <Link
-      className={className}
-      id={trackingId}
-      color={color}
-      href={href}
-      prefetch={false}
-      variant={variant}
-      onClick={() => trackLoginClick(position)}
-    >
-      {children}
-    </Link>
-  )
-}

components/Current/Header/MainMenu/index.tsx

@@ -7,13 +7,13 @@ import { myPages } from "@/constants/routes/myPages"
 import useDropdownStore from "@/stores/main-menu"
 
 import Image from "@/components/Image"
+import LoginButton from "@/components/LoginButton"
 import Avatar from "@/components/MyPages/Avatar"
 import Link from "@/components/TempDesignSystem/Link"
 import useLang from "@/hooks/useLang"
 import { trackClick } from "@/utils/tracking"
 
 import BookingButton from "../BookingButton"
-import LoginButton from "../LoginButton"
 
 import styles from "./mainMenu.module.css"
 

components/Current/Header/TopMenu/index.tsx

@@ -2,12 +2,11 @@ import { logout } from "@/constants/routes/handleAuth"
 import { overview } from "@/constants/routes/myPages"
 import { getName } from "@/lib/trpc/memoizedRequests"
 
+import LoginButton from "@/components/LoginButton"
 import Link from "@/components/TempDesignSystem/Link"
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
 
-import LoginButton from "../LoginButton"
-
 import styles from "./topMenu.module.css"
 
 import type { TopMenuProps } from "@/types/components/current/header/topMenu"
@@ -67,7 +66,7 @@ export default async function TopMenu({
             ) : (
               <LoginButton
                 position="hamburger menu"
-                trackingId="loginStartTopMeny"
+                trackingId="loginStartTopMenu"
                 className={`${styles.sessionLink} ${styles.loginLink}`}
               >
                 {formatMessage({ id: "Log in" })}

components/Current/LivePreview/index.tsx

@@ -1,14 +0,0 @@
-"use client"
-
-import ContentstackLivePreview from "@contentstack/live-preview-utils"
-import { useEffect } from "react"
-
-export default function InitLivePreview() {
-  useEffect(() => {
-    if (!ContentstackLivePreview.livePreview) {
-      ContentstackLivePreview.init()
-    }
-  }, [])
-
-  return null
-}