coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combined documents and collections in the sidepanel

Browse Source
This commit is contained in:
Jori Lallo
2017-09-17 23:45:40 -07:00
parent 53c0c9180b
commit 0a5f5712ef
13 changed files with 254 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/components/Layout/Layout.js
View File

@ -14,11 +14,9 @@ import { LoadingIndicatorBar } from 'components/LoadingIndicator';
import Scrollable from 'components/Scrollable';
import Icon from 'components/Icon';
import Toasts from 'components/Toasts';
import CollectionMenu from 'menus/CollectionMenu';
import AccountMenu from 'menus/AccountMenu';
import SidebarCollection from './components/SidebarCollection';
import SidebarCollectionList from './components/SidebarCollectionList';
import SidebarCollections from './components/SidebarCollections';
import SidebarLink from './components/SidebarLink';
import HeaderBlock from './components/HeaderBlock';
import Modals from './components/Modals';
@ -84,7 +82,7 @@ type Props = {
};
render() {
const { auth, documents, collections, ui } = this.props;
const { auth, documents, ui } = this.props;
const { user, team } = auth;
return (
@ -130,20 +128,11 @@ type Props = {
</SidebarLink>
</LinkSection>
<LinkSection>
{collections.active
? <CollectionAction>
<CollectionMenu collection={collections.active} />
</CollectionAction>
: <CollectionAction onClick={this.handleCreateCollection}>
<Icon type="PlusCircle" />
</CollectionAction>}
{collections.active
? <SidebarCollection
document={documents.active}
collection={collections.active}
history={this.props.history}
/>
: <SidebarCollectionList history={this.props.history} />}
<SidebarCollections
history={this.props.history}
activeDocument={documents.active}
onCreateCollection={this.handleCreateCollection}
/>
</LinkSection>
</Scrollable>
</Flex>
@ -160,18 +149,6 @@ type Props = {
}
}
const CollectionAction = styled.a`
position: absolute;
top: -4px;
right: ${layout.hpadding};
color: ${color.slate};
svg { opacity: .75; }
&:hover {
svg { opacity: 1; }
}
`;
const Container = styled(Flex)`
position: relative;
width: 100%;