Skip to content

Commit 260f0b2

Browse files
author
Emmanouil Konstantinidis
committed
Show back button if in settings
Also show settings only if loggedIn
1 parent 16282e9 commit 260f0b2

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

src/js/components/navigation.js

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
var React = require('react');
22
var Reflux = require('reflux');
3+
var Router = require('react-router');
4+
35
var ipc = window.require('ipc');
46

57
var Actions = require('../actions/actions');
68
var AuthStore = require('../stores/auth');
79

810
var Navigation = React.createClass({
911
mixins: [
12+
Router.State,
1013
Reflux.connect(AuthStore, 'authStatus'),
1114
Reflux.listenTo(Actions.getNotifications.completed, 'refreshDone'),
1215
Reflux.listenTo(Actions.getNotifications.failed, 'refreshDone')
@@ -52,12 +55,16 @@ var Navigation = React.createClass({
5255
ipc.sendChannel('update-icon', 'IconPlain');
5356
},
5457

58+
goBack: function () {
59+
this.context.router.transitionTo('notifications');
60+
},
61+
5562
appQuit: function () {
5663
ipc.sendChannel('app-quit');
5764
},
5865

5966
render: function () {
60-
var refreshIcon, logoutIcon;
67+
var refreshIcon, logoutIcon, backIcon, settingsIcon;
6168
var loadingClass = this.state.loading ? 'fa fa-refresh fa-spin' : 'fa fa-refresh';
6269

6370
if (this.state.authStatus) {
@@ -67,18 +74,29 @@ var Navigation = React.createClass({
6774
logoutIcon = (
6875
<i className='fa fa-sign-out' onClick={this.logOut} />
6976
);
77+
settingsIcon = (
78+
<i className='fa fa-cog' onClick={this.goToSettings} />
79+
);
80+
}
81+
if (this.getPath() === '/settings') {
82+
backIcon = (
83+
<i onClick={this.goBack} className='fa fa-chevron-left' />
84+
);
7085
}
7186

7287
return (
7388
<div className='container-fluid'>
7489
<div className='row navigation'>
75-
<div className='col-xs-4 left'>{refreshIcon}</div>
90+
<div className='col-xs-4 left'>
91+
{backIcon}
92+
{refreshIcon}
93+
</div>
7694
<div className='col-xs-4 logo'>
7795
<img className='img-responsive' src='images/logo-hor-white.png' />
7896
</div>
7997
<div className='col-xs-4 right'>
8098
{logoutIcon}
81-
<i className='fa fa-cog' onClick={this.goToSettings} />
99+
{settingsIcon}
82100
<i className="fa fa-power-off" onClick={this.appQuit} />
83101
</div>
84102
</div>

0 commit comments

Comments
 (0)