diff --git a/app.js b/app.js index 03f8595..f0251e5 100644 --- a/app.js +++ b/app.js @@ -7,6 +7,7 @@ var bodyParser = require('body-parser'); var routes = require('./routes/index'); var users = require('./routes/users'); +var api = require('./routes/api'); var app = express(); @@ -22,6 +23,7 @@ app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); +app.use('/api', api); app.use('/', routes); app.use('/users', users); diff --git a/package.json b/package.json index b8c9187..df88dcd 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "supervisor ./bin/www", - "launch": "supervisor ./bin/www" + "start": "supervisor ./bin/www" }, "dependencies": { "body-parser": "~1.15.1", @@ -13,6 +12,8 @@ "ejs": "~2.4.1", "express": "~4.13.4", "morgan": "~1.7.0", - "serve-favicon": "~2.3.0" + "mysql": "^2.11.1", + "serve-favicon": "~2.3.0", + "supervisor": "^0.11.0" } } diff --git a/public/index.html b/public/index.html index c9de0e4..6dbc037 100644 --- a/public/index.html +++ b/public/index.html @@ -1,59 +1,71 @@ -
- - - - -