Remove communities from top-level nav. List out options in mobile

This commit is contained in:
James Grugett 2022-04-03 23:20:41 -05:00
parent 6ce53a4418
commit 7cd4b5d454
3 changed files with 41 additions and 27 deletions

View File

@ -1,6 +1,5 @@
import Link from 'next/link' import Link from 'next/link'
import { useUser } from '../../hooks/use-user'
import { import {
HomeIcon, HomeIcon,
MenuAlt3Icon, MenuAlt3Icon,
@ -27,7 +26,7 @@ export function BottomNavBar() {
<Link href="/markets"> <Link href="/markets">
<a className="block w-full py-1 px-3 text-center hover:bg-indigo-200 hover:text-indigo-700"> <a className="block w-full py-1 px-3 text-center hover:bg-indigo-200 hover:text-indigo-700">
<SearchIcon className="my-1 mx-auto h-6 w-6" aria-hidden="true" /> <SearchIcon className="my-1 mx-auto h-6 w-6" aria-hidden="true" />
Search Explore
</a> </a>
</Link> </Link>

View File

@ -12,6 +12,7 @@ export function getNavigationOptions(user?: User | null) {
if (!user) { if (!user) {
return [ return [
{ name: 'Leaderboards', href: '/leaderboards' }, { name: 'Leaderboards', href: '/leaderboards' },
{ name: 'Communities', href: '/folds' },
{ name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh' }, { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh' },
] ]
} }
@ -19,6 +20,7 @@ export function getNavigationOptions(user?: User | null) {
return [ return [
{ name: 'Add funds', href: '/add-funds' }, { name: 'Add funds', href: '/add-funds' },
{ name: 'Leaderboards', href: '/leaderboards' }, { name: 'Leaderboards', href: '/leaderboards' },
{ name: 'Communities', href: '/folds' },
{ name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh' }, { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh' },
{ name: 'About', href: 'https://docs.manifold.markets' }, { name: 'About', href: 'https://docs.manifold.markets' },
{ name: 'Sign out', href: '#', onClick: () => firebaseLogout() }, { name: 'Sign out', href: '#', onClick: () => firebaseLogout() },

View File

@ -1,10 +1,13 @@
import { import {
HomeIcon, HomeIcon,
UserGroupIcon, UserGroupIcon,
CakeIcon,
SearchIcon, SearchIcon,
ChatIcon,
BookOpenIcon, BookOpenIcon,
TableIcon, TableIcon,
DotsHorizontalIcon, DotsHorizontalIcon,
CashIcon,
} from '@heroicons/react/outline' } from '@heroicons/react/outline'
import clsx from 'clsx' import clsx from 'clsx'
import _ from 'lodash' import _ from 'lodash'
@ -12,23 +15,35 @@ import Link from 'next/link'
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
import { useFollowedFolds } from '../../hooks/use-fold' import { useFollowedFolds } from '../../hooks/use-fold'
import { useUser } from '../../hooks/use-user' import { useUser } from '../../hooks/use-user'
import { firebaseLogin } from '../../lib/firebase/users' import { firebaseLogin, firebaseLogout } from '../../lib/firebase/users'
import { ManifoldLogo } from './manifold-logo' import { ManifoldLogo } from './manifold-logo'
import { MenuButton } from './menu' import { MenuButton } from './menu'
import { getNavigationOptions, ProfileSummary } from './profile-menu' import { getNavigationOptions, ProfileSummary } from './profile-menu'
const navigation = [ const navigation = [
{ name: 'Home', href: '/home', icon: HomeIcon }, { name: 'Home', href: '/home', icon: HomeIcon },
{ name: 'Markets', href: '/markets', icon: SearchIcon }, { name: 'Explore', href: '/markets', icon: SearchIcon },
{ name: 'Portfolio', href: '/portfolio', icon: TableIcon }, { name: 'Portfolio', href: '/portfolio', icon: TableIcon },
] ]
const signedOutNavigation = [ const signedOutNavigation = [
{ name: 'Home', href: '/home', icon: HomeIcon }, { name: 'Home', href: '/home', icon: HomeIcon },
{ name: 'Markets', href: '/markets', icon: SearchIcon }, { name: 'Explore', href: '/markets', icon: SearchIcon },
{ name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon }, { name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon },
] ]
const signedOutMobileNavigation = [
{ name: 'Leaderboards', href: '/leaderboards', icon: CakeIcon },
{ name: 'Communities', href: '/folds', icon: UserGroupIcon },
{ name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', icon: ChatIcon },
{ name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon },
]
const mobileNavigation = [
{ name: 'Add funds', href: '/add-funds', icon: CashIcon },
...signedOutMobileNavigation,
]
type Item = { type Item = {
name: string name: string
href: string href: string
@ -84,10 +99,12 @@ export default function Sidebar() {
folds = _.sortBy(folds, 'followCount').reverse() folds = _.sortBy(folds, 'followCount').reverse()
const navigationOptions = user === null ? signedOutNavigation : navigation const navigationOptions = user === null ? signedOutNavigation : navigation
const mobileNavigationOptions =
user === null ? signedOutMobileNavigation : mobileNavigation
return ( return (
<nav aria-label="Sidebar" className="sticky top-4 divide-y divide-gray-300"> <nav aria-label="Sidebar" className="sticky top-4 divide-gray-300 pl-2">
<div className="space-y-1 pb-6"> <div className="space-y-1 pb-4">
<ManifoldLogo hideText /> <ManifoldLogo hideText />
</div> </div>
@ -112,7 +129,22 @@ export default function Sidebar() {
)} )}
</div> </div>
<div className="space-y-1 py-6"> <div className="space-y-1 lg:hidden">
{mobileNavigationOptions.map((item) => (
<SidebarItem key={item.name} item={item} currentPage={currentPage} />
))}
{user && (
<MenuButton
menuItems={[
{ name: 'Sign out', href: '#', onClick: () => firebaseLogout() },
]}
buttonContent={<MoreButton />}
/>
)}
</div>
<div className="hidden space-y-1 lg:block">
{navigationOptions.map((item) => ( {navigationOptions.map((item) => (
<SidebarItem key={item.name} item={item} currentPage={currentPage} /> <SidebarItem key={item.name} item={item} currentPage={currentPage} />
))} ))}
@ -122,25 +154,6 @@ export default function Sidebar() {
buttonContent={<MoreButton />} buttonContent={<MoreButton />}
/> />
</div> </div>
<div className="pt-6">
<SidebarItem
item={{ name: 'Communities', href: '/folds', icon: UserGroupIcon }}
currentPage={currentPage}
/>
<div className="mt-3 space-y-2">
{folds.map((fold) => (
<a
key={fold.name}
href={`/fold/${fold.slug}`}
className="group flex items-center rounded-md px-3 py-2 text-sm font-medium text-gray-600 hover:bg-gray-100 hover:text-gray-900"
>
<span className="truncate">&nbsp; {fold.name}</span>
</a>
))}
</div>
</div>
</nav> </nav>
) )
} }