disconnect server bug fixed + showLogin added to reducer

Author: pmzi

src/js/views/components/ChoosingPage.js

@@ -3,6 +3,8 @@ const React = require('react');
 const Input = require('./Input');
 const Spinner = require('./Spinner');
 
+const {connect} = require('react-redux');
+
 class ChoosingPage extends React.Component{
 
     constructor(props){
@@ -74,6 +76,9 @@ class ChoosingPage extends React.Component{
                                 this.setState({
                                     choosingPageNone: true
                                 })
+                                this.props.dispatch({
+                                    type: 'HIDE_LOGIN'
+                                })
                             }, 500)
 
                         }, 500)
@@ -146,6 +151,10 @@ class ChoosingPage extends React.Component{
                                         choosingPageNone: true
                                     })
 
+                                    this.props.dispatch({
+                                        type: 'HIDE_LOGIN'
+                                    })
+
                                 }, 500)
 
                             }, 500)
@@ -174,6 +183,17 @@ class ChoosingPage extends React.Component{
 
     }
 
+    componentDidUpdate(prevProps){
+        if(prevProps.showLogin != this.props.showLogin){
+            if(this.props.showLogin){
+                this.setState({
+                    choosingPageNone: false
+                })
+                setTimeout(this.resetState.bind(this),100)
+            }
+        }
+    }
+
     resetState(){
         this.setState({
             loadingShow: false,
@@ -261,4 +281,6 @@ class ChoosingPage extends React.Component{
 
 }
 
-module.exports = ChoosingPage;
+module.exports = connect((state)=>{
+    return {showLogin:state.general.showLogin}
+})(ChoosingPage);

src/js/views/components/Header.js

@@ -13,7 +13,7 @@ class Header extends React.Component{
             <header className="header">
                 <div className="header__left-side">
                     <div className="header__side-icon">
-                        <Icon onClick={this.disconnect} clickable={true} color='red' icon='power_settings_new' />
+                        <Icon onClick={this.disconnect.bind(this)} clickable={true} color='red' icon='power_settings_new' />
                     </div>
                 </div>
                 <div className="header__ip-address">
@@ -43,16 +43,9 @@ class Header extends React.Component{
 
         // Let's show the choosingPage
 
-        $('.choosingPage').classList.remove('none');
-        setTimeout(() => {
-
-            $('.choosingPage').classList.remove('choosingPage--fadeOut');
-            $('.choosingPage__address-wrapper').classList.remove('choosingPage__address-wrapper--show');
-            $('.choosingPage__loading').classList.remove('choosingPage__loading--show');
-            $('.choosingPage .choosingPage__item--selected').classList.remove('choosingPage__item--selected');
-            $('.choosingPage .choosingPage__item--not-selected').classList.remove('choosingPage__item--not-selected');
-
-        }, 100)
+        this.props.dispatch({
+            type: 'SHOW_LOGIN'
+        })
     }
 
     sync(){

src/js/views/controllers/Server.js

@@ -91,9 +91,9 @@ class Server {
 
     }
 
-    disconnect() {
+    disConnect() {
 
-        this.server.close(()=>{console.log("Server Closed!")});
+        this.io.close(()=>{console.log("Server Closed!")});
 
     }
 

src/js/views/reducers/generalReducer.js

@@ -1,6 +1,7 @@
 module.exports = (state = {
     isServer: false,
-    port: '2020'
+    port: '2020',
+    showLogin: true
 }, action) => {
 
     switch (action.type) {
@@ -19,6 +20,12 @@ module.exports = (state = {
                 port: action.port
             })
             break;
+        case 'SHOW_LOGIN':
+            return Object.assign({}, state, {showLogin: true})
+        break;
+        case 'HIDE_LOGIN':
+            return Object.assign({}, state, {showLogin: false})
+        break;
         default:
             return state;
         break;