aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+about/about-instance/about-instance.resolver.ts
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+about/about-instance/about-instance.resolver.ts')
-rw-r--r--client/src/app/+about/about-instance/about-instance.resolver.ts15
1 files changed, 10 insertions, 5 deletions
diff --git a/client/src/app/+about/about-instance/about-instance.resolver.ts b/client/src/app/+about/about-instance/about-instance.resolver.ts
index b2349ba12..9a5924ebb 100644
--- a/client/src/app/+about/about-instance/about-instance.resolver.ts
+++ b/client/src/app/+about/about-instance/about-instance.resolver.ts
@@ -2,15 +2,19 @@ import { forkJoin } from 'rxjs'
2import { map, switchMap } from 'rxjs/operators' 2import { map, switchMap } from 'rxjs/operators'
3import { Injectable } from '@angular/core' 3import { Injectable } from '@angular/core'
4import { ActivatedRouteSnapshot, Resolve } from '@angular/router' 4import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
5import { ServerService } from '@app/core'
5import { InstanceService } from '@app/shared/shared-instance' 6import { InstanceService } from '@app/shared/shared-instance'
6import { About } from '@shared/models/server' 7import { About, ServerConfig } from '@shared/models/server'
7 8
8export type ResolverData = { about: About, languages: string[], categories: string[] } 9export type ResolverData = { about: About, languages: string[], categories: string[], serverConfig: ServerConfig }
9 10
10@Injectable() 11@Injectable()
11export class AboutInstanceResolver implements Resolve<any> { 12export class AboutInstanceResolver implements Resolve<any> {
12 13
13 constructor (private instanceService: InstanceService) {} 14 constructor (
15 private instanceService: InstanceService,
16 private serverService: ServerService
17 ) {}
14 18
15 resolve (route: ActivatedRouteSnapshot) { 19 resolve (route: ActivatedRouteSnapshot) {
16 return this.instanceService.getAbout() 20 return this.instanceService.getAbout()
@@ -18,8 +22,9 @@ export class AboutInstanceResolver implements Resolve<any> {
18 switchMap(about => { 22 switchMap(about => {
19 return forkJoin([ 23 return forkJoin([
20 this.instanceService.buildTranslatedLanguages(about), 24 this.instanceService.buildTranslatedLanguages(about),
21 this.instanceService.buildTranslatedCategories(about) 25 this.instanceService.buildTranslatedCategories(about),
22 ]).pipe(map(([ languages, categories ]) => ({ about, languages, categories }))) 26 this.serverService.getConfig()
27 ]).pipe(map(([ languages, categories, serverConfig ]) => ({ about, languages, categories, serverConfig })))
23 }) 28 })
24 ) 29 )
25 } 30 }