diff --git a/SE_API/CourseRoutes.py b/SE_API/CourseRoutes.py
index 5713db2..51a54a4 100644
--- a/SE_API/CourseRoutes.py
+++ b/SE_API/CourseRoutes.py
@@ -42,9 +42,9 @@ def create_course(token):
{
'courseName': 'Advance Math',
'campusName': 'JCE',
- 'startDate': '2015-14-3'
- 'endDate': '2015-29-6'
- 'taskFlag': 'False'
+ 'startDate': {'year': 2015, 'month' : 4, 'day' : 3}
+ 'endDate': {'year': 2016, 'month' : 5, 'day' : 14}
+ 'taskFlag': false
}
@@ -67,8 +67,7 @@ def create_course(token):
try:
payload = json.loads(request.data)
except Exception as e:
- return bad_request(e)
-
+ return bad_request()
try:
start_date = datetime.date(payload['startDate']['year'],payload['startDate']['month'],payload['startDate']['day'])
diff --git a/models/User.py b/models/User.py
index 2328f39..348266c 100644
--- a/models/User.py
+++ b/models/User.py
@@ -24,6 +24,7 @@ class User(db.Model):
'seToken' : self.seToken,
'avatar_url' : self.avatar_url,
'isFirstLogin' : self.isFirstLogin,
+ 'campusName': self.campusName,
'campuses_id_list': self.campuses_id_list,
'classes_id_list': self.classes_id_list
}
diff --git a/templates/css/theme.css b/templates/css/theme.css
index ff2f7ab..92d6805 100644
--- a/templates/css/theme.css
+++ b/templates/css/theme.css
@@ -213,6 +213,7 @@ body.noscroll
.se-menu li:hover{
background-color: #E2E2E2;
font-weight: bold;
+ cursor: pointer;
}
.se-menu li:active{
diff --git a/templates/js/app.js b/templates/js/app.js
index 76bba8f..86cbcc1 100644
--- a/templates/js/app.js
+++ b/templates/js/app.js
@@ -37,6 +37,10 @@ app.config(['$routeProvider', '$locationProvider',
.when('/home', {
templateUrl: 'templates/views/home.html',
controller: 'homeController'
+ })
+ .when('/Settings', {
+ templateUrl: 'templates/views/settings.html',
+ controller: 'settingsController'
});
}
diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js
index 6216c2b..bad88a9 100644
--- a/templates/js/controllers/mainController.js
+++ b/templates/js/controllers/mainController.js
@@ -10,8 +10,9 @@ angular.module('SeHub')
if (data.message == 'No User Found') {
console.error("No User Found!");
}
-
+ $scope.loadingData = false;
$scope.user = data;
+ console.log(data);
if ($scope.user.isFirstLogin) {
$scope.menuObj = {};
$scope.isInRegisterMode = true;
@@ -23,24 +24,11 @@ angular.module('SeHub')
})
- apiService.getUserByToken(token).success(function(data) // Get user token
- {
- $scope.user = data;
- $scope.loadingData = false;
-
- apiService.getAllCampuses($scope.user.seToken).success(function(data) // Get all the campuses
- {
- $scope.campuses = data;
- }).error(function() {
-
- });
- });
-
$scope.menuItems = [{
"title": "Home",
"icon": "fa fa-home",
"style": "selected",
- "route": "#/home"
+ "route": "/home"
}, {
"title": "My Campuses",
"icon": "fa fa-university",
@@ -65,12 +53,26 @@ angular.module('SeHub')
"title": "Settings",
"icon": "fa fa-cogs",
"style": "",
- "route": "#/Settings"
+ "route": "/Settings"
}, {
"title": "Log Out",
"icon": "fa fa-power-off",
"style": "",
- "route": "#/logout"
+ "route": "/logout"
}];
+ $scope.menuClicked = function(item){
+ var route = ""
+ for (var i = $scope.menuItems.length - 1; i >= 0; i--) {
+ if($scope.menuItems[i].title === item.title){
+ $scope.menuItems[i].style="selected";
+ route = $scope.menuItems[i].route;
+ }else{
+ $scope.menuItems[i].style = "";
+ }
+ };
+ $location.path(route);
+ }
+
+
}]);
\ No newline at end of file
diff --git a/templates/js/controllers/settingsController.js b/templates/js/controllers/settingsController.js
new file mode 100644
index 0000000..4968b42
--- /dev/null
+++ b/templates/js/controllers/settingsController.js
@@ -0,0 +1,30 @@
+angular.module('SeHub')
+ .controller('settingsController', ['$scope', '$rootScope', 'apiService', '$cookies', '$location', function($scope, $rootScope, apiService, $cookies, $location) {
+
+ var token = $cookies['com.sehub.www'];
+
+ $scope.loadingData = true;
+ $scope.isInRegisterMode = false;
+
+ $scope.title = "Settings"
+
+ apiService.getUserByToken(token).success(function(data) {
+ if (data.message == 'No User Found') {
+ console.error("No User Found!");
+ }
+ $scope.loadingData = false;
+ $scope.user = data;
+ console.log(data);
+ if ($scope.user.isFirstLogin) {
+ $scope.menuObj = {};
+ $scope.isInRegisterMode = true;
+ $scope.loadingData = false;
+ $location.path('/register')
+ }
+
+ });
+
+
+
+
+ }]);
\ No newline at end of file
diff --git a/templates/js/services/apiService.js b/templates/js/services/apiService.js
index 297bea4..d07e1f1 100644
--- a/templates/js/services/apiService.js
+++ b/templates/js/services/apiService.js
@@ -9,7 +9,6 @@ service.factory('apiService', ['$http', function($http) {
req = {
method : "GET",
url : url
-
};
return $http(req);
},
diff --git a/templates/views/index.html b/templates/views/index.html
index 7183c20..cd629d1 100644
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -21,9 +21,6 @@
-
diff --git a/templates/views/settings.html b/templates/views/settings.html
new file mode 100644
index 0000000..0c4b980
--- /dev/null
+++ b/templates/views/settings.html
@@ -0,0 +1,10 @@
+