From c67d3ee2f102155e2e9781e13d5d33c1ab227cb4 Mon Sep 17 00:00:00 2001 From: Sabir Hassan Date: Fri, 5 Aug 2022 01:10:15 +0500 Subject: [PATCH] fix: improve mobile view for studio page --- .../Settings/addPermissionModal.tsx | 1 + web/src/containers/Studio/editor.tsx | 13 +-- web/src/containers/Studio/sideBar.tsx | 87 ++++++++++++++++--- 3 files changed, 81 insertions(+), 20 deletions(-) diff --git a/web/src/containers/Settings/addPermissionModal.tsx b/web/src/containers/Settings/addPermissionModal.tsx index f1d7ffa..945ed46 100644 --- a/web/src/containers/Settings/addPermissionModal.tsx +++ b/web/src/containers/Settings/addPermissionModal.tsx @@ -147,6 +147,7 @@ const AddPermissionModal = ({ @@ -372,10 +370,7 @@ const SASjsEditor = ({ - + -
+

SAS Log

{log}
-
+
{webout}
diff --git a/web/src/containers/Studio/sideBar.tsx b/web/src/containers/Studio/sideBar.tsx index 65af0bc..3c0f639 100644 --- a/web/src/containers/Studio/sideBar.tsx +++ b/web/src/containers/Studio/sideBar.tsx @@ -1,6 +1,15 @@ import React, { useState, useMemo } from 'react' import axios from 'axios' -import { Backdrop, Box, CircularProgress, Drawer, Toolbar } from '@mui/material' +import { + Backdrop, + Box, + Paper, + CircularProgress, + Drawer, + Toolbar, + IconButton +} from '@mui/material' +import { FolderOpen } from '@mui/icons-material' import TreeView from '../../components/tree' import BootstrapSnackbar, { AlertSeverityType } from '../../components/snackbar' @@ -33,6 +42,12 @@ const SideBar = ({ const [snackbarSeverity, setSnackbarSeverity] = useState( AlertSeverityType.Success ) + const [mobileOpen, setMobileOpen] = React.useState(false) + + const handleDrawerToggle = () => { + setMobileOpen(!mobileOpen) + } + const defaultExpanded = useMemo(() => { const splittedPath = selectedFilePath.split('/') const arr = [''] @@ -147,15 +162,8 @@ const SideBar = ({ .finally(() => setIsLoading(false)) } - return ( - + const drawer = ( +
theme.zIndex.drawer + 1 }} open={isLoading} @@ -189,7 +197,64 @@ const SideBar = ({ title={modalTitle} payload={modalPayload} /> - +
+ ) + + return ( + <> + + + + + + + {drawer} + + + {drawer} + + ) }