From fba3f245681fd3fb13889172ef255fe8a8e57580 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Sun, 9 Oct 2022 16:32:44 +0530
Subject: [PATCH] chore: updated icon used for collection

---
 packages/bruno-app/package.json                   |  2 +-
 .../RequestTabs/CollectionToolBar/index.js        |  4 ++--
 .../src/components/Sidebar/MenuBar/index.js       |  7 ++-----
 .../src/components/Sidebar/TitleBar/index.js      | 15 ++++++++++-----
 .../bruno-app/src/components/Sidebar/index.js     |  4 ++--
 .../bruno-app/src/components/Welcome/index.js     |  6 +++---
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/bruno-app/package.json b/packages/bruno-app/package.json
index dc769712f..d0007ccbe 100644
--- a/packages/bruno-app/package.json
+++ b/packages/bruno-app/package.json
@@ -2,7 +2,7 @@
   "name": "@usebruno/app",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "../../node_modules/.bin/next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"
diff --git a/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js b/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js
index c480410de..16013dbd7 100644
--- a/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { IconFolders } from '@tabler/icons';
+import { IconFiles } from '@tabler/icons';
 import EnvironmentSelector from 'components/EnvironmentSelector';
 import StyledWrapper from './StyledWrapper';
 
@@ -8,7 +8,7 @@ const CollectionToolBar = ({collection}) => {
     <StyledWrapper>
       <div className="flex items-center p-2">
         <div className="flex flex-1 items-center">
-          <IconFolders size={18} strokeWidth={1.5}/>
+          <IconFiles size={18} strokeWidth={1.5}/>
           <span className="ml-2 mr-4 font-semibold">{collection.name}</span>
         </div>
         <div className="flex flex-1 items-center justify-end">
diff --git a/packages/bruno-app/src/components/Sidebar/MenuBar/index.js b/packages/bruno-app/src/components/Sidebar/MenuBar/index.js
index 319daf332..abe966779 100644
--- a/packages/bruno-app/src/components/Sidebar/MenuBar/index.js
+++ b/packages/bruno-app/src/components/Sidebar/MenuBar/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Link from 'next/link';
-import { IconCode, IconStack, IconGitPullRequest, IconUser, IconUsers, IconSettings, IconBuilding, IconChevronsLeft} from '@tabler/icons';
+import { IconCode, IconFiles, IconUser, IconUsers, IconSettings, IconBuilding, IconChevronsLeft} from '@tabler/icons';
 import { useSelector, useDispatch } from 'react-redux';
 import { toggleLeftMenuBar } from 'providers/ReduxStore/slices/app'
 import StyledWrapper from './StyledWrapper';
@@ -18,10 +18,7 @@ const MenuBar = () => {
           </Link>
         </div>
         <div className="menu-item">
-          <IconStack size={28} strokeWidth={1.5}/>
-        </div>
-        <div className="menu-item">
-          <IconGitPullRequest size={28} strokeWidth={1.5}/>
+          <IconFiles size={28} strokeWidth={1.5}/>
         </div>
         <div className="menu-item">
           <IconUsers size={28} strokeWidth={1.5}/>
diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
index 70d178127..e33b2ab9f 100644
--- a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
+++ b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
@@ -68,17 +68,22 @@ const TitleBar = () => {
         <div className=" flex items-center font-medium select-none" style={{fontSize: 14, paddingLeft: 6, position: 'relative', top: -1}}>bruno</div>
         <div className="collection-dropdown flex flex-grow items-center justify-end">
           <Dropdown onCreate={onMenuDropdownCreate} icon={<MenuIcon />} placement='bottom-start'>
-            <div className="dropdown-item" onClick={(e) => {
-              menuDropdownTippyRef.current.hide();
-            }}>
-              Open Collection
-            </div>
             <div className="dropdown-item" onClick={(e) => {
               menuDropdownTippyRef.current.hide();
               setModalOpen(true);
             }}>
               Create Collection
             </div>
+            <div className="dropdown-item" onClick={(e) => {
+              menuDropdownTippyRef.current.hide();
+            }}>
+              Import Collection
+            </div>
+            <div className="dropdown-item" onClick={(e) => {
+              menuDropdownTippyRef.current.hide();
+            }}>
+              Add Collection to Workspace
+            </div>
           </Dropdown>
         </div>
       </div>
diff --git a/packages/bruno-app/src/components/Sidebar/index.js b/packages/bruno-app/src/components/Sidebar/index.js
index e9ec30c1a..d738da080 100644
--- a/packages/bruno-app/src/components/Sidebar/index.js
+++ b/packages/bruno-app/src/components/Sidebar/index.js
@@ -3,7 +3,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import Collections from './Collections';
 import TitleBar from './TitleBar';
 import MenuBar from './MenuBar';
-import { IconSearch, IconChevronsRight, IconSettings, IconShieldCheck, IconShieldX, IconLayoutGrid} from '@tabler/icons';
+import { IconSearch, IconChevronsRight } from '@tabler/icons';
 import { updateLeftSidebarWidth, updateIsDragging, toggleLeftMenuBar } from 'providers/ReduxStore/slices/app';
 import StyledWrapper from './StyledWrapper';
 import WorkspaceSelector from 'components/Workspaces/WorkspaceSelector';
@@ -99,7 +99,7 @@ const Sidebar = () => {
               <div className="flex items-center ml-1 text-xs ">
                 {!leftMenuBarOpen && <IconChevronsRight size={24} strokeWidth={1.5}  className="mr-2  hover:text-gray-700" onClick={() => dispatch(toggleLeftMenuBar())}/>}
                 {/* <IconLayoutGrid size={20} strokeWidth={1.5} className="mr-2"/> */}
-                <IconSettings size={20} strokeWidth={1.5} className="mr-2  hover:text-gray-700"/>
+                {/* Need to ut github stars link here */}
               </div>
               <div className="flex flex-grow items-center justify-end text-xs mr-2">
                 v1.25.2
diff --git a/packages/bruno-app/src/components/Welcome/index.js b/packages/bruno-app/src/components/Welcome/index.js
index 8c6505718..ecd88955d 100644
--- a/packages/bruno-app/src/components/Welcome/index.js
+++ b/packages/bruno-app/src/components/Welcome/index.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { IconPlus, IconUpload, IconFolders } from '@tabler/icons';
+import { IconPlus, IconUpload, IconFiles } from '@tabler/icons';
 import { useDispatch } from 'react-redux';
 import { createCollection } from 'providers/ReduxStore/slices/collections';
 import Bruno from 'components/Bruno';
@@ -33,10 +33,10 @@ const Welcome = () => {
       <div className="uppercase font-semibold create-request mt-10">Collections</div>
       <div className="mt-4 flex items-center collection-options">
         <div className="flex items-center">
-          <IconFolders size={18} strokeWidth={2}/><span className="label ml-2">Open Collection</span>
+          <IconPlus size={18} strokeWidth={2}/><span className="label ml-2" onClick={() => setModalOpen(true)}>Create Collection</span>
         </div>
         <div className="flex items-center ml-6">
-          <IconPlus size={18} strokeWidth={2}/><span className="label ml-2" onClick={() => setModalOpen(true)}>Create Collection</span>
+          <IconFiles size={18} strokeWidth={2}/><span className="label ml-2">Add Collection to Workspace</span>
         </div>
         {/* not in mvp */}
         {/* <div className="flex items-center ml-6">