scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 159114a082 f0890f6cf9
commit b6e22d51a5
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/Current/Header/BookingButton/bookingButton.module.css
View File

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

16
components/Current/Header/MainMenu/index.tsx
View File

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

26
components/Current/Header/TopMenu/index.tsx
View File

@@ -1,19 +1,19 @@
import { logout } from "@/constants/routes/handleAuth" // import { logout } from "@/constants/routes/handleAuth"
import { serverClient } from "@/lib/trpc/server" // import { serverClient } from "@/lib/trpc/server"
import Link from "@/components/TempDesignSystem/Link" // import Link from "@/components/TempDesignSystem/Link"
import { getIntl } from "@/i18n" // import { getIntl } from "@/i18n"
import { getLang } from "@/i18n/serverContext" // import { getLang } from "@/i18n/serverContext"
import LoginButton from "../LoginButton" // import LoginButton from "../LoginButton"
import styles from "./topMenu.module.css" import styles from "./topMenu.module.css"
import type { TopMenuProps } from "@/types/components/current/header/topMenu" import type { TopMenuProps } from "@/types/components/current/header/topMenu"
function capitalize(str: string) { // function capitalize(str: string) {
return str.charAt(0).toUpperCase().toUpperCase() + str.slice(1).toLowerCase() // return str.charAt(0).toUpperCase().toUpperCase() + str.slice(1).toLowerCase()
} // }
export default async function TopMenu({ export default async function TopMenu({
frontpageLinkText, frontpageLinkText,
@@ -21,8 +21,8 @@ export default async function TopMenu({
links, links,
languageSwitcher, languageSwitcher,
}: TopMenuProps) { }: TopMenuProps) {
const { formatMessage } = await getIntl() // const { formatMessage } = await getIntl()
const user = await serverClient().user.name() // const user = await serverClient().user.name()
return ( return (
<div className={styles.topMenu}> <div className={styles.topMenu}>
<div className={styles.container}> <div className={styles.container}>
@@ -42,7 +42,7 @@ export default async function TopMenu({
</a> </a>
</li> </li>
))} ))}
<li className={styles.sessionContainer}> {/* <li className={styles.sessionContainer}>
{user ? ( {user ? (
<> <>
{user ? ( {user ? (
@@ -72,7 +72,7 @@ export default async function TopMenu({
{formatMessage({ id: "Log in" })} {formatMessage({ id: "Log in" })}
</LoginButton> </LoginButton>
)} )}
</li> </li> */}
</ul> </ul>
</div> </div>
</div> </div>