From bd074e15fade8e9b82474b6624c58d7f99c845bb Mon Sep 17 00:00:00 2001 From: Austin Chen Date: Wed, 30 Mar 2022 14:22:28 -0700 Subject: [PATCH] Add "more" and profile link --- web/components/nav/profile-menu.tsx | 42 +++++------------------------ web/components/nav/sidebar.tsx | 36 ++++++++++++++++++++----- 2 files changed, 35 insertions(+), 43 deletions(-) diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx index d0f604ab..f404d06c 100644 --- a/web/components/nav/profile-menu.tsx +++ b/web/components/nav/profile-menu.tsx @@ -1,37 +1,11 @@ import { firebaseLogout, User } from '../../lib/firebase/users' import { formatMoney } from '../../../common/util/format' import { Avatar } from '../avatar' -import { Col } from '../layout/col' -import { MenuButton } from './menu' import { IS_PRIVATE_MANIFOLD } from '../../../common/envs/constants' +import { Row } from '../layout/row' - -function getNavigationOptions( - user: User | undefined, - options: { mobile: boolean } -) { - const { mobile } = options +export function getNavigationOptions() { return [ - { - name: 'Home', - href: user ? '/home' : '/', - }, - ...(mobile - ? [ - { - name: 'Markets', - href: '/markets', - }, - { - name: 'Communities', - href: '/folds', - }, - ] - : []), - { - name: `Your profile`, - href: `/${user?.username}`, - }, { name: 'Your trades', href: '/trades', @@ -57,10 +31,6 @@ function getNavigationOptions( name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', }, - { - name: 'About', - href: '/about', - }, ]), { name: 'Sign out', @@ -70,18 +40,18 @@ function getNavigationOptions( ] } -function ProfileSummary(props: { user: User | undefined }) { +export function ProfileSummary(props: { user: User | undefined }) { const { user } = props return ( - +
{user?.name}
-
+
{user ? formatMoney(Math.floor(user.balance)) : ' '}
- + ) } diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx index 3dc0d037..6df5e946 100644 --- a/web/components/nav/sidebar.tsx +++ b/web/components/nav/sidebar.tsx @@ -3,6 +3,7 @@ import { UserGroupIcon, SearchIcon, BookOpenIcon, + DotsHorizontalIcon, } from '@heroicons/react/outline' import clsx from 'clsx' import _ from 'lodash' @@ -10,10 +11,10 @@ import Link from 'next/link' import { useRouter } from 'next/router' import { useFollowedFolds } from '../../hooks/use-fold' import { useUser } from '../../hooks/use-user' -import { Row } from '../layout/row' import { Spacer } from '../layout/spacer' import { ManifoldLogo } from './manifold-logo' -import { NavOptions } from './nav-bar' +import { MenuButton } from './menu' +import { getNavigationOptions, ProfileSummary } from './profile-menu' const navigation = [ { name: 'Home', href: '/home', icon: HomeIcon }, @@ -32,8 +33,6 @@ function SidebarItem(props: { item: Item; currentPage: string }) { return ( + + ) +} + export default function Sidebar() { const router = useRouter() const currentPage = router.pathname @@ -74,11 +85,22 @@ export default function Sidebar() { {navigation.map((item) => ( ))} + + } + />
- - {(user || user === null) && } - + {user && ( +
+ + + + + +
+ )}