Correct conflicts

1 files changed, 36 insertions, 0 deletions

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
new file mode 100644
index 0000000..f84f625
--- /dev/null
+++ b/client/js/controllers/home/home.js
@@ -0,0 +1,36 @@
+/**
+ * The home controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
+{
+
+	var callMeAfterPullData=function(data){
+		$scope.machines=Compute.getData().machines;
+			Loading.stop();
+	}
+
+	;
+	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
+		Loading.start();
+		Compute.pullData(callMeAfterPullData);		
+	}
+
+
+
+	
+	$scope.raiseShowMachineDetailsEvent=function(id){
+
+		var callback=function(){
+			Loading.stop();
+			var data=Compute.getData();
+			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);		
+	
+		}
+		Loading.start();
+		Compute.pullMachines(callback);
+	}
+
+
+}]);