diff --git a/packages/bruno-app/src/components/Help/StyledWrapper.js b/packages/bruno-app/src/components/Help/StyledWrapper.js new file mode 100644 index 000000000..f4a69fe40 --- /dev/null +++ b/packages/bruno-app/src/components/Help/StyledWrapper.js @@ -0,0 +1,11 @@ +import styled from 'styled-components'; + +const Wrapper = styled.div` + font-weight: 400; + font-size: 0.75rem; + background-color: ${props => props.theme.infoTip.bg}; + border: 1px solid ${props => props.theme.infoTip.border}; + box-shadow: ${props => props.theme.infoTip.boxShadow}; +`; + +export default Wrapper; diff --git a/packages/bruno-app/src/components/Help/index.js b/packages/bruno-app/src/components/Help/index.js new file mode 100644 index 000000000..6d3f40f87 --- /dev/null +++ b/packages/bruno-app/src/components/Help/index.js @@ -0,0 +1,40 @@ +/** + * The InfoTip components needs to be nuked + * This component will be the future replacement + * We should allow icon and placement props to be passed in + */ + +import React, { useState } from 'react'; +import HelpIcon from 'components/Icons/Help'; +import StyledWrapper from './StyledWrapper'; + +const Help = ({ children, width = 200 }) => { + const [showTooltip, setShowTooltip] = useState(false); + + return ( +
+ setShowTooltip(true)} + onMouseLeave={() => setShowTooltip(false)} + > + + + {showTooltip && ( + + {children} + + )} +
+ ); +}; + +export default Help; \ No newline at end of file diff --git a/packages/bruno-app/src/components/Icons/Help/index.js b/packages/bruno-app/src/components/Icons/Help/index.js new file mode 100644 index 000000000..95c8710af --- /dev/null +++ b/packages/bruno-app/src/components/Icons/Help/index.js @@ -0,0 +1,20 @@ +import React from 'react'; + +const HelpIcon = ({ size = 14 }) => { + return ( + + + + + ) +} + +export default HelpIcon; \ No newline at end of file diff --git a/packages/bruno-app/src/components/Modal/index.js b/packages/bruno-app/src/components/Modal/index.js index 0b44b928b..99bf1f89d 100644 --- a/packages/bruno-app/src/components/Modal/index.js +++ b/packages/bruno-app/src/components/Modal/index.js @@ -16,7 +16,7 @@ const ModalHeader = ({ title, handleCancel, customHeader, hideClose }) => ( ); -const ModalContent = ({ children }) =>
{children}
; +const ModalContent = ({ children }) =>
{children}
; const ModalFooter = ({ confirmText, diff --git a/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js b/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js index 943a58673..bdaca8bbf 100644 --- a/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js +++ b/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js @@ -5,16 +5,32 @@ const StyledWrapper = styled.div` background: ${(props) => props.theme.requestTabPanel.url.bg}; border-radius: 4px; padding: 8px 12px; - - .filename { - color: ${(props) => props.theme.brand}; - font-weight: 500; - min-height: 1.25rem; + font-size: 0.8125rem; + border: 1px solid rgba(0, 0, 0, 0.08); + + .icon-column { + padding-right: 8px; + align-items: flex-start; + padding-top: 2px; } - .file-extension { + .path-container { + flex-wrap: wrap; + } + + .path-segment { + white-space: nowrap; + } + + + .filename, .file-extension { + color: ${(props) => props.theme.colors.text.yellow}; + } + + .separator { color: ${(props) => props.theme.text}; - opacity: 0.5; + opacity: 0.6; + margin: 0 1px; } } `; diff --git a/packages/bruno-app/src/components/PathDisplay/index.js b/packages/bruno-app/src/components/PathDisplay/index.js index 78b6f189a..b7ffa087f 100644 --- a/packages/bruno-app/src/components/PathDisplay/index.js +++ b/packages/bruno-app/src/components/PathDisplay/index.js @@ -19,7 +19,7 @@ const PathDisplay = ({
- +
-
-
- {showExtension ? : } - {collection?.name} +
+
+ {showExtension ? : }
- {pathSegments?.length > 0 && pathSegments?.map((segment, index) => ( -
- / - {segment} +
+
+ {collection?.name}
- ))} -
- {collection && /} + + {pathSegments?.length > 0 && pathSegments?.map((segment, index) => ( + + / +
+ {segment} +
+
+ ))} + + {collection && ( + / + )} + {filename} {showExtension && filename?.length ? ( diff --git a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js index 019195c6c..a1b48843f 100644 --- a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js +++ b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js @@ -10,6 +10,7 @@ import { sanitizeName, validateName, validateNameError } from 'utils/common/rege import PathDisplay from 'components/PathDisplay/index'; import { useState } from 'react'; import { IconArrowBackUp } from '@tabler/icons'; +import Help from 'components/Help'; const CreateCollection = ({ onClose }) => { const inputRef = useRef(); @@ -97,8 +98,16 @@ const CreateCollection = ({ onClose }) => {
{formik.errors.collectionName}
) : null} -