From ced1c2b39ee476b0076a1c25366aa6e40d9f0dbe Mon Sep 17 00:00:00 2001 From: Minal Shah Date: Tue, 24 Jan 2017 18:33:19 +0530 Subject: [PATCH 1/2] trying to modify gitignore --- my-todolist/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my-todolist/.gitignore b/my-todolist/.gitignore index aa8b37c..004ff13 100644 --- a/my-todolist/.gitignore +++ b/my-todolist/.gitignore @@ -1,3 +1,3 @@ node_modules/ -*/.idea/ +.idea/* uploads/ \ No newline at end of file From 43180a5781bc4fcbbe777453f38678f5183661af Mon Sep 17 00:00:00 2001 From: Minal Shah Date: Tue, 24 Jan 2017 18:44:40 +0530 Subject: [PATCH 2/2] checking the modified gitignore --- my-todolist/.idea/workspace.xml | 141 +++++++++++++++----------------- my-todolist/input.txt | 36 -------- my-todolist/settings.js | 7 ++ 3 files changed, 74 insertions(+), 110 deletions(-) delete mode 100644 my-todolist/input.txt diff --git a/my-todolist/.idea/workspace.xml b/my-todolist/.idea/workspace.xml index b059be5..185be88 100644 --- a/my-todolist/.idea/workspace.xml +++ b/my-todolist/.idea/workspace.xml @@ -18,11 +18,21 @@ + + + + + + + + + + - - + + @@ -58,21 +68,21 @@ - - + + - - + + - - + + - - + + @@ -88,36 +98,16 @@ - + - + - - - - - - - - - - - - - - - - - - - - @@ -134,7 +124,6 @@ @@ -365,12 +356,12 @@ - + - @@ -382,25 +373,25 @@ - + + + - - @@ -637,17 +628,11 @@ - - - - - - - + @@ -673,14 +658,6 @@ - - - - - - - - @@ -697,26 +674,26 @@ - + - - + + - + - - + + - + - - + + @@ -729,34 +706,50 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + diff --git a/my-todolist/input.txt b/my-todolist/input.txt deleted file mode 100644 index 7215050..0000000 --- a/my-todolist/input.txt +++ /dev/null @@ -1,36 +0,0 @@ -fffffffffffffffff,1,wwwwwwwwwwwwwww -ffffffffft,tttttttttttttttttt,yyyyyyyyyyyyyyyyy -gggggggggggg,,fffffffffffffffffffff -/*router.get('/file/:id',function(req,res){ - var pic_id = req.param('id'); - var gfs = req.gfs; - - gfs.files.find({filename: pic_id}).toArray(function (err, files) { - - if (err) { - res.json(err); - } - if (files.length > 0) { - var mime = 'image/jpeg'; - res.set('Content-Type', mime); - var read_stream = gfs.createReadStream({filename: pic_id}); - read_stream.pipe(res); - } else { - res.json('File Not Found'); - } - }); -});*/ -// router.all('/upload',function(req,res){ -// var dirname=require('path').dirname(__dirname); -// var filename=req.files.file.name; -// var type=req.files.file.mimetype; -// var read_stream=fs.creeateReadStream(dirname+'/'+path); -// var conn=req.conn; -// var Grid=require('gridfs-stream'); -// Grid.mongo=mongoose.mongo; -// gfs=Grid(conn.db); -// var writestream=gfs.createWriteStream({ -// filename:filename -// }); -// read_stream.pipe(writestream); -// }); \ No newline at end of file diff --git a/my-todolist/settings.js b/my-todolist/settings.js index e69de29..f16a14e 100644 --- a/my-todolist/settings.js +++ b/my-todolist/settings.js @@ -0,0 +1,7 @@ +exports.dbConfig = { + user: "sa", + password: "Lanetteam1", + server: "mongodb://localhost:27017", + database: "test", + port: 1433 +}; \ No newline at end of file