From 06f94259282ea0bc113196bc6ae82d3b756935e6 Mon Sep 17 00:00:00 2001
From: Sagi Dayan <sagidayan@gmail.com>
Date: Tue, 16 Jun 2015 22:45:06 +0300
Subject: [PATCH 1/2] issue #33 - Main Menu

Done
---
 templates/css/theme.css                    | 11 ++++++-
 templates/js/controllers/mainController.js | 18 ++++++------
 templates/views/index.html                 | 34 ++++++++++++----------
 3 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/templates/css/theme.css b/templates/css/theme.css
index a1cac9b..83a3c64 100644
--- a/templates/css/theme.css
+++ b/templates/css/theme.css
@@ -214,8 +214,17 @@ body.noscroll
     background-color: #E2E2E2;
     font-weight: bold;
   }
-  .se-menu li .selected{
+
+  .se-menu li:active{
+    background-color: #B2B2B2;
+    text-shadow:#e0e0e0 1px 1px 0;
+    font-weight: bold;
+  }
+
+  .se-menu .selected{
     background-color: #E2E2E2;
+    text-shadow:#e0e0e0 1px 1px 0;
+    font-weight: bold;
   }
 
   .user-box{
diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js
index c0ba8ce..6216c2b 100644
--- a/templates/js/controllers/mainController.js
+++ b/templates/js/controllers/mainController.js
@@ -40,37 +40,37 @@ angular.module('SeHub')
 			"title": "Home",
 			"icon": "fa fa-home",
 			"style": "selected",
-			"route": "/home"
+			"route": "#/home"
 		}, {
 			"title": "My Campuses",
 			"icon": "fa fa-university",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "My Classes",
 			"icon": "fa fa-graduation-cap",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "My Projects",
 			"icon": "fa fa-cube",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "Tasks",
 			"icon": "fa fa-clipboard",
-			"style": "selected",
+			"style": "",
 			"route": "/campuses"
 		}, {
 			"title": "Settings",
 			"icon": "fa fa-cogs",
-			"style": "selected",
-			"route": "/campuses"
+			"style": "",
+			"route": "#/Settings"
 		}, {
 			"title": "Log Out",
 			"icon": "fa fa-power-off",
-			"style": "selected",
-			"route": "/campuses"
+			"style": "",
+			"route": "#/logout"
 		}];
 
 	}]);
\ No newline at end of file
diff --git a/templates/views/index.html b/templates/views/index.html
index 3abfe58..7183c20 100644
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -25,26 +25,28 @@
             <img ng-src="{{user.avatar_url}}" alt="">
         </div> -->
         <md-content class="se-menu">
-            <div class="user-box" layout="row" layout-padding>
-                <div flex="30"> <!-- Avatar -->
-                    <img ng-src="{{user.avatar_url}}" alt="">
-                </div>
-                <div class="user-data" layout="column" flex>
-                    <div>
-                        {{user.name}}
+            <div ng-if="!isInRegisterMode">
+                <div class="user-box" layout="row" layout-padding>
+                    <div flex="30"> <!-- Avatar -->
+                        <img ng-src="{{user.avatar_url}}" alt="">
                     </div>
-                    <div>
-                        {{user.email}}
+                    <div class="user-data" layout="column" flex>
+                        <div>
+                            {{user.name}}
+                        </div>
+                        <div>
+                            {{user.email}}
+                        </div>
                     </div>
                 </div>
+                
+                    <ul>
+                        <a ng-repeat="item in menuItems" ng-href="{{item.route}}">
+                            <li ng-class="[item.style]"><i ng-class="item.icon"></i> {{item.title}}</li>
+                            <md-divider ng-if="!$last"></md-divider>
+                        </a>
+                    </ul>
             </div>
-            
-                <ul>
-                    <a ng-repeat="item in menuItems" href="#">
-                        <li><i ng-class="item.icon"></i> {{item.title}}</li>
-                        <md-divider ng-if="!$last"></md-divider>
-                    </a>
-                </ul>
             <div ng-if="loadingData">
                 <md-progress-circular></md-progress-circular>
             </div>

From 24d8252d07e6144264c2ec1404f12156419d3b38 Mon Sep 17 00:00:00 2001
From: Sagi Dayan <sagidayan@gmail.com>
Date: Tue, 16 Jun 2015 23:08:37 +0300
Subject: [PATCH 2/2] API: Hot-Fix for the GetUserByToken Method

---
 SE_API/UserRoutes.py | 2 +-
 models/User.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SE_API/UserRoutes.py b/SE_API/UserRoutes.py
index ce51a1b..0bc26d1 100644
--- a/SE_API/UserRoutes.py
+++ b/SE_API/UserRoutes.py
@@ -60,7 +60,7 @@ def getUserByToken(token):
     403 - No User Found
     """
     query = User.all()
-    query.filter("seToken = ", token)
+    query.filter("seToken =", token)
 
     for u in query.run(limit=5):
         return Response(response=u.to_JSON(),
diff --git a/models/User.py b/models/User.py
index d59e690..2328f39 100644
--- a/models/User.py
+++ b/models/User.py
@@ -12,7 +12,7 @@ class User(db.Model):
     seToken = db.StringProperty(required=True)
     avatar_url = db.StringProperty(required=True)
     isFirstLogin = db.BooleanProperty(default=True)
-    campusName = db.StringProperty(required=True, default="")
+    campusName = db.StringProperty(required=True, default=" ")
     campuses_id_list = db.StringListProperty(default=[])
     classes_id_list = db.StringListProperty(default=[])