Skip to content

Commit 17a517e

Browse files
committed
update code
1 parent 9825531 commit 17a517e

File tree

8 files changed

+212
-225
lines changed

8 files changed

+212
-225
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11

2-
node_modules
2+
node_modules
3+
package-lock.json

app.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
var express = require('express');
2-
var path = require('path');
3-
var favicon = require('serve-favicon');
4-
var logger = require('morgan');
5-
var cookieParser = require('cookie-parser');
6-
var bodyParser = require('body-parser');
1+
let express = require('express');
2+
let path = require('path');
3+
let favicon = require('serve-favicon');
4+
let logger = require('morgan');
5+
let cookieParser = require('cookie-parser');
6+
let bodyParser = require('body-parser');
77

8-
var index = require('./routes/index');
9-
//var users = require('./routes/users');
10-
var mongoose = require('mongoose');
11-
mongoose.connect('mongodb://localhost/REst');
8+
let index = require('./routes/index');
9+
//let users = require('./routes/users');
10+
let mongoose = require('mongoose');
11+
mongoose.connect('mongodb://localhost/detail');
1212

13-
var app = express();
13+
let app = express();
1414

1515
// view engine setup
1616
app.set('views', path.join(__dirname, 'views'));
@@ -28,14 +28,14 @@ app.use('/', index);
2828
//app.use('/users', users);
2929

3030
// catch 404 and forward to error handler
31-
app.use(function(req, res, next) {
32-
var err = new Error('Not Found');
31+
app.use((req, res, next) => {
32+
let err = new Error('Not Found');
3333
err.status = 404;
3434
next(err);
3535
});
3636

3737
// error handler
38-
app.use(function(err, req, res, next) {
38+
app.use((err, req, res, next) => {
3939
// set locals, only providing error in development
4040
res.locals.message = err.message;
4141
res.locals.error = req.app.get('env') === 'development' ? err : {};

controllers/userController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
var user = require('../models/user.js');
1+
let user = require('../models/user.js');

models/user.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
var mongoose = require('mongoose');
2-
var Schema = mongoose.Schema;
1+
let mongoose = require('mongoose');
2+
let Schema = mongoose.Schema;
33

4-
userSchema = new Schema( {
4+
userSchema = new Schema({
55
unique_id: Number,
66
username: String,
77
fullname: String,

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "nodetest2",
3-
"version": "0.0.0",
2+
"name": "Node-Express-MongoDB-REST-API-jQuery-AJAX",
3+
"version": "0.0.1",
44
"private": true,
55
"scripts": {
66
"start": "node ./bin/www"

routes/index.js

Lines changed: 66 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,110 @@
1-
/*var User = require('mongoose').model('User');*/
2-
var express = require('express');
3-
var router = express.Router();
4-
var userControllers = require('../controllers/userController.js')
1+
/*let User = require('mongoose').model('User');*/
2+
let express = require('express');
3+
let router = express.Router();
4+
let userControllers = require('../controllers/userController.js')
55
/* GET home page. */
6-
router.get('/', function(req, res, next) {
7-
res.render('index', { title: 'Express' });
6+
router.get('/', (req, res, next) => {
7+
res.render('index', { title: 'Express' });
88
});
99

1010

11-
router.get('/', function(req, res, next) {
12-
//res.send('respond with a resource');
13-
return User.find( function( err, clients ) {
14-
if( !err ) {
15-
res.render('detail.ejs', {
16-
title: 'Details',
17-
clients: clients
18-
19-
});
20-
21-
// console.log(clients);
22-
} else {
23-
return console.log( err );
24-
}
11+
router.get('/', (req, res, next) => {
12+
//res.send('respond with a resource');
13+
return User.find(function (err, clients) {
14+
if (!err) {
15+
res.render('detail.ejs', {
16+
title: 'Details',
17+
clients: clients
2518
});
19+
} else {
20+
return console.log(err);
21+
}
22+
});
2623
});
2724

28-
router.post('/', function(req, res, next) {
29-
console.log(req.body);
30-
// res.json(req.body);
31-
var personInfo = req.body; //Get the parsed information
25+
router.post('/', (req, res, next) => {
26+
// res.json(req.body);
27+
let personInfo = req.body; //Get the parsed information
3228

33-
34-
if(!personInfo.username || !personInfo.fullname || !personInfo.age){
29+
if (!personInfo.username || !personInfo.fullname || !personInfo.age) {
3530
res.send();
3631
} else {
3732

38-
/* User.count(function(err,c){
39-
//console.log('Count is ' + c);
40-
var e = c+1;
41-
//console.log("e"+e);
42-
43-
var newPerson = new User({
44-
unique_id:e,
45-
username: personInfo.username,
46-
fullname: personInfo.fullname,
47-
age: personInfo.age
48-
});
33+
/*User.count(function(err,c){
34+
//console.log('Count is ' + c);
35+
let e = c+1;
36+
//console.log("e"+e);
37+
38+
let newPerson = new User({
39+
unique_id:e,
40+
username: personInfo.username,
41+
fullname: personInfo.fullname,
42+
age: personInfo.age
43+
});
44+
45+
newPerson.save(function(err, Person){
46+
if(err)
47+
console.log(err);
48+
else
49+
console.log('Success');
50+
});
51+
52+
});*/
53+
let c = 1;
54+
User.findOne({}, (err, data) => {
4955

50-
newPerson.save(function(err, Person){
51-
if(err)
52-
console.log(err);
53-
else
54-
console.log('Success');
55-
});
56-
57-
});*/
58-
var c=1;
59-
User.findOne({},function(err,data){
60-
6156
if (data) {
62-
console.log("if");
63-
c = data.unique_id + 1;
57+
c = data.unique_id + 1;
6458
}
6559

66-
var newPerson = new User({
67-
unique_id:c,
60+
let newPerson = new User({
61+
unique_id: c,
6862
username: personInfo.username,
6963
fullname: personInfo.fullname,
7064
age: personInfo.age
7165
});
7266

73-
newPerson.save(function(err, Person){
74-
if(err)
67+
newPerson.save((err, Person) => {
68+
/* if (err)
7569
console.log(err);
7670
else
77-
console.log('Success');
71+
console.log('Success'); */
7872
});
79-
80-
}).sort({_id: -1}).limit(1);
73+
74+
}).sort({ _id: -1 }).limit(1);
8175

8276
}
83-
res.json({Success:'1'});
77+
res.json({ Success: '1' });
8478
});
8579

86-
router.get('/show', function(req, res, next) {
80+
router.get('/show', (req, res, next) => {
8781

88-
User.find(function(err, response){
82+
User.find((err, response) => {
8983
res.json(response);
9084
});
9185

9286
});
9387

94-
router.put('/user/:id', function(req, res) {
95-
var id = req.params.id;
96-
console.log("id"+id);
97-
var personInfo = req.body;
98-
console.log()
88+
router.put('/user/:id', (req, res) => {
89+
let id = req.params.id;
90+
let personInfo = req.body;
9991

100-
User.update({unique_id:id}, {
101-
username: personInfo.username,
102-
fullname: personInfo.fullname,
92+
User.update({ unique_id: id }, {
93+
username: personInfo.username,
94+
fullname: personInfo.fullname,
10395
age: personInfo.age
104-
}, function(err, rawResponse) {
105-
console.log(rawResponse);
106-
});
96+
}, (err, rawResponse) => {
97+
console.log(rawResponse);
98+
});
10799

108100
});
109101

110-
router.delete('/user/:id', function(req, res) {
111-
var id = req.params.id;
112-
console.log("id"+id);
113-
102+
router.delete('/user/:id', (req, res) => {
103+
let id = req.params.id;
114104
/*User.find({unique_id:id}, function(err, data) {
115105
data.remove();
116106
});*/
117-
User.findOneAndRemove({'unique_id' : id}, function (err,offer){
118-
console.log('asa');
119-
});
107+
User.findOneAndRemove({ 'unique_id': id }, (err, offer) => {});
120108
res.send("Success");
121109
});
122110

routes/users.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
var express = require('express');
2-
var router = express.Router();
1+
let express = require('express');
2+
let router = express.Router();
33

4-
/* GET home page. */
5-
6-
/*router.get('/', function(req, res, next) {
7-
res.send('respond with a resource');
8-
});*/
94
module.exports = router;

0 commit comments

Comments
 (0)