Merge pull request #4 from codeuino/development

Development

Author: lakshyabatman

.DS_Store

@@ -79,4 +79,6 @@ typings/
 
 # Config files
 credential.js
-secret.js
+secret.js
+
+views/images/uploads

.gitignore

@@ -1,15 +1,15 @@
-module.exports = {
-  oauth: {
-    clientID: "192695093229-kf95jtdv1jge25d86ak99e68dkrpu33o.apps.googleusercontent.com",
-    clientSecret: "rXvfxBahDlJF1ORk7y660XM8"
-  },
-  database: 'mongodb://localhost:27017',
-  github: {
-    clientID: 'c9afdb238ed98b213912',
-    clientSecret: '3031efea8badea1381da682fd5f21e88e5a15d2f'
-  },
-  facebook: {
-    clientID: '383717979035587',
-    clientSecret: '82bd80d286ef6e45606da6d53a97efbc'
-  }
-}
+module.exports = {
+  oauth: {
+    clientID: "192695093229-kf95jtdv1jge25d86ak99e68dkrpu33o.apps.googleusercontent.com",
+    clientSecret: "rXvfxBahDlJF1ORk7y660XM8"
+  },
+  database: 'mongodb://localhost:27017/donut1',
+  github: {
+    clientID: 'c9afdb238ed98b213912',
+    clientSecret: '3031efea8badea1381da682fd5f21e88e5a15d2f'
+  },
+  facebook: {
+    clientID: '383717979035587',
+    clientSecret: '82bd80d286ef6e45606da6d53a97efbc'
+  }
+}

config/credential.js

@@ -2,7 +2,16 @@ const user = require('../schema/user.js');
 const proj = require('../schema/project.js');
 const expressValidator = require('express-validator');
 const { check, validationResult } = require('express-validator/check');
-
+// var multer = require('multer');
+// var storage = multer.diskStorage({
+//   destination: (req, file, cb) => {
+//     cb(null, 'public/images/uploads')
+//   },
+//   filename: (req, file, cb) => {
+//     cb(null, file.fieldname + '-' + Date.now())
+//   }
+// });
+// var upload = multer({storage: storage});
 module.exports = {
   SubmitprojectForm:function(req,res){
     res.render('projectForm')
@@ -35,6 +44,7 @@ module.exports = {
     ]).sort({createdAt:-1}).then((da)=>{
       console.log(req.user);
       user.findOne({ Eid: req.params.sd }).then(function (use) {
+        console.log(da)
           res.render('other-landing', { use: use, ques: da, sign: req.user});
       })
     })
@@ -62,7 +72,8 @@ module.exports = {
             content: req.body.cont,
             upvote: '',
             downvote: '',
-            proid: Math.floor(Math.random() * 100000)
+            proid: Math.floor(Math.random() * 100000),
+            image:'/images/uploads/'+req.file.filename
           })
             .save()
             .then(function() {

controller/profile.controller.js

@@ -21,8 +21,7 @@
     "method-override": "^3.0.0",
     "mongo": "^0.1.0",
     "mongodb": "^3.1.0",
-    "mongoose": "^5.1.7",
-    "multer": "^1.4.1",
+    "mongoose": "^5.4.19",
     "node": "^10.5.0",
     "node-memwatch": "^1.0.1",
     "nodemon": "^1.18.8",

package-lock.json

@@ -13,7 +13,16 @@ const auth = function(req, res, next) {
     next();
   }
 };
-
+var multer = require('multer');
+var storage = multer.diskStorage({
+  destination: (req, file, cb) => {
+    cb(null, 'views/images/uploads')
+  },
+  filename: (req, file, cb) => {
+    cb(null, file.fieldname + '-' + Date.now())
+  }
+});
+var upload = multer({storage: storage});
 route.get('/submitProject',auth,profileController.SubmitprojectForm)
 route.get('/search', url, jsonParser, profileController.search);
 
@@ -23,7 +32,7 @@ route.get('/profile/:id', auth, profileController.profileId);
 
 route.get('/profileview/:sd', auth, url, profileController.profileViewSd);
 
-route.post('/publish', auth, url, profileController.publish);
+route.post('/publish', auth, url,upload.single('image'), profileController.publish);
 
 route.post('/upDownVote', auth,url, jsonParser,profileController.upDownVote);
 

package.json

@@ -41,7 +41,9 @@ createdAt:{
 endAt:{
   type:Date
 },
-
+image:{
+type:String
+}
 });
 
 const proj=mongoose.model('project',project);