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 } 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'
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',
@ViewChild('welcomeModal') welcomeModal: WelcomeModalComponent
@ViewChild('instanceConfigWarningModal') instanceConfigWarningModal: InstanceConfigWarningModalComponent
- isMenuDisplayed = true
- isMenuChangedByUser = false
-
customCSS: SafeHtml
private serverConfig: ServerConfig
private themeService: ThemeService,
private hooks: HooksService,
private location: PlatformLocation,
- private modalService: NgbModal
+ private modalService: NgbModal,
+ public menu: MenuService
) { }
get instanceName () {
this.authService.refreshUserInformation()
}
- // 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()
return this.authService.isLoggedIn()
}
- toggleMenu () {
- this.isMenuDisplayed = !this.isMenuDisplayed
- this.isMenuChangedByUser = true
- }
-
- onResize () {
- this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser
- }
-
private initRouteEvents () {
let resetScroll = true
const eventsObs = this.router.events
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 () {
}, 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')),