diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index d852fba..9f6cd0a 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -29,7 +29,6 @@ export const routes: Routes = [ { path: 'task/:id', component: TaskOverlayComponent }, { path: 'task-edit/:id', component: TaskEditOverlayComponent }, { path: 'contacts', component: ContactsComponent }, - { path: 'contacts/:id', component: ContactsComponent }, { path: 'help', component: HelpComponent }, { path: 'imprint', component: ImprintComponent }, { path: 'privacy-policy', component: PrivacyPolicyComponent }, diff --git a/src/app/components/contacts/contact-detail/contact-detail.component.ts b/src/app/components/contacts/contact-detail/contact-detail.component.ts index 23ebb9a..0949147 100644 --- a/src/app/components/contacts/contact-detail/contact-detail.component.ts +++ b/src/app/components/contacts/contact-detail/contact-detail.component.ts @@ -32,7 +32,7 @@ export class ContactDetailComponent { ) {} closeUserDetails() { - this.router.navigate(['contacts']); + this.sharedService.currentUserId = ''; } checkUserData(userId: string) { diff --git a/src/app/components/contacts/contacts.component.html b/src/app/components/contacts/contacts.component.html index 4b35ec3..bdb9ad3 100644 --- a/src/app/components/contacts/contacts.component.html +++ b/src/app/components/contacts/contacts.component.html @@ -1,7 +1,9 @@
diff --git a/src/app/components/contacts/contacts.component.ts b/src/app/components/contacts/contacts.component.ts index 9d14ae0..6763b35 100644 --- a/src/app/components/contacts/contacts.component.ts +++ b/src/app/components/contacts/contacts.component.ts @@ -19,31 +19,24 @@ export class ContactsComponent { usersFirstLetter: string[] = []; usersByFirstLetter: { [key: string]: string[] } = {}; showAllUsers!: boolean; - currentUserId: string = ''; constructor( public firebaseService: FirebaseService, private route: ActivatedRoute, - private sharedService: SharedService + public sharedService: SharedService ) {} ngOnInit(): void { - this.routeUserId(); this.onResize(); } - routeUserId() { - if (this.route.params.subscribe()) { - this.route.params.subscribe((params) => { - this.currentUserId = params['id']; - this.sharedService.currentUserId = params['id']; - }); - } + showUserId(userId: string = '') { + this.sharedService.currentUserId = userId; } @HostListener('window:resize', ['$event']) onResize() { - if (window.innerWidth <= 1150 && this.currentUserId != '') { + if (window.innerWidth <= 1150 && this.sharedService.currentUserId != '') { this.showAllUsers = false; } else { this.showAllUsers = true;