Loading events.js +42 −43 Changes for events.js: 42 added lines, 43 removed lines. Original line number Diff line number Diff line const express = require('express'); const io = require("socket.io-client"); //const socket = io('ws://tabu-server.willers.digital'); const socket = io('ws://localhost:80'); const socket = io('ws://tabu-server.willers.digital'); //const socket = io('ws://localhost:80'); function createRouter(db) { const router = express.Router(); Loading @@ -15,7 +15,7 @@ function createRouter(db) { }); const isTrue = function(req, res) { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); }; const isSession = function isSession(req, res, next) { Loading @@ -28,18 +28,18 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); return res.status(500).json({status: 'error'}); return res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } else { if (results.length > 0) { next(); } else { return res.status(200).json({status: 'false'}); return res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'false'}); } } } ); } else { return res.status(500).json({status: 'error'}); return res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -53,9 +53,9 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', sessionID: results[0].SessionID, Loading @@ -70,7 +70,7 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -84,7 +84,7 @@ function createRouter(db) { error => { if (error) { console.error(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { //Init new Gamestatus var redTurn = Math.random(); Loading @@ -96,9 +96,9 @@ function createRouter(db) { error => { if (error) { console.error(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); } } ); Loading @@ -106,7 +106,7 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -118,9 +118,9 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } else { res.status(200).json(results); res.header('Access-Control-Allow-Origin', "*").status(200).json(results); } } ); Loading @@ -144,7 +144,7 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { if (results.length > 0) { let random = Math.random() * (results.length-1); Loading @@ -156,9 +156,9 @@ function createRouter(db) { sql, (error) => { if (error) { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', cardID: card.CardID, Loading @@ -175,12 +175,12 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } } }); } else { res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -194,9 +194,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); socket.emit('newRound', { sessionName: spielname, isOpen: true Loading @@ -206,7 +206,7 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -221,18 +221,18 @@ function createRouter(db) { if (error) { console.log(error); return //res.status(500).json({status: 'false'}); //res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { socket.emit('endRound', { isOpen: true, sessionName: spielname, }); //res.status(200).json({status: 'true'}); //res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); } } ); } else { //res.status(500).json({status: 'false'}); //res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -246,14 +246,14 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); } } ); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -270,9 +270,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: JSON.parse(req.body.red)+1, Loading @@ -290,9 +290,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: req.body.red, Loading @@ -304,7 +304,7 @@ function createRouter(db) { ); } } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -321,9 +321,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: JSON.parse(req.body.red)-1, Loading @@ -341,9 +341,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: req.body.red, Loading @@ -355,7 +355,7 @@ function createRouter(db) { ); } } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -369,10 +369,10 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } else { if (results.length > 0) { res.status(200).json({ res.header('Access-Control-Allow-Origin', "*").status(200).json({ cardID: results[0].CardID, solution: results[0].Solution, tabu1: results[0].Tabu1, Loading @@ -382,7 +382,7 @@ function createRouter(db) { tabu5: results[0].Tabu5 }); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } } } Loading Loading @@ -426,7 +426,6 @@ function createRouter(db) { router.post('/getCard', [getCard]); return router; } module.exports = createRouter; Loading
events.js +42 −43 Changes for events.js: 42 added lines, 43 removed lines. Original line number Diff line number Diff line const express = require('express'); const io = require("socket.io-client"); //const socket = io('ws://tabu-server.willers.digital'); const socket = io('ws://localhost:80'); const socket = io('ws://tabu-server.willers.digital'); //const socket = io('ws://localhost:80'); function createRouter(db) { const router = express.Router(); Loading @@ -15,7 +15,7 @@ function createRouter(db) { }); const isTrue = function(req, res) { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); }; const isSession = function isSession(req, res, next) { Loading @@ -28,18 +28,18 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); return res.status(500).json({status: 'error'}); return res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } else { if (results.length > 0) { next(); } else { return res.status(200).json({status: 'false'}); return res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'false'}); } } } ); } else { return res.status(500).json({status: 'error'}); return res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -53,9 +53,9 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', sessionID: results[0].SessionID, Loading @@ -70,7 +70,7 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -84,7 +84,7 @@ function createRouter(db) { error => { if (error) { console.error(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { //Init new Gamestatus var redTurn = Math.random(); Loading @@ -96,9 +96,9 @@ function createRouter(db) { error => { if (error) { console.error(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); } } ); Loading @@ -106,7 +106,7 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -118,9 +118,9 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } else { res.status(200).json(results); res.header('Access-Control-Allow-Origin', "*").status(200).json(results); } } ); Loading @@ -144,7 +144,7 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { if (results.length > 0) { let random = Math.random() * (results.length-1); Loading @@ -156,9 +156,9 @@ function createRouter(db) { sql, (error) => { if (error) { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', cardID: card.CardID, Loading @@ -175,12 +175,12 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } } }); } else { res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } }; Loading @@ -194,9 +194,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); socket.emit('newRound', { sessionName: spielname, isOpen: true Loading @@ -206,7 +206,7 @@ function createRouter(db) { } ); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -221,18 +221,18 @@ function createRouter(db) { if (error) { console.log(error); return //res.status(500).json({status: 'false'}); //res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { socket.emit('endRound', { isOpen: true, sessionName: spielname, }); //res.status(200).json({status: 'true'}); //res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); } } ); } else { //res.status(500).json({status: 'false'}); //res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -246,14 +246,14 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json({status: 'true'}); res.header('Access-Control-Allow-Origin', "*").status(200).json({status: 'true'}); } } ); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -270,9 +270,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: JSON.parse(req.body.red)+1, Loading @@ -290,9 +290,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: req.body.red, Loading @@ -304,7 +304,7 @@ function createRouter(db) { ); } } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -321,9 +321,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: JSON.parse(req.body.red)-1, Loading @@ -341,9 +341,9 @@ function createRouter(db) { (error) => { if (error) { console.log(error); res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } else { res.status(200).json( res.header('Access-Control-Allow-Origin', "*").status(200).json( { status: 'true', red: req.body.red, Loading @@ -355,7 +355,7 @@ function createRouter(db) { ); } } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } }; Loading @@ -369,10 +369,10 @@ function createRouter(db) { (error, results) => { if (error) { console.log(error); res.status(500).json({status: 'error'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'error'}); } else { if (results.length > 0) { res.status(200).json({ res.header('Access-Control-Allow-Origin', "*").status(200).json({ cardID: results[0].CardID, solution: results[0].Solution, tabu1: results[0].Tabu1, Loading @@ -382,7 +382,7 @@ function createRouter(db) { tabu5: results[0].Tabu5 }); } else { res.status(500).json({status: 'false'}); res.header('Access-Control-Allow-Origin', "*").status(500).json({status: 'false'}); } } } Loading Loading @@ -426,7 +426,6 @@ function createRouter(db) { router.post('/getCard', [getCard]); return router; } module.exports = createRouter;