mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 11:03:05 +00:00
[DURACOM-191] Remove navbar.module
This commit is contained in:
@@ -55,7 +55,6 @@ import {
|
|||||||
import { ClientCookieService } from './core/services/client-cookie.service';
|
import { ClientCookieService } from './core/services/client-cookie.service';
|
||||||
import { ListableModule } from './core/shared/listable.module';
|
import { ListableModule } from './core/shared/listable.module';
|
||||||
import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
|
import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
|
||||||
import { NavbarModule } from './navbar/navbar.module';
|
|
||||||
import { RootModule } from './root.module';
|
import { RootModule } from './root.module';
|
||||||
import { ThemedRootComponent } from './root/themed-root.component';
|
import { ThemedRootComponent } from './root/themed-root.component';
|
||||||
import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator';
|
import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator';
|
||||||
@@ -83,7 +82,6 @@ export function getMetaReducers(appConfig: AppConfig): MetaReducer<AppState>[] {
|
|||||||
|
|
||||||
const IMPORTS = [
|
const IMPORTS = [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
NavbarModule,
|
|
||||||
HttpClientModule,
|
HttpClientModule,
|
||||||
AppRoutingModule,
|
AppRoutingModule,
|
||||||
ScrollToModule.forRoot(),
|
ScrollToModule.forRoot(),
|
||||||
|
@@ -1,58 +0,0 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { EffectsModule } from '@ngrx/effects';
|
|
||||||
|
|
||||||
import { MenuModule } from '../shared/menu/menu.module';
|
|
||||||
import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
|
|
||||||
import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component';
|
|
||||||
import { NavbarComponent } from './navbar.component';
|
|
||||||
import { NavbarEffects } from './navbar.effects';
|
|
||||||
import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
|
|
||||||
import { ThemedNavbarComponent } from './themed-navbar.component';
|
|
||||||
|
|
||||||
const effects = [
|
|
||||||
NavbarEffects,
|
|
||||||
];
|
|
||||||
|
|
||||||
const ENTRY_COMPONENTS = [
|
|
||||||
// put only entry components that use custom decorator
|
|
||||||
NavbarSectionComponent,
|
|
||||||
ExpandableNavbarSectionComponent,
|
|
||||||
ThemedExpandableNavbarSectionComponent,
|
|
||||||
];
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
MenuModule,
|
|
||||||
FormsModule,
|
|
||||||
EffectsModule.forFeature(effects),
|
|
||||||
...ENTRY_COMPONENTS,
|
|
||||||
NavbarComponent,
|
|
||||||
ThemedNavbarComponent,
|
|
||||||
],
|
|
||||||
providers: [],
|
|
||||||
exports: [
|
|
||||||
ThemedNavbarComponent,
|
|
||||||
NavbarSectionComponent,
|
|
||||||
ThemedExpandableNavbarSectionComponent,
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This module handles all components and pipes that are necessary for the horizontal navigation bar
|
|
||||||
*/
|
|
||||||
export class NavbarModule {
|
|
||||||
/**
|
|
||||||
* NOTE: this method allows to resolve issue with components that using a custom decorator
|
|
||||||
* which are not loaded during SSR otherwise
|
|
||||||
*/
|
|
||||||
static withEntryComponents() {
|
|
||||||
return {
|
|
||||||
ngModule: NavbarModule,
|
|
||||||
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@@ -17,7 +17,6 @@ import { HeaderComponent } from './header/header.component';
|
|||||||
import { ThemedHeaderComponent } from './header/themed-header.component';
|
import { ThemedHeaderComponent } from './header/themed-header.component';
|
||||||
import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
|
import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
|
||||||
import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
|
import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
|
||||||
import { NavbarModule } from './navbar/navbar.module';
|
|
||||||
import { PageErrorComponent } from './page-error/page-error.component';
|
import { PageErrorComponent } from './page-error/page-error.component';
|
||||||
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
|
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
|
||||||
import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
|
import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
|
||||||
@@ -33,7 +32,6 @@ import { SystemWideAlertModule } from './system-wide-alert/system-wide-alert.mod
|
|||||||
|
|
||||||
const IMPORTS = [
|
const IMPORTS = [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
NavbarModule,
|
|
||||||
SystemWideAlertModule,
|
SystemWideAlertModule,
|
||||||
NgbModule,
|
NgbModule,
|
||||||
];
|
];
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
|
|
||||||
import { NavbarModule } from '../../app/navbar/navbar.module';
|
|
||||||
import { RootModule } from '../../app/root.module';
|
import { RootModule } from '../../app/root.module';
|
||||||
import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
|
import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
|
||||||
import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
|
import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
|
||||||
@@ -81,7 +80,6 @@ const DECLARATIONS = [
|
|||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
RootModule,
|
RootModule,
|
||||||
NavbarModule,
|
|
||||||
SharedBrowseByModule,
|
SharedBrowseByModule,
|
||||||
DsoPageModule,
|
DsoPageModule,
|
||||||
...DECLARATIONS,
|
...DECLARATIONS,
|
||||||
|
@@ -13,7 +13,6 @@ import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
|
|||||||
import { IdlePreloadModule } from 'angular-idle-preload';
|
import { IdlePreloadModule } from 'angular-idle-preload';
|
||||||
|
|
||||||
import { AppModule } from '../../app/app.module';
|
import { AppModule } from '../../app/app.module';
|
||||||
import { NavbarModule } from '../../app/navbar/navbar.module';
|
|
||||||
import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
|
import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
|
||||||
import { RootModule } from '../../app/root.module';
|
import { RootModule } from '../../app/root.module';
|
||||||
import { SearchPageModule } from '../../app/search-page/search-page.module';
|
import { SearchPageModule } from '../../app/search-page/search-page.module';
|
||||||
@@ -208,7 +207,6 @@ const DECLARATIONS = [
|
|||||||
IdlePreloadModule,
|
IdlePreloadModule,
|
||||||
MenuModule,
|
MenuModule,
|
||||||
DsoPageModule,
|
DsoPageModule,
|
||||||
NavbarModule,
|
|
||||||
NgbModule,
|
NgbModule,
|
||||||
RegisterEmailFormModule,
|
RegisterEmailFormModule,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
|
|
||||||
import { NavbarModule } from '../../app/navbar/navbar.module';
|
|
||||||
import { RootModule } from '../../app/root.module';
|
import { RootModule } from '../../app/root.module';
|
||||||
import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
|
import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
|
||||||
import { HeaderComponent } from './app/header/header.component';
|
import { HeaderComponent } from './app/header/header.component';
|
||||||
@@ -28,7 +27,6 @@ const DECLARATIONS = [
|
|||||||
CommonModule,
|
CommonModule,
|
||||||
SharedBrowseByModule,
|
SharedBrowseByModule,
|
||||||
RootModule,
|
RootModule,
|
||||||
NavbarModule,
|
|
||||||
...DECLARATIONS,
|
...DECLARATIONS,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
|
@@ -12,7 +12,6 @@ import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
|
|||||||
import { IdlePreloadModule } from 'angular-idle-preload';
|
import { IdlePreloadModule } from 'angular-idle-preload';
|
||||||
|
|
||||||
import { AppModule } from '../../app/app.module';
|
import { AppModule } from '../../app/app.module';
|
||||||
import { NavbarModule } from '../../app/navbar/navbar.module';
|
|
||||||
import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
|
import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
|
||||||
import { RootModule } from '../../app/root.module';
|
import { RootModule } from '../../app/root.module';
|
||||||
import { SearchPageModule } from '../../app/search-page/search-page.module';
|
import { SearchPageModule } from '../../app/search-page/search-page.module';
|
||||||
@@ -37,7 +36,6 @@ const DECLARATIONS = [
|
|||||||
HttpClientModule,
|
HttpClientModule,
|
||||||
IdlePreloadModule,
|
IdlePreloadModule,
|
||||||
MenuModule,
|
MenuModule,
|
||||||
NavbarModule,
|
|
||||||
NgbModule,
|
NgbModule,
|
||||||
RegisterEmailFormModule,
|
RegisterEmailFormModule,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
|
Reference in New Issue
Block a user