Skip to content

chore: Temporarily change links of Header to the links to HTML pages build by Sessionize #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2023
Merged

chore: Temporarily change links of Header to the links to HTML pages build by Sessionize #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54c7b79
chore: Remove `next/link` temporary for forwarding to HTML pages buil…
taigakiyokawa Mar 31, 2023
dab08f6
chore: Temporarily change links of Header to the links to HTML pages …
taigakiyokawa Mar 31, 2023
698ee86
fix(HeaderMenu): Use `next/link` when href is `/`
taigakiyokawa Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/components/molecules/HeaderMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import { Typography, Box } from '@mui/material'
import Link from 'next/link'
import { useRouter } from 'next/router'
import { HeaderItemColor, HeaderMenuItem, HeaderItemBehaviorStyles } from 'src/components/organisms/Header'
import Link from 'next/link'

export interface HeaderMenuProps {
menuList: HeaderMenuItem[]
Expand All @@ -17,8 +17,24 @@ export const HeaderMenu = ({ menuList, itemColor, itemBehaviorStyles }: HeaderMe
<Box sx={{ display: 'flex', gap: '8px', margin: '0 24px 0 auto' }}>
{menuList.map((list, i) => {
return list.href ? (
<Link href={list.href} key={i}>
<a>
list.href === '/' ? (
<Link href={list.href} key={i}>
<a>
<Typography
sx={{
borderBottom: router.pathname === list.href ? '3px solid' : '',
color: itemColor.default,
p: '4px 8px',
...itemBehaviorStyles
}}
>
{list.label}
</Typography>
</a>
</Link>
) : (
// TODO(taigakiyokawa): Revert using `next/link` when pages have implemented.
<a href={list.href} target="_blank" rel="noreferrer" key={i}>
<Typography
sx={{
borderBottom: router.pathname === list.href ? '3px solid' : '',
Expand All @@ -30,7 +46,7 @@ export const HeaderMenu = ({ menuList, itemColor, itemBehaviorStyles }: HeaderMe
{list.label}
</Typography>
</a>
</Link>
)
) : (
<Typography
onClick={list.onClick}
Expand Down
9 changes: 6 additions & 3 deletions src/components/organisms/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ export const Header = () => {
const menuList: HeaderMenuItem[] = useMemo(() => {
return [
{ href: '/', label: 'Home' },
{ href: '/sessions', label: 'Sessions' },
{ href: '/timetable', label: 'Timetable' },
{ href: '/floor_guide', label: 'Floor Guide' },
// TODO(taigakiyokawa): Revert to `/sessions` when the page has implemented.
{ href: 'https://sessionize.com/api/v2/jmtn42ls/view/Sessions', label: 'Sessions' },
// TODO(taigakiyokawa): Revert to `/timetable` when the page has implemented.
{ href: 'https://sessionize.com/api/v2/jmtn42ls/view/GridSmart', label: 'Timetable' },
// TODO(taigakiyokawa): Revert comment out when the page has implemented.
// { href: '/floor_guide', label: 'Floor Guide' },
{
label: t('change_language'),
onClick: handleChangeLanguage
Expand Down