made websockets available, needs cleanup

dajoh16 · Mar 9, 2020 · a131e48 · a131e48
1 parent 4470130
commit a131e48
Show file tree

Hide file tree

Showing 9 changed files with 166 additions and 22 deletions.
diff --git a/InOutBoardServer/.idea/workspace.xml b/InOutBoardServer/.idea/workspace.xml
diff --git a/InOutBoardServer/app.js b/InOutBoardServer/app.js
@@ -2,20 +2,25 @@ var express = require('express');
 var path = require('path');
 var cookieParser = require('cookie-parser');
 var logger = require('morgan');
-
+var bodyparser = require('body-parser');
 var indexRouter = require('./routes/index');
 var usersRouter = require('./routes/users');
 
-var app = express();
-
+var app = require('express')();
 
 app.use(logger('dev'));
-app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
+app.use(bodyparser.json());
+app.use(bodyparser.urlencoded({extended: false}));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+
 app.use('/', indexRouter);
 
 app.use('/api/users', usersRouter);
+
 module.exports = app;
diff --git a/InOutBoardServer/bin/www b/InOutBoardServer/bin/www
@@ -19,7 +19,8 @@ app.set('port', port);
  * Create HTTP server.
  */
 
-var server = http.createServer(app);
+var server = require('http').Server(app);
+var io = require('socket.io')(server);
 
 /**
  * Listen on provided port, on all network interfaces.
@@ -88,3 +89,12 @@ function onListening() {
     : 'port ' + addr.port;
   debug('Listening on ' + bind);
 }
+
+io.on('connection', function (socket) {
+  socket.emit('news', { hello: 'world' });
+  socket.on('my other event', function (data) {
+    console.log(data);
+  });
+});
+
+module.exports = io;
diff --git a/InOutBoardServer/package-lock.json b/InOutBoardServer/package-lock.json
diff --git a/InOutBoardServer/package.json b/InOutBoardServer/package.json
@@ -6,6 +6,7 @@
     "start": "node ./bin/www"
   },
   "dependencies": {
+    "body-parser": "^1.19.0",
     "cookie-parser": "~1.4.4",
     "debug": "~2.6.9",
     "express": "^4.15.2",

diff --git a/InOutBoardServer/public/index.html b/InOutBoardServer/public/index.html
@@ -6,11 +6,17 @@
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
 </head>
 
-<script src="../node_modules/socket.io-client/dist/socket.io.js"></script>
 <script src="javascripts/frontend.js"></script>
 
 <body>
-
+<script src="/socket.io/socket.io.js"></script>
+<script>
+  var socket = io.connect('http://localhost:3000');
+  socket.on('news', function (data) {
+    console.log(data);
+    socket.emit('my other event', { my: 'data' });
+  });
+</script>
 <div class="card border-primary mb-3" style="width: 15rem;">
   <div class="card-body">
     <h5 class="card-title">#Name</h5>

diff --git a/InOutBoardServer/public/javascripts/frontend.js b/InOutBoardServer/public/javascripts/frontend.js
@@ -6,4 +6,3 @@ function checkedInElementCreator(name,timestamp){
 
 }
 
-var socket = io();
diff --git a/InOutBoardServer/routes/index.js b/InOutBoardServer/routes/index.js
@@ -1,18 +1,12 @@
 var express = require('express');
 var router = express.Router();
 var db = require('..\\database');
-var io = require('..\\ws');
 
 /* GET home page. */
 router.get('/', function (req, res, next) {
     res.render('index', {title: 'Express'});
 });
 
-io.on('connection', function(socket){
-    console.log('a user connected');
-});
-
-
 
 router.get('/api/status', function (req, res, next) {
     db.many(`SELECT DISTINCT ON (userid) userid, status, dt, tuser.name FROM tevent INNER JOIN tuser AS tuser ON tevent.userid = tuser.id ORDER BY userid, dt DESC`)
@@ -63,4 +57,4 @@ module.exports = router;
 const status = {
     IN: "IN",
     OUT: "OUT"
-};
+};
diff --git a/InOutBoardServer/ws.js b/InOutBoardServer/ws.js
@@ -1,5 +0,0 @@
-var app = require('app');
-var http = require('http').createServer(app);
-var io = require('socket.io')(http);
-
-module.exports = io;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@ function checkedInElementCreator(name,timestamp){

		}

		var socket = io();