You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/30 07:28:32 UTC
[incubator-dlab] branch DLAB-955 created (now 85cb6e3)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-955
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 85cb6e3 [DLAB-955]: moved terminal out of parent route
This branch includes the following new commits:
new 85cb6e3 [DLAB-955]: moved terminal out of parent route
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-955]: moved terminal out of parent
route
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-955
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 85cb6e3929872cfd1179c5c0ac3211b51bc52ec4
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 30 10:26:12 2019 +0300
[DLAB-955]: moved terminal out of parent route
---
.../resources/webapp/src/app/app.routing.module.ts | 38 +++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index 5135e02..a608deb 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -35,14 +35,14 @@ import { RolesComponent } from './administration/roles/roles.component';
import { AuthorizationGuard, CheckParamsGuard, CloudProviderGuard, AdminGuard } from './core/services';
const routes: Routes = [{
- path: 'login',
- component: LoginComponent
- }, {
- path: '',
- canActivate: [AuthorizationGuard],
- component: LayoutComponent,
- children: [
- {
+ path: 'login',
+ component: LoginComponent
+}, {
+ path: '',
+ canActivate: [AuthorizationGuard],
+ component: LayoutComponent,
+ children: [
+ {
path: '',
redirectTo: 'resources_list',
pathMatch: 'full'
@@ -67,9 +67,6 @@ const routes: Routes = [{
component: ManagementComponent,
canActivate: [AuthorizationGuard, AdminGuard]
}, {
- path: 'terminal/:id',
- component: WebterminalComponent
- }, {
path: 'help/publickeyguide',
component: PublicKeyGuideComponent,
canActivate: [AuthorizationGuard]
@@ -79,13 +76,16 @@ const routes: Routes = [{
canActivate: [AuthorizationGuard]
}
]
- }, {
- path: '403',
- component: AccessDeniedComponent,
- canActivate: [AuthorizationGuard]
- }, {
- path: '**',
- component: NotFoundComponent
- }];
+}, {
+ path: 'terminal/:id',
+ component: WebterminalComponent
+}, {
+ path: '403',
+ component: AccessDeniedComponent,
+ canActivate: [AuthorizationGuard]
+}, {
+ path: '**',
+ component: NotFoundComponent
+}];
export const AppRoutingModule: ModuleWithProviders = RouterModule.forRoot(routes, { useHash: true });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org