Skip to content

Commit 8ca3d78

Browse files
authored
Merge pull request #10 from foramsojitra/master
code format and git ignore updated
2 parents 096c7b7 + ea87931 commit 8ca3d78

File tree

2 files changed

+42
-41
lines changed

2 files changed

+42
-41
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
.env
55
.env-stag
66
.env-prod
7+
package-lock.json
78
ecosystem.config.js

server.js

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var express = require('express');
22
var multer = require('multer'),
3-
bodyParser = require('body-parser'),
4-
path = require('path');
3+
bodyParser = require('body-parser'),
4+
path = require('path');
55
var mongoose = require('mongoose');
66
var Detail = require('./models/detail');
77
var fs = require('fs');
@@ -10,26 +10,26 @@ var dir = './uploads';
1010
mongoose.connect('mongodb://localhost/uploadFiles');
1111

1212

13-
var upload = multer({storage: multer.diskStorage({
13+
var upload = multer({
14+
storage: multer.diskStorage({
1415

15-
destination: function (req, file, callback) {
16-
if (!fs.existsSync(dir)) {
17-
fs.mkdirSync(dir);
18-
}
19-
callback(null, './uploads');
20-
},
21-
filename: function (req, file, callback)
22-
{ callback(null, file.fieldname +'-' + Date.now()+path.extname(file.originalname));}
16+
destination: function (req, file, callback) {
17+
if (!fs.existsSync(dir)) {
18+
fs.mkdirSync(dir);
19+
}
20+
callback(null, './uploads');
21+
},
22+
filename: function (req, file, callback) { callback(null, file.fieldname + '-' + Date.now() + path.extname(file.originalname)); }
2323

24-
}),
24+
}),
2525

26-
fileFilter: function(req, file, callback) {
27-
var ext = path.extname(file.originalname)
28-
if (ext !== '.png' && ext !== '.jpg' && ext !== '.gif' && ext !== '.jpeg') {
29-
return callback(/*res.end('Only images are allowed')*/ null, false)
26+
fileFilter: function (req, file, callback) {
27+
var ext = path.extname(file.originalname)
28+
if (ext !== '.png' && ext !== '.jpg' && ext !== '.gif' && ext !== '.jpeg') {
29+
return callback(/*res.end('Only images are allowed')*/ null, false)
30+
}
31+
callback(null, true)
3032
}
31-
callback(null, true)
32-
}
3333
});
3434

3535
var app = new express();
@@ -41,67 +41,67 @@ app.set('views', path.join(__dirname, 'views'));
4141
app.set('view engine', 'ejs');
4242
app.use(express.static('uploads'));
4343

44-
app.get('/', (req, res) =>{
45-
Detail.find({}, (err,data)=>{
46-
if(err){
44+
app.get('/', (req, res) => {
45+
Detail.find({}, (err, data) => {
46+
if (err) {
4747
console.log(err);
48-
}else{
49-
res.render('index',{data:data});
48+
} else {
49+
res.render('index', { data: data });
5050
}
5151
})
52-
52+
5353
});
5454

55-
app.post('/', upload.any(), (req,res)=>{
56-
55+
app.post('/', upload.any(), (req, res) => {
56+
5757
// console.log("req.body"); //form fields
5858
// console.log(req.body);
5959
// console.log("req.file");
6060
// console.log(req.files); //form files
61-
62-
if(!req.body && !req.files){
63-
res.json({success: false});
64-
} else {
61+
62+
if (!req.body && !req.files) {
63+
res.json({ success: false });
64+
} else {
6565
var c;
66-
Detail.findOne({},(err,data)=>{
66+
Detail.findOne({}, (err, data) => {
6767
// console.log("into detail");
6868

6969
if (data) {
7070
c = data.unique_id + 1;
71-
}else{
72-
c=1;
71+
} else {
72+
c = 1;
7373
}
7474

7575
var detail = new Detail({
7676

77-
unique_id:c,
77+
unique_id: c,
7878
Name: req.body.title,
7979
image1: req.files[0] && req.files[0].filename ? req.files[0].filename : '',
8080
image2: req.files[1] && req.files[1].filename ? req.files[1].filename : '',
8181
});
8282

83-
detail.save((err, Person)=>{
84-
if(err)
83+
detail.save((err, Person) => {
84+
if (err)
8585
console.log(err);
8686
else
8787
res.redirect('/');
8888

8989
});
9090

91-
}).sort({_id: -1}).limit(1);
91+
}).sort({ _id: -1 }).limit(1);
9292

9393
}
9494
});
9595

96-
app.post('/delete',(req,res)=>{
96+
app.post('/delete', (req, res) => {
9797

98-
Detail.findByIdAndRemove(req.body.prodId, (err, data) => {
98+
Detail.findByIdAndRemove(req.body.prodId, (err, data) => {
9999

100100
console.log(data);
101101

102-
})
102+
})
103103
res.redirect('/');
104104
});
105105

106106
var port = 2000;
107-
app.listen( port, () =>{ console.log('listening on port '+port); } );
107+
app.listen(port, () => { console.log('listening on port ' + port); });

0 commit comments

Comments
 (0)