From 318da1bd6f4cbc557a2c349a16bfaf6628922c1c Mon Sep 17 00:00:00 2001 From: Austin Chen Date: Thu, 17 Mar 2022 00:50:45 -0700 Subject: [PATCH] Move nav items into nav/ --- web/components/{ => nav}/manifold-logo.tsx | 4 ++-- web/components/{ => nav}/menu.tsx | 0 web/components/{ => nav}/nav-bar.tsx | 6 +++--- web/components/{ => nav}/profile-menu.tsx | 10 +++++----- web/components/page.tsx | 2 +- web/pages/landing-page.tsx | 2 +- web/pages/simulator.tsx | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename web/components/{ => nav}/manifold-logo.tsx (92%) rename web/components/{ => nav}/menu.tsx (100%) rename web/components/{ => nav}/nav-bar.tsx (96%) rename web/components/{ => nav}/profile-menu.tsx (89%) diff --git a/web/components/manifold-logo.tsx b/web/components/nav/manifold-logo.tsx similarity index 92% rename from web/components/manifold-logo.tsx rename to web/components/nav/manifold-logo.tsx index 26344bf3..5043f7b0 100644 --- a/web/components/manifold-logo.tsx +++ b/web/components/nav/manifold-logo.tsx @@ -1,8 +1,8 @@ import Link from 'next/link' import clsx from 'clsx' -import { useUser } from '../hooks/use-user' -import { ENV_CONFIG } from '../../common/envs/constants' +import { useUser } from '../../hooks/use-user' +import { ENV_CONFIG } from '../../../common/envs/constants' export function ManifoldLogo(props: { className?: string diff --git a/web/components/menu.tsx b/web/components/nav/menu.tsx similarity index 100% rename from web/components/menu.tsx rename to web/components/nav/menu.tsx diff --git a/web/components/nav-bar.tsx b/web/components/nav/nav-bar.tsx similarity index 96% rename from web/components/nav-bar.tsx rename to web/components/nav/nav-bar.tsx index 1f54e090..f600d994 100644 --- a/web/components/nav-bar.tsx +++ b/web/components/nav/nav-bar.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx' import Link from 'next/link' -import { useUser } from '../hooks/use-user' -import { Row } from './layout/row' -import { firebaseLogin, User } from '../lib/firebase/users' +import { useUser } from '../../hooks/use-user' +import { Row } from '../layout/row' +import { firebaseLogin, User } from '../../lib/firebase/users' import { ManifoldLogo } from './manifold-logo' import { ProfileMenu } from './profile-menu' import { diff --git a/web/components/profile-menu.tsx b/web/components/nav/profile-menu.tsx similarity index 89% rename from web/components/profile-menu.tsx rename to web/components/nav/profile-menu.tsx index a01614b1..98de7286 100644 --- a/web/components/profile-menu.tsx +++ b/web/components/nav/profile-menu.tsx @@ -1,9 +1,9 @@ -import { firebaseLogout, User } from '../lib/firebase/users' -import { formatMoney } from '../../common/util/format' -import { Avatar } from './avatar' -import { Col } from './layout/col' +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 { IS_PRIVATE_MANIFOLD } from '../../../common/envs/constants' export function ProfileMenu(props: { user: User | undefined }) { const { user } = props diff --git a/web/components/page.tsx b/web/components/page.tsx index 472ec9a5..95ff4270 100644 --- a/web/components/page.tsx +++ b/web/components/page.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx' -import { NavBar } from './nav-bar' +import { NavBar } from './nav/nav-bar' export function Page(props: { wide?: boolean diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx index cbd41e55..d45c0aef 100644 --- a/web/pages/landing-page.tsx +++ b/web/pages/landing-page.tsx @@ -10,7 +10,7 @@ import { import { firebaseLogin } from '../lib/firebase/users' import { ContractsGrid } from '../components/contracts-list' import { Col } from '../components/layout/col' -import { NavBar } from '../components/nav-bar' +import { NavBar } from '../components/nav/nav-bar' import Link from 'next/link' import { Contract } from '../lib/firebase/contracts' diff --git a/web/pages/simulator.tsx b/web/pages/simulator.tsx index c75b849d..b253ac29 100644 --- a/web/pages/simulator.tsx +++ b/web/pages/simulator.tsx @@ -3,7 +3,7 @@ import { DatumValue } from '@nivo/core' import { ResponsiveLine } from '@nivo/line' import { Entry, makeEntries } from '../lib/simulator/entries' -import { NavBar } from '../components/nav-bar' +import { NavBar } from '../components/nav/nav-bar' import { Col } from '../components/layout/col' function TableBody(props: { entries: Entry[] }) {