Skip to content

Commit

Permalink
Merge pull request #213 from topcoder-platform/dev
Browse files Browse the repository at this point in the history
Add Settings Tab
  • Loading branch information
eisbilir authored Aug 10, 2022
2 parents 42b22ee + 546879a commit 3afbf13
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ version: 2
defaults: &defaults
docker:
- image: circleci/node:6.14-stretch-browsers

install_dependency: &install_dependency
name: Installation of build and deployment dependencies.
command: |
sudo apt update
sudo apt install jq python3-pip
sudo pip3 install awscli --upgrade
sudo pip3 install docker-compose
# sudo pip3 install docker-compose
install_deploysuite: &install_deploysuite
name: Installation of install_deploysuite.
command: |
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"angular-ui-bootstrap": "~2.5.0",
"angular-ui-tinymce": "0.0.19",
"auth0-angular": "~4.0.4",
"auth0-js": "~6.4.2",
"auth0-js": "^9.19.0",
"auth0-lock": "~11.21.0",
"bootstrap": "~3.3.5",
"bootstrap-ui-datetime-picker": "^2.4.0",
Expand Down
6 changes: 6 additions & 0 deletions src/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,12 @@ angular.module('supportAdminApp', [
title: null
},
resolve: { auth: authenticate }
})
.state('index.settings', {
url: '/settings',
templateUrl: 'app/settings/settings.html',
data: { pageTitle: 'Settings' },
resolve: { auth: authenticate }
});

$urlRouterProvider.otherwise('/index/main');
Expand Down
4 changes: 2 additions & 2 deletions src/app/groups/groups.list.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module.controller('permissionmanagement.GroupsListController', [
// list data
$scope.groups = [];

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

/* Maps user ids, present in the page, into user handles. */
$scope.users = {};
Expand Down
16 changes: 16 additions & 0 deletions src/app/settings/settings.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use strict';

var module = angular.module('supportAdminApp');

module.controller('settings.Controller', ['$scope', 'AuthService', 'ONLINE_REVIEW_URL',
function ($scope, $authService, ONLINE_REVIEW_URL) {
$scope.ONLINE_REVIEW_URL = ONLINE_REVIEW_URL;

/**
* Check if user is logged in.
*/
$scope.authorized = function () {
return $authService.isLoggedIn();
};
}
]);
20 changes: 20 additions & 0 deletions src/app/settings/settings.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<div class="row wrapper border-bottom white-bg page-heading">
<div class="col-lg-10">
<h2>Settings</h2>
</div>
<div class="col-lg-2">

</div>
</div>
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row" ng-controller="settings.Controller" ng-show="authorized()">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<a ng-href="{{ONLINE_REVIEW_URL}}/togglz" target="_blank">Online
Review Togglz Page</a>
</div>
</div>
</div>
</div>
</div>
5 changes: 4 additions & 1 deletion src/components/common/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@
</li>
<li ui-sref-active="active">
<a ui-sref="index.terms.list"><i class="fa fa-file-text"></i> <span class="nav-label">Terms of Use</span> </a>
</li>
</li>
<li ui-sref-active="active">
<a ui-sref="index.settings"><i class="fa fa-cog"></i> <span class="nav-label">Settings</span> </a>
</li>
</ul>
</div>
</nav>

0 comments on commit 3afbf13

Please sign in to comment.