diff --git a/src/components/FolderTree/FolderTree.js b/src/components/FolderTree/FolderTree.js index 0c98bf6..a8dc2e1 100644 --- a/src/components/FolderTree/FolderTree.js +++ b/src/components/FolderTree/FolderTree.js @@ -5,7 +5,7 @@ import FolderTreeStorage from ".././FolderTreeStorage" const FolderTree = (props) => (
-
+
{(env.activeSubscription || !env.commercialMode) ? : undefined} {env.s3Enabled ? : undefined} diff --git a/src/components/FolderTree/index.js b/src/components/FolderTree/index.js index bd4b054..f6cf69c 100644 --- a/src/components/FolderTree/index.js +++ b/src/components/FolderTree/index.js @@ -5,14 +5,41 @@ class FolderTreeContrainer extends React.Component { constructor(props) { super(props); + + this.state = { + hideFolderTree: false, + showFolderTreeScrollBars: false + } } componentDidMount = () => { + //folder-tree__box-hide-scroll-bars + + const hideFolderTree = localStorage.getItem("hide-folder-tree"); + const showFolderTreeScrollBars = localStorage.getItem("show-folder-tree-scroll-bars") + + //console.log("show folder tree scroll bars"); + + if (hideFolderTree) { + + this.setState(() => ({ + hideFolderTree, + })) + + } else { + + this.setState(() => ({ + showFolderTreeScrollBars + })) + } } render() { - return + + if (this.state.hideFolderTree) return
+ + return } } diff --git a/src/components/FolderTreeStorage/index.js b/src/components/FolderTreeStorage/index.js index aeb345d..9ea5672 100644 --- a/src/components/FolderTreeStorage/index.js +++ b/src/components/FolderTreeStorage/index.js @@ -59,7 +59,19 @@ class FolderTreeStorageContainer extends React.Component { componentDidMount = () => { - //this.getFolders(); + // const hideFolderTree = localStorage.getItem("hide-folder-tree"); + + // if (hideFolderTree) { + + // this.setState(() => ({ + // hideFolderTree + // })) + + // } else { + // this.getFolders(); + // } + + this.getFolders(); } componentDidUpdate = () => { @@ -98,6 +110,7 @@ class FolderTreeStorageContainer extends React.Component { } render() { + return } } diff --git a/src/components/LeftSection/LeftSection.js b/src/components/LeftSection/LeftSection.js index bb17015..026eb1a 100644 --- a/src/components/LeftSection/LeftSection.js +++ b/src/components/LeftSection/LeftSection.js @@ -60,7 +60,7 @@ class LeftSection extends React.Component {
-
+
    {/*
  • utility Shared with me
  • utility Recent Files
  • diff --git a/src/components/LeftSection/index.js b/src/components/LeftSection/index.js index 78b863b..f82b5bc 100644 --- a/src/components/LeftSection/index.js +++ b/src/components/LeftSection/index.js @@ -19,6 +19,7 @@ class LeftSectionContainer extends React.Component { this.state = { open: false, + hideFolderTree: false, } } @@ -64,6 +65,15 @@ class LeftSectionContainer extends React.Component { componentDidMount = () => { document.addEventListener('mousedown', this.handleClickOutside); + + const hideFolderTree = localStorage.getItem("hide-folder-tree"); + + if (hideFolderTree) { + + this.setState(() => ({ + hideFolderTree + })) + } } componentWillUnmount = () => { diff --git a/src/components/SettingsPage/index.js b/src/components/SettingsPage/index.js index 3e9ac55..491e668 100644 --- a/src/components/SettingsPage/index.js +++ b/src/components/SettingsPage/index.js @@ -53,6 +53,8 @@ class SettingsPageContainer extends React.Component { descendingSort: true, dropToUpload: true, doubleClickFolders: false, + hideFolderTree: false, + showFolderTreeScrollBars: false } this.uploadReference = React.createRef() @@ -99,7 +101,9 @@ class SettingsPageContainer extends React.Component { const nameMode = window.localStorage.getItem("name-mode"); const ascMode = window.localStorage.getItem("asc-mode"); const dropToUpload = window.localStorage.getItem("non_drop-mode"); - const doubleClickFolders = window.localStorage.getItem("double-click-folders") + const doubleClickFolders = window.localStorage.getItem("double-click-folders"); + const hideFolderTree = window.localStorage.getItem("hide-folder-tree"); + const showFolderTreeScrollBars = window.localStorage.getItem("show-folder-tree-scroll-bars") this.setState(() => { return { @@ -109,6 +113,8 @@ class SettingsPageContainer extends React.Component { descendingSort: !ascMode, dropToUpload: !dropToUpload, doubleClickFolders: doubleClickFolders, + hideFolderTree: hideFolderTree, + showFolderTreeScrollBars } }) } @@ -786,6 +792,44 @@ class SettingsPageContainer extends React.Component { }) } + hideFolderTreeOnChange = () =>{ + + if (this.state.hideFolderTree) { + + window.localStorage.removeItem("hide-folder-tree"); + + } else { + + console.log("setting hide folder tree to true") + + window.localStorage.setItem("hide-folder-tree", true); + } + + this.setState(() => ({ + ...this.state, + hideFolderTree: !this.state.hideFolderTree + })) + + } + + showFolderTreeScrollBarsOnChange = () => { + + if (this.state.showFolderTreeScrollBars) { + + window.localStorage.removeItem("show-folder-tree-scroll-bars"); + + } else { + + window.localStorage.setItem("show-folder-tree-scroll-bars", true); + } + + this.setState(() => ({ + ...this.state, + showFolderTreeScrollBars: !this.state.showFolderTreeScrollBars + })) + + } + render() { return ( @@ -1259,6 +1303,14 @@ class SettingsPageContainer extends React.Component {

    +

    + + +

    +

    + + +

diff --git a/src/styles/components/_Folder-tree.scss b/src/styles/components/_Folder-tree.scss index f916446..209591e 100644 --- a/src/styles/components/_Folder-tree.scss +++ b/src/styles/components/_Folder-tree.scss @@ -28,6 +28,22 @@ // border-radius: 10px; } +.folder-tree__box-hide-scroll-bars { + + width: 95%; + height: 85%; + overflow: scroll; + + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; + &::-webkit-scrollbar { + display: none; + width: 0px; + background: transparent + } + +} + .folder-tree__storage { // width: 100%; // height: 55px; diff --git a/src/styles/components/_LeftSection.scss b/src/styles/components/_LeftSection.scss index 83eb06f..06b641e 100644 --- a/src/styles/components/_LeftSection.scss +++ b/src/styles/components/_LeftSection.scss @@ -547,4 +547,8 @@ // height: inherit; // /* color: red; */ // background: #3f85f0; +} + +.utility__buttons_no_border { + border: none !important; } \ No newline at end of file