X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=12c0efd8a5f9efa09d1dfe6ec5a6ae7d1a8195a4;hb=ee8e602ef9761b4869e14d4d3ed24a2e18f22c65;hp=f686410478d5028a590eab88677d7e988f57fa04;hpb=43d0ea7f4b88d52097172cc0c1831edd7e492503;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index f68641047..12c0efd8a 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,13 +1,12 @@
-import { Component, OnInit, ViewChild } from '@angular/core'
+import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core'
import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
import { Event, GuardsCheckStart, NavigationEnd, Router, Scroll } from '@angular/router'
import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core'
import { is18nPath } from '../../../shared/models/i18n'
import { ScreenService } from '@app/shared/misc/screen.service'
-import { debounceTime, filter, map, pairwise, skip, switchMap } from 'rxjs/operators'
+import { filter, map, pairwise } from 'rxjs/operators'
import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { I18n } from '@ngx-translate/i18n-polyfill'
-import { fromEvent } from 'rxjs'
import { PlatformLocation, ViewportScroller } from '@angular/common'
import { PluginService } from '@app/core/plugins/plugin.service'
import { HooksService } from '@app/core/plugins/hooks.service'
@@ -15,24 +14,26 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { POP_STATE_MODAL_DISMISS } from '@app/shared/misc/constants'
import { WelcomeModalComponent } from '@app/modal/welcome-modal.component'
import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
-import { UserRole } from '@shared/models'
+import { CustomModalComponent } from '@app/modal/custom-modal.component'
+import { ServerConfig, UserRole } from '@shared/models'
import { User } from '@app/shared'
import { InstanceService } from '@app/shared/instance/instance.service'
+import { MenuService } from './core/menu/menu.service'
@Component({
selector: 'my-app',
templateUrl: './app.component.html',
styleUrls: [ './app.component.scss' ]
})
-export class AppComponent implements OnInit {
- @ViewChild('welcomeModal', { static: false }) welcomeModal: WelcomeModalComponent
- @ViewChild('instanceConfigWarningModal', { static: false }) instanceConfigWarningModal: InstanceConfigWarningModalComponent
-
- isMenuDisplayed = true
- isMenuChangedByUser = false
+export class AppComponent implements OnInit, AfterViewInit {
+ @ViewChild('welcomeModal') welcomeModal: WelcomeModalComponent
+ @ViewChild('instanceConfigWarningModal') instanceConfigWarningModal: InstanceConfigWarningModalComponent
+ @ViewChild('customModal') customModal: CustomModalComponent
customCSS: SafeHtml
+ private serverConfig: ServerConfig
+
constructor (
private i18n: I18n,
private viewportScroller: ViewportScroller,
@@ -48,20 +49,12 @@ export class AppComponent implements OnInit {
private themeService: ThemeService,
private hooks: HooksService,
private location: PlatformLocation,
- private modalService: NgbModal
+ private modalService: NgbModal,
+ public menu: MenuService
) { }
- get serverVersion () {
- return this.serverService.getConfig().serverVersion
- }
-
- get serverCommit () {
- const commit = this.serverService.getConfig().serverCommit || ''
- return (commit !== '') ? '...' + commit : commit
- }
-
get instanceName () {
- return this.serverService.getConfig().instance.name
+ return this.serverConfig.instance.name
}
get defaultRoute () {
@@ -71,6 +64,13 @@ export class AppComponent implements OnInit {
ngOnInit () {
document.getElementById('incompatible-browser').className += ' browser-ok'
+ this.serverConfig = this.serverService.getTmpConfig()
+ this.serverService.getConfig()
+ .subscribe(config => this.serverConfig = config)
+
+ this.loadPlugins()
+ this.themeService.initialize()
+
this.authService.loadClientCredentials()
if (this.isUserLoggedIn()) {
@@ -78,48 +78,23 @@ export class AppComponent implements OnInit {
this.authService.refreshUserInformation()
}
- // Load custom data from server
- this.serverService.loadConfig()
- this.serverService.loadVideoCategories()
- this.serverService.loadVideoLanguages()
- this.serverService.loadVideoLicences()
- this.serverService.loadVideoPrivacies()
- this.serverService.loadVideoPlaylistPrivacies()
-
- this.loadPlugins()
- this.themeService.initialize()
-
- // Do not display menu on small screens
- if (this.screenService.isInSmallView()) {
- this.isMenuDisplayed = false
- }
-
this.initRouteEvents()
this.injectJS()
this.injectCSS()
this.initHotkeys()
- fromEvent(window, 'resize')
- .pipe(debounceTime(200))
- .subscribe(() => this.onResize())
-
this.location.onPopState(() => this.modalService.dismissAll(POP_STATE_MODAL_DISMISS))
this.openModalsIfNeeded()
}
- isUserLoggedIn () {
- return this.authService.isLoggedIn()
- }
-
- toggleMenu () {
- this.isMenuDisplayed = !this.isMenuDisplayed
- this.isMenuChangedByUser = true
+ ngAfterViewInit () {
+ this.pluginService.initializeCustomModal(this.customModal)
}
- onResize () {
- this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser
+ isUserLoggedIn () {
+ return this.authService.isLoggedIn()
}
private initRouteEvents () {
@@ -187,15 +162,13 @@ export class AppComponent implements OnInit {
eventsObs.pipe(
filter((e: Event): e is GuardsCheckStart => e instanceof GuardsCheckStart),
filter(() => this.screenService.isInSmallView())
- ).subscribe(() => this.isMenuDisplayed = false) // User clicked on a link in the menu, change the page
+ ).subscribe(() => this.menu.isMenuDisplayed = false) // User clicked on a link in the menu, change the page
}
private injectJS () {
// Inject JS
- this.serverService.configLoaded
- .subscribe(() => {
- const config = this.serverService.getConfig()
-
+ this.serverService.getConfig()
+ .subscribe(config => {
if (config.instance.customizations.javascript) {
try {
// tslint:disable:no-eval
@@ -209,17 +182,14 @@ export class AppComponent implements OnInit {
private injectCSS () {
// Inject CSS if modified (admin config settings)
- this.serverService.configLoaded
- .pipe(skip(1)) // We only want to subscribe to reloads, because the CSS is already injected by the server
+ this.serverService.configReloaded
.subscribe(() => {
const headStyle = document.querySelector('style.custom-css-style')
if (headStyle) headStyle.parentNode.removeChild(headStyle)
- const config = this.serverService.getConfig()
-
// We test customCSS if the admin removed the css
- if (this.customCSS || config.instance.customizations.css) {
- const styleTag = ''
+ if (this.customCSS || this.serverConfig.instance.customizations.css) {
+ const styleTag = ''
this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag)
}
})
@@ -232,27 +202,29 @@ export class AppComponent implements OnInit {
}
private async openModalsIfNeeded () {
- this.serverService.configLoaded
+ this.authService.userInformationLoaded
.pipe(
- switchMap(() => this.authService.userInformationLoaded),
map(() => this.authService.getUser()),
filter(user => user.role === UserRole.ADMINISTRATOR)
- ).subscribe(user => setTimeout(() => this.openAdminModals(user))) // setTimeout because of ngIf in template
+ ).subscribe(user => setTimeout(() => this._openAdminModalsIfNeeded(user))) // setTimeout because of ngIf in template
}
- private async openAdminModals (user: User) {
+ private async _openAdminModalsIfNeeded (user: User) {
if (user.noWelcomeModal !== true) return this.welcomeModal.show()
- const config = this.serverService.getConfig()
-
- if (user.noInstanceConfigWarningModal !== true && config.signup.allowed && config.instance.name.toLowerCase() === 'peertube') {
- this.instanceService.getAbout()
- .subscribe(about => {
- if (!about.instance.terms) {
- this.instanceConfigWarningModal.show()
- }
- })
- }
+ if (user.noInstanceConfigWarningModal === true || !this.serverConfig.signup.allowed) return
+
+ this.instanceService.getAbout()
+ .subscribe(about => {
+ if (
+ this.serverConfig.instance.name.toLowerCase() === 'peertube' ||
+ !about.instance.terms ||
+ !about.instance.administrator ||
+ !about.instance.maintenanceLifetime
+ ) {
+ this.instanceConfigWarningModal.show(about)
+ }
+ })
}
private initHotkeys () {
@@ -263,7 +235,7 @@ export class AppComponent implements OnInit {
}, undefined, this.i18n('Focus the search bar')),
new Hotkey('b', (event: KeyboardEvent): boolean => {
- this.toggleMenu()
+ this.menu.toggleMenu()
return false
}, undefined, this.i18n('Toggle the left menu')),