X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Babout%2Fabout-instance%2Fabout-instance.component.ts;h=c8c1561054c0de160c39903bde137860c0329c30;hb=7024e9120b381b5b3201212f5a18f5cdc14e15ff;hp=d3ee8a1e437f0c98dbccad2f8abe297edf57de68;hpb=d3e56c0c4b307c99e83fbafb7f2c5884cbc20055;p=github%2FChocobozzz%2FPeerTube.git

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 d3ee8a1e4..c8c156105 100644
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -1,9 +1,10 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { Notifier, ServerService } from '@app/core'
-import { MarkdownService } from '@app/videos/shared'
-import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component'
 import { InstanceService } from '@app/shared/instance/instance.service'
+import { ServerConfig } from '@shared/models'
+import { ActivatedRoute } from '@angular/router'
+import { ResolverData } from './about-instance.resolver'
 
 @Component({
   selector: 'my-about-instance',
@@ -11,51 +12,67 @@ import { InstanceService } from '@app/shared/instance/instance.service'
   styleUrls: [ './about-instance.component.scss' ]
 })
 export class AboutInstanceComponent implements OnInit {
-  @ViewChild('contactAdminModal') contactAdminModal: ContactAdminModalComponent
+  @ViewChild('contactAdminModal', { static: true }) contactAdminModal: ContactAdminModalComponent
 
   shortDescription = ''
-  descriptionHTML = ''
-  termsHTML = ''
+
+  html = {
+    description: '',
+    terms: '',
+    codeOfConduct: '',
+    moderationInformation: '',
+    administrator: '',
+    hardwareInformation: ''
+  }
+
+  creationReason = ''
+  maintenanceLifetime = ''
+  businessModel = ''
+
+  languages: string[] = []
+  categories: string[] = []
+
+  serverConfig: ServerConfig
 
   constructor (
+    private route: ActivatedRoute,
     private notifier: Notifier,
     private serverService: ServerService,
-    private instanceService: InstanceService,
-    private markdownService: MarkdownService,
-    private i18n: I18n
+    private instanceService: InstanceService
   ) {}
 
   get instanceName () {
-    return this.serverService.getConfig().instance.name
+    return this.serverConfig.instance.name
   }
 
-  get userVideoQuota () {
-    return this.serverService.getConfig().user.videoQuota
+  get isContactFormEnabled () {
+    return this.serverConfig.email.enabled && this.serverConfig.contactForm.enabled
   }
 
-  get isSignupAllowed () {
-    return this.serverService.getConfig().signup.allowed
+  get isNSFW () {
+    return this.serverConfig.instance.isNSFW
   }
 
-  get isContactFormEnabled () {
-    return this.serverService.getConfig().email.enabled && this.serverService.getConfig().contactForm.enabled
-  }
+  async ngOnInit () {
+    this.serverConfig = this.serverService.getTmpConfig()
+    this.serverService.getConfig()
+        .subscribe(config => this.serverConfig = config)
+
+    const { about, languages, categories }: ResolverData = this.route.snapshot.data.instanceData
+
+    this.languages = languages
+    this.categories = categories
 
-  ngOnInit () {
-    this.instanceService.getAbout()
-      .subscribe(
-        res => {
-          this.shortDescription = res.instance.shortDescription
-          this.descriptionHTML = this.markdownService.textMarkdownToHTML(res.instance.description)
-          this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms)
-        },
-
-        () => this.notifier.error(this.i18n('Cannot get about information from server'))
-      )
+    this.shortDescription = about.instance.shortDescription
+
+    this.creationReason = about.instance.creationReason
+    this.maintenanceLifetime = about.instance.maintenanceLifetime
+    this.businessModel = about.instance.businessModel
+
+    this.html = await this.instanceService.buildHtml(about)
   }
 
   openContactModal () {
     return this.contactAdminModal.show()
   }
-
 }