Merge branch 'development' into development

Author: shivamluthra

.DS_Store

@@ -1,26 +1,32 @@
 ### **Problem**
-_Describe the problem you are trying to achieve. Please provide in detail_
-
+new and robust schema needed for users, project and notification.
 ### **Issue this PR referred to**
-_Please refer to the issue this PR is referred to write in this format `Fixes #<issue number>`, Refer to this [link](https://help.github.com/en/articles/closing-issues-using-keywords) for more details_
+Fixes issue number 146, Refer to this [link](https://github.com/codeuino/Social-Platform-Donut/issues/146) for more details_
 
 ### **Solution of problem**
-_How did you solve this problem? Please provide in detail_
+I added some new fields to the schema of the user.js, project.js and notification.js
 
-### **Before and After Screenshots**
-_**Before** [How was it earlier, add it here]_
+# in notification.js
+- added field shortinfo(type:string) for short description about notification.
+# in user.js
+- added field website(type:string) for any personal website user has.
+- added followerList and followingList(type:\[number]) to include the name of all the followers and following.
+- add field status(type:string) for status of user.
+- added field school(type:string) for user's schoolname.
+- added field collegeTimeperiod and schoolTimeperiod (type:\[Date]) for time period of college and school respectively.
+- added field blockedUser(type:\[Number]) for keeping track of all users blocked.
+# in project.js
+- added field endAt(type:\[Date]) as to when is the deadline.
+- added field shortDesc(type:String) for one liner description of the project.
+- added field linkedUser(type:\[Number]) for all the people linked with project.
 
-_**After** [How it looks now, add it here]_
+### **Before and After Screenshots**
 
 ### **Type of Change**
-- [ ] Bug fix
-- [ ] New Feature
-- [ ] Development of UI/UX prototypes
-- [ ] Small refactor
-- [ ] Change in Documentation
+- Small refactor
 
 ### **Checklist**
-- [ ] My code follow the same style as the codebase
-- [ ] My Code changed required change in documentation
-- [ ] I have updated the Readme accordingly
-- [ ] I made PR within **development branch only**
+- My code follow the same style as the codebase
+- My Code changed required change in documentation
+- I have updated the Readme accordingly
+- I made PR within **development branch only**

PR_Template.md

@@ -1,15 +1,15 @@
-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'
-  }
-}
+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

@@ -1,6 +1,7 @@
 const passport = require('passport');
 const LocalStrategy = require('passport-local');
 const User = require('../schema/user');
+const path=require('path')
 
 passport.serializeUser(function(user, done) {
   done(null, user.id);
@@ -28,7 +29,14 @@ passport.use(
         if (user) {
           return done(null, false);
         }
-
+        
+        upload(req,res,(err)=>{
+          if(err){
+            let img="oldMan.jpeg"
+          }else{
+            let img=req.file.filename
+          }
+        })
         let newUser = new User();
         newUser.fname = req.body.fname;
         newUser.lname = req.body.lname;
@@ -41,6 +49,7 @@ passport.use(
         newUser.following = 0;
         newUser.status = 'idle';
         newUser.Eid = newUser.id;
+        newUser.profilePicture=img;
 
         newUser.save(err => {
           if (err) {

config/local.js

@@ -1,6 +1,7 @@
 const user = require('../schema/user.js');
 const proj = require('../schema/project.js');
 const expressValidator = require('express-validator');
+const { check, validationResult } = require('express-validator/check');
 
 module.exports = {
   SubmitprojectForm:function(req,res){
@@ -108,19 +109,48 @@ module.exports = {
   updateDetails: function(req, res) {
     user.findOne({ Eid: req.user.Eid }).then(function(data) {
       // prettier-ignore
-      (data.fname = req.body.fname),
-      (data.lname = req.body.lname),
-      (data.bio = req.body.bio),
-      (data.college = req.body.college),
-      (data.email = req.body.email),
-      (data.github = req.body.githubUrl),
-      (data.linkedin = req.body.linkedinUrl),
-      (data.city = req.body.city),
-      (data.country = req.body.country),
-      (data.lang = req.body.languages),
-      (data.facebook = req.body.facebookUrl);
-      data.save();
-      res.send('success');
+      req.check('fname','First name is required !').notEmpty();
+      req.check('lname','Last name is required !').notEmpty();
+      req.check('bio','Bio is required !').notEmpty();
+      req.check('college','College name is required !').notEmpty();
+      req.check('email','Email is required !').isEmail();
+      req.check('githubUrl','Github url is required !').isURL();
+      req.check('linkedinUrl','Linkedin url is required !').isURL();
+      req.check('facebookUrl','Facebook url is required !').isURL();
+      req.check('city','City name is required !').notEmpty();
+      req.check('country','Country name is required !').notEmpty();
+      req.check('languages','Language is required !').notEmpty();
+      req.getValidationResult(req)
+      .then((result)=>{
+        if(result.isEmpty() === true){
+          result.array().forEach((error)=>{
+            console.log(error.msg);
+            res.redirect('/profile/setting');
+          });
+        } 
+      })
+      .catch((err)=>{
+        console.log(`${err}`);
+      });       
+          (data.fname = req.body.fname),
+          (data.lname = req.body.lname),
+          (data.bio = req.body.bio),
+          (data.college = req.body.college),
+          (data.email = req.body.email),
+          (data.github = req.body.githubUrl),
+          (data.linkedin = req.body.linkedinUrl),
+          (data.city = req.body.city),
+          (data.country = req.body.country),
+          (data.lang = req.body.languages),
+          (data.facebook = req.body.facebookUrl);
+          data.save()
+            .then(()=>{
+              console.log('profile updated !');
+              // res.send('success');
+            })
+            .catch((err)=>{
+              console.log(`${err}`);
+            });
     });
   },
   getDetails: function(req, res) {