Merged in fix/static-pages-prelaunch (pull request #462)

fix: static pages changes prelaunch

Approved-by: Chuma Mcphoy (We Ahead)
This commit is contained in:
Michael Zetterberg
2024-08-23 05:40:02 +00:00
3 changed files with 24 additions and 23 deletions

View File

@@ -33,10 +33,11 @@
@media screen and (min-width: 1367px) {
.button {
font-weight: 600;
/* font-weight: 600;
font-size: 16px;
line-height: 24px;
height: auto;
padding: 12px 32px;
padding: 12px 32px; */
display: none;
}
}

View File

@@ -85,7 +85,7 @@ export function MainMenu({
className={`${styles.listWrapper} ${isHamburgerMenuOpen ? styles.isOpen : ""}`}
>
<ul className={styles.linkRow}>
{!!user ? (
{/* {!!user ? (
<>
<li className={styles.mobileLinkRow}>
<Link
@@ -117,7 +117,7 @@ export function MainMenu({
</LoginButton>
</li>
</>
)}
)} */}
<li className={styles.mobileLinkRow}>
<span className={styles.mobileSeparator} />
@@ -166,7 +166,7 @@ export function MainMenu({
{languageSwitcher ? (
<li className={styles.mobileLi}>{languageSwitcher}</li>
) : null}
{!!user ? (
{/* {!!user ? (
<li className={`${styles.mobileLi} ${styles.logout}`}>
<Link
href={logout[lang]}
@@ -176,18 +176,18 @@ export function MainMenu({
{intl.formatMessage({ id: "Log out" })}
</Link>
</li>
) : null}
) : null} */}
</ul>
<div className={styles.buttonContainer}>
<div className={styles.myPagesDesktopLink}>
{/* <div className={styles.myPagesDesktopLink}>
{user ? (
<Link className={styles.link} href={myPages[lang]}>
{intl.formatMessage({ id: "My pages" })}
</Link>
) : null}
</div>
</div> */}
<BookingButton href={bookingHref} />
{myPagesMobileDropdown && user ? (
{/* {myPagesMobileDropdown && user ? (
<div
role="button"
onClick={handleMyPagesMobileMenuClick}
@@ -195,7 +195,7 @@ export function MainMenu({
>
<Avatar firstName={user.firstName} lastName={user.lastName} />
</div>
) : null}
) : null} */}
</div>
{isMyPagesMobileMenuOpen ? myPagesMobileDropdown : null}
</nav>

View File

@@ -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 (
<div className={styles.topMenu}>
<div className={styles.container}>
@@ -42,7 +42,7 @@ export default async function TopMenu({
</a>
</li>
))}
<li className={styles.sessionContainer}>
{/* <li className={styles.sessionContainer}>
{user ? (
<>
{user ? (
@@ -72,7 +72,7 @@ export default async function TopMenu({
{formatMessage({ id: "Log in" })}
</LoginButton>
)}
</li>
</li> */}
</ul>
</div>
</div>