diff --git a/Server/Account/manager.js b/Server/Account/manager.js index 881f638..4073f8b 100644 --- a/Server/Account/manager.js +++ b/Server/Account/manager.js @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/Server/Account/router.js b/Server/Account/router.js index ae26e9d..cb0accf 100644 --- a/Server/Account/router.js +++ b/Server/Account/router.js @@ -1,4 +1,3 @@ - let router = require('express').Router(); let manager = require('./manager'); @@ -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 })); diff --git a/Server/Circle/manager.js b/Server/Circle/manager.js index 5a26ae3..44813f0 100644 --- a/Server/Circle/manager.js +++ b/Server/Circle/manager.js @@ -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; \ No newline at end of file diff --git a/Server/Circle/router.js b/Server/Circle/router.js index 56c45fd..0aeee27 100644 --- a/Server/Circle/router.js +++ b/Server/Circle/router.js @@ -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; \ No newline at end of file diff --git a/Server/Server.js b/Server/Server.js index b15f33f..67e68e7 100644 --- a/Server/Server.js +++ b/Server/Server.js @@ -1,4 +1,3 @@ - let http = require('http'); let express = require('express'); let path = require('path'); @@ -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'); @@ -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'); });