Merge pull request #12 from MeeraChandrasekaran/master

made login work
2015-SanJose-Opportunity-Hack · Oct 4, 2015 · 7337266 · 7337266
2 parents 407e65b + ab2f973
commit 7337266
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/client/index.html b/client/index.html
@@ -12,7 +12,6 @@
 		<script src="routes.js"></script>
 		<script src="./js/homeController.js"></script>
 		<script src="./js/newKidController.js"></script>
-		<script src="./js/loginController.js"></script>
 	</head>
 	<body>
 		<div ng-view="">

diff --git a/client/js/homeController.js b/client/js/homeController.js
@@ -175,7 +175,6 @@ saburiKonnect.controller('homeController', function($scope, $location, NewOrgani
 
     $scope.login = function()
     {
-    	console.log(NewOrganisationFactory);
     	NewOrganisationFactory.login($scope.orgLogin);
 	};
 
@@ -190,7 +189,8 @@ saburiKonnect.controller('homeController', function($scope, $location, NewOrgani
     	var factory = {};
         factory.login = function(info,callback){
             $http.post('/login', info).success(function(output){
-                callback(output);
+            	console.log(output);
+                // callback(output);
             });
         };
     	factory.add_Organisation = function(info,callback){

diff --git a/client/partials/home.html b/client/partials/home.html
@@ -100,7 +100,7 @@ <h4 class="modal-title" id="myModalLabel">Login</h4>
           <label>Email</label>
           <input type="text" ng-model="orgLogin.email"><br>
           <label>Password</label>
-          <input type="text" ng-model="orgLogin.password">
+          <input type="password" ng-model="orgLogin.password">
         </form>
       </div>
       <div class="modal-footer">
@@ -136,7 +136,7 @@ <h4 class="modal-title" id="myModalLabel">Register</h4>
           <label>Email</label>
           <input type="text" ng-model="organisation.email"><br>
           <label>Password</label>
-          <input type="text" ng-model="organisation.password"><br>
+          <input type="password" ng-model="organisation.password"><br>
           <label>Contact Number</label>
           <input type="text" ng-model="organisation.contact_number">
       </div>

diff --git a/config/routes.js b/config/routes.js
@@ -18,6 +18,10 @@ module.exports = function(app){
     app.post('/add_organisation',function(req,res){
     	organisations.add_organisation(req,res)
     });
+
+    app.post('/login',function(req,res){
+     	organisations.login(req,res)
+    });
 }
 
 
diff --git a/server/controllers/organisations.js b/server/controllers/organisations.js
@@ -13,6 +13,23 @@ module.exports = (function(){
 					res.redirect('');
 				}
 			});
+		},
+
+		login: function(req,res){
+			organisation.find({},function(err,results){
+				if(err){
+					console.log('error');
+				}else{
+					for(var i=0;i<results.length;i++){
+						if(results[i].email == req.body.email){
+							console.log('found user');
+							res.json(results[i]);
+						}else{
+							console.log('user not found');
+						}
+					}
+				}
+			})
 		}
 	};
 })();