diff --git a/comixed-frontend/src/app/app.component.html b/comixed-frontend/src/app/app.component.html index ee3647351..a972bc209 100644 --- a/comixed-frontend/src/app/app.component.html +++ b/comixed-frontend/src/app/app.component.html @@ -1,6 +1,6 @@ - - + + diff --git a/comixed-frontend/src/app/app.component.spec.ts b/comixed-frontend/src/app/app.component.spec.ts index f933b8cd5..bd0158ea2 100644 --- a/comixed-frontend/src/app/app.component.spec.ts +++ b/comixed-frontend/src/app/app.component.spec.ts @@ -27,7 +27,6 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { BreadcrumbAdaptor } from 'app/adaptors/breadcrumb.adaptor'; import { AppComponent } from 'app/app.component'; import { LoginComponent } from 'app/components/login/login.component'; -import { MainMenuComponent } from 'app/components/main-menu/main-menu.component'; import { LibraryAdaptor } from 'app/library'; import { LibraryModule } from 'app/library/library.module'; import { UserService } from 'app/services/user.service'; @@ -49,6 +48,7 @@ import { MenuModule } from 'primeng/primeng'; import { ToastModule } from 'primeng/toast'; +import { NavigationBarComponent } from 'app/components/navigation-bar/navigation-bar.component'; describe('AppComponent', () => { const USER = USER_READER; @@ -89,7 +89,7 @@ describe('AppComponent', () => { BreadcrumbModule, MenuModule ], - declarations: [AppComponent, LoginComponent, MainMenuComponent], + declarations: [AppComponent, LoginComponent, NavigationBarComponent], providers: [ TranslateService, MessageService, diff --git a/comixed-frontend/src/app/app.component.ts b/comixed-frontend/src/app/app.component.ts index 5d1f127d0..544bbe094 100644 --- a/comixed-frontend/src/app/app.component.ts +++ b/comixed-frontend/src/app/app.component.ts @@ -16,14 +16,12 @@ * along with this program. If not, see */ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { AuthenticationAdaptor, User } from 'app/user'; import { LibraryAdaptor } from 'app/library'; import { Subscription } from 'rxjs'; import { BreadcrumbAdaptor } from 'app/adaptors/breadcrumb.adaptor'; -import { MenuItem } from 'primeng/api'; -import { MainMenuComponent } from 'app/components/main-menu/main-menu.component'; import { LoggerLevel, LoggerService } from '@angular-ru/logger'; @Component({ @@ -32,23 +30,14 @@ import { LoggerLevel, LoggerService } from '@angular-ru/logger'; styleUrls: ['./app.component.scss'] }) export class AppComponent implements OnInit { - @ViewChild(MainMenuComponent, { static: false }) - mainmenu: MainMenuComponent; - title = 'ComiXed'; - user: User; - authenticated = false; showLogin = false; comicCount = 0; processingCount = 0; fetchingUpdateSubscription: Subscription; breadcrumbs = []; - home = { - icon: 'fa fa-fw fas fa-bars', - command: (event: any) => this.mainmenu.toggle(event) - } as MenuItem; constructor( private translateService: TranslateService, diff --git a/comixed-frontend/src/app/app.module.ts b/comixed-frontend/src/app/app.module.ts index 8bc5e54b3..c5cf0bb56 100644 --- a/comixed-frontend/src/app/app.module.ts +++ b/comixed-frontend/src/app/app.module.ts @@ -40,7 +40,6 @@ import { BackendStatusModule } from 'app/backend-status/backend-status.module'; import { ComicImportModule } from 'app/comic-import/comic-import.module'; import { ComicsModule } from 'app/comics/comics.module'; import { LoginComponent } from 'app/components/login/login.component'; -import { MainMenuComponent } from 'app/components/main-menu/main-menu.component'; import { LibraryModule } from 'app/library/library.module'; import { MainPageComponent } from 'app/pages/main-page/main-page.component'; import { UserService } from 'app/services/user.service'; @@ -89,7 +88,6 @@ import { NavigationBarComponent } from './components/navigation-bar/navigation-b AppComponent, MainPageComponent, LoginComponent, - MainMenuComponent, NavigationBarComponent ], imports: [