Merge branch 'master' of https://github.com/Opportunity-Hack-2015-San…

…Jose/Repo-15
2015-SanJose-Opportunity-Hack · Oct 4, 2015 · 97655ad · 97655ad
2 parents 4becbf9 + 0f6578c
commit 97655ad
Show file tree

Hide file tree

Showing 127 changed files with 3,428 additions and 1,716 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>

diff --git a/client/js/homeController.js b/client/js/homeController.js
@@ -322,15 +322,17 @@ saburiKonnect.controller('homeController', function($scope, $location, NewOrgani
 
 })
 
-   saburiKonnect.factory('NewOrganisationFactory',function($http){
+   saburiKonnect.factory('NewOrganisationFactory',function($http,$location){
     	var factory = {};
         factory.login = function(info,callback){
             $http.post('/login', info).success(function(output){
-            	console.log(output);
                 // callback(output);
+                if (!output.error) {
+                	$location.path ("/kids")
+                }
             });
         };
-    	factory.add_Organisation = function(info,callback){
+    	factory.addOrganisation = function(info,callback){
         	$http.post('/add_organisation', info).success(function(output){
             	callback(output);
         	});

diff --git a/client/js/loginController.js b/client/js/loginController.js
diff --git a/client/js/newkidController.js b/client/js/newkidController.js
@@ -11,11 +11,17 @@
             	callback(output);
         	});        
     	};
+        factory.getKids = function(callback){
+            $http.get('/get_kids').success(function(output){
+                callback(output);
+            });
+        };
     	return factory;
     });
 
     saburiKonnect.controller('newKidController', function($scope,$location,$routeParams, NewKidFactory){
-    	$scope.addKid = function()
+    	// console.log('hi');
+        $scope.addKid = function()
     	{
     		console.log("in controller");
     		NewKidFactory.addKid($scope.newkid);
@@ -25,6 +31,10 @@
     	{
        		$scope.organisations = data;
     	})
+
+        NewKidFactory.getKids(function(data){
+            $scope.kids = data;
+        })
     });
 
 

diff --git a/client/partials/kids.html b/client/partials/kids.html
@@ -0,0 +1,18 @@
+<style type="text/css">
+.kids{
+	display: inline-block;
+	vertical-align: top;
+	height: 250px;
+	width: 250px;
+	border:1px solid black;
+}
+
+</style>
+<div ng-controller = "newKidController">
+<h2> Meet the kids who need support </h2>
+<div ng-repeat="kid in kids">
+	<div class="kids">
+		<p ng-bind="kid.first_name"></p>
+		<p ng-bind="kid.last_name"></p>
+	</div>
+</div>
diff --git a/client/partials/newkid.html b/client/partials/newkid.html
@@ -53,16 +53,6 @@ <h2>Add a new Kiddo</h2>
 			<select ng-repeat="organisation in organisations">
 				<option ng-model="newKid.organisation" ng-bind="organisation.id"></option>
 			</select><br>
-		<label>Upload Picture </label>
-			    <input type='file' id="imgInp" name="imgInp"/>
-				<img id="image" src="" alt="your image" />
-
-				<div id="imgList"></div>
-    				<script src='http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
-
-        			<script src="js/upload.js"></script>
-        		</div>
-
 				<button ng-click="addKid()">Add Kiddo</button>
 
 

diff --git a/client/routes.js b/client/routes.js
@@ -10,6 +10,9 @@ saburiKonnect.config(function($routeProvider){
 	.when('/addKid',{
 		templateUrl: './partials/newKid.html'
 	})
+	.when('/kids',{
+		templateUrl: './partials/kids.html'
+	})
 	.otherwise('/', {
 		redirectTo: '/'
 	})

diff --git a/config/routes.js b/config/routes.js
@@ -22,6 +22,11 @@ module.exports = function(app){
     app.post('/login',function(req,res){
      	organisations.login(req,res)
     });
+
+    app.get('/get_kids',function(req,res){
+        kids.get_kids(req,res)
+    });
+
 }
 
 
diff --git a/node_modules/body-parser/node_modules/bytes/package.json b/node_modules/body-parser/node_modules/bytes/package.json
diff --git a/node_modules/body-parser/node_modules/content-type/package.json b/node_modules/body-parser/node_modules/content-type/package.json
diff --git a/node_modules/body-parser/node_modules/debug/package.json b/node_modules/body-parser/node_modules/debug/package.json
diff --git a/node_modules/body-parser/node_modules/depd/package.json b/node_modules/body-parser/node_modules/depd/package.json