Menu is usable (issue #42) and starting settings
This commit is contained in:
parent
24d8252d07
commit
f5be224cb2
7 changed files with 66 additions and 25 deletions
|
@ -213,6 +213,7 @@ body.noscroll
|
||||||
.se-menu li:hover{
|
.se-menu li:hover{
|
||||||
background-color: #E2E2E2;
|
background-color: #E2E2E2;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.se-menu li:active{
|
.se-menu li:active{
|
||||||
|
|
|
@ -37,6 +37,10 @@ app.config(['$routeProvider', '$locationProvider',
|
||||||
.when('/home', {
|
.when('/home', {
|
||||||
templateUrl: 'templates/views/home.html',
|
templateUrl: 'templates/views/home.html',
|
||||||
controller: 'homeController'
|
controller: 'homeController'
|
||||||
|
})
|
||||||
|
.when('/Settings', {
|
||||||
|
templateUrl: 'templates/views/settings.html',
|
||||||
|
controller: 'settingsController'
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,8 +10,9 @@ angular.module('SeHub')
|
||||||
if (data.message == 'No User Found') {
|
if (data.message == 'No User Found') {
|
||||||
console.error("No User Found!");
|
console.error("No User Found!");
|
||||||
}
|
}
|
||||||
|
$scope.loadingData = false;
|
||||||
$scope.user = data;
|
$scope.user = data;
|
||||||
|
console.log(data);
|
||||||
if ($scope.user.isFirstLogin) {
|
if ($scope.user.isFirstLogin) {
|
||||||
$scope.menuObj = {};
|
$scope.menuObj = {};
|
||||||
$scope.isInRegisterMode = true;
|
$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 = [{
|
$scope.menuItems = [{
|
||||||
"title": "Home",
|
"title": "Home",
|
||||||
"icon": "fa fa-home",
|
"icon": "fa fa-home",
|
||||||
"style": "selected",
|
"style": "selected",
|
||||||
"route": "#/home"
|
"route": "/home"
|
||||||
}, {
|
}, {
|
||||||
"title": "My Campuses",
|
"title": "My Campuses",
|
||||||
"icon": "fa fa-university",
|
"icon": "fa fa-university",
|
||||||
|
@ -65,12 +53,26 @@ angular.module('SeHub')
|
||||||
"title": "Settings",
|
"title": "Settings",
|
||||||
"icon": "fa fa-cogs",
|
"icon": "fa fa-cogs",
|
||||||
"style": "",
|
"style": "",
|
||||||
"route": "#/Settings"
|
"route": "/Settings"
|
||||||
}, {
|
}, {
|
||||||
"title": "Log Out",
|
"title": "Log Out",
|
||||||
"icon": "fa fa-power-off",
|
"icon": "fa fa-power-off",
|
||||||
"style": "",
|
"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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}]);
|
}]);
|
30
templates/js/controllers/settingsController.js
Normal file
30
templates/js/controllers/settingsController.js
Normal file
|
@ -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')
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}]);
|
|
@ -11,7 +11,6 @@ service.factory('apiService', ['$http', function($http) {
|
||||||
req = {
|
req = {
|
||||||
method : "GET",
|
method : "GET",
|
||||||
url : url
|
url : url
|
||||||
|
|
||||||
};
|
};
|
||||||
return $http(req);
|
return $http(req);
|
||||||
},
|
},
|
||||||
|
|
|
@ -21,9 +21,6 @@
|
||||||
</md-toolbar>
|
</md-toolbar>
|
||||||
<div layout="row" flex>
|
<div layout="row" flex>
|
||||||
<md-sidenav layout="column" class="md-sidenav-left md-whiteframe-z2" md-component-id="left" md-is-locked-open="$mdMedia('gt-sm')">
|
<md-sidenav layout="column" class="md-sidenav-left md-whiteframe-z2" md-component-id="left" md-is-locked-open="$mdMedia('gt-sm')">
|
||||||
<!-- <div class="user-pane-menu">
|
|
||||||
<img ng-src="{{user.avatar_url}}" alt="">
|
|
||||||
</div> -->
|
|
||||||
<md-content class="se-menu">
|
<md-content class="se-menu">
|
||||||
<div ng-if="!isInRegisterMode">
|
<div ng-if="!isInRegisterMode">
|
||||||
<div class="user-box" layout="row" layout-padding>
|
<div class="user-box" layout="row" layout-padding>
|
||||||
|
@ -41,15 +38,12 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<a ng-repeat="item in menuItems" ng-href="{{item.route}}">
|
<a ng-repeat="item in menuItems" ng-click="menuClicked(item)">
|
||||||
<li ng-class="[item.style]"><i ng-class="item.icon"></i> {{item.title}}</li>
|
<li ng-class="[item.style]"><i ng-class="item.icon"></i> {{item.title}}</li>
|
||||||
<md-divider ng-if="!$last"></md-divider>
|
<md-divider ng-if="!$last"></md-divider>
|
||||||
</a>
|
</a>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="loadingData">
|
|
||||||
<md-progress-circular></md-progress-circular>
|
|
||||||
</div>
|
|
||||||
<div ng-if="isInRegisterMode"> <!-- User Needs To Register -->
|
<div ng-if="isInRegisterMode"> <!-- User Needs To Register -->
|
||||||
<md-card layout-padding>
|
<md-card layout-padding>
|
||||||
<div layout=-"row">
|
<div layout=-"row">
|
||||||
|
@ -91,6 +85,7 @@
|
||||||
<!-- Controllers -->
|
<!-- Controllers -->
|
||||||
<script src="templates/js/controllers/mainController.js"></script>
|
<script src="templates/js/controllers/mainController.js"></script>
|
||||||
<script src="templates/js/controllers/homeController.js"></script>
|
<script src="templates/js/controllers/homeController.js"></script>
|
||||||
|
<script src="templates/js/controllers/settingsController.js"></script>
|
||||||
<script src="templates/js/controllers/registerController.js"></script>
|
<script src="templates/js/controllers/registerController.js"></script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
10
templates/views/settings.html
Normal file
10
templates/views/settings.html
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
<div>
|
||||||
|
<div class="loader" ng-if="loadingData">
|
||||||
|
<md-progress-circular md-mode="indeterminate"></md-progress-circular>
|
||||||
|
</div>
|
||||||
|
<md-content layout-padding>
|
||||||
|
<md-card layout-padding>
|
||||||
|
<h1><i class="fa fa-cogs"></i> {{title}}</h1>
|
||||||
|
</md-card>
|
||||||
|
</md-content>
|
||||||
|
</div>
|
Loading…
Reference in a new issue