From 022d9653a4c95d63ef473afc9919bacfdd174ea1 Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 10:58:47 +0700 Subject: [PATCH 1/9] add sequelize template --- .gitignore | 1 + README.md | 25 +++++++++- app.js | 46 ++++++++++++++++++ bin/www | 90 ++++++++++++++++++++++++++++++++++++ config/config.json | 23 +++++++++ models/index.js | 36 +++++++++++++++ package.json | 20 ++++++++ public/stylesheets/style.css | 8 ++++ routes/index.js | 9 ++++ routes/users.js | 9 ++++ views/error.jade | 6 +++ views/index.jade | 5 ++ views/layout.jade | 7 +++ 13 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 app.js create mode 100755 bin/www create mode 100644 config/config.json create mode 100644 models/index.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 views/error.jade create mode 100644 views/index.jade create mode 100644 views/layout.jade diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules diff --git a/README.md b/README.md index 6379a41..ce202ac 100644 --- a/README.md +++ b/README.md @@ -1 +1,24 @@ -# api-basic \ No newline at end of file +# api-basic + +Author : Haryana wisnu +Create Date : Selasa, 25 April 2017 + + +Install Step : +- create folder api-basic +- npm init +- express . +- npm install +- npm install --save sequelize sequelize-cli pg +- sequelize init +- sequelize model:craete --name Users --attribute name:string,age:integer,email:string +- sequelize db:migrate +- sequelize seed:craete --name seed-users-dummy +- sequelize db:seed --seed seed-users-dummy + +Route HTTP Description +/api/users GET get all the users +/api/users/:id GET get a single users +/api/users POST create a user +/api/users/:id DELETE delete a user +/api/users/:id PUT update a user with new info diff --git a/app.js b/app.js new file mode 100644 index 0000000..06548a0 --- /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', 'jade'); + +// 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 100755 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..0f858c6 --- /dev/null +++ b/config/config.json @@ -0,0 +1,23 @@ +{ + "development": { + "username": "root", + "password": null, + "database": "database_development", + "host": "127.0.0.1", + "dialect": "mysql" + }, + "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/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/package.json b/package.json new file mode 100644 index 0000000..7b2abb0 --- /dev/null +++ b/package.json @@ -0,0 +1,20 @@ +{ + "name": "api-basic", + "version": "0.0.0", + "private": true, + "scripts": { + "start": "node ./bin/www" + }, + "dependencies": { + "body-parser": "~1.17.1", + "cookie-parser": "~1.4.3", + "debug": "~2.6.3", + "express": "~4.15.2", + "jade": "~1.11.0", + "morgan": "~1.8.1", + "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..623e430 --- /dev/null +++ b/routes/users.js @@ -0,0 +1,9 @@ +var express = require('express'); +var router = express.Router(); + +/* GET users listing. */ +router.get('/', function(req, res, next) { + res.send('respond with a resource'); +}); + +module.exports = router; diff --git a/views/error.jade b/views/error.jade new file mode 100644 index 0000000..51ec12c --- /dev/null +++ b/views/error.jade @@ -0,0 +1,6 @@ +extends layout + +block content + h1= message + h2= error.status + pre #{error.stack} diff --git a/views/index.jade b/views/index.jade new file mode 100644 index 0000000..3d63b9a --- /dev/null +++ b/views/index.jade @@ -0,0 +1,5 @@ +extends layout + +block content + h1= title + p Welcome to #{title} diff --git a/views/layout.jade b/views/layout.jade new file mode 100644 index 0000000..15af079 --- /dev/null +++ b/views/layout.jade @@ -0,0 +1,7 @@ +doctype html +html + head + title= title + link(rel='stylesheet', href='/stylesheets/style.css') + body + block content From 5ac85b3bc9c923acd7b7dbf86959a622acd3d4e8 Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 11:07:58 +0700 Subject: [PATCH 2/9] add model and seed user --- config/config.json | 9 +++-- migrations/20170425040212-create-user.js | 33 +++++++++++++++++ models/user.js | 15 ++++++++ seeders/20170425040320-seed-user-dummy.js | 45 +++++++++++++++++++++++ 4 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 migrations/20170425040212-create-user.js create mode 100644 models/user.js create mode 100644 seeders/20170425040320-seed-user-dummy.js diff --git a/config/config.json b/config/config.json index 0f858c6..4248eb5 100644 --- a/config/config.json +++ b/config/config.json @@ -1,10 +1,11 @@ { "development": { - "username": "root", - "password": null, - "database": "database_development", + "username": "wisnu", + "password": "wisnu", + "database": "2w1d1", "host": "127.0.0.1", - "dialect": "mysql" + "dialect": "postgres", + "logging":false }, "test": { "username": "root", diff --git a/migrations/20170425040212-create-user.js b/migrations/20170425040212-create-user.js new file mode 100644 index 0000000..2c83e99 --- /dev/null +++ b/migrations/20170425040212-create-user.js @@ -0,0 +1,33 @@ +'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 + }, + age: { + type: Sequelize.INTEGER + }, + email: { + 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/user.js b/models/user.js new file mode 100644 index 0000000..abc2f5e --- /dev/null +++ b/models/user.js @@ -0,0 +1,15 @@ +'use strict'; +module.exports = function(sequelize, DataTypes) { + var User = sequelize.define('User', { + name: DataTypes.STRING, + age: DataTypes.INTEGER, + email: DataTypes.STRING + }, { + classMethods: { + associate: function(models) { + // associations can be defined here + } + } + }); + return User; +}; \ No newline at end of file diff --git a/seeders/20170425040320-seed-user-dummy.js b/seeders/20170425040320-seed-user-dummy.js new file mode 100644 index 0000000..e5fb37f --- /dev/null +++ b/seeders/20170425040320-seed-user-dummy.js @@ -0,0 +1,45 @@ +'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 + }], {}); + */ + return queryInterface.bulkInsert('Users', [{ + name: 'John Doe', + age: 12, + email: 'John@gmail.com', + createdAt: new Date(), + updatedAt: new Date() + }, { + name: 'Kemal', + age: 22, + email: 'Kemal@gmail.com', + createdAt: new Date(), + updatedAt: new Date() + }, { + name: 'Tora', + age: 15, + email: 'Tora@gmail.com', + createdAt: new Date(), + updatedAt: new Date() + }], {}); + }, + + down: function(queryInterface, Sequelize) { + /* + Add reverting commands here. + Return a promise to correctly handle asynchronicity. + + Example: + return queryInterface.bulkDelete('Person', null, {}); + */ + } +}; From 3c2131e360ccf31223182c7af9db00f6861f4575 Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 11:28:32 +0700 Subject: [PATCH 3/9] add controllers --- app.js | 6 ++++-- controllers/usersControllers.js | 8 ++++++++ package.json | 2 +- routes/users.js | 6 ++---- 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 controllers/usersControllers.js diff --git a/app.js b/app.js index 06548a0..d4ff2a6 100644 --- a/app.js +++ b/app.js @@ -18,12 +18,14 @@ app.set('view engine', 'jade'); //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(bodyParser.urlencoded({ + extended: false +})); 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/usersControllers.js b/controllers/usersControllers.js new file mode 100644 index 0000000..a85a2dc --- /dev/null +++ b/controllers/usersControllers.js @@ -0,0 +1,8 @@ +var db = require('../models'); +module.exports = { + getall: (req, res, next) => { + db.User.findAll().then(ArrResult => { + res.send(ArrResult) + }) + } +} diff --git a/package.json b/package.json index 7b2abb0..1c4c9a8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node ./bin/www" + "start": "nodemon ./bin/www" }, "dependencies": { "body-parser": "~1.17.1", diff --git a/routes/users.js b/routes/users.js index 623e430..3f1fcab 100644 --- a/routes/users.js +++ b/routes/users.js @@ -1,9 +1,7 @@ var express = require('express'); var router = express.Router(); +var controllers = require('../controllers/usersControllers'); -/* GET users listing. */ -router.get('/', function(req, res, next) { - res.send('respond with a resource'); -}); +router.get('/', controllers.getall); module.exports = router; From 35c315ccb2247be18038307956ba619a14ede33c Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 11:47:18 +0700 Subject: [PATCH 4/9] add getall,getone and create --- controllers/usersControllers.js | 23 ++++++++++++++++++++++- routes/users.js | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/controllers/usersControllers.js b/controllers/usersControllers.js index a85a2dc..a65a6b3 100644 --- a/controllers/usersControllers.js +++ b/controllers/usersControllers.js @@ -2,7 +2,28 @@ var db = require('../models'); module.exports = { getall: (req, res, next) => { db.User.findAll().then(ArrResult => { - res.send(ArrResult) + res.send(ArrResult); + }) + }, + getone: (req, res, next) => { + let id = req.params.id; + db.User.findById(id).then(Result => { + res.send(Result); + }) + }, + create: (req, res, next) => { + let name = req.body.name; + let age = req.body.age; + let email = req.body.email; + console.log(`name ${name} age ${age} email ${email}`); + db.User.create({ + name: name, + age: age, + email: email + }).then(Result => { + res.send(Result); + }).catch(err => { + res.send(err); }) } } diff --git a/routes/users.js b/routes/users.js index 3f1fcab..85b9ee8 100644 --- a/routes/users.js +++ b/routes/users.js @@ -3,5 +3,7 @@ var router = express.Router(); var controllers = require('../controllers/usersControllers'); router.get('/', controllers.getall); +router.get('/:id', controllers.getone); +router.post('/', controllers.create); module.exports = router; From 738ee57a90018e9fb52e143f002c62aae9292cdc Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 11:57:15 +0700 Subject: [PATCH 5/9] add delete and update send.json --- controllers/usersControllers.js | 18 +++++++++++++++--- routes/users.js | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/controllers/usersControllers.js b/controllers/usersControllers.js index a65a6b3..d7f5bb7 100644 --- a/controllers/usersControllers.js +++ b/controllers/usersControllers.js @@ -2,13 +2,13 @@ var db = require('../models'); module.exports = { getall: (req, res, next) => { db.User.findAll().then(ArrResult => { - res.send(ArrResult); + res.json(ArrResult); }) }, getone: (req, res, next) => { let id = req.params.id; db.User.findById(id).then(Result => { - res.send(Result); + res.json(Result); }) }, create: (req, res, next) => { @@ -21,9 +21,21 @@ module.exports = { age: age, email: email }).then(Result => { - res.send(Result); + res.json(Result); }).catch(err => { res.send(err); }) + }, + delete: (req, res, next) => { + let id = req.params.id; + db.User.destroy({ + where: { + id: id + } + }).then(Result => { + res.json(Result); + }).catch(err => { + res.json(err); + }) } } diff --git a/routes/users.js b/routes/users.js index 85b9ee8..a2727d1 100644 --- a/routes/users.js +++ b/routes/users.js @@ -5,5 +5,6 @@ var controllers = require('../controllers/usersControllers'); router.get('/', controllers.getall); router.get('/:id', controllers.getone); router.post('/', controllers.create); +router.delete('/:id', controllers.delete); module.exports = router; From c54c114ac06238bdb9b1032154b5713f550cfe07 Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 12:51:04 +0700 Subject: [PATCH 6/9] add update and done --- controllers/usersControllers.js | 19 +++++++++++++++++++ routes/users.js | 1 + 2 files changed, 20 insertions(+) diff --git a/controllers/usersControllers.js b/controllers/usersControllers.js index d7f5bb7..fa2c21a 100644 --- a/controllers/usersControllers.js +++ b/controllers/usersControllers.js @@ -37,5 +37,24 @@ module.exports = { }).catch(err => { res.json(err); }) + }, + update: (req, res, next) => { + let id = req.params.id; + let name = req.body.name; + let age = req.body.age; + let email = req.body.email; + db.User.update({ + name: name, + age: age, + email: email + }, { + where: { + id: id + } + }).then(Result => { + res.json(Result); + }).catch(err => { + res.json(err); + }) } } diff --git a/routes/users.js b/routes/users.js index a2727d1..c02718d 100644 --- a/routes/users.js +++ b/routes/users.js @@ -6,5 +6,6 @@ router.get('/', controllers.getall); router.get('/:id', controllers.getone); router.post('/', controllers.create); router.delete('/:id', controllers.delete); +router.put('/:id', controllers.update); module.exports = router; From 5e0c893688ad144ad1e85a349c9ada6e70a18ef0 Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 12:56:52 +0700 Subject: [PATCH 7/9] done revisi Readme.md --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ce202ac..220a532 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,10 @@ Install Step : - sequelize seed:craete --name seed-users-dummy - sequelize db:seed --seed seed-users-dummy -Route HTTP Description -/api/users GET get all the users -/api/users/:id GET get a single users -/api/users POST create a user -/api/users/:id DELETE delete a user -/api/users/:id PUT update a user with new info +| Route | HTTP |Description| +| ------ | ------ |------ | +|/api/users | GET | get all the users| +|/api/users/:id | GET | get a single users| +|/api/users | POST | create a user| +|/api/users/:id | DELETE | delete a user| +|/api/users/:id | PUT | update a user with new info| From faa0f631b4f317ecebb89f68babbce7afaf7a6aa Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 13:56:18 +0700 Subject: [PATCH 8/9] done revisi Readme.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 220a532..be3cd8c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ # api-basic Author : Haryana wisnu + Create Date : Selasa, 25 April 2017 +Description : API Basic dengan CRUT + +Acces via localhost:3000/api/users Install Step : - create folder api-basic @@ -16,6 +20,7 @@ Install Step : - sequelize seed:craete --name seed-users-dummy - sequelize db:seed --seed seed-users-dummy + | Route | HTTP |Description| | ------ | ------ |------ | |/api/users | GET | get all the users| From 25a7082503b9a40126ed3c228777a92ff31bf463 Mon Sep 17 00:00:00 2001 From: haryanawisnu Date: Tue, 25 Apr 2017 17:24:46 +0700 Subject: [PATCH 9/9] revisi done --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index be3cd8c..947a83c 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,9 @@ Description : API Basic dengan CRUT Acces via localhost:3000/api/users Install Step : -- create folder api-basic -- npm init -- express . - npm install -- npm install --save sequelize sequelize-cli pg - sequelize init -- sequelize model:craete --name Users --attribute name:string,age:integer,email:string - sequelize db:migrate -- sequelize seed:craete --name seed-users-dummy - sequelize db:seed --seed seed-users-dummy