Skip to content

Commit 3afbf13

Browse files
authored
Merge pull request #213 from topcoder-platform/dev
Add Settings Tab
2 parents 42b22ee + 546879a commit 3afbf13

File tree

7 files changed

+52
-5
lines changed

7 files changed

+52
-5
lines changed

.circleci/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ version: 2
22
defaults: &defaults
33
docker:
44
- image: circleci/node:6.14-stretch-browsers
5+
56
install_dependency: &install_dependency
67
name: Installation of build and deployment dependencies.
78
command: |
89
sudo apt update
910
sudo apt install jq python3-pip
1011
sudo pip3 install awscli --upgrade
11-
sudo pip3 install docker-compose
12+
# sudo pip3 install docker-compose
13+
1214
install_deploysuite: &install_deploysuite
1315
name: Installation of install_deploysuite.
1416
command: |

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"angular-ui-bootstrap": "~2.5.0",
1919
"angular-ui-tinymce": "0.0.19",
2020
"auth0-angular": "~4.0.4",
21-
"auth0-js": "~6.4.2",
21+
"auth0-js": "^9.19.0",
2222
"auth0-lock": "~11.21.0",
2323
"bootstrap": "~3.3.5",
2424
"bootstrap-ui-datetime-picker": "^2.4.0",

src/app/app.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,12 @@ angular.module('supportAdminApp', [
486486
title: null
487487
},
488488
resolve: { auth: authenticate }
489+
})
490+
.state('index.settings', {
491+
url: '/settings',
492+
templateUrl: 'app/settings/settings.html',
493+
data: { pageTitle: 'Settings' },
494+
resolve: { auth: authenticate }
489495
});
490496

491497
$urlRouterProvider.otherwise('/index/main');

src/app/groups/groups.list.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ module.controller('permissionmanagement.GroupsListController', [
1818
// list data
1919
$scope.groups = [];
2020

21-
// used to get all groups , increased perPage from 1000 to 2000 to accomodate all groups in one call
21+
// used to get all groups , increased perPage from 2000 to 3000 to accomodate all groups in one call
2222
$scope.page = 1;
23-
$scope.perPage = 2000;
23+
$scope.perPage = 3000;
2424

2525
/* Maps user ids, present in the page, into user handles. */
2626
$scope.users = {};
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
var module = angular.module('supportAdminApp');
4+
5+
module.controller('settings.Controller', ['$scope', 'AuthService', 'ONLINE_REVIEW_URL',
6+
function ($scope, $authService, ONLINE_REVIEW_URL) {
7+
$scope.ONLINE_REVIEW_URL = ONLINE_REVIEW_URL;
8+
9+
/**
10+
* Check if user is logged in.
11+
*/
12+
$scope.authorized = function () {
13+
return $authService.isLoggedIn();
14+
};
15+
}
16+
]);

src/app/settings/settings.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<div class="row wrapper border-bottom white-bg page-heading">
2+
<div class="col-lg-10">
3+
<h2>Settings</h2>
4+
</div>
5+
<div class="col-lg-2">
6+
7+
</div>
8+
</div>
9+
<div class="wrapper wrapper-content animated fadeInRight">
10+
<div class="row" ng-controller="settings.Controller" ng-show="authorized()">
11+
<div class="col-lg-12">
12+
<div class="ibox float-e-margins">
13+
<div class="ibox-title">
14+
<a ng-href="{{ONLINE_REVIEW_URL}}/togglz" target="_blank">Online
15+
Review Togglz Page</a>
16+
</div>
17+
</div>
18+
</div>
19+
</div>
20+
</div>

src/components/common/navigation.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@
5757
</li>
5858
<li ui-sref-active="active">
5959
<a ui-sref="index.terms.list"><i class="fa fa-file-text"></i> <span class="nav-label">Terms of Use</span> </a>
60-
</li>
60+
</li>
61+
<li ui-sref-active="active">
62+
<a ui-sref="index.settings"><i class="fa fa-cog"></i> <span class="nav-label">Settings</span> </a>
63+
</li>
6164
</ul>
6265
</div>
6366
</nav>

0 commit comments

Comments
 (0)