diff options
Diffstat (limited to 'client/src/app/+about/about-instance')
3 files changed, 13 insertions, 15 deletions
diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index 15841be74..c57ac69ab 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts | |||
@@ -1,11 +1,11 @@ | |||
1 | import { Component, OnInit, ViewChild, AfterViewChecked } from '@angular/core' | 1 | import { ViewportScroller } from '@angular/common' |
2 | import { Notifier, ServerService } from '@app/core' | 2 | import { AfterViewChecked, Component, OnInit, ViewChild } from '@angular/core' |
3 | import { ActivatedRoute } from '@angular/router' | ||
3 | import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' | 4 | import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' |
4 | import { InstanceService } from '@app/shared/instance/instance.service' | 5 | import { ServerService } from '@app/core' |
6 | import { InstanceService } from '@app/shared/shared-instance' | ||
5 | import { ServerConfig } from '@shared/models' | 7 | import { ServerConfig } from '@shared/models' |
6 | import { ActivatedRoute } from '@angular/router' | ||
7 | import { ResolverData } from './about-instance.resolver' | 8 | import { ResolverData } from './about-instance.resolver' |
8 | import { ViewportScroller } from '@angular/common' | ||
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-about-instance', | 11 | selector: 'my-about-instance', |
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 94c6abe5a..b2349ba12 100644 --- a/client/src/app/+about/about-instance/about-instance.resolver.ts +++ b/client/src/app/+about/about-instance/about-instance.resolver.ts | |||
@@ -1,17 +1,16 @@ | |||
1 | import { forkJoin } from 'rxjs' | ||
2 | import { map, switchMap } from 'rxjs/operators' | ||
1 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
2 | import { ActivatedRouteSnapshot, Resolve } from '@angular/router' | 4 | import { ActivatedRouteSnapshot, Resolve } from '@angular/router' |
3 | import { map, switchMap } from 'rxjs/operators' | 5 | import { InstanceService } from '@app/shared/shared-instance' |
4 | import { forkJoin } from 'rxjs' | ||
5 | import { InstanceService } from '@app/shared/instance/instance.service' | ||
6 | import { About } from '@shared/models/server' | 6 | import { About } from '@shared/models/server' |
7 | 7 | ||
8 | export type ResolverData = { about: About, languages: string[], categories: string[] } | 8 | export type ResolverData = { about: About, languages: string[], categories: string[] } |
9 | 9 | ||
10 | @Injectable() | 10 | @Injectable() |
11 | export class AboutInstanceResolver implements Resolve<any> { | 11 | export class AboutInstanceResolver implements Resolve<any> { |
12 | constructor ( | 12 | |
13 | private instanceService: InstanceService | 13 | constructor (private instanceService: InstanceService) {} |
14 | ) {} | ||
15 | 14 | ||
16 | resolve (route: ActivatedRouteSnapshot) { | 15 | resolve (route: ActivatedRouteSnapshot) { |
17 | return this.instanceService.getAbout() | 16 | return this.instanceService.getAbout() |
diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts index d5e146b82..5199402e6 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.ts +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts | |||
@@ -1,11 +1,10 @@ | |||
1 | import { Component, OnInit, ViewChild } from '@angular/core' | 1 | import { Component, OnInit, ViewChild } from '@angular/core' |
2 | import { Notifier, ServerService } from '@app/core' | 2 | import { Notifier, ServerService } from '@app/core' |
3 | import { I18n } from '@ngx-translate/i18n-polyfill' | 3 | import { FormReactive, FormValidatorService, InstanceValidatorsService } from '@app/shared/shared-forms' |
4 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 4 | import { InstanceService } from '@app/shared/shared-instance' |
5 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' | 5 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' |
6 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' | 6 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' |
7 | import { FormReactive, InstanceValidatorsService } from '@app/shared' | 7 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { InstanceService } from '@app/shared/instance/instance.service' | ||
9 | import { ServerConfig } from '@shared/models' | 8 | import { ServerConfig } from '@shared/models' |
10 | 9 | ||
11 | @Component({ | 10 | @Component({ |