moving and renaming

README.md

@@ -1,9 +1,9 @@
-# CarsInCommonServer
+# commonroutesServer
 
-- server code: https://github.com/arnaucode/carsincommonServer
-- frontend app code: https://github.com/arnaucode/carsincommonApp
+- server code: https://github.com/arnaucode/commonroutesServer
+- frontend app code: https://github.com/arnaucode/commonroutesApp
 - images server: https://github.com/arnaucode/goImgServer
-- admin web: https://github.com/arnaucode/carsincommonAdminWeb
+- admin web: https://github.com/arnaucode/commonroutesAdminWeb
 
 **Backend:**
 
@@ -18,8 +18,8 @@
 
 App:
 
-![carsincommon](https://raw.githubusercontent.com/arnaucode/carsincommonApp/master/carsincommon.png "carsincommon")
-code: https://github.com/arnaucode/carsincommonApp
+![commonroutes](https://raw.githubusercontent.com/arnaucode/commonroutesApp/master/commonroutes.png "commonroutes")
+code: https://github.com/arnaucode/commonroutesApp
 
 --------------------
 

controllers/adminController.js

@@ -113,6 +113,15 @@ exports.login = function(req, res) {
 
         });
 };
+exports.getAllAdmins = function(req, res) {
+    adminModel.find()
+        .limit(pageSize)
+        .skip(pageSize * Number(req.query.page))
+        .exec(function(err, admins) {
+            if (err) return res.send(500, err.message);
+            res.status(200).jsonp(admins);
+        });
+};
 exports.changePassword = function(req, res) {
     //if(req.body.)
     userModel.update({
@@ -534,9 +543,22 @@ exports.validateUser = function(req, res) {
                         user.validated = true;
                         user.validatedBy = admin._id;
 
-                        user.save(function(err, user) {
+                        var notification = new notificationModel({
+                            concept: "admin",
+                            message: "an admin has validated your account",
+                            date: new Date(),
+                            icon: 'admin',
+                            link: "users/" + user._id,
+                            user: user._id
+                        });
+                        notification.save(function(err, notification) {
                             if (err) return res.send(500, err.message);
-                            userController.getUserById(req, res);
+
+                            user.notifications.push(notification._id);
+                            user.save(function(err, user) {
+                                if (err) return res.send(500, err.message);
+                                userController.getUserById(req, res);
+                            });
                         });
                     });
             }
@@ -563,10 +585,24 @@ exports.unvalidateUser = function(req, res) {
                         user.validated = false;
                         user.validatedBy = admin._id;
 
-                        user.save(function(err, user) {
+                        var notification = new notificationModel({
+                            concept: "admin",
+                            message: "an admin has unvalidated your account",
+                            date: new Date(),
+                            icon: 'admin',
+                            link: "users/" + user._id,
+                            user: user._id
+                        });
+                        notification.save(function(err, notification) {
                             if (err) return res.send(500, err.message);
-                            userController.getUserById(req, res);
+
+                            user.notifications.push(notification._id);
+                            user.save(function(err, user) {
+                                if (err) return res.send(500, err.message);
+                                userController.getUserById(req, res);
+                            });
                         });
+
                     });
             }
         });

server.js

@@ -118,6 +118,9 @@ apiRoutes.use(function(req, res, next) {
 }); //fi verificació de token
 
 //admin
+
+apiRoutes.route('/admins')
+    .get(adminCtrl.getAllAdmins);
 apiRoutes.route('/admin/network')
     .get(adminCtrl.network);
 apiRoutes.route('/admin/user/network/:userid')