From 0e74d741933ac2d9df9dca4856afc895cc5ad551 Mon Sep 17 00:00:00 2001 From: Rudy Wahjudi Date: Tue, 25 Apr 2017 10:44:27 +0700 Subject: [PATCH 1/4] First commit --- .gitignore | 1 + README.md | 0 app.js | 46 ++++++++++++ bin/www | 90 ++++++++++++++++++++++++ config/config.json | 24 +++++++ controllers/userController.js | 87 +++++++++++++++++++++++ migrations/20170424020928-create-user.js | 39 ++++++++++ models/index.js | 36 ++++++++++ models/user.js | 17 +++++ package.json | 21 ++++++ public/stylesheets/style.css | 8 +++ routes/index.js | 9 +++ routes/users.js | 47 +++++++++++++ seeders/20170424040552-generate-users.js | 38 ++++++++++ views/error.ejs | 3 + views/index.ejs | 11 +++ views/users/edit.ejs | 21 ++++++ views/users/new.ejs | 21 ++++++ 18 files changed, 519 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app.js create mode 100644 bin/www create mode 100644 config/config.json create mode 100644 controllers/userController.js create mode 100644 migrations/20170424020928-create-user.js create mode 100644 models/index.js create mode 100644 models/user.js create mode 100644 package.json create mode 100644 public/stylesheets/style.css create mode 100644 routes/index.js create mode 100644 routes/users.js create mode 100644 seeders/20170424040552-generate-users.js create mode 100644 views/error.ejs create mode 100644 views/index.ejs create mode 100644 views/users/edit.ejs create mode 100644 views/users/new.ejs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..08b2553 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/app.js b/app.js new file mode 100644 index 0000000..b2a5037 --- /dev/null +++ b/app.js @@ -0,0 +1,46 @@ +var express = require('express'); +var path = require('path'); +var favicon = require('serve-favicon'); +var logger = require('morgan'); +var cookieParser = require('cookie-parser'); +var bodyParser = require('body-parser'); + +var index = require('./routes/index'); +var users = require('./routes/users'); + +var app = express(); + +// view engine setup +app.set('views', path.join(__dirname, 'views')); +app.set('view engine', 'ejs'); + +// uncomment after placing your favicon in /public +//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico'))); +app.use(logger('dev')); +app.use(bodyParser.json()); +app.use(bodyParser.urlencoded({ extended: false })); +app.use(cookieParser()); +app.use(express.static(path.join(__dirname, 'public'))); + +app.use('/', index); +app.use('/users', users); + +// catch 404 and forward to error handler +app.use(function(req, res, next) { + var err = new Error('Not Found'); + err.status = 404; + next(err); +}); + +// error handler +app.use(function(err, req, res, next) { + // set locals, only providing error in development + res.locals.message = err.message; + res.locals.error = req.app.get('env') === 'development' ? err : {}; + + // render the error page + res.status(err.status || 500); + res.render('error'); +}); + +module.exports = app; diff --git a/bin/www b/bin/www new file mode 100644 index 0000000..e49e193 --- /dev/null +++ b/bin/www @@ -0,0 +1,90 @@ +#!/usr/bin/env node + +/** + * Module dependencies. + */ + +var app = require('../app'); +var debug = require('debug')('api-basic:server'); +var http = require('http'); + +/** + * Get port from environment and store in Express. + */ + +var port = normalizePort(process.env.PORT || '3000'); +app.set('port', port); + +/** + * Create HTTP server. + */ + +var server = http.createServer(app); + +/** + * Listen on provided port, on all network interfaces. + */ + +server.listen(port); +server.on('error', onError); +server.on('listening', onListening); + +/** + * Normalize a port into a number, string, or false. + */ + +function normalizePort(val) { + var port = parseInt(val, 10); + + if (isNaN(port)) { + // named pipe + return val; + } + + if (port >= 0) { + // port number + return port; + } + + return false; +} + +/** + * Event listener for HTTP server "error" event. + */ + +function onError(error) { + if (error.syscall !== 'listen') { + throw error; + } + + var bind = typeof port === 'string' + ? 'Pipe ' + port + : 'Port ' + port; + + // handle specific listen errors with friendly messages + switch (error.code) { + case 'EACCES': + console.error(bind + ' requires elevated privileges'); + process.exit(1); + break; + case 'EADDRINUSE': + console.error(bind + ' is already in use'); + process.exit(1); + break; + default: + throw error; + } +} + +/** + * Event listener for HTTP server "listening" event. + */ + +function onListening() { + var addr = server.address(); + var bind = typeof addr === 'string' + ? 'pipe ' + addr + : 'port ' + addr.port; + debug('Listening on ' + bind); +} diff --git a/config/config.json b/config/config.json new file mode 100644 index 0000000..31afd21 --- /dev/null +++ b/config/config.json @@ -0,0 +1,24 @@ +{ + "development": { + "username": "nextacademy", + "password": "nextacademy", + "database": "h8_w05d01_01_rest_api", + "host": "127.0.0.1", + "port": "5432", + "dialect": "postgres" + }, + "test": { + "username": "root", + "password": null, + "database": "database_test", + "host": "127.0.0.1", + "dialect": "mysql" + }, + "production": { + "username": "root", + "password": null, + "database": "database_production", + "host": "127.0.0.1", + "dialect": "mysql" + } +} diff --git a/controllers/userController.js b/controllers/userController.js new file mode 100644 index 0000000..46293a2 --- /dev/null +++ b/controllers/userController.js @@ -0,0 +1,87 @@ +var User = require("../models/user"); + +const db = require("../models") + +exports.index = (req, res, next) => { + db.User.findAll() + .then ( users => { + // res.render('index', {title: "Get Users",users: JSON.stringify(users)}); + res.send(JSON.stringify(users)); + }) + +} + +exports.user_detail = (req, res, next) => { + db.User.findById(req.params.id) + .then ( user => { + res.send(JSON.stringify(user)); + }) +} + +exports.user_create_get = (req, res, next) => { + res.render('./users/new', {title: "Create New User"}); +} + +exports.user_create_post = (req, res, next) => { + let name = req.body.name; + let username = req.body.username; + let phone = req.body.phone; + let email = req.body.email; + let password = req.body.password; + + db.User.create({name: name, username: username, phone: phone, email: email, password: password}) + .then ( user => { + res.send(`Created user ${user.username}`); + }) +} + +exports.user_delete = (req, res, next) => { + let user_id = req.params.id + + db.User.destroy({where: {id: user_id}}) + .then ( row => { + console.log(row); + if(row > 0) + res.send(`Deleted user with user id: ${user_id}.`); + else + res.send(`Delete not successful, make sure user id is correct.`); + }) +} + +exports.user_update_get = (req, res, next) => { + let user_id = req.params.id + db.User.findById(user_id) + .then ( user => { + res.render('./users/edit', {title: "Edit User", user: user}) + }) + +} + +exports.user_update_post = (req, res, next) => { + let user_id = req.params.id + let name = req.body.name; + let username = req.body.username; + let phone = req.body.phone; + let email = req.body.email; + let password = req.body.password; + + console.log(req.body); + + db.User.update({name: name, username: username, phone: phone, email: email, password: password}, {fields: ['name', 'username', 'phone', 'email', 'password'], where: {id: user_id}}) + .then ( row => { + if (row > 0) + res.send(`User id=${user_id} has been updated.`); + else + res.send('Update is unsuccessful') + + }) + +} + + + + + + + +// diff --git a/migrations/20170424020928-create-user.js b/migrations/20170424020928-create-user.js new file mode 100644 index 0000000..1f8e89d --- /dev/null +++ b/migrations/20170424020928-create-user.js @@ -0,0 +1,39 @@ +'use strict'; +module.exports = { + up: function(queryInterface, Sequelize) { + return queryInterface.createTable('Users', { + id: { + allowNull: false, + autoIncrement: true, + primaryKey: true, + type: Sequelize.INTEGER + }, + name: { + type: Sequelize.STRING + }, + username: { + type: Sequelize.STRING + }, + phone: { + type: Sequelize.STRING + }, + email: { + type: Sequelize.STRING + }, + password: { + type: Sequelize.STRING + }, + createdAt: { + allowNull: false, + type: Sequelize.DATE + }, + updatedAt: { + allowNull: false, + type: Sequelize.DATE + } + }); + }, + down: function(queryInterface, Sequelize) { + return queryInterface.dropTable('Users'); + } +}; \ No newline at end of file diff --git a/models/index.js b/models/index.js new file mode 100644 index 0000000..7540dba --- /dev/null +++ b/models/index.js @@ -0,0 +1,36 @@ +'use strict'; + +var fs = require('fs'); +var path = require('path'); +var Sequelize = require('sequelize'); +var basename = path.basename(module.filename); +var env = process.env.NODE_ENV || 'development'; +var config = require(__dirname + '/../config/config.json')[env]; +var db = {}; + +if (config.use_env_variable) { + var sequelize = new Sequelize(process.env[config.use_env_variable]); +} else { + var sequelize = new Sequelize(config.database, config.username, config.password, config); +} + +fs + .readdirSync(__dirname) + .filter(function(file) { + return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js'); + }) + .forEach(function(file) { + var model = sequelize['import'](path.join(__dirname, file)); + db[model.name] = model; + }); + +Object.keys(db).forEach(function(modelName) { + if (db[modelName].associate) { + db[modelName].associate(db); + } +}); + +db.sequelize = sequelize; +db.Sequelize = Sequelize; + +module.exports = db; diff --git a/models/user.js b/models/user.js new file mode 100644 index 0000000..b44ce2e --- /dev/null +++ b/models/user.js @@ -0,0 +1,17 @@ +'use strict'; +module.exports = function(sequelize, DataTypes) { + var User = sequelize.define('User', { + name: DataTypes.STRING, + username: DataTypes.STRING, + phone: DataTypes.STRING, + email: DataTypes.STRING, + password: DataTypes.STRING + }, { + classMethods: { + associate: function(models) { + // associations can be defined here + } + } + }); + return User; +}; \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..cf3a8ba --- /dev/null +++ b/package.json @@ -0,0 +1,21 @@ +{ + "name": "api-basic", + "version": "0.0.0", + "private": true, + "scripts": { + "start": "nodemon ./bin/www" + }, + "dependencies": { + "body-parser": "~1.17.1", + "cookie-parser": "~1.4.3", + "debug": "~2.6.3", + "ejs": "~2.5.6", + "express": "~4.15.2", + "morgan": "~1.8.1", + "nodemon": "^1.11.0", + "pg": "^6.1.5", + "sequelize": "^3.30.4", + "sequelize-cli": "^2.7.0", + "serve-favicon": "~2.4.2" + } +} diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css new file mode 100644 index 0000000..9453385 --- /dev/null +++ b/public/stylesheets/style.css @@ -0,0 +1,8 @@ +body { + padding: 50px; + font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; +} + +a { + color: #00B7FF; +} diff --git a/routes/index.js b/routes/index.js new file mode 100644 index 0000000..ecca96a --- /dev/null +++ b/routes/index.js @@ -0,0 +1,9 @@ +var express = require('express'); +var router = express.Router(); + +/* GET home page. */ +router.get('/', function(req, res, next) { + res.render('index', { title: 'Express' }); +}); + +module.exports = router; diff --git a/routes/users.js b/routes/users.js new file mode 100644 index 0000000..5f89356 --- /dev/null +++ b/routes/users.js @@ -0,0 +1,47 @@ +var express = require('express'); +var router = express.Router(); + +var user_controller = require("../controllers/userController"); + +/* GET users listing. */ +// router.get('/', function(req, res, next) { +// res.send('respond with a resource'); +// }); + + +// Get all the users +router.get('/', user_controller.index); + +// Create a user +// get create form +router.get('/create', user_controller.user_create_get); +// create user +router.post('/create', user_controller.user_create_post); + +// Delete a user +router.get('/:id/delete', user_controller.user_delete) + + +// Update user +// Get update form +router.get('/:id/edit', user_controller.user_update_get) +router.post('/:id/edit', user_controller.user_update_post) + + + +// Get a single user_controller +router.get('/:id', user_controller.user_detail); + + + +// Delete a user + +// Update a user with new info + + + + + + + +module.exports = router; diff --git a/seeders/20170424040552-generate-users.js b/seeders/20170424040552-generate-users.js new file mode 100644 index 0000000..543b3c9 --- /dev/null +++ b/seeders/20170424040552-generate-users.js @@ -0,0 +1,38 @@ +'use strict'; + +module.exports = { + up: function (queryInterface, Sequelize) { + /* + Add altering commands here. + Return a promise to correctly handle asynchronicity. + + Example: + return queryInterface.bulkInsert('Person', [{ + name: 'John Doe', + isBetaMember: false + }], {}); + */ + + let data = [ + { name: 'James Harden', username: 'beard', phone:'013131313', email: 'thebeard@rockets.com', password: 'haha', createdAt: new Date(), updatedAt: new Date() }, + { name: 'Russel Westbrook', username: 'russ', phone:'0000000', email: 'rw@thunders.com', password: 'haha', createdAt: new Date(), updatedAt: new Date() }, + { name: 'Steph Curry', username: 'curry', phone:'3030303030', email: 'curry@warriors.com', password: 'haha', createdAt: new Date(), updatedAt: new Date() }, + { name: 'Giannis Antetokounmpo', username: 'greekfreak', phone:'34343434', email: 'greekfreak@bucks.com', password: 'haha', createdAt: new Date(), updatedAt: new Date() } + ]; + + return queryInterface.bulkInsert('Users', data, {}); + + + + }, + + down: function (queryInterface, Sequelize) { + /* + Add reverting commands here. + Return a promise to correctly handle asynchronicity. + + Example: + return queryInterface.bulkDelete('Person', null, {}); + */ + } +}; diff --git a/views/error.ejs b/views/error.ejs new file mode 100644 index 0000000..7cf94ed --- /dev/null +++ b/views/error.ejs @@ -0,0 +1,3 @@ +

<%= message %>

+

<%= error.status %>

+
<%= error.stack %>
diff --git a/views/index.ejs b/views/index.ejs new file mode 100644 index 0000000..7b7a1d6 --- /dev/null +++ b/views/index.ejs @@ -0,0 +1,11 @@ + + + + <%= title %> + + + +

<%= title %>

+

Welcome to <%= title %>

+ + diff --git a/views/users/edit.ejs b/views/users/edit.ejs new file mode 100644 index 0000000..72c767e --- /dev/null +++ b/views/users/edit.ejs @@ -0,0 +1,21 @@ + + + + <%= title %> + + + +

<%= title %>

+ + +
+ Name
+ Username
+ Phone
+ Email
+ Password
+ +
+ + + diff --git a/views/users/new.ejs b/views/users/new.ejs new file mode 100644 index 0000000..d0e0800 --- /dev/null +++ b/views/users/new.ejs @@ -0,0 +1,21 @@ + + + + <%= title %> + + + +

<%= title %>

+ + +
+ Name
+ Username
+ Phone
+ Email
+ Password
+ +
+ + + From 0329e185c44cab76653fd2e10302e7fca45810e2 Mon Sep 17 00:00:00 2001 From: Rudy Wahjudi Date: Tue, 25 Apr 2017 10:57:58 +0700 Subject: [PATCH 2/4] added route in readme.md --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6379a41..dc317aa 100644 --- a/README.md +++ b/README.md @@ -1 +1,9 @@ -# api-basic \ No newline at end of file +# api-basic + +| Route | HTTP | Description | +|-----------------|----------|------------------------------| +| /api/users | GET | Get all the users | +| /api/users/:id | GET | Get a single user | +| /api/users | POST | Create a user | +| /api/users/:id | DELETE | Delete a user | +| /api/users/:id | PUT | Update a user with new info | From 179bb8c7c5a0641873846ce01e8453046b006a24 Mon Sep 17 00:00:00 2001 From: Rudy Wahjudi Date: Tue, 25 Apr 2017 11:20:57 +0700 Subject: [PATCH 3/4] controller and router fix, no more getting the view form --- app.js | 2 +- controllers/userController.js | 8 ++++---- routes/users.js | 36 +++++------------------------------ 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/app.js b/app.js index b2a5037..c4eadbe 100644 --- a/app.js +++ b/app.js @@ -23,7 +23,7 @@ app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); app.use('/', index); -app.use('/users', users); +app.use('/api/users', users); // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/controllers/userController.js b/controllers/userController.js index 46293a2..adc3192 100644 --- a/controllers/userController.js +++ b/controllers/userController.js @@ -1,4 +1,3 @@ -var User = require("../models/user"); const db = require("../models") @@ -6,7 +5,7 @@ exports.index = (req, res, next) => { db.User.findAll() .then ( users => { // res.render('index', {title: "Get Users",users: JSON.stringify(users)}); - res.send(JSON.stringify(users)); + res.send(users); }) } @@ -14,7 +13,7 @@ exports.index = (req, res, next) => { exports.user_detail = (req, res, next) => { db.User.findById(req.params.id) .then ( user => { - res.send(JSON.stringify(user)); + res.send(user); }) } @@ -31,7 +30,8 @@ exports.user_create_post = (req, res, next) => { db.User.create({name: name, username: username, phone: phone, email: email, password: password}) .then ( user => { - res.send(`Created user ${user.username}`); + // res.send(`Created user ${user.username}`); + res.send(user); }) } diff --git a/routes/users.js b/routes/users.js index 5f89356..7e7e27b 100644 --- a/routes/users.js +++ b/routes/users.js @@ -3,45 +3,19 @@ var router = express.Router(); var user_controller = require("../controllers/userController"); -/* GET users listing. */ -// router.get('/', function(req, res, next) { -// res.send('respond with a resource'); -// }); - - // Get all the users router.get('/', user_controller.index); -// Create a user -// get create form -router.get('/create', user_controller.user_create_get); -// create user -router.post('/create', user_controller.user_create_post); - -// Delete a user -router.get('/:id/delete', user_controller.user_delete) - - -// Update user -// Get update form -router.get('/:id/edit', user_controller.user_update_get) -router.post('/:id/edit', user_controller.user_update_post) - - - // Get a single user_controller router.get('/:id', user_controller.user_detail); - +// Create a user +router.post('/', user_controller.user_create_post); // Delete a user +router.delete('/:id', user_controller.user_delete) -// Update a user with new info - - - - - - +// Update user +router.put('/:id', user_controller.user_update_post) module.exports = router; From 668dbbcca8f0d24b7b2f09090f7822531d7fa279 Mon Sep 17 00:00:00 2001 From: Rudy Wahjudi Date: Tue, 25 Apr 2017 11:43:31 +0700 Subject: [PATCH 4/4] added example and usage --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index dc317aa..2c5d15c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # api-basic +###List of user routes: | Route | HTTP | Description | |-----------------|----------|------------------------------| | /api/users | GET | Get all the users | @@ -7,3 +8,18 @@ | /api/users | POST | Create a user | | /api/users/:id | DELETE | Delete a user | | /api/users/:id | PUT | Update a user with new info | + +#### Example +``` +localhost:3000/api/users // will return all users in JSON format +``` + + +### Usage +``` +npm install +npm start +``` + +### Heroku +()[]