diff --git a/app/components/EntrySelector.jsx b/app/components/EntrySelector.jsx index 847ef93..c7cd9f1 100644 --- a/app/components/EntrySelector.jsx +++ b/app/components/EntrySelector.jsx @@ -56,7 +56,7 @@ export default class EntrySelector extends React.Component { render(){ return ( - +
) diff --git a/app/components/LibraryNav.jsx b/app/components/LibraryNav.jsx index e972b6f..b3ef80a 100644 --- a/app/components/LibraryNav.jsx +++ b/app/components/LibraryNav.jsx @@ -26,6 +26,7 @@ import glob from 'glob' import fs from 'fs' import mkdirp from 'mkdirp' import jsfile from 'jsonfile' +import rmdir from 'rimraf' const colors = styles.Colors @@ -49,6 +50,7 @@ const { IconButton, EnhancedButton, NavigationClose, + FloatingActionButton, Menu, MenuItem, Mixins, @@ -59,8 +61,7 @@ const { TextField, Dialog, Styles, - Tab, - Tabs, + LeftNav, Paper} = mui let SelectableList = SelectableContainerEnhance(List) @@ -100,7 +101,7 @@ export default class LibraryNav extends React.Component { constructor(props, context){ super(props, context) this.state = { - open: false, + open: true, navItems: [ { 'name': 'Entries', @@ -338,7 +339,10 @@ export default class LibraryNav extends React.Component { deleteTapped = (i) => { var nbs = this.state.notebooks - nbs.splice(i, 1) + var nb = nbs.splice(i, 1)[0] + + rmdir(nb.path, (err)=>{if(err){console.log(err)}}) + this.setState({notebooks: nbs}) this.props.closeContextMenu() } @@ -408,10 +412,12 @@ export default class LibraryNav extends React.Component { ref={notebook.title+i} className="noselect" onTouchTap={this.noteBookTapped.bind(this, i)} - leftIcon={} + leftIcon={} rightIcon={} + style={{'padding': 0}} + badgeContent={notebook.notes} />} /> } return l @@ -425,7 +431,7 @@ export default class LibraryNav extends React.Component { render(){ return ( -
+
{this.state.navItems.map((item, i) => { return -
NoteBooks
}> {this.notebookList()}
-
) } diff --git a/app/containers/App.jsx b/app/containers/App.jsx index 2d3c35b..47b1e53 100644 --- a/app/containers/App.jsx +++ b/app/containers/App.jsx @@ -1,6 +1,5 @@ import React from 'react' import getMuiTheme from 'material-ui/lib/styles/getMuiTheme' -import LibraryNav from 'LibraryNav' import Styles from 'material-ui/lib/styles' import Rethink from 'rethinkdbdash' import mui from 'material-ui' @@ -9,6 +8,8 @@ import * as ContextMenuActions from '../actions' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' +import LibraryNav from 'LibraryNav' +import EntrySelector from 'EntrySelector' const { Popover, @@ -94,6 +95,8 @@ class App extends React.Component { className="left inline fill-height" {...contextMenuActions} /> + +
) } diff --git a/package.json b/package.json index a9027d1..391e85a 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,8 @@ "react-redux": "^4.4.0", "react-tap-event-plugin": "^0.2.2", "redux": "^3.3.1", - "rethinkdbdash": "^2.2.17" + "rethinkdbdash": "^2.2.17", + "rimraf": "^2.5.2" }, "ppapi_flash_version": "", "nodejs": true, diff --git a/style.css b/style.css index 38a83e3..817ae3b 100644 --- a/style.css +++ b/style.css @@ -25,9 +25,13 @@ body, html{ .right{ float: right; } +#entry-selector{ + border-right: solid 1px #d9d9d9; + min-width: 250px; +} #library-nav{ border-right: solid 1px #d9d9d9; - width: 300px; + min-width: 250px !important; height: 100%; min-height: 100%; }