Merge branch 'development' of https://github.com/codeuino/Social-Platform-Donut into development

TG1999 · TG1999 · commit 6b122ce47868 · 2019-04-09T09:29:28.000+05:30
diff --git a/config/local.js b/config/local.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) {
diff --git a/routes/login.routes.js b/routes/login.routes.js
@@ -4,6 +4,21 @@ const url = bodyparser.urlencoded({ extended: false });
 const passport = require('passport');
 const user = require('../schema/user.js');
 const route = express.Router();
+const multer=require('multer')
+const path=require('path')
+//MULTER
+const storage=multer.diskStorage({
+  destination: (req, file, cb) => {
+    cb(null, './views/uploads/profilePics')
+  },
+  filename:function(req,file,cb){
+      cb(null,file.fieldname+"-"+Date.now()+path.extname(file.originalname))
+  }
+})
+const upload=multer({
+  storage:storage
+});
+
 
 //get request
 
@@ -33,10 +48,19 @@ route.get(
     res.redirect('/profile/profile/:id');
   }
 );
+route.get('/signup',url,function(req,res){
+  res.render('user.ejs')
+})
 
 //post request
-
-route.post('/userlogin', url, function(req, res) {
+//SIGNUP ROUTE
+route.post('/userlogin',upload.single('profilepic'), function(req, res) {
+  let img=""
+  if(req.file){
+    img=req.file.filename
+  }else{
+    img="oldMan.jpeg"
+  }
   new user({
     fname: req.body.fname,
     lname: req.body.lname,
@@ -48,14 +72,21 @@ route.post('/userlogin', url, function(req, res) {
     follower: 0,
     following: 0,
     status: 'idle',
-    Eid: Math.floor(Math.random() * 1000000)
+    Eid: Math.floor(Math.random() * 1000000),
+    profilePicture:img,
+
   })
     .save()
+    .catch((err)=>{
+      res.send("ERROR")
+    })
     .then(function(use) {
-      res.render('user', { user: use });
+      //Right now it render index page because no login page is created yet so 
+      res.send(use)
+      //res.send("WELCOME TO CODEUINO, you can now login")
     });
 });
-
+//LOGIN ROUTE
 route.post('/login', url, function(req, res) {
   user
     .findOne({ email: req.body.email })
@@ -68,6 +99,7 @@ route.post('/login', url, function(req, res) {
       }
     });
 });
+
 route.get('/logout', function(req, res) {
   req.logout();
   res.redirect('/');
diff --git a/schema/user.js b/schema/user.js
@@ -88,6 +88,9 @@ const user = new Schema({
   },
   blockedUser : {
     type : [Number]
+  },
+  profilePicture:{
+    type: String
   }
 });
 
diff --git a/server.js b/server.js
@@ -28,6 +28,7 @@ const loged = [];
 
 app.set('view engine', 'ejs');
 app.use(express.static(path.join(__dirname, 'views')));
+app.set('views',path.join(__dirname+"/views"));
 app.use(methodOverride('_method'));
 
 app.use(
diff --git a/views/all.ejs b/views/all.ejs
@@ -88,7 +88,7 @@
                   <div class="container d-flex flex-column justify-content-center w-75">
                     <a href="/auth/github" class="btn btn-dark js-scroll-trigger mb-2">Sign Up Using <i class="fab fa-github" style="font-size: 24px;"></i></a>
                     <a href="/auth/google" class="btn btn-danger js-scroll-trigger mb-2">Sign Up Using <i class="fab fa-google" style="font-size: 24px;"></i></a>
-                    <a href="#" class="btn btn-primary js-scroll-trigger">Sign Up Using <i class="fas fa-envelope" style="font-size: 24px;"></i></a>
+                    <a href="/auth/signup" class="btn btn-primary js-scroll-trigger">Sign Up Using <i class="fas fa-envelope" style="font-size: 24px;"></i></a>
                   </div>
                 </div>
                 <div class="modal-footer">
diff --git a/views/index.ejs b/views/index.ejs
@@ -81,7 +81,7 @@
                   <div class="container d-flex flex-column justify-content-center w-75">
                     <a href="/auth/github" class="btn btn-dark js-scroll-trigger mb-2">Sign Up Using <i class="fab fa-github" style="font-size: 24px;"></i></a>
                     <a href="/auth/google" class="btn btn-danger js-scroll-trigger mb-2">Sign Up Using <i class="fab fa-google" style="font-size: 24px;"></i></a>
-                    <a href="#" class="btn btn-primary js-scroll-trigger">Sign Up Using <i class="fas fa-envelope" style="font-size: 24px;"></i></a>
+                    <a href="/auth/signup" class="btn btn-primary js-scroll-trigger">Sign Up Using <i class="fas fa-envelope" style="font-size: 24px;"></i></a>
                   </div>
                 </div>
                 <div class="modal-footer">
diff --git a/views/uploads/profilePics/oldMan.jpeg b/views/uploads/profilePics/oldMan.jpeg
diff --git a/views/user.ejs.html b/views/user.ejs.html
@@ -6,9 +6,9 @@
     <title>Codeuino</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel=stylesheet type=text/css href="css/bootstrap4/bootstrap.min.css">
-    <link rel=stylesheet type=text/css href="css/home.css">
-    <link rel="stylesheet" href="css/style.css">
+    <link rel=stylesheet type=text/css href="/css/bootstrap4/bootstrap.min.css">
+    <link rel=stylesheet type=text/css href="/css/home.css">
+    <link rel="stylesheet" href="/css/style.css">
     <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css">
     <style>
       .signup{
@@ -47,28 +47,23 @@
     </header>
     <!-- Sign Up -->
     <div class="signup">
-      <div class="phrase l1">
-        <p>
-          SIGNING UP AS A <n>USER</n>!
-        <p style="font-size:40px"> Thanks for signing up  <%= user.fname %> you can now log in</p>
-        </p>
-      </div>
-      <div class="form">
-        <form action="/" method="post"  name="myForm" onsubmit="return(validate());">
+      
+      <div class="form" >
+        <form action="/auth/userlogin" enctype="multipart/form-data" method="post"  name="myForm" onsubmit="return(validate());">
           <div class="top-row">
             <div class="field-wrap">
-              <input type="text" placeholder="First Name" required autocomplete="off" />
+              <input type="text" name="fname" placeholder="First Name" required autocomplete="off" />
             </div>
             <div class="field-wrap">
-              <input type="text" placeholder="Last Name" required autocomplete="off"/>
+              <input type="text" name="lname" placeholder="Last Name" required autocomplete="off"/>
             </div>
           </div>
           <div class="field-wrap">
-            <input type="email" name="EMail" placeholder="Email Address" required autocomplete="off"/>
+            <input type="email" name="email" placeholder="Email Address" required autocomplete="off"/>
           </div>
           <div class="top-row">
             <div class="field-wrap">
-              <input id="datepicker" placeholder="Date of Birth- DD/MM/YY" required autocomplete="off"/>
+              <input id="datepicker" name="dob" placeholder="Date of Birth- DD/MM/YY" required autocomplete="off"/>
             </div>
             <div class="field-wrap">
               <select name="Gender" id="drop" required>
@@ -81,19 +76,23 @@
             </div>
           </div>
           <div class="field-wrap">
-            <input type="text" placeholder="Github Handle Link" required autocomplete="off"/>
+            <input type="text" name="github" placeholder="Github Handle Link" required autocomplete="off"/>
           </div>
           <div class="field-wrap">
-            <input type="text" placeholder="Username" required autocomplete="off"/>
+            <input type="text" name="username" placeholder="Username" required autocomplete="off"/>
           </div>
           <div class="top-row">
             <div class="field-wrap">
-              <input type="password" id="pass" placeholder="Password" required autocomplete="off" />
+              <input type="password" name="pass" id="pass" placeholder="Password" required autocomplete="off" />
             </div>
             <div class="field-wrap">
               <input type="password" id="cpass" placeholder="Confirm Password" required autocomplete="off"/>
             </div>
           </div>
+          <div class="top-row ">
+            <label>Upload A Profile Picture</label>
+            <input type="file" name="profilepic" id="" class="mb-2">
+          </div>
           <div class="field-wrap">
             <label class="container">I accept the <i>Code of Conduct</i> of this community
             <input type="checkbox" checked="checked" name="check" id="check">

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ const user = new Schema({`
`88`	`88`	`},`
`89`	`89`	`blockedUser : {`
`90`	`90`	`type : [Number]`
	`91`	`+ },`
	`92`	`+ profilePicture:{`
	`93`	`+ type: String`
`91`	`94`	`}`
`92`	`95`	`});`
`93`	`96`