diff --git a/README.md b/README.md
index 24e07ee..1e37786 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ npm install promise
##Database Construction
create database googleTrends;
+use googleTrends;
+
create table users(
user_id mediumint unsigned not null AUTO_INCREMENT,
name varchar(30) not null,
@@ -28,5 +30,9 @@ create table data(
data_id mediumint unsigned not null AUTO_INCREMENT,
user_id mediumint unsigned not null,
word varchar(100) not null,
+ score mediumint not null,
primary key(data_id)
);
+
+
+grant all on googleTrends.* to trendingUser@localhost identified by "password";
\ No newline at end of file
diff --git a/googletrendsgame/package.json b/googletrendsgame/package.json
index a691d30..93ced3a 100644
--- a/googletrendsgame/package.json
+++ b/googletrendsgame/package.json
@@ -3,9 +3,14 @@
"version": "0.1.0",
"private": true,
"dependencies": {
+ "express": "^4.16.2",
+ "google-trends-api": "^4.4.0",
+ "mysql": "^2.15.0",
+ "promise": "^8.0.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-scripts": "1.1.0",
+ "sanitizer": "^0.1.3",
"socket.io": "^2.0.4",
"socket.io-client": "^2.0.4"
},
diff --git a/googletrendsgame/server/index.html b/googletrendsgame/server/index.html
new file mode 100644
index 0000000..9a36dd9
--- /dev/null
+++ b/googletrendsgame/server/index.html
@@ -0,0 +1,20 @@
+
+
+
+ Hello world
+
+
+
+
+Hello world
+
\ No newline at end of file
diff --git a/googletrendsgame/server/server.js b/googletrendsgame/server/server.js
index 08cb11c..5dc1a79 100644
--- a/googletrendsgame/server/server.js
+++ b/googletrendsgame/server/server.js
@@ -71,25 +71,25 @@ var room = function(capacityP, pass, owner)
var countInner = 0;
var countSwap = 0;
- var swapped;
- do
- {
- countOuter++;
- swapped = false;
- for(var i = 0; i < result.users.length; i++)
- {
- countInner++;
- if(result.users[i].score && result.users[i + 1].score &&
- result.users[i].score > result.users[i + 1].score)
- {
- countSwap++;
- var temp = result.users[i];
- result.users[i] = result.users[j];
- result.users[j] = temp;
- swapped = true;
- }
- }
- } while(swapped);
+ // var swapped;
+ // do
+ // {
+ // countOuter++;
+ // swapped = false;
+ // for(var i = 0; i < result.users.length; i++)
+ // {
+ // countInner++;
+ // if(result.users[i].score && result.users[i + 1].score &&
+ // result.users[i].score > result.users[i + 1].score)
+ // {
+ // countSwap++;
+ // var temp = result.users[i];
+ // result.users[i] = result.users[j];
+ // result.users[j] = temp;
+ // swapped = true;
+ // }
+ // }
+ // } while(swapped);
result.gameState = this.state;
@@ -120,6 +120,7 @@ var room = function(capacityP, pass, owner)
var message = this.generateRoomUpdate();
this.users.forEach(function(u)
{
+ console.log("room update called");
u.socket.emit('roomUpdate', message);
console.log(message);
});
@@ -307,6 +308,8 @@ var player = function(s)
result.name = this.name;
result.score = this.score;
result.word = this.sumbission;
+
+ return result;
}
/**
@@ -385,6 +388,12 @@ var io = require('socket.io')(http);
const port = 3000;
+app.get('/', function(req, res)
+{
+ console.log("err");
+ res.sendfile('index.html');
+});
+
//Whenever someone connects this gets executed
io.on('connection', function(socket)
{
@@ -489,4 +498,4 @@ io.on('connection', function(socket)
http.listen(port, function() {
console.log('listening on *:3000');
-});
\ No newline at end of file
+});
diff --git a/googletrendsgame/server/sql.js b/googletrendsgame/server/sql.js
index 2797956..e828b07 100644
--- a/googletrendsgame/server/sql.js
+++ b/googletrendsgame/server/sql.js
@@ -1,9 +1,9 @@
-//
-
const mysql = require('mysql');
const sanitizer = require('sanitizer');
+var Promise = require('promise');
+
module.exports=
{
/**
@@ -28,5 +28,17 @@ module.exports=
resolve(result.insertId);
});
})
+ },
+
+ /**
+ * Insert all of the user's data into the sql database
+ * @param player
+ */
+ insertData : function(player)
+ {
+ return new Promise(function(resolve, reject)
+ {
+ var q = "";
+ })
}
};
\ No newline at end of file