From 0aba04851f9677c2922815643006fdebe12499a4 Mon Sep 17 00:00:00 2001 From: Michael An <2331806369@qq.com> Date: Thu, 11 Jul 2024 16:01:58 +0800 Subject: [PATCH] 02 change path --- frontend/src/app.js | 91 ++++--------------- frontend/src/components/logo.js | 9 +- frontend/src/components/side-panel.js | 10 +- .../src/components/toolbar/common-toolbar.js | 3 +- frontend/src/pages/groups/group-view.js | 9 -- .../src/pages/invitations/invitations-view.js | 7 -- .../lib-content-view/lib-content-view.js | 46 +--------- frontend/src/pages/libraries/index.js | 2 - frontend/src/pages/my-libs/my-libs-deleted.js | 1 - frontend/src/pages/my-libs/my-libs.js | 3 - frontend/src/pages/share-admin/share-links.js | 8 -- .../src/pages/share-admin/upload-links.js | 7 -- .../pages/share-with-ocm/remote-dir-view.js | 20 ++-- 13 files changed, 30 insertions(+), 186 deletions(-) diff --git a/frontend/src/app.js b/frontend/src/app.js index 901a2329c72..e8fef0c7b8a 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -3,15 +3,12 @@ import ReactDom from 'react-dom'; import { Router, navigate } from '@gatsbyjs/reach-router'; import MediaQuery from 'react-responsive'; import { Modal } from 'reactstrap'; - import { siteRoot } from './utils/constants'; import { Utils } from './utils/utils'; - import SystemNotification from './components/system-notification'; import Header from './components/header'; import SidePanel from './components/side-panel'; import MainPanel from './components/main-panel'; - import FilesActivities from './pages/dashboard/files-activities'; import MyFileActivities from './pages/dashboard/my-file-activities'; import Starred from './pages/starred/starred'; @@ -230,88 +227,38 @@ class App extends Component { onCloseSidePanel={this.onCloseSidePanel} currentTab={currentTab} tabItemClick={this.tabItemClick} - showLogoOnlyInMobile={true} toggleFoldSideNav={this.toggleFoldSideNav} /> - {/* 现在宽度是固定的 MainPanel 78%,SidePanel 22%,未来增加一个拖动工具,支持左右拖动,改变这里的宽度 */} - {/* 未来优化一下 commonProps = { onShowSidePanel={this.onShowSidePanel}, onSearchedClick={this.onSearchedClick} } */} - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/components/logo.js b/frontend/src/components/logo.js index 1e7fefc2159..4839b359ed2 100644 --- a/frontend/src/components/logo.js +++ b/frontend/src/components/logo.js @@ -1,13 +1,11 @@ import React from 'react'; import PropTypes from 'prop-types'; import { siteRoot, mediaUrl, logoPath, logoWidth, logoHeight, siteTitle } from '../utils/constants'; -import { Utils } from '../utils/utils'; const propTypes = { onCloseSidePanel: PropTypes.func, showCloseSidePanelIcon: PropTypes.bool, positioned: PropTypes.bool, - showLogoOnlyInMobile: PropTypes.bool }; class Logo extends React.Component { @@ -17,12 +15,7 @@ class Logo extends React.Component { }; render() { - const { positioned, showLogoOnlyInMobile } = this.props; - - if (showLogoOnlyInMobile && Utils.isDesktop()) { - return null; - } - + const { positioned } = this.props; return (