feat: make ML Challenge Page mobile friendly #1141
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,30 @@ | ||
| import { MenuDropdown } from 'app/components/MenuDropdown' | ||
| import { MenuItemHeader } from 'app/components/MenuItemHeader' | ||
| import { MenuItemLink } from 'app/components/MenuItemLink' | ||
| import { useI18n } from 'app/hooks/useI18n' | ||
|
|
||
| import { ABOUT_LINKS, HELP_AND_REPORT_LINKS } from './constants' | ||
|
|
||
| export function AboutAndHelpDropdown({ className }: { className?: string }) { | ||
| const { t } = useI18n() | ||
|
|
||
| return ( | ||
| <MenuDropdown className={className} title={t('aboutAndHelp')}> | ||
| <MenuItemHeader>{t('about')}</MenuItemHeader> | ||
|
|
||
| {ABOUT_LINKS.map(({ label, link }) => ( | ||
| <MenuItemLink key={label} to={link}> | ||
| {t(label)} | ||
| </MenuItemLink> | ||
| ))} | ||
|
|
||
| <MenuItemHeader>{t('helpAndReport')}</MenuItemHeader> | ||
|
|
||
| {HELP_AND_REPORT_LINKS.map(({ label, link }) => ( | ||
| <MenuItemLink key={label} to={link}> | ||
| {t(label)} | ||
| </MenuItemLink> | ||
| ))} | ||
| </MenuDropdown> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import { ButtonIcon } from '@czi-sds/components' | ||
|
|
||
| import { Link } from 'app/components/Link' | ||
| import { useI18n } from 'app/hooks/useI18n' | ||
| import { I18nKeys } from 'app/types/i18n' | ||
|
|
||
| import { | ||
| ABOUT_LINKS, | ||
| HELP_AND_REPORT_LINKS, | ||
| NavLink, | ||
| TOOLS_LINKS, | ||
| TOP_LEVEL_LINKS, | ||
| } from './constants' | ||
| import { CryoETHomeLink } from './CryoETHomeLink' | ||
|
|
||
| function SubMenu({ title, links }: { title: I18nKeys; links: NavLink[] }) { | ||
| const { t } = useI18n() | ||
|
|
||
| return ( | ||
| <div className="border-t border-sds-gray-500 pt-sds-l flex flex-col gap-sds-l"> | ||
| <p className="text-sds-caps-xxs leading-sds-caps-xxs font-semibold uppercase text-sds-gray-400"> | ||
| {t(title)} | ||
| </p> | ||
| <div className="flex flex-col gap-sds-m"> | ||
| {links.map(({ label, link }) => ( | ||
| <Link | ||
| key={label} | ||
| to={link} | ||
| className="text-sds-header-m leading-sds-header-m font-semibold text-sds-gray-300" | ||
| > | ||
| {t(label)} | ||
| </Link> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export function MobileNavigationMenu({ onClose }: { onClose: () => void }) { | ||
| const { t } = useI18n() | ||
|
|
||
| return ( | ||
| <nav className="fixed z-30 top-0 bottom-0 right-0 left-0 bg-black screen-716:hidden px-sds-xl overflow-y-scroll"> | ||
| <div className="flex justify-between py-sds-m items-center"> | ||
| <CryoETHomeLink /> | ||
| <ButtonIcon | ||
| sdsIcon="xMark" | ||
| sdsSize="large" | ||
| sdsType="secondary" | ||
| classes={{ | ||
| root: '!text-sds-gray-white', | ||
| }} | ||
| onClick={onClose} | ||
| /> | ||
| </div> | ||
| <div className="flex flex-col py-sds-l gap-sds-xl"> | ||
| {TOP_LEVEL_LINKS.map(({ label, link }) => ( | ||
| <Link | ||
| key={label} | ||
| to={link} | ||
| className="text-sds-header-m leading-sds-header-m font-semibold text-sds-gray-300" | ||
| > | ||
| {t(label)} | ||
| </Link> | ||
| ))} | ||
| <SubMenu title="tools" links={TOOLS_LINKS} /> | ||
| <SubMenu title="about" links={ABOUT_LINKS} /> | ||
| <SubMenu title="helpAndReport" links={HELP_AND_REPORT_LINKS} /> | ||
| </div> | ||
| </nav> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,18 @@ | ||
| import { MenuDropdown } from 'app/components/MenuDropdown' | ||
| import { MenuItemLink } from 'app/components/MenuItemLink' | ||
| import { useI18n } from 'app/hooks/useI18n' | ||
|
|
||
| import { TOOLS_LINKS } from './constants' | ||
|
|
||
| export function ToolsDropdown({ className }: { className?: string }) { | ||
| const { t } = useI18n() | ||
| return ( | ||
| <MenuDropdown className={className} title={t('tools')}> | ||
| {TOOLS_LINKS.map(({ label, link }) => ( | ||
| <MenuItemLink key={label} to={link}> | ||
| {t(label)} | ||
| </MenuItemLink> | ||
| ))} | ||
| </MenuDropdown> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,76 @@ | ||
| import { ButtonIcon } from '@czi-sds/components' | ||
| import { useLocation } from '@remix-run/react' | ||
| import { useEffect, useState } from 'react' | ||
| import { useTranslation } from 'react-i18next' | ||
|
|
||
| import { Link } from 'app/components/Link' | ||
| import { cns } from 'app/utils/cns' | ||
|
|
||
| import { AboutAndHelpDropdown } from './AboutAndHelpDropdown' | ||
| import { TOP_LEVEL_LINKS } from './constants' | ||
| import { CryoETHomeLink } from './CryoETHomeLink' | ||
| import { MobileNavigationMenu } from './MobileNavigationMenu' | ||
| import { ToolsDropdown } from './ToolsDropdown' | ||
|
|
||
| export function TopNavigation() { | ||
| const { pathname } = useLocation() | ||
| const { t } = useTranslation() | ||
|
|
||
| const [mobileMenuIsOpen, setMobileMenuOpen] = useState(false) | ||
|
|
||
| // force close mobile menu when navigating | ||
| useEffect(() => { | ||
| setMobileMenuOpen(false) | ||
| }, [pathname]) | ||
|
|
||
| return ( | ||
| <nav | ||
| className={cns( | ||
| 'bg-sds-gray-black text-sds-gray-white', | ||
| 'flex py-sds-m flex-shrink-0 items-center px-sds-xl', | ||
| 'sticky top-0 z-30', | ||
| )} | ||
| > | ||
| <CryoETHomeLink /> | ||
|
|
||
| {/* Add empty space to push content to right */} | ||
| <div className="basis-sds-xxl flex-grow screen-790:mr-sds-xxl" /> | ||
|
|
||
| <div className="hidden screen-716:flex basis-auto flex-shrink-0"> | ||
| {TOP_LEVEL_LINKS.map((link) => ( | ||
| <Link | ||
| className={cns( | ||
| 'text-sds-header-s leading-sds-header-s font-semibold mr-sds-xxl p-0', | ||
|
|
||
| link.isActive(pathname) | ||
| ? 'text-sds-gray-white' | ||
| : 'text-sds-gray-400 hover:text-sds-gray-white', | ||
| )} | ||
| to={link.link} | ||
| key={link.link} | ||
| > | ||
| {t(link.label)} | ||
| </Link> | ||
| ))} | ||
|
|
||
| <ToolsDropdown className="mr-sds-xxl text-sds-header-s" /> | ||
| <AboutAndHelpDropdown className="screen-790:ml-sds-xxl text-sds-header-s" /> | ||
| </div> | ||
|
|
||
| <ButtonIcon | ||
| className="screen-716:!hidden" | ||
| sdsIcon="linesHorizontal" | ||
| sdsType="tertiary" | ||
| sdsSize="large" | ||
| classes={{ | ||
| root: '!text-sds-gray-400', | ||
| }} | ||
| onClick={() => setMobileMenuOpen(true)} | ||
| /> | ||
|
|
||
| {mobileMenuIsOpen && ( | ||
| <MobileNavigationMenu onClose={() => setMobileMenuOpen(false)} /> | ||
| )} | ||
| </nav> | ||
| ) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can be done later, but if
716is the breakpoint we're going to settle on for phones it might make sense to add it to our tailwind configThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I just realized this is the alias 😆. Maybe we should give them better semantics like "phone", "desktop" or whatever, but that's not really relevant to this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we've used this pattern in the past for the napari hub because our breakpoints didn't really have good semantics. I think when SDS officially defines semantic breakpoints for their framework, then we can start using that
I'm also curious from @Janeece @kev-zunshiwang on this, we could defer to SDS or figure out semantic breakpoints for the data portal, but I imagine it would take time to holistically determine the right breakpoints and I know mobile hasn't been a priority up until now 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@codemonkey800 SDS has had breakpoints on its backlog for a long time -- im not sure if that work has been completed (Connor was scoping it, last I heard). We'd want to defer to SDS when they have defined them.
Agreed, mobile has not been generally considered a priority, ML challenge page was a special case because of how the page is promoted.