Did some shit

mhacks · Sep 22, 2017 · c46bf5f · c46bf5f
1 parent 52f829c
commit c46bf5f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/app.js b/app.js
@@ -36,7 +36,8 @@ var http = require('http'),
     apiRouter = require('./server/routes/api.js'),
     indexRouter = require('./server/routes/index.js'),
     shortenerRouter = require('./server/routes/shortener.js'),
-    sharedsession = require('express-socket.io-session');
+    sharedsession = require('express-socket.io-session'),
+    Configuration = require('./server/db/model/Configuration.js');
 
 // Force https
 app.use(function(req, res, next) {
@@ -167,7 +168,11 @@ if (config.service === 'shortener') {
     require('./server/interactors/setup.js');
 }
 
-require('./server/socketio/index.js')(io);
+Configuration.findOne().then(configuration => {
+    if (configuration.is_chat_enabled) {
+        require('./server/socketio/index.js')(io);
+    }
+});
 
 // Now we start the server
 if (config.start_server) {

diff --git a/app/pages/live/index.jsx b/app/pages/live/index.jsx
@@ -69,9 +69,13 @@ class LivePage extends React.Component {
                     <Row>
                         <Mentorship />
                     </Row>
-                    <Row>
-                        <Chat />
-                    </Row>
+                    {this.props.configurationState.data.is_chat_enabled ? (
+                        <Row>
+                            <Chat />
+                        </Row>
+                    ) : (
+                        undefined
+                    )}
                     <Double>
                         <Hardware />
                         <Resources />

diff --git a/server/db/model/Configuration.js b/server/db/model/Configuration.js
@@ -39,6 +39,15 @@ var schema = new mongoose.Schema(
                 label: 'Application Open'
             }
         },
+        is_chat_enabled: {
+            type: Boolean,
+            default: false,
+            required: true,
+            form: {
+                user_editable: true,
+                label: 'Chat Enabled'
+            }
+        },
         save_button: {
             type: String,
             form: {

diff --git a/server/routes/api/configuration.js b/server/routes/api/configuration.js
@@ -74,6 +74,10 @@ router.post('/control', authMiddleware('admin', 'api'), function(req, res) {
                     req.body.is_live_page_enabled !== undefined
                         ? req.body.is_live_page_enabled
                         : configuration.is_live_page_enabled;
+                configuration.is_chat_enabled =
+                    req.body.is_chat_enabled !== undefined
+                        ? req.body.is_chat_enabled
+                        : configuration.is_chat_enabled;
                 configuration.is_application_open =
                     req.body.is_application_open !== undefined
                         ? req.body.is_application_open