diff --git a/renderer/components/EnvironmentSelector/StyledWrapper.js b/renderer/components/EnvironmentSelector/StyledWrapper.js new file mode 100644 index 000000000..9ab33dece --- /dev/null +++ b/renderer/components/EnvironmentSelector/StyledWrapper.js @@ -0,0 +1,10 @@ +import styled from 'styled-components'; + +const Wrapper = styled.div` + .current-enviroment { + background: #efefef; + border-radius: 15px; + } +`; + +export default Wrapper; diff --git a/renderer/components/EnvironmentSelector/index.js b/renderer/components/EnvironmentSelector/index.js new file mode 100644 index 000000000..9208728d8 --- /dev/null +++ b/renderer/components/EnvironmentSelector/index.js @@ -0,0 +1,54 @@ +import React, { useRef, forwardRef } from 'react'; +import Dropdown from 'components/Dropdown'; +import { faCaretDown } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { IconAdjustmentsHorizontal } from '@tabler/icons'; +import StyledWrapper from './StyledWrapper'; + +const EnvironmentSelector = () => { + const dropdownTippyRef = useRef(); + + const Icon = forwardRef((props, ref) => { + return ( +
+ No Environment +
+ ); + }); + + const onDropdownCreate = (ref) => dropdownTippyRef.current = ref; + + return ( + +
+ } placement='bottom-start'> +
{ + dropdownTippyRef.current.hide(); + }}> + QA1 +
+
{ + dropdownTippyRef.current.hide(); + }}> + STG +
+
{ + dropdownTippyRef.current.hide(); + }}> + No Environment +
+
{ + dropdownTippyRef.current.hide(); + }}> +
+ +
+ Settings +
+
+
+
+ ); +}; + +export default EnvironmentSelector; diff --git a/renderer/components/RequestTabs/CollectionTitleBar/index.js b/renderer/components/RequestTabs/CollectionTitleBar/index.js deleted file mode 100644 index 1aa4458f7..000000000 --- a/renderer/components/RequestTabs/CollectionTitleBar/index.js +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { IconStack, IconGitFork } from '@tabler/icons'; -import StyledWrapper from './StyledWrapper'; - -const CollectionTitleBar = ({collection}) => { - return ( - -
- - anoop/{collection.name} - - from anoop/notebase -
-
- ) -}; - -export default CollectionTitleBar; diff --git a/renderer/components/RequestTabs/CollectionTitleBar/StyledWrapper.js b/renderer/components/RequestTabs/CollectionToolBar/StyledWrapper.js similarity index 100% rename from renderer/components/RequestTabs/CollectionTitleBar/StyledWrapper.js rename to renderer/components/RequestTabs/CollectionToolBar/StyledWrapper.js diff --git a/renderer/components/RequestTabs/CollectionToolBar/index.js b/renderer/components/RequestTabs/CollectionToolBar/index.js new file mode 100644 index 000000000..4a725bd04 --- /dev/null +++ b/renderer/components/RequestTabs/CollectionToolBar/index.js @@ -0,0 +1,24 @@ +import React from 'react'; +import { IconStack, IconGitFork } from '@tabler/icons'; +import EnvironmentSelector from 'components/EnvironmentSelector'; +import StyledWrapper from './StyledWrapper'; + +const CollectionToolBar = ({collection}) => { + return ( + +
+
+ + anoop/{collection.name} + + from anoop/notebase +
+
+ +
+
+
+ ) +}; + +export default CollectionToolBar; diff --git a/renderer/components/RequestTabs/index.js b/renderer/components/RequestTabs/index.js index f6a6eb445..7ea9b3e30 100644 --- a/renderer/components/RequestTabs/index.js +++ b/renderer/components/RequestTabs/index.js @@ -5,7 +5,7 @@ import classnames from 'classnames'; import { IconHome2 } from '@tabler/icons'; import { useStore } from 'providers/Store'; import actions from 'providers/Store/actions'; -import CollectionTitleBar from './CollectionTitleBar'; +import CollectionToolBar from './CollectionToolBar'; import StyledWrapper from './StyledWrapper'; const RequestTabs = () => { @@ -75,7 +75,7 @@ const RequestTabs = () => { {collectionRequestTabs && collectionRequestTabs.length ? ( <> - +
  • diff --git a/renderer/components/Sidebar/Collections/Collection/index.js b/renderer/components/Sidebar/Collections/Collection/index.js index 01d90c54d..a8bf2c733 100644 --- a/renderer/components/Sidebar/Collections/Collection/index.js +++ b/renderer/components/Sidebar/Collections/Collection/index.js @@ -1,5 +1,5 @@ import React, { forwardRef, useRef } from 'react'; -import { IconChevronRight, IconDots, IconWorld } from '@tabler/icons'; +import { IconChevronRight, IconDots } from '@tabler/icons'; import CollectionItem from './CollectionItem'; import Dropdown from '../../../Dropdown'; import get from 'lodash/get'; @@ -9,14 +9,6 @@ import StyledWrapper from './StyledWrapper'; const Collection = ({collection, actions, dispatch, activeRequestTabId}) => { const envDropdownTippyRef = useRef(); - const onEnvDropdownCreate = (ref) => envDropdownTippyRef.current = ref; - const EnvIcon = forwardRef((props, ref) => { - return ( -
    - -
    - ); - }); const menuDropdownTippyRef = useRef(); const onMenuDropdownCreate = (ref) => menuDropdownTippyRef.current = ref; @@ -50,16 +42,6 @@ const Collection = ({collection, actions, dispatch, activeRequestTabId}) => { {collection.name}
    - } placement='bottom-start'> -
    -
    { - envDropdownTippyRef.current.hide(); - }}> - No Environment Selected -
    -
    -
    - } placement='bottom-start'>
    {