MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

update about, glossary, terms pages when language changes.

This commit is contained in:
Bernaldo Mihasi 2023-05-02 13:48:07 +03:00
parent 7c347569fd
commit 5d5ebe7a55
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dmp-frontend/src/app/ui/about/about.component.ts
View File

@ -1,9 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { Router } from '@angular/router';
import { AboutService } from '@app/core/services/about/about.service';
import { LanguageService } from '@app/core/services/language/language.service';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
import { BaseComponent } from '@common/base/base.component';
import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
import { takeUntil } from 'rxjs/operators';
@Component({
@ -20,11 +22,16 @@ export class AboutComponent extends BaseComponent implements OnInit {
private aboutService: AboutService,
private sanitizer: DomSanitizer,
private languageService: LanguageService,
private matomoService: MatomoService
private matomoService: MatomoService,
private translate: TranslateService,
private router: Router
) { super(); }
ngOnInit() {
this.matomoService.trackPageView('About');
this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/about']));
});
this.aboutService.getAbout(this.languageService.getCurrentLanguage())
.pipe(takeUntil(this._destroyed))
.subscribe(response => {

2
dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts
View File

@ -26,7 +26,7 @@ export class FaqContentComponent extends BaseComponent implements OnInit {
) { super(); }
ngOnInit() {
this.matomoService.trackPageView('Terms of Service');
this.matomoService.trackPageView('FAQ');
this.faqService.getFaq(this.languageService.getCurrentLanguage())
.pipe(takeUntil(this._destroyed))
.subscribe(response => {

10
dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts
View File

@ -1,9 +1,11 @@
import { Component, OnInit, Input } from '@angular/core';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { Router } from '@angular/router';
import { GlossaryService } from '@app/core/services/glossary/glossary.service';
import { LanguageService } from '@app/core/services/language/language.service';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
import { BaseComponent } from '@common/base/base.component';
import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
import { takeUntil } from 'rxjs/operators';
@Component({
@ -22,11 +24,17 @@ export class GlossaryContentComponent extends BaseComponent implements OnInit {
private glossaryService: GlossaryService,
private sanitizer: DomSanitizer,
private languageService: LanguageService,
private matomoService: MatomoService
private matomoService: MatomoService,
private translate: TranslateService,
private router: Router
) { super(); }
ngOnInit() {
this.matomoService.trackPageView('Glossary');
this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/glossary']));
});
this.glossaryService.getGlossary(this.languageService.getCurrentLanguage())
.pipe(takeUntil(this._destroyed))
.subscribe(response => {

9
dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts
View File

@ -1,9 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser';
import { Router } from '@angular/router';
import { LanguageService } from '@app/core/services/language/language.service';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
import { TermsOfServiceService } from '@app/core/services/terms-of-service/terms-of-service.service';
import { BaseComponent } from '@common/base/base.component';
import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
import { takeUntil } from 'rxjs/operators';
@Component({
@ -20,11 +22,16 @@ export class TermsComponent extends BaseComponent implements OnInit {
private termsService: TermsOfServiceService,
private sanitizer: DomSanitizer,
private languageService: LanguageService,
private matomoService: MatomoService
private matomoService: MatomoService,
private translate: TranslateService,
private router: Router
) { super(); }
ngOnInit() {
this.matomoService.trackPageView('Terms of Service');
this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/terms-and-conditions']));
});
this.termsService.getTermsOfService(this.languageService.getCurrentLanguage())
.pipe(takeUntil(this._destroyed))
.subscribe(response => {

2
dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts
View File

@ -48,7 +48,7 @@ export class UserGuideContentComponent extends BaseComponent implements OnInit {
this.scroll(ev);
});
this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
this.router.navigate(['/reload']).then(() => this.router.navigate(['/user-guide']));
this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/user-guide']));
});
this.userGuideService.getUserGuide(this.languageService.getCurrentLanguage())
.pipe(takeUntil(this._destroyed))