Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit edd1886

Browse files
brunobritodevbrunobritodev
committed
routes
1 parent 91c451b commit edd1886

21 files changed

Lines changed: 154 additions & 123 deletions

‎src/Frontend/Jp.AdminUI/src/app/core/menu/menu.ts‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const Home = {
55
icon: "icon-home"
66
};
77

8-
const Settings = {
8+
const Clients = {
99
text: "Clients",
1010
link: "/clients",
1111
icon: "fa fa-desktop",
1212
submenu: [
1313
{
1414
text: "List",
15-
link: "/clients/list"
15+
link: "/clients"
1616
},
1717
{
1818
text: "Add",
@@ -28,7 +28,7 @@ const IdentityResource = {
2828
submenu: [
2929
{
3030
text: "List",
31-
link: "/identity-resource/list"
31+
link: "/identity-resource"
3232
},
3333
{
3434
text: "Add",
@@ -44,7 +44,7 @@ const ApiResource = {
4444
submenu: [
4545
{
4646
text: "List",
47-
link: "/api-resource/list"
47+
link: "/api-resource"
4848
},
4949
{
5050
text: "Add",
@@ -82,7 +82,7 @@ const Roles = {
8282
submenu: [
8383
{
8484
text: "List",
85-
link: "/roles/list"
85+
link: "/roles"
8686
},
8787
{
8888
text: "Add",
@@ -95,14 +95,19 @@ const headingMain = {
9595
text: "Main Navigation",
9696
heading: true
9797
};
98+
const Settings = {
99+
text: "Settings",
100+
heading: true
101+
};
98102

99103
export const menu = [
100104
headingMain,
101105
Home,
102-
Settings,
106+
Clients,
103107
IdentityResource,
104108
ApiResource,
105109
PersistedGrants,
106110
Users,
107-
Roles
111+
Roles,
112+
Settings
108113
];

‎src/Frontend/Jp.AdminUI/src/app/panel/api-resources/api-resource.module.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import { NgModule } from "@angular/core";
2-
import { Routes, RouterModule } from "@angular/router";
3-
import { SharedModule } from "@shared/shared.module";
4-
import { DndModule } from "ng2-dnd";
5-
import { NgxSelectModule } from 'ngx-select-ex';
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { SharedModule } from '@shared/shared.module';
4+
import { DndModule } from 'ng2-dnd';
65
import { TagInputModule } from 'ngx-chips';
7-
import { ApiResourceListComponent } from "./list/api-resources-list.component";
8-
import { ApiResourceEditComponent } from "./edit/api-resource-edit.component";
9-
import { ApiResourceAddComponent } from "./add/api-resource-add.component";
10-
import { ApiResourceSecretsComponent } from "./secrets/api-secrets.component";
11-
import { ApiResourceScopesComponent } from "./scope/api-scopes.component";
6+
import { NgxSelectModule } from 'ngx-select-ex';
7+
8+
import { ApiResourceAddComponent } from './add/api-resource-add.component';
9+
import { ApiResourceEditComponent } from './edit/api-resource-edit.component';
10+
import { ApiResourceListComponent } from './list/api-resources-list.component';
11+
import { ApiResourceScopesComponent } from './scope/api-scopes.component';
12+
import { ApiResourceSecretsComponent } from './secrets/api-secrets.component';
1213

1314
const routes: Routes = [
14-
{ path: "", redirectTo: "list", pathMatch: "full" },
15-
{ path: "list", component: ApiResourceListComponent },
16-
{ path: "edit/:name", component: ApiResourceEditComponent },
15+
{ path: "", component: ApiResourceListComponent },
16+
{ path: ":name/edit", component: ApiResourceEditComponent },
1717
{ path: "add", component: ApiResourceAddComponent },
1818
{ path: "secrets/:resource", component: ApiResourceSecretsComponent },
1919
{ path: "scopes/:resource", component: ApiResourceScopesComponent },

‎src/Frontend/Jp.AdminUI/src/app/panel/api-resources/edit/api-resource-edit.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h3>{{model.name}}</h3>
8888
<label placement="top" [tooltip]="'apiResource.edit.secrets-tooltip' | translate" class="col-xl-4 col-form-label">{{
8989
'apiResource.edit.secrets' | translate }} <i class="fa fa-comment-dots"></i></label>
9090
<div class="col-xl-8">
91-
<a [routerLink]="['/api-resource/secrets', model.name]" class="btn btn-primary">{{
91+
<a [routerLink]="['/api-resource', model.name, 'secrets']" class="btn btn-primary">{{
9292
'apiResource.edit.secrets' | translate }}</a>
9393
</div>
9494
</div>
@@ -99,7 +99,7 @@ <h3>{{model.name}}</h3>
9999
<label placement="top" [tooltip]="'apiResource.edit.scope-tooltip' | translate" class="col-xl-4 col-form-label">{{
100100
'apiResource.edit.scope' | translate }} <i class="fa fa-comment-dots"></i></label>
101101
<div class="col-xl-8">
102-
<a [routerLink]="['/api-resource/scopes', model.name]" class="btn btn-primary">{{
102+
<a [routerLink]="['/api-resource', model.name, 'scopes']" class="btn btn-primary">{{
103103
'apiResource.edit.scope' | translate }}</a>
104104
</div>
105105
</div>

‎src/Frontend/Jp.AdminUI/src/app/panel/api-resources/list/api-resources-list.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<tbody>
2828
<tr *ngFor="let resource of apiResources">
2929
<td>
30-
<a [routerLink]="['/api-resource/edit', resource.name]" class="btn btn-primary btn-xs"
30+
<a [routerLink]="['/api-resource', resource.name, 'edit']" class="btn btn-primary btn-xs"
3131
placement="top" [tooltip]="'general.edit' | translate"><i class="fa fa-edit"></i></a>
3232
&nbsp;
3333
</td>

‎src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="card card-default">
99
<div class="card-body">
10-
<a [routerLink]="[ '/api-resource/edit', resourceName]" class="btn btn-outline-primary">{{ 'general.goback' |
10+
<a [routerLink]="['/api-resource', resourceName, 'edit']" class="btn btn-outline-primary">{{ 'general.goback' |
1111
translate }}</a>
1212
</div>
1313
</div>
@@ -231,7 +231,7 @@ <h3>{{ resourceName }}</h3>
231231
</div>
232232
<div class="card-footer">
233233
<button class="mb-1 btn btn-primary" (click)="save()" type="button">Save</button>
234-
<a class="mb-1 btn btn-secondary" [routerLink]="['/api-resource/edit', resourceName]">Cancel</a>
234+
<a class="mb-1 btn btn-secondary" [routerLink]="['/api-resource', resourceName, 'edit']">Cancel</a>
235235
</div>
236236
</div>
237237

‎src/Frontend/Jp.AdminUI/src/app/panel/api-resources/secrets/api-secrets.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="card card-default">
99
<div class="card-body">
10-
<a [routerLink]="[ '/api-resource/edit', resourceName]" class="btn btn-outline-primary">{{ 'general.goback' | translate }}</a>
10+
<a [routerLink]="[ '/api-resource', resourceName, 'edit']" class="btn btn-outline-primary">{{ 'general.goback' | translate }}</a>
1111
</div>
1212
</div>
1313

@@ -109,7 +109,7 @@ <h3>{{ resourceName }}</h3>
109109
</div>
110110
<div class="card-footer">
111111
<button class="mb-1 btn btn-primary" (click)="save()" type="button">Save</button>
112-
<a class="mb-1 btn btn-secondary" [routerLink]="['/api-resource/edit', resourceName]">Cancel</a>
112+
<a class="mb-1 btn btn-secondary" [routerLink]="['/api-resource', resourceName, 'edit']">Cancel</a>
113113
</div>
114114
</div>
115115

‎src/Frontend/Jp.AdminUI/src/app/panel/clients/add/add.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class ClientAddComponent implements OnInit {
5959
registerResult => {
6060
if (registerResult) {
6161
this.showSuccessMessage();
62-
this.router.navigate(['/clients/edit', this.model.clientId]);
62+
this.router.navigate(['/clients', this.model.clientId, 'edit']);
6363
}
6464
this.showButtonLoading = false;
6565
},

‎src/Frontend/Jp.AdminUI/src/app/panel/clients/claims/claims.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="card card-default">
99
<div class="card-body">
10-
<a [routerLink]="[ '/clients/edit', client]" class="btn btn-outline-primary">{{ 'general.goback' | translate }}</a>
10+
<a [routerLink]="['/clients', client, 'edit']" class="btn btn-outline-primary">{{ 'general.goback' | translate }}</a>
1111
</div>
1212
</div>
1313

@@ -82,7 +82,7 @@ <h3>{{ client }}</h3>
8282
</div>
8383
<div class="card-footer">
8484
<button class="mb-1 btn btn-primary" (click)="save()" type="button">Save</button>
85-
<a class="mb-1 btn btn-secondary" [routerLink]="['/clients/edit', client]">Cancel</a>
85+
<a class="mb-1 btn btn-secondary" [routerLink]="['/clients', client, 'edit']">Cancel</a>
8686
</div>
8787
</div>
8888

‎src/Frontend/Jp.AdminUI/src/app/panel/clients/clients.module.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
import { NgModule } from "@angular/core";
2-
import { ClientListComponent } from "./list/clients-list.component";
3-
import { Routes, RouterModule } from "@angular/router";
4-
import { SharedModule } from "@shared/shared.module";
5-
import { DndModule } from "ng2-dnd";
6-
import { ClientEditComponent } from "./edit/client-edit.component";
7-
import { NgxSelectModule } from 'ngx-select-ex';
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { SharedModule } from '@shared/shared.module';
4+
import { DndModule } from 'ng2-dnd';
85
import { TagInputModule } from 'ngx-chips';
9-
import { ClientAuthComponent } from "./edit/auth/auth.component";
10-
import { ClientSettingsComponent } from "./edit/settings/settings.component";
11-
import { ClientTokenComponent } from "./edit/token/token.component";
12-
import { ClientBasicComponent } from "./edit/basic/basic.component";
13-
import { ClientSecretsComponent } from "./secrets/secrets.component";
14-
import { ClientPropertiesComponent } from "./properties/properties.component";
15-
import { ClientClaimsComponent } from "./claims/claims.component";
16-
import { ClientAddComponent } from "./add/add.component";
17-
import { ClientDeviceFlowComponent } from "./edit/device-flow/device-flow.component";
18-
import { ClientService } from "./clients.service";
6+
import { NgxSelectModule } from 'ngx-select-ex';
7+
8+
import { ClientAddComponent } from './add/add.component';
9+
import { ClientClaimsComponent } from './claims/claims.component';
10+
import { ClientService } from './clients.service';
11+
import { ClientAuthComponent } from './edit/auth/auth.component';
12+
import { ClientBasicComponent } from './edit/basic/basic.component';
13+
import { ClientEditComponent } from './edit/client-edit.component';
14+
import { ClientDeviceFlowComponent } from './edit/device-flow/device-flow.component';
15+
import { ClientSettingsComponent } from './edit/settings/settings.component';
16+
import { ClientTokenComponent } from './edit/token/token.component';
17+
import { ClientListComponent } from './list/clients-list.component';
18+
import { ClientPropertiesComponent } from './properties/properties.component';
19+
import { ClientSecretsComponent } from './secrets/secrets.component';
1920

2021
const routes: Routes = [
21-
{ path: "", redirectTo: "list", pathMatch: "full" },
22-
{ path: "list", component: ClientListComponent },
23-
{ path: "edit/:clientId", component: ClientEditComponent },
24-
{ path: "secrets/:clientId", component: ClientSecretsComponent },
25-
{ path: "properties/:clientId", component: ClientPropertiesComponent },
26-
{ path: "claims/:clientId", component: ClientClaimsComponent },
22+
{ path: "", component: ClientListComponent },
23+
{ path: ":clientId/edit", component: ClientEditComponent },
24+
{ path: ":clientId/secrets", component: ClientSecretsComponent },
25+
{ path: ":clientId/properties", component: ClientPropertiesComponent },
26+
{ path: ":clientId/claims", component: ClientClaimsComponent },
2727
{ path: "add", component: ClientAddComponent },
2828
];
2929

‎src/Frontend/Jp.AdminUI/src/app/panel/clients/edit/settings/settings.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
class="col-xl-4 col-form-label">{{
5151
'client.details.clientSecrets' | translate }} <i class="fa fa-comment-dots"></i></label>
5252
<div class="col-xl-8">
53-
<a [routerLink]="['/clients/secrets', model.clientId]" class="btn btn-primary">{{
53+
<a [routerLink]="['/clients', model.clientId, 'secrets']" class="btn btn-primary">{{
5454
'client.details.clientSecrets' | translate }}</a>
5555
</div>
5656
</div>
@@ -222,7 +222,7 @@
222222
class="col-xl-4 col-form-label">{{
223223
'client.details.properties' | translate }} <i class="fa fa-comment-dots"></i></label>
224224
<div class="col-xl-8">
225-
<a [routerLink]="['/clients/properties', model.clientId]" class="btn btn-primary">{{
225+
<a [routerLink]="['/clients', model.clientId, 'properties']" class="btn btn-primary">{{
226226
'client.details.properties' | translate }}</a>
227227
</div>
228228
</div>

0 commit comments

Comments
 (0)