diff --git a/packages/web/src/impexp/ImportExportConfigurator.js b/packages/web/src/impexp/ImportExportConfigurator.js index 2ef09f7a2..d6ea84025 100644 --- a/packages/web/src/impexp/ImportExportConfigurator.js +++ b/packages/web/src/impexp/ImportExportConfigurator.js @@ -25,8 +25,9 @@ import SqlEditor from '../sqleditor/SqlEditor'; import { useUploadsProvider } from '../utility/UploadsProvider'; const Container = styled.div` - max-height: 50vh; - overflow-y: scroll; + // max-height: 50vh; + // overflow-y: scroll; + flex: 1; `; const Wrapper = styled.div` @@ -68,6 +69,12 @@ const DragWrapper = styled.div` background: #ddd; `; +const ArrowWrapper = styled.div` + font-size: 30px; + color: blue; + align-self: center; +`; + function getFileFilters(storageType) { const res = []; if (storageType == 'csv') res.push({ name: 'CSV files', extensions: ['csv'] }); @@ -344,6 +351,9 @@ export default function ImportExportConfigurator({ uploadedFile = undefined }) { tablesField="sourceList" engine={sourceEngine} /> + + + + -
+ Import/Export - - - - - - - - - {runnerId && ( - - - - )} - + + + + + + + {/* + Preview + */} + + + + + + + + + + +
); diff --git a/packages/web/src/modals/ModalBase.js b/packages/web/src/modals/ModalBase.js index 2c554ab79..b015d8c7a 100644 --- a/packages/web/src/modals/ModalBase.js +++ b/packages/web/src/modals/ModalBase.js @@ -22,27 +22,51 @@ const StyledModal = styled(Modal)` background: #fff; overflow: auto; webkitoverflowscrolling: touch; - borderradius: 4px; outline: none; - width: 50%; - max-width: 900px; - margin: auto; - margin-top: 15vh; + ${(props) => + props.fullScreen && + ` + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + // width: 100%; + // height: 100%; + `} - // z-index:1200; + ${(props) => + !props.fullScreen && + ` + border-radius: 10px; + width: 50%; + max-width: 900px; + margin: auto; + margin-top: 15vh; + `} + + // z-index:1200; + + ${(props) => + props.isFlex && + ` + display: flex; + `} `; const ModalContent = styled.div` padding: 20px; `; -export default function ModalBase({ modalState, children }) { +export default function ModalBase({ modalState, children, isFlex = false, fullScreen = false }) { return (