Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Server/Account/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ manager.serialCheck = function (serial, callback) {
error: false,
available: false
};

conn.query("select * from account where uid=? and id is null and password is null", serial, function (err, rows) {
if (err) {
response.error = true;
Expand All @@ -23,7 +23,7 @@ manager.idCheck = function (id, callback) {
error: false,
available: false
};

conn.query("select * from account where id=?", id, function (err, rows) {
if (err) {
response.error = true;
Expand All @@ -39,7 +39,7 @@ manager.emailCheck = function (email, callback) {
error: false,
available: false
};

conn.query("select * from account where email=?", email, function (err, rows) {
if (err) {
response.error = true;
Expand Down Expand Up @@ -106,7 +106,7 @@ manager.getUserInfo = function (uid, callback) {
user: null,
circle: null
};

conn.query("select a.name, c.name as circle from account as a inner join circle as c on a.circle_id = c.id where a.uid = ?", uid, function (err, rows) {
if (err) {
response.error = true;
Expand Down
4 changes: 1 addition & 3 deletions Server/Account/router.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

let router = require('express').Router();
let manager = require('./manager');

Expand Down Expand Up @@ -87,12 +86,11 @@ router.route('/account/logout').post(function (req, res) {
res.write(JSON.stringify(response));
res.end();
}

});

router.route('/account/getUserInfo').post(function (req, res) {
if (!req.session.user) {
res.writeHead(200, { 'Content-Type': 'application/json' });
res.writeHead(200, { 'Content-Type': 'application/json' });
res.write(JSON.stringify({
session: false
}));
Expand Down
17 changes: 17 additions & 0 deletions Server/Circle/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,21 @@ manager.getCirclePlan = function (circle_id, callback) {
});
}

manager.getCounts = function (callback) {
let response = {
session: true,
error: false,
counts: 0
};

conn.query("select * from circle", function (err, rows) {
if (err) response.error = true;
else if (rows.length >= 0) {
response.counts = rows.length;
}

callback(JSON.stringify(response));
});
}

module.exports = manager;
15 changes: 15 additions & 0 deletions Server/Circle/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,19 @@ router.route('/circle/getCirclePlan').post(function (req, res) {
});
});

router.route('/circle/counts').get(function (req, res) {
if (!req.session.user) {
res.writeHead(200, { 'Content-Type': 'application/json' });
res.write(JSON.stringify({
session: false
}));
res.end();
return;
}
manager.getCounts(function (JSONResponse) {
res.writeHead(200, { 'Content-Type': 'application/json' });
res.write(JSONResponse);
res.end();
});
});
module.exports = router;
26 changes: 8 additions & 18 deletions Server/Server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

let http = require('http');
let express = require('express');
let path = require('path');
Expand All @@ -7,7 +6,7 @@ let cookieParser = require('cookie-parser');
let static = require('serve-static');
let errorHandler = require('errorhandler');
let expressSession = require('express-session');
let app = express()
let app = express();

let mongoose = require('mongoose');
let mysql = require('mysql');
Expand All @@ -16,34 +15,25 @@ let mysql = require('mysql');
let accountRouter = require('./Account/router');
let circleRouter = require('./Circle/router');

let pool = mysql.createPool({
connectionLimit : 10,
host : 'localhost',
user : 'root',
password : 'xogns1228',
database : 'Arirang',
debug : false
});


// on Mac :: 8080,
// on Ubuntu :: 80
app.set('port', 8080);
app.set('port', 80);

app.use(bodyParser.urlencoded({extended:false}));
app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.json());

app.use(cookieParser());

app.use(expressSession({
secret : 'my key',
resave : true,
saveUninitialized : true
secret: 'my key',
resave: true,
saveUninitialized: true
}));

app.use('/', accountRouter);
app.use('/', circleRouter);

http.createServer(app).listen(app.get('port'), function(){
console.log('Server started on '+app.get('port')+'port');
http.createServer(app).listen(app.get('port'), function () {
console.log('Server started on ' + app.get('port') + 'port');
});