e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix navicon

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2017-05-29 03:02:39 +02:00
parent a084e6d0af
commit fa9c5a9c16
4 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

37
client/src/js/components/App.js
View File

@ -1,24 +1,29 @@
import React from 'react'; import React, { Component } from 'react';
import Route from '../containers/Route'; import Route from '../containers/Route';
import Chat from '../containers/Chat'; import Chat from '../containers/Chat';
import Connect from '../containers/Connect'; import Connect from '../containers/Connect';
import Settings from '../containers/Settings'; import Settings from '../containers/Settings';
import TabList from '../components/TabList'; import TabList from '../components/TabList';
const App = props => { export default class App extends Component {
const { onClick, ...tabListProps } = props; handleClick = () => {
const mainClass = props.showTabList ? 'main-container off-canvas' : 'main-container'; const { showTabList, hideMenu } = this.props;
if (showTabList) {
hideMenu();
}
};
return ( render() {
<div onClick={onClick}> const mainClass = this.props.showTabList ? 'main-container off-canvas' : 'main-container';
<TabList {...tabListProps} /> return (
<div className={mainClass}> <div onClick={this.handleClick}>
<Route name="chat"><Chat /></Route> <TabList {...this.props} />
<Route name="connect"><Connect /></Route> <div className={mainClass}>
<Route name="settings"><Settings /></Route> <Route name="chat"><Chat /></Route>
<Route name="connect"><Connect /></Route>
<Route name="settings"><Settings /></Route>
</div>
</div> </div>
</div> );
); }
}; }
export default App;

2
client/src/js/components/ChatTitle.js
View File

@ -1,6 +1,6 @@
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import { List } from 'immutable'; import { List } from 'immutable';
import Navicon from '../components/Navicon'; import Navicon from '../containers/Navicon';
import { linkify } from '../util'; import { linkify } from '../util';
export default class ChatTitle extends PureComponent { export default class ChatTitle extends PureComponent {

10
client/src/js/containers/App.js
View File

@ -1,4 +1,3 @@
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from 'reselect';
import App from '../components/App'; import App from '../components/App';
@ -17,13 +16,6 @@ const mapState = createStructuredSelector({
tab: getSelectedTab tab: getSelectedTab
}); });
const mapDispatch = (dispatch, props) => ({ const mapDispatch = { push, select, hideMenu };
onClick: () => {
if (props.showTabList) {
dispatch(hideMenu());
}
},
...bindActionCreators({ push, select }, dispatch)
});
export default connect(mapState, mapDispatch)(App); export default connect(mapState, mapDispatch)(App);