From b447bbc3229141ef73617523536a929f4ef1460e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 1 Oct 2020 10:03:06 -0300
Subject: [PATCH] UI State changes

---
 .../cart/CartSidebarView/CartSidebarView.tsx  | 15 +++++----
 components/core/Layout/Layout.tsx             | 10 +++---
 components/core/Navbar/Navbar.tsx             | 14 ++------
 components/core/UserNav/UserNav.module.css    | 10 ++++++
 components/core/UserNav/UserNav.tsx           | 33 +++++++++++++++++++
 components/core/UserNav/index.ts              |  1 +
 components/core/index.ts                      |  1 +
 components/ui/Sidebar/Sidebar.tsx             |  4 +--
 8 files changed, 64 insertions(+), 24 deletions(-)
 create mode 100644 components/core/UserNav/UserNav.module.css
 create mode 100644 components/core/UserNav/UserNav.tsx
 create mode 100644 components/core/UserNav/index.ts

diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx
index 6a3a8ca10..b65d9498c 100644
--- a/components/cart/CartSidebarView/CartSidebarView.tsx
+++ b/components/cart/CartSidebarView/CartSidebarView.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from "react";
-// import s from "./CartSidebarView.module.css";
+import { UserNav } from "@components/core";
 import { Button } from "@components/ui";
 import { Trash, Cross } from "@components/icon";
 import { useUI } from "@components/ui/context";
@@ -10,11 +10,6 @@ const CartSidebarView: FunctionComponent = () => {
     <>
       <header className="px-4 py-6 sm:px-6 border-b border-gray-200">
         <div className="flex items-start justify-between space-x-3">
-          <div className="space-y-1">
-            <h2 className="text-lg leading-7 font-medium text-gray-900 uppercase">
-              My Cart
-            </h2>
-          </div>
           <div className="h-7 flex items-center">
             <button
               onClick={closeSidebar}
@@ -24,10 +19,16 @@ const CartSidebarView: FunctionComponent = () => {
               <Cross className="h-6 w-6" />
             </button>
           </div>
+          <div className="space-y-1">
+            <UserNav />
+          </div>
         </div>
+        <h2 className="pt-6 text-lg leading-7 font-medium text-gray-900 uppercase">
+          My Cart
+        </h2>
       </header>
 
-      <div className="px-4 sm:px-6 py-4">
+      <div className="px-4 sm:px-6 py-4 flex-1">
         <ul className="py-6 space-y-6 sm:py-0 sm:space-y-0 sm:divide-y sm:divide-gray-200">
           <li className="flex flex-row space-x-6">
             <div className="h-12 w-12 bg-violet"></div>
diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx
index aa22d3d52..fafc3b39a 100644
--- a/components/core/Layout/Layout.tsx
+++ b/components/core/Layout/Layout.tsx
@@ -15,19 +15,21 @@ const Layout: FunctionComponent<Props> = ({ className, children }) => {
   const rootClassName = cn(s.root, className);
   const { displaySidebar } = useUI();
   return (
-    <Container className={rootClassName}>
+    <div className={rootClassName}>
       <Featurebar
         title="Free Standard Shipping on orders over $99.99"
         description="Due to COVID-19, some orders may experience processing and delivery delays."
       />
-      <Navbar />
-      <main className="h-screen">{children}</main>
+      <Container>
+        <Navbar />
+        <main className="h-screen">{children}</main>
+      </Container>
       {displaySidebar && (
         <Sidebar>
           <CartSidebarView />
         </Sidebar>
       )}
-    </Container>
+    </div>
   );
 };
 
diff --git a/components/core/Navbar/Navbar.tsx b/components/core/Navbar/Navbar.tsx
index bee174068..4a8c2dd7b 100644
--- a/components/core/Navbar/Navbar.tsx
+++ b/components/core/Navbar/Navbar.tsx
@@ -2,18 +2,14 @@ import cn from "classnames";
 import React, { FunctionComponent } from "react";
 import s from "./Navbar.module.css";
 import { Logo, Container } from "@components/ui";
-import { Avatar, Searchbar } from "@components/core";
-import { Heart, Bag } from "@components/icon";
-import { useUI } from "@components/ui/context";
+import { Searchbar } from "@components/core";
+import { UserNav } from "@components/core";
 interface Props {
   className?: string;
-  children?: any;
 }
 
 const Navbar: FunctionComponent<Props> = ({ className }) => {
   const rootClassName = cn(s.root, className);
-  const { openSidebar } = useUI();
-
   return (
     <Container className={rootClassName}>
       <Logo />
@@ -25,11 +21,7 @@ const Navbar: FunctionComponent<Props> = ({ className }) => {
           <a>Accesories</a>
         </nav>
       </div>
-      <nav className="flex flex-row items-center">
-        <Bag className="mr-6" onClick={openSidebar} />
-        <Heart className="mr-6" />
-        <Avatar />
-      </nav>
+      <UserNav />
     </Container>
   );
 };
diff --git a/components/core/UserNav/UserNav.module.css b/components/core/UserNav/UserNav.module.css
new file mode 100644
index 000000000..3dd90ada2
--- /dev/null
+++ b/components/core/UserNav/UserNav.module.css
@@ -0,0 +1,10 @@
+.root {
+}
+
+.list {
+  @apply flex flex-row items-center;
+}
+
+.item {
+  @apply mr-6 cursor-pointer;
+}
diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx
new file mode 100644
index 000000000..dd36cb5fe
--- /dev/null
+++ b/components/core/UserNav/UserNav.tsx
@@ -0,0 +1,33 @@
+import cn from "classnames";
+import React, { FunctionComponent } from "react";
+import s from "./UserNav.module.css";
+import { Avatar } from "@components/core";
+import { Heart, Bag } from "@components/icon";
+import { useUI } from "@components/ui/context";
+
+interface Props {
+  className?: string;
+}
+
+const UserNav: FunctionComponent<Props> = ({ className }) => {
+  const rootClassName = cn(s.root, className);
+  const { openSidebar } = useUI();
+
+  return (
+    <nav className={rootClassName}>
+      <ul className={s.list}>
+        <li className={s.item}>
+          <Bag onClick={openSidebar} />
+        </li>
+        <li className={s.item}>
+          <Heart />
+        </li>
+        <li className={s.item}>
+          <Avatar />
+        </li>
+      </ul>
+    </nav>
+  );
+};
+
+export default UserNav;
diff --git a/components/core/UserNav/index.ts b/components/core/UserNav/index.ts
new file mode 100644
index 000000000..68149bc0c
--- /dev/null
+++ b/components/core/UserNav/index.ts
@@ -0,0 +1 @@
+export { default } from "./UserNav";
diff --git a/components/core/index.ts b/components/core/index.ts
index 3aab7b5ca..57d076f79 100644
--- a/components/core/index.ts
+++ b/components/core/index.ts
@@ -4,3 +4,4 @@ export { default as Footer } from "./Footer";
 export { default as Layout } from "./Layout";
 export { default as Navbar } from "./Navbar";
 export { default as Searchbar } from "./Searchbar";
+export { default as UserNav } from "./UserNav";
diff --git a/components/ui/Sidebar/Sidebar.tsx b/components/ui/Sidebar/Sidebar.tsx
index a74da8026..081198e3f 100644
--- a/components/ui/Sidebar/Sidebar.tsx
+++ b/components/ui/Sidebar/Sidebar.tsx
@@ -11,12 +11,12 @@ const Sidebar: FunctionComponent<Props> = ({ className, children }) => {
   const rootClassName = cn(s.root, className);
   return (
     <div className={rootClassName}>
-      <div className="fixed inset-0 overflow-hidden">
+      <div className="fixed inset-0 overflow-hidden shadow-sm bg-black bg-opacity-25">
         <div className="absolute inset-0 overflow-hidden">
           <section className="absolute inset-y-0 right-0 pl-10 max-w-full flex sm:pl-16 ">
             <div className="w-screen max-w-2xl">
               <div className="h-full flex flex-col bg-white shadow-xl overflow-y-scroll">
-                <div className="flex-1">{children}</div>
+                {children}
               </div>
             </div>
           </section>