From 6d0e01d4e4715f3195583798517d5382f81dedfc Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Mon, 26 Aug 2024 16:06:26 +0200 Subject: [PATCH] Revert "fix: static pages changes prelaunch" This reverts commit f0890f6cf94d0cdab4e7ea171d630d3a41b388db. --- .../BookingButton/bookingButton.module.css | 5 ++-- components/Current/Header/MainMenu/index.tsx | 16 ++++++------ components/Current/Header/TopMenu/index.tsx | 26 +++++++++---------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/components/Current/Header/BookingButton/bookingButton.module.css b/components/Current/Header/BookingButton/bookingButton.module.css index f24de74c3..797cd377b 100644 --- a/components/Current/Header/BookingButton/bookingButton.module.css +++ b/components/Current/Header/BookingButton/bookingButton.module.css @@ -33,11 +33,10 @@ @media screen and (min-width: 1367px) { .button { - /* font-weight: 600; + font-weight: 600; font-size: 16px; line-height: 24px; height: auto; - padding: 12px 32px; */ - display: none; + padding: 12px 32px; } } diff --git a/components/Current/Header/MainMenu/index.tsx b/components/Current/Header/MainMenu/index.tsx index f7f5d91af..f18b73803 100644 --- a/components/Current/Header/MainMenu/index.tsx +++ b/components/Current/Header/MainMenu/index.tsx @@ -85,7 +85,7 @@ export function MainMenu({ className={`${styles.listWrapper} ${isHamburgerMenuOpen ? styles.isOpen : ""}`} >
- {/*
+
{user ? ( {intl.formatMessage({ id: "My pages" })} ) : null} -
*/} +
- {/* {myPagesMobileDropdown && user ? ( + {myPagesMobileDropdown && user ? (
- ) : null} */} + ) : null}
{isMyPagesMobileMenuOpen ? myPagesMobileDropdown : null} diff --git a/components/Current/Header/TopMenu/index.tsx b/components/Current/Header/TopMenu/index.tsx index 250dea1d8..743261cb2 100644 --- a/components/Current/Header/TopMenu/index.tsx +++ b/components/Current/Header/TopMenu/index.tsx @@ -1,19 +1,19 @@ -// import { logout } from "@/constants/routes/handleAuth" -// import { serverClient } from "@/lib/trpc/server" +import { logout } from "@/constants/routes/handleAuth" +import { serverClient } from "@/lib/trpc/server" -// import Link from "@/components/TempDesignSystem/Link" -// import { getIntl } from "@/i18n" -// import { getLang } from "@/i18n/serverContext" +import Link from "@/components/TempDesignSystem/Link" +import { getIntl } from "@/i18n" +import { getLang } from "@/i18n/serverContext" -// import LoginButton from "../LoginButton" +import LoginButton from "../LoginButton" import styles from "./topMenu.module.css" import type { TopMenuProps } from "@/types/components/current/header/topMenu" -// function capitalize(str: string) { -// return str.charAt(0).toUpperCase().toUpperCase() + str.slice(1).toLowerCase() -// } +function capitalize(str: string) { + return str.charAt(0).toUpperCase().toUpperCase() + str.slice(1).toLowerCase() +} export default async function TopMenu({ frontpageLinkText, @@ -21,8 +21,8 @@ export default async function TopMenu({ links, languageSwitcher, }: TopMenuProps) { - // const { formatMessage } = await getIntl() - // const user = await serverClient().user.name() + const { formatMessage } = await getIntl() + const user = await serverClient().user.name() return (
@@ -42,7 +42,7 @@ export default async function TopMenu({ ))} - {/*
  • +
  • {user ? ( <> {user ? ( @@ -72,7 +72,7 @@ export default async function TopMenu({ {formatMessage({ id: "Log in" })} )} -
  • */} +