mirror of
https://github.com/usebruno/bruno.git
synced 2025-06-20 19:58:10 +02:00
chore: moved workspace selector to sidebar
This commit is contained in:
parent
17e755123e
commit
6d71393069
@ -1,8 +1,7 @@
|
|||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
|
|
||||||
const StyledWrapper = styled.div`
|
const StyledWrapper = styled.div`
|
||||||
background: #383735;
|
background-color: #f2f2f2;
|
||||||
color: white;
|
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export default StyledWrapper;
|
export default StyledWrapper;
|
@ -6,10 +6,10 @@ import StyledWrapper from './StyledWrapper';
|
|||||||
|
|
||||||
const Navbar = () => {
|
const Navbar = () => {
|
||||||
return (
|
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}/>
|
<IconBox size={22} strokeWidth={1.5}/>
|
||||||
<span className="ml-2">My Workspace</span>
|
<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>
|
</StyledWrapper>
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import Collections from './Collections';
|
import Collections from './Collections';
|
||||||
|
import Navbar from '../Navbar';
|
||||||
import { IconDatabase, IconSearch } from '@tabler/icons';
|
import { IconDatabase, IconSearch } from '@tabler/icons';
|
||||||
|
|
||||||
const Sidebar = ({collections, actions, dispatch, activeRequestTabId}) => {
|
const Sidebar = ({collections, actions, dispatch, activeRequestTabId}) => {
|
||||||
return (
|
return (
|
||||||
<aside>
|
<aside>
|
||||||
|
<Navbar />
|
||||||
<div className="mt-4 px-2 flex">
|
<div className="mt-4 px-2 flex">
|
||||||
<IconDatabase size={20} strokeWidth={1.5}/>
|
<IconDatabase size={20} strokeWidth={1.5}/>
|
||||||
<span className="ml-1">No Environment</span>
|
<span className="ml-1">No Environment</span>
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import dynamic from 'next/dynamic'
|
import dynamic from 'next/dynamic'
|
||||||
import {
|
import {
|
||||||
Navbar,
|
|
||||||
RequestTabs,
|
RequestTabs,
|
||||||
Sidebar
|
Sidebar
|
||||||
} from '@grafnode/components';
|
} from '@grafnode/components';
|
||||||
@ -49,7 +48,6 @@ export default function Main() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Navbar />
|
|
||||||
<StyledWrapper>
|
<StyledWrapper>
|
||||||
<Sidebar
|
<Sidebar
|
||||||
collections={collections}
|
collections={collections}
|
||||||
@ -57,7 +55,7 @@ export default function Main() {
|
|||||||
dispatch={dispatch}
|
dispatch={dispatch}
|
||||||
activeRequestTabId={activeRequestTabId}
|
activeRequestTabId={activeRequestTabId}
|
||||||
/>
|
/>
|
||||||
<section className='mt-4 flex flex-grow flex-col'>
|
<section className='flex flex-grow flex-col'>
|
||||||
<RequestTabs
|
<RequestTabs
|
||||||
requestTabs={requestTabs}
|
requestTabs={requestTabs}
|
||||||
actions={actions}
|
actions={actions}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user