From 6d71393069add860332ad9effd2d462ed2c62fcc Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Sat, 11 Dec 2021 00:04:00 +0530
Subject: [PATCH] chore: moved workspace selector to sidebar

---
 .../src/components/Navbar/StyledWrapper.js                    | 3 +--
 packages/grafnode-components/src/components/Navbar/index.js   | 4 ++--
 packages/grafnode-components/src/components/Sidebar/index.js  | 2 ++
 packages/grafnode-run/src/pageComponents/Main/index.js        | 4 +---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/grafnode-components/src/components/Navbar/StyledWrapper.js b/packages/grafnode-components/src/components/Navbar/StyledWrapper.js
index 20e6248e..413b6a82 100644
--- a/packages/grafnode-components/src/components/Navbar/StyledWrapper.js
+++ b/packages/grafnode-components/src/components/Navbar/StyledWrapper.js
@@ -1,8 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  background: #383735;
-  color: white;
+  background-color: #f2f2f2;
 `;
 
 export default StyledWrapper;
\ No newline at end of file
diff --git a/packages/grafnode-components/src/components/Navbar/index.js b/packages/grafnode-components/src/components/Navbar/index.js
index 56d5191d..6f8e1eb4 100644
--- a/packages/grafnode-components/src/components/Navbar/index.js
+++ b/packages/grafnode-components/src/components/Navbar/index.js
@@ -6,10 +6,10 @@ import StyledWrapper from './StyledWrapper';
 
 const Navbar = () => {
   return (
-    <StyledWrapper className="px-3 py-2 flex items-center bg-gray-200 justify-center">
+    <StyledWrapper className="px-2 py-2 flex items-center">
       <IconBox size={22} strokeWidth={1.5}/>
       <span className="ml-2">My Workspace</span>
-      <FontAwesomeIcon className="ml-2 text-gray-200" icon={faCaretDown} style={{fontSize: 13}}/>
+      <FontAwesomeIcon className="ml-2" icon={faCaretDown} style={{fontSize: 13}}/>
     </StyledWrapper>
   )
 };
diff --git a/packages/grafnode-components/src/components/Sidebar/index.js b/packages/grafnode-components/src/components/Sidebar/index.js
index 1ad793e0..715a7895 100644
--- a/packages/grafnode-components/src/components/Sidebar/index.js
+++ b/packages/grafnode-components/src/components/Sidebar/index.js
@@ -1,10 +1,12 @@
 import React from 'react';
 import Collections from './Collections';
+import Navbar from '../Navbar';
 import { IconDatabase, IconSearch } from '@tabler/icons';
 
 const Sidebar = ({collections, actions, dispatch, activeRequestTabId}) => {
   return (
     <aside>
+      <Navbar />
       <div className="mt-4 px-2 flex">
         <IconDatabase size={20} strokeWidth={1.5}/>
         <span className="ml-1">No Environment</span>
diff --git a/packages/grafnode-run/src/pageComponents/Main/index.js b/packages/grafnode-run/src/pageComponents/Main/index.js
index 61260aca..740ce0a0 100644
--- a/packages/grafnode-run/src/pageComponents/Main/index.js
+++ b/packages/grafnode-run/src/pageComponents/Main/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import dynamic from 'next/dynamic'
 import {
-  Navbar,
   RequestTabs,
   Sidebar
 } from '@grafnode/components';
@@ -49,7 +48,6 @@ export default function Main() {
 
   return (
     <div>
-      <Navbar />
       <StyledWrapper>
         <Sidebar
           collections={collections}
@@ -57,7 +55,7 @@ export default function Main() {
           dispatch={dispatch}
           activeRequestTabId={activeRequestTabId}
         />
-        <section className='mt-4 flex flex-grow flex-col'>
+        <section className='flex flex-grow flex-col'>
           <RequestTabs
             requestTabs={requestTabs}
             actions={actions}