From 73d9a65dab043d2f489727f3a565b12298ed4c68 Mon Sep 17 00:00:00 2001
From: Sagi Dayan <sagidayan@gmail.com>
Date: Mon, 15 Jun 2015 18:41:44 +0300
Subject: [PATCH] AngularJS: Fixed Scope Issue & more

Starting to work on the mailController
---
 templates/index.html                       | 10 ++++-----
 templates/js/app.js                        |  7 +++---
 templates/js/controllers/mainController.js | 15 ++++++++-----
 templates/views/index.html                 | 26 +++++++++++++++++++---
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index e612d8e..a94ff2e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -32,11 +32,11 @@
 
 
 <!-- Angular Material Dependencies -->
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-route.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-animate.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-aria.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-cookies.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-route.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-animate.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-aria.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-cookies.js"></script>
 
 <script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.8.3/angular-material.min.js"></script>
 
diff --git a/templates/js/app.js b/templates/js/app.js
index 46b8d12..9b93421 100644
--- a/templates/js/app.js
+++ b/templates/js/app.js
@@ -14,8 +14,10 @@ welcome.controller('welcomeController', ['$scope', 'apiService', '$cookies', '$w
 	console.log("Welcome Controller");
 
 	var uid = $cookies['com.sehub.www'];
-	if(uid)
+	if(uid){
+		console.info("Session in Place");
 		$window.location.href = DEBUG ? 'http://localhost:8080/home' : 'http://se-hub.appspot.com/home';
+	}
 
 
 
@@ -26,8 +28,7 @@ app.config(['$routeProvider', '$locationProvider',
 	function($routeProvider, $locationProvider) {
 		$routeProvider
 			.when('/', {
-				templateUrl: 'templates/views/home.html',
-				controller: 'mainController'
+				templateUrl: 'templates/views/home.html'
 			})
 			.when('/register', {
 				templateUrl: 'templates/views/register.html',
diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js
index c27cf90..d05f895 100644
--- a/templates/js/controllers/mainController.js
+++ b/templates/js/controllers/mainController.js
@@ -1,19 +1,24 @@
 angular.module('SeHub')
 .controller('mainController', ['$scope', '$rootScope', 'apiService', '$cookies', '$location', function ($scope, $rootScope, apiService, $cookies, $location) {
 
-	$rootScope.seToken = $cookies['com.sehub.www'];
-	var token = $rootScope.seToken;
+	var token = $cookies['com.sehub.www'];
+
 	$scope.loadingData = true;
+	$scope.isInRegisterMode = false;
 
 	apiService.getUserByToken(token).success(function(data){
-		console.log(data);
-		if(data.message == 'No User Found')
+		if(data.message == 'No User Found'){
 			console.error("No User Found!");
+		}
 
 		$scope.user = data;
 		$rootScope.user = data;
-		if($scope.user.isFirstLogin)
+		if($scope.user.isFirstLogin){
+			$scope.menuObj = {};
+			$scope.isInRegisterMode = true;
+			$scope.loadingData = false;
 			$location.path('/register')
+		}
 	})
 
 	$scope.loadingData = false;
diff --git a/templates/views/index.html b/templates/views/index.html
index 816e633..fcc374d 100644
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -8,8 +8,8 @@
     <link rel="stylesheet" href="templates/css/theme.css">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1" />
 </head>
-<!-- <body layout="column" ng-controller="RegisterCtrl"> -->
-<body layout="column" >
+
+<body layout="column" ng-controller="mainController">
 <md-toolbar layout="row">
     <button ng-click="toggleSidenav('left')" hide-gt-sm class="menuBtn">
         <span class="visually-hidden">Menu</span>
@@ -23,8 +23,28 @@
     <md-sidenav layout="column" class="md-sidenav-left md-whiteframe-z2" md-component-id="left" md-is-locked-open="$mdMedia('gt-sm')">
         <md-content>
             <center>
-                <h1>Menu</h1>
+                <h1><i class="fa fa-compass"></i> Menu</h1>
             </center>
+            <div ng-if="loadingData">
+                <md-progress-circular></md-progress-circular>
+            </div>
+            <div ng-if="isInRegisterMode"> <!-- User Needs To Register -->
+                <md-card layout-padding>
+                    <div layout=-"row">
+                        <div class="spacer"></div>
+                        <div>
+                            <h3>
+                                <i class="fa fa-exclamation-triangle"></i>
+                            </h3>
+                        </div>
+                        <div class="spacer"></div>
+                    </div>
+                    <p>
+                        You Are Currently Not Assigned To Any Campus Nor Course.
+                        Please Fill The Form On your Right Hand Side, and Confirm Your Academic E-Mail.
+                    </p>
+                </md-card>
+            </div>
         </md-content>
     </md-sidenav>
     <div layout="column" flex id="content">