Merge pull request #25 from DenisCarriere/master

Fix minor UI issues

package.json

@@ -15,7 +15,7 @@
     "react-dom": "^16.0.0",
     "react-markdown": "^3.6.0",
     "react-redux": "^5.0.7",
-    "react-router-dom": "^4.1.2",
+    "react-router-dom": "*",
     "redux": "^4.0.0",
     "redux-immutable": "^4.0.0",
     "redux-saga": "^0.16.0",

src/app/containers/foo/foo.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import ScatterJS from 'scatter-js/dist/scatter.esm';
+import { loadScatter, getIdentity } from 'store/scatter/actions';
+import { selectClient, selectIdentity, selectAccount,selectStatus } from 'store/scatter/selectors';
+
+class Foo extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    ScatterJS.scatter.connect('EOSVotes.io').then(connected => {
+      if(connected){
+          this.props.loadScatter(ScatterJS.scatter);
+          window.scatter = null;
+      }
+    });
+  }
+
+  render() {
+    return require('./foo.rt').call(this);
+  }
+}
+
+const mapStateToProps = createStructuredSelector({
+  client: selectClient(),
+  identity: selectIdentity(),
+  account: selectAccount(),
+  status: selectStatus(),
+});
+
+function mapDispatchToProps(dispatch) {
+  return {
+    loadScatter: (scatter) => dispatch(loadScatter(scatter)),
+    getIdentity: () => dispatch(getIdentity()),
+  };
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(Foo);

src/app/containers/foo/foo.rt

@@ -0,0 +1,17 @@
+<rt-import name="*" as="Components" from="components" />
+<rt-import name="*" as="Containers" from="containers" />
+
+<Components.Fragment>
+
+    <Containers.Header rt-props="this.props" />
+
+    <div>
+        Foo Bar
+    </div>
+
+    <Components.Footer />
+
+    <Containers.ReferendumPopup   rt-props="this.props"/>
+
+
+</Components.Fragment>

src/app/containers/header/header.rt

@@ -14,6 +14,7 @@
                         <span class="header__logo">
                             <rt-include src="./logo.svg" />
                         </span>
+                        <b>Beta</b>
                     </span>
                 </div>
                 <!-- right -->
@@ -37,7 +38,6 @@
                     </span>
                     <select class="header__language dropdown show-for-medium">
                         <option>eng</option>
-                        <option>rus</option>
                     </select>
                     <span onClick="e => this.open('search')" class="hide-for-medium hoverable">
                         <i class="header__icon icon icon-search" rt-if="!this.props.filters" />

src/app/main.js

@@ -1,15 +1,22 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
+import { BrowserRouter as Router, Route } from "react-router-dom";
 import configureStore from 'store/configureStore'
 import App from './app';
+import Foo from './containers/foo/foo';
 
 const store = configureStore();
 
 function render(){
   ReactDOM.render(
     <Provider store={store}>
-      <App/>
+      <Router>
+        <div>
+          <Route exact path="/" component={App} />
+          <Route path="/foo" component={Foo} />
+        </div>
+      </Router>
     </Provider>,
     window.document.getElementById('root'));
 }