1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-02 07:47:32 +00:00

Repair draft activities (#2403)

* repair drafts and activities

* repair bug

* repair bug

* repair bug
This commit is contained in:
shanshuirenjia 2018-09-27 15:09:44 +08:00 committed by Daniel Pan
parent 82dcb711a1
commit aa9798ef08
2 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,7 @@
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
import { Router } from '@reach/router'
import { siteRoot } from './components/constants';
import SidePanel from './components/side-panel';
import MainPanel from './components/main-panel';
import DraftsView from './pages/drafts/drafts-view';
@ -40,15 +41,15 @@ class App extends Component {
render() {
let href = window.location.href.split('/');
let currentTab = href[href.length - 2];
return (
<div id="main">
<SidePanel isSidePanelClosed={this.state.isSidePanelClosed} onCloseSidePanel={this.onCloseSidePanel} currentTab={currentTab} />
<MainPanel path='/' onShowSidePanel={this.onShowSidePanel}>
<MainPanel onShowSidePanel={this.onShowSidePanel}>
<Router>
<FilesActivities path='dashboard' />
<DraftsView path='drafts' />
<FilesActivities path={siteRoot + 'dashboard'} />
<DraftsView path={siteRoot + 'drafts'} />
</Router>
</MainPanel>
</div>

View File

@ -111,4 +111,5 @@
[role=group] {
display: flex;
flex: 1;
}