Skip to content

Commit 94fc0eb

Browse files
committed
asd
1 parent 7afd7a5 commit 94fc0eb

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

frontend/src/main/javascript/src/js/components/sidebar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ class Sidebar {
8484
{
8585
title: 'App Settings',
8686
icon: 'fa-gears',
87-
active: () => this.isState('settings'),
87+
active: () => this.isState('adminSettings'),
8888
display: () => true,
89-
click: () => $state.go('settings')
89+
click: () => $state.go('adminSettings')
9090
},
9191
{
9292
title: 'User Management',

frontend/src/main/javascript/src/js/components/views/settingsView.js renamed to frontend/src/main/javascript/src/js/components/views/adminSettingsView.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {webBrowser} from "../../constants";
1919
/**
2020
* The component for the about page.
2121
*/
22-
class SettingsView {
22+
class AdminSettingsView {
2323

2424
/**
2525
* Constructor.
@@ -54,8 +54,8 @@ class SettingsView {
5454
}
5555
}
5656

57-
export const settingsView = {
58-
controller: SettingsView,
57+
export const adminSettingsView = {
58+
controller: AdminSettingsView,
5959
controllerAs: 'vm',
60-
templateUrl: 'html/components/views/settings-view.html'
60+
templateUrl: 'html/components/views/admin-settings-view.html'
6161
};

frontend/src/main/javascript/src/js/components/views/resultsView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ class ResultsView {
113113
*/
114114
openSelectedResults() {
115115
if (this.selectedResults.length > 0) {
116-
const testNos = this.selectedResults.map(r => r.testNo);
117-
this.$state.go('resultsCompare', {testNos: testNos.join(',')});
116+
const testNos = this.selectedResults.map(r => r.testNo).join(',');
117+
this.$state.go('resultsCompare', {testNos});
118118
}
119119
}
120120

frontend/src/main/javascript/src/js/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ import {projectsView} from "./components/views/projectsView";
9696
import {projectsDashboardView} from "./components/views/projectsDashboardView";
9797
import {resultsCompareView} from "./components/views/resultsCompareView";
9898
import {resultsView} from "./components/views/resultsView";
99-
import {settingsView} from "./components/views/settingsView";
99+
import {adminSettingsView} from "./components/views/adminSettingsView";
100100
import {statisticsCompareView} from "./components/views/statisticsCompareView";
101101
import {symbolsActionsView} from "./components/views/symbolsActionsView";
102102
import {symbolsView} from "./components/views/symbolsView";
@@ -301,6 +301,7 @@ angular
301301

302302
// view components
303303
.component('aboutView', aboutView)
304+
.component('adminSettingsView', adminSettingsView)
304305
.component('adminUsersView', adminUsersView)
305306
.component('countersView', countersView)
306307
.component('errorView', errorView)
@@ -312,7 +313,6 @@ angular
312313
.component('projectsDashboardView', projectsDashboardView)
313314
.component('resultsCompareView', resultsCompareView)
314315
.component('resultsView', resultsView)
315-
.component('settingsView', settingsView)
316316
.component('statisticsCompareView', statisticsCompareView)
317317
.component('symbolsActionsView', symbolsActionsView)
318318
.component('symbolsView', symbolsView)

frontend/src/main/javascript/src/js/routes.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ export function config($stateProvider, $urlRouterProvider) {
3434
template: '<users-settings-view></users-settings-view>',
3535
data: {requiresProject: false, roles: ['REGISTERED', 'ADMIN'], title: 'Settings'}
3636
})
37-
.state('settings', {
38-
url: '/settings',
39-
template: '<settings-view></settings-view>',
37+
.state('adminUsers', {
38+
url: '/admin/users',
39+
template: '<admin-users-view></admin-users-view>',
40+
data: {requiresProject: false, roles: ['ADMIN'], title: 'Admin > Users'}
41+
})
42+
.state('adminSettings', {
43+
url: '/admin/settings',
44+
template: '<admin-settings-view></admin-settings-view>',
4045
data: {requiresProject: false, roles: ['ADMIN'], title: 'Application Settings'}
4146
})
4247
.state('projects', {
@@ -75,7 +80,7 @@ export function config($stateProvider, $urlRouterProvider) {
7580
data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Learner > Setup'}
7681
})
7782
.state('learnerStart', {
78-
url: '/learner/start',
83+
url: '/learner/learn',
7984
template: '<learner-view></learner-view>',
8085
data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Learning'},
8186
params: {result: null}
@@ -86,7 +91,7 @@ export function config($stateProvider, $urlRouterProvider) {
8691
data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Results'}
8792
})
8893
.state('resultsCompare', {
89-
url: '/results/:testNos/compare',
94+
url: '/results/{testNos:string}',
9095
template: '<results-compare-view></results-compare-view>',
9196
data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Results > Compare'}
9297
})
@@ -95,11 +100,6 @@ export function config($stateProvider, $urlRouterProvider) {
95100
template: '<statistics-compare-view></statistics-compare-view>',
96101
data: {requiresProject: true, roles: ['REGISTERED', 'ADMIN'], title: 'Statistics > Compare'}
97102
})
98-
.state('adminUsers', {
99-
url: '/admin/users',
100-
template: '<admin-users-view></admin-users-view>',
101-
data: {requiresProject: false, roles: ['ADMIN'], title: 'Admin > Users'}
102-
})
103103
.state('tests', {
104104
url: '/tests/{testId:int}',
105105
template: '<tests-view></tests-view>',

0 commit comments

Comments
 (0)