Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show hide columns #15

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Show hide columns #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccad908
Add buttons for hiding logbookstree and logbook
Mar 19, 2019
82af3c8
remove log
Mar 19, 2019
d683ec4
Added button to noentry for showing logbooktree and logbook
Mar 19, 2019
ab6b7b4
fix indent and clean uo
Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 60 additions & 10 deletions frontend/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,26 @@ class NoEntry extends React.Component {

render() {
const logbookId = parseInt(this.props.match.params.logbookId);
const {hideLogbook, hideLogbookTree, eventbus} = this.props;
console.log(this.props.match.location);
return (
<div className="empty">
<i className="fa fa-arrow-left" /> Select an entry to read it
{logbookId ? (
<div>
{hideLogbookTree &&
<span>
<a href="#" onClick={() => eventbus.publish("logbooktree.hide", false)}>Show logbooks</a>

</span>
}
{hideLogbookTree && hideLogbook && <span>&nbsp;|&nbsp;</span> }
{hideLogbook &&
<span>
<a href="#" onClick={() => eventbus.publish("logbook.hide", false)}>Show logbook</a>
</span>
}
</div>
{!hideLogbook && <i className="fa fa-arrow-left" > Select an entry to read it </i>}
{logbookId && !hideLogbook ? (
<div>
{" "}
or{" "}
Expand All @@ -72,19 +87,53 @@ class NoEntry extends React.Component {
click here to make a new entry.
</Link>
</div>

) : null}
</div>
);
}
}
class Elogy extends React.Component {

constructor() {
super();
this.state = {
hideLogbookTree: false,
hideLogbook: false
};
this._hideLogbookTree = this._hideLogbookTree.bind(this);
this._hideLogbook = this._hideLogbook.bind(this);
}

const Elogy = () => (
componentDidMount() {
eventbus.subscribe("logbooktree.hide", this._hideLogbookTree);
eventbus.subscribe("logbook.hide", this._hideLogbook);
}

componentWillUnmount() {
eventbus.unsubscribe("logbooktree.hide", this._hideLogbookTree);
eventbus.unsubscribe("logbook.hide", this._hideLogbook);
}

_hideLogbookTree(hide) {
this.setState({hideLogbookTree: hide});
}

_hideLogbook(hide) {
this.setState({hideLogbook: hide});
}

render() {
const EntryWithEventbus = withProps(Entry, { "eventbus": eventbus, "hideLogbookTree": this.state.hideLogbookTree, "hideLogbook": this.state.hideLogbook });
const NoEntryWithEventbus = withProps(NoEntry, { "eventbus": eventbus, "hideLogbookTree": this.state.hideLogbookTree, "hideLogbook": this.state.hideLogbook });

return (
/* Set up a browser router that will render the correct component
in the right places, all depending on the current URL. */

<Router>
<div id="app">
<div id="logbooks">
{!this.state.hideLogbookTree ? <div id="logbooks">
<Switch>
<Route
path="/logbooks/:logbookId"
Expand All @@ -99,9 +148,9 @@ const Elogy = () => (
/>
<Route component={QuickSearch} />
</Switch>
</div>
</div> : null}

<div id="logbook">
{!this.state.hideLogbook ? <div id="logbook">
<Switch>
<Route
path="/logbooks/:logbookId/entries/:entryId"
Expand All @@ -113,7 +162,7 @@ const Elogy = () => (
/>
<Route component={NoLogbook} />
</Switch>
</div>
</div> : null}

<div id="entry">
<Switch>
Expand All @@ -128,7 +177,7 @@ const Elogy = () => (

<Route
path="/logbooks/:logbookId/entries/:entryId"
component={Entry}
component={EntryWithEventbus}
/>

<Route
Expand All @@ -140,11 +189,12 @@ const Elogy = () => (
component={LogbookEditorWithEventbus}
/>

<Route path="/logbooks/:logbookId" component={NoEntry} />
<Route path="/logbooks/:logbookId" component={NoEntryWithEventbus} />
</Switch>
</div>
</div>
</Router>
);

}
}
export default Elogy;
12 changes: 12 additions & 0 deletions frontend/src/entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,18 @@ class Entry extends React.Component {
<header>
{this.state.logbook ? (
<span className="commands">
{this.props.hideLogbookTree &&
<span>
<a href="#" onClick={() => this.props.eventbus.publish("logbooktree.hide", false)}>Show logbooks</a>
&nbsp;|&nbsp;
</span>
}
{this.props.hideLogbook &&
<span>
<a href="#" onClick={() => this.props.eventbus.publish("logbook.hide", false)}>Show logbook</a>
&nbsp;|&nbsp;
</span>
}
{this.state.follows ? (
<Link
to={{
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/logbook.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
border-bottom: 1px solid #aaa;
}

#logbook header .commands {
float: right;
}

#logbook header .name {
font-size: 120%;
font-weight: bold;
Expand Down
11 changes: 10 additions & 1 deletion frontend/src/logbook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ class Logbook extends React.Component {
this.props.history.push(`?sort_by=${sortBy}`);
}

hide(){
this.props.eventbus.publish("logbook.hide", true);
}

render() {
const logbook = this.state.logbook,
entryId = this.props.match.params.entryId
Expand Down Expand Up @@ -239,7 +243,12 @@ class Logbook extends React.Component {
<i className="fa fa-book" />
{logbook.id === 0 ? "[All logbooks]" : logbook.name}
</span>

<div className="commands">
<a href="#">
<i className="fa fa-minus" onClick={() => this.hide()}/>
</a>
&nbsp;
</div>
<div>
{logbook.id ? (
<span>
Expand Down
8 changes: 8 additions & 0 deletions frontend/src/logbooktree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ class LogbookTree extends React.Component {
this.props.eventbus.unsubscribe("logbook.reload", this._reload);
}

hide(){
this.props.eventbus.publish("logbooktree.hide", true);
}

reload() {
console.log("reload logbook tree");
this.fetch(this.props.location.search);
Expand Down Expand Up @@ -148,6 +152,10 @@ class LogbookTree extends React.Component {
</Link>
</span>
<div className="commands">
<a href="#">
<i className="fa fa-minus" onClick={() => this.hide()}/>
</a>
&nbsp;
{logbookId !== this.state.id ? (
<Link
to={{
Expand Down