[Profile](CLIENT/SERVER): refactor profile page and functions {IA}

theDOMfather · Dec 11, 2016 · 5c4c3cb · 5c4c3cb
1 parent 2f74be5
commit 5c4c3cb
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 93 deletions.
diff --git a/client/app/app.js b/client/app/app.js
@@ -5,8 +5,7 @@ angular.module('jobTracker', [
   'jobTracker.signup',
   'jobTracker.mainList',
   'jobTracker.profile',
-  'jobTracker.editProfile',
-  'jobTracker.changePassword',
+  'jobTracker.profileDir',
   'jobTracker.authService',
   'jobTracker.jobService',
   'jobTracker.directives',

diff --git a/client/app/services/AuthFactory.js b/client/app/services/AuthFactory.js
@@ -40,42 +40,49 @@ angular.module('jobTracker.authService', [])
       console.error("ERROR:", err);
     });
   };
+  var getProfile = function() {
+    return $http({
+      method: 'GET',
+      url: '/users',
+    }).then((res) => {
+      console.log("GOT USER", res.data)
+      return res.data;
+      }, (err) => {
+      console.error("ERROR:", err);
+    });
+  }
 
-  var updateAccount = function(infoPeople) {
-
+  var updateAccount = function(user) {
     return $http({
       method: 'PUT',
-      url: '/user',
-      data: infoPeople
+      url: '/users',
+      data: user,
     }).then((res) => {
       console.log(res);
-      $location.path('/profile');
-
+      return res.data;
+    },(err) => {
+      console.error("ERROR:", err);
     });
   };
 
-  var updatePassword = function(infoPeople) {
-
+  var updatePassword = function(user) {
     return $http({
       method: 'PUT',
-      url: '/changepassword',
-      data: infoPeople
-    }).then((res) => {
+      url: '/users/password',
+      data: user
+      }).then((res) => {
       console.log(res);
       $location.path('/profile');
-      
+
     });
   };
-  var deleteProfile = function(infoPeople) {
-
+  var deleteAccount = function() {
     return $http({
-      method: 'DELETE',
-      url: '/user',
-      data: infoPeople
+      method: 'POST',
+      url: '/users/delete',
     }).then((res) => {
       console.log(res);
-      $location.path('/login');
-
+      $location.path('/');
     });
   };
 
@@ -86,7 +93,8 @@ angular.module('jobTracker.authService', [])
     isAuth: isAuth,
     updateAccount: updateAccount,
     updatePassword: updatePassword,
-    deleteProfile:deleteProfile
+    deleteAccount: deleteAccount,
+    getProfile: getProfile
   };
 
 });
diff --git a/client/index.html b/client/index.html
@@ -39,13 +39,8 @@
     <script src="app/demo/demo.js"></script>
     <script src="app/mainList/getNews/getNews.js"></script>
     <script src="app/mainList/removeModal/removeModal.js"></script>
-
     <script src="app/profile/profile.js"></script>
-    <script src="app/profile/editProfile.js"></script>
-    <script src="app/profile/changePassword.js"></script>
-
-
-
+    <script src="app/profile/profileDir.js"></script>
     <script src="app/services/externalApiFactory.js"></script>
     <script src="app/services/AuthFactory.js"></script>
     <script src="app/services/JobFactory.js"></script>

diff --git a/server/controllers/userController.js b/server/controllers/userController.js
@@ -24,40 +24,31 @@ module.exports = {
       });
     });
   },
-  updateUserInDb: function(user, username) {
-
-    return User.update(
-      {"username": username}, 
-      {"$set": 
-        {"firstname": user.firstname , 
-        "lastname" : user.lastname,
-        "emailid":user.emailid,
-        "dob":user.dob,
-        "jobstatus":user.jobstatus
-      }
 
-    })
+  updateUserInDb: function(user, userId) {
+    return User.update({"_id": userId}, user)
     .exec()
     .then(function(resp) {
       return resp;
     });
   },
-  updateUserPasswordInDb: function(user, username) {
-    
+
+  changePassword: function(user, userId) {
     return User.update(
-      {"username": username}, 
-      {"$set": 
-        {"password": user.password}
-    })
-    .exec()
-    .then(function(resp) {
-      return resp;
-    });
+    //TO BE REDONE
+    //   {"username": username},
+    //   {"$set":
+    //     {"password": user.password}
+    // })
+    // .exec()
+    // .then(function(resp) {
+    //   return resp;
+    );
   },
-  deleteProfile: function(username) {
-    
+
+  deleteUser: function(userId) {
     return User.remove(
-      {"username": username} 
+      {"_id": userId}
       )
     .exec()
     .then(function(resp) {

diff --git a/server/handlers.js b/server/handlers.js
@@ -58,8 +58,8 @@ getUser: function(req, res) {
     var userId = req.user._id;
     var job = req.body;
     jobsController.addJobToDb(job, userId)
-    .then(function(resp) {
-      res.send(resp);
+    .then(function(data) {
+      res.send(data);
     })
     .catch(function(err) {
       console.error(err);
@@ -71,8 +71,8 @@ getUser: function(req, res) {
     var userId = req.user._id;
     var job = req.body;
     jobsController.removeJobFromDb(job, userId)
-    .then(function(resp) {
-      res.send(resp);
+    .then(function(data) {
+      res.send(data);
     })
     .catch(function(err) {
       console.error(err);
@@ -84,8 +84,8 @@ getUser: function(req, res) {
     var userId = req.user._id;
     var job = req.body;
     jobsController.updateJobInDb(job, userId)
-    .then(function(resp) {
-      res.send(resp);
+    .then(function(data) {
+      res.send(data);
     })
     .catch(function(err) {
       console.error(err);
@@ -95,52 +95,42 @@ getUser: function(req, res) {
   },
 
   uploadFile: function(req, res) {
-    console.log(req);
     res.json({success : true});
   },
 
-  updateUser : function(req,res){
-    var username = req.user.username;
-
+  updateUser: function(req, res){
+    var userId = req.user._id;
     var user = req.body;
-    userController.updateUserInDb(user, username)
-    .then(function(resp) {
-      //getUser(req,res)
-      res.send(resp)
+    userController.updateUserInDb(user, userId)
+    .then(function(data) {
+      res.send(data)
     })
     .catch(function(err) {
       console.error(err);
       res.sendStatus(204);
     });
   },
-  updatePassword : function(req,res){
-    var username = req.user.username;
-    console.log(username)
+  updatePassword: function(req,res){
+    var userId = req.user._id;
     var user = req.body;
-    userController.updateUserPasswordInDb(user, username)
-    .then(function(resp) {
-      //getUser(req,res)
+    userController.changePassword(user, userId)
+    .then(function(data) {
       res.send(resp)
     })
     .catch(function(err) {
       console.error(err);
       res.sendStatus(204);
     });
   },
-  deleteProfile : function(req,res){
-    var username = req.user.username;
-    console.log(username)
-    // var user = req.body;
-    userController.deleteProfile(username)
-    .then(function(resp) {
-      //getUser(req,res)
-      res.send(resp)
+  deleteAccount: function(req, res){
+    var userId = req.user._id;
+    userController.deleteUser(userId)
+    .then(function(data) {
+      res.send(data)
     })
     .catch(function(err) {
       console.error(err);
       res.sendStatus(204);
     });
-
   }
-
 };
diff --git a/server/models/userModel.js b/server/models/userModel.js
@@ -3,17 +3,16 @@ var jobSchema = require('./jobSchema.js');
 var passportLocalMongoose = require('passport-local-mongoose');
 
 var userSchema = mongoose.Schema({
-  firstname:{type: String, default:''},
-  lastname:{type: String, default:''},
-  emailid:{type: String, default:''},
-  dob:{type: Date, default:''},
-  jobstatus:{type: String, default:''},
-
   username: {type: String, unique: true},
   facebookId: String,
   password: String,
+  jobList: [jobSchema],
+
+  firstname: String,
+  lastname: String,
   email: String,
-  jobList: [jobSchema]
+  phone: Number,
+  jobstatus: {type: Number, default: 1}
 });
 
 userSchema.plugin(passportLocalMongoose);
@@ -23,3 +22,12 @@ var User = mongoose.model('User', userSchema);
 
 
 module.exports = User;
+
+
+///////////////////////////
+////Job status explained///
+///////////////////////////
+
+//1 - actively looking for a job
+//2 - found a job
+//3 - not actively looking for a job
diff --git a/server/server.js b/server/server.js
@@ -70,11 +70,13 @@ app.post('/jobs/delete', handlers.deleteJob);
 
 app.put('/jobs', handlers.updateJob);
 
-app.put('/user', handlers.updateUser);
+app.get('/users', handlers.getUser);
 
-app.put('/changepassword', handlers.updatePassword);
-app.delete('/user', handlers.deleteProfile);
+app.put('/users', handlers.updateUser);
 
+app.put('/users/password', handlers.updatePassword);
+
+app.post('/users/delete', handlers.deleteAccount);
 
 
 db.on('error', (err) => {