From 86115c44ce12e1715c2855371dd090d85535d083 Mon Sep 17 00:00:00 2001 From: lotte Date: Wed, 13 Feb 2019 12:18:21 +0100 Subject: [PATCH] started navigation for tabs --- .../edit-item-page/edit-item-page.component.html | 10 +++++----- .../edit-item-page/edit-item-page.component.ts | 5 +++-- src/app/+item-page/item-page-routing.module.ts | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.html b/src/app/+item-page/edit-item-page/edit-item-page.component.html index 82a4b0c283..2cb05ab21f 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.component.html +++ b/src/app/+item-page/edit-item-page/edit-item-page.component.html @@ -3,13 +3,13 @@

{{'item.edit.head' | translate}}

- - + + - + @@ -20,12 +20,12 @@ - + - + diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.ts b/src/app/+item-page/edit-item-page/edit-item-page.component.ts index b8d3ca7957..a795dd3dee 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.component.ts +++ b/src/app/+item-page/edit-item-page/edit-item-page.component.ts @@ -1,6 +1,6 @@ import {fadeIn, fadeInOut} from '../../shared/animations/fade'; import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; +import { ActivatedRoute, Params } from '@angular/router'; import {RemoteData} from '../../core/data/remote-data'; import {Item} from '../../core/shared/item.model'; import {Observable} from 'rxjs'; @@ -24,12 +24,13 @@ export class EditItemPageComponent implements OnInit { * The item to edit */ itemRD$: Observable>; - + params$: Observable; constructor(private route: ActivatedRoute) { } ngOnInit(): void { this.itemRD$ = this.route.data.pipe(map((data) => data.item)); + this.params$ = this.route.params; } } diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts index 0f2f0817f6..962f659076 100644 --- a/src/app/+item-page/item-page-routing.module.ts +++ b/src/app/+item-page/item-page-routing.module.ts @@ -15,7 +15,7 @@ export function getItemEditPath(id: string) { return new URLCombiner(getItemModulePath(),ITEM_EDIT_PATH.replace(/:id/, id)).toString() } -const ITEM_EDIT_PATH = ':id/edit'; +const ITEM_EDIT_PATH = ':id/edit/:page'; @NgModule({ imports: [ @@ -38,7 +38,7 @@ const ITEM_EDIT_PATH = ':id/edit'; { path: ITEM_EDIT_PATH, loadChildren: './edit-item-page/edit-item-page.module#EditItemPageModule', - // canActivate: [AuthenticatedGuard] + canActivate: [AuthenticatedGuard] } ]) ],