From 5689f387e3ef154fd55cf5c9ad71e85be383802b Mon Sep 17 00:00:00 2001 From: Silvia Zeni Date: Fri, 18 Feb 2022 12:18:52 +0000 Subject: [PATCH 01/23] feat: new navbar (WIP) --- src/components/NavBar.tsx | 17 ++------ src/components/ProductsNavbar.tsx | 43 ++++++++++++++++++ src/components/index.ts | 2 + src/ui.tsx | 25 +++++++---- src/wrappers/AnnotateWrapper.tsx | 72 +++++++++++++++---------------- src/wrappers/CurateWrapper.tsx | 3 +- 6 files changed, 103 insertions(+), 59 deletions(-) create mode 100644 src/components/ProductsNavbar.tsx diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index 6a4f2e94..4165c8f2 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -17,7 +17,7 @@ import { HtmlTooltip } from "@gliff-ai/style"; import { imgSrc } from "@/imgSrc"; import { useAuth } from "@/hooks/use-auth"; -import { ProductIcons, BaseProductIcon } from "@/components"; +import { ProductsNavbar, ProductNavbarData } from "@/components"; const useStyles = makeStyles((theme: Theme) => ({ appBar: { @@ -77,7 +77,7 @@ const useStyles = makeStyles((theme: Theme) => ({ }, })); interface Props { - productSection: JSX.Element | null; + productNavbarData: ProductNavbarData; } export const NavBar = (props: Props): ReactElement | null => { // Get auth state and re-render anytime it changes @@ -204,22 +204,11 @@ export const NavBar = (props: Props): ReactElement | null => { alt="gliff logo" /> - - {props.productSection} -