From 6e70aad7b831aaa0833e30fbcb5d8e55cbcc61e9 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Wed, 10 Jan 2024 09:46:03 +0100 Subject: [PATCH] [DURACOM-191] change routing for home-page, delete home-page.module.ts --- src/app/app-routing.module.ts | 4 +- src/app/home-page/home-page-routes.ts | 35 +++++++++++++++ src/app/home-page/home-page-routing.module.ts | 43 ------------------- src/app/home-page/home-page.module.ts | 39 ----------------- src/themes/custom/lazy-theme.module.ts | 2 - src/themes/dspace/lazy-theme.module.ts | 2 - 6 files changed, 37 insertions(+), 88 deletions(-) create mode 100644 src/app/home-page/home-page-routes.ts delete mode 100644 src/app/home-page/home-page-routing.module.ts delete mode 100644 src/app/home-page/home-page.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d621f96a70..b3f44f6e46 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -61,8 +61,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: 'home', - loadChildren: () => import('./home-page/home-page.module') - .then((m) => m.HomePageModule), + loadChildren: () => import('./home-page/home-page-routes') + .then((m) => m.ROUTES), data: { showBreadcrumbs: false }, canActivate: [EndUserAgreementCurrentUserGuard] }, diff --git a/src/app/home-page/home-page-routes.ts b/src/app/home-page/home-page-routes.ts new file mode 100644 index 0000000000..d083dac47b --- /dev/null +++ b/src/app/home-page/home-page-routes.ts @@ -0,0 +1,35 @@ +import { HomePageResolver } from './home-page.resolver'; +import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; +import { ThemedHomePageComponent } from './themed-home-page.component'; +import { MenuItemType } from '../shared/menu/menu-item-type.model'; +import { Route } from '@angular/router'; + +export const ROUTES: Route[] = [ + { + path: '', + component: ThemedHomePageComponent, + providers: [ + HomePageResolver + ], + pathMatch: 'full', + data: { + title: 'home.title', + menu: { + public: [{ + id: 'statistics_site', + active: true, + visible: true, + index: 2, + model: { + type: MenuItemType.LINK, + text: 'menu.section.statistics', + link: 'statistics', + } as LinkMenuItemModel, + }], + }, + }, + resolve: { + site: HomePageResolver + } + } +]; diff --git a/src/app/home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts deleted file mode 100644 index 196a290552..0000000000 --- a/src/app/home-page/home-page-routing.module.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { HomePageResolver } from './home-page.resolver'; -import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; -import { ThemedHomePageComponent } from './themed-home-page.component'; -import { MenuItemType } from '../shared/menu/menu-item-type.model'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: ThemedHomePageComponent, - pathMatch: 'full', - data: { - title: 'home.title', - menu: { - public: [{ - id: 'statistics_site', - active: true, - visible: true, - index: 2, - model: { - type: MenuItemType.LINK, - text: 'menu.section.statistics', - link: 'statistics', - } as LinkMenuItemModel, - }], - }, - }, - resolve: { - site: HomePageResolver - } - } - ]) - ], - providers: [ - HomePageResolver - ] -}) -export class HomePageRoutingModule { -} diff --git a/src/app/home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts deleted file mode 100644 index 13f37b10a1..0000000000 --- a/src/app/home-page/home-page.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { HomeNewsComponent } from './home-news/home-news.component'; -import { HomePageRoutingModule } from './home-page-routing.module'; - -import { HomePageComponent } from './home-page.component'; -import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component'; -import { StatisticsModule } from '../statistics/statistics.module'; -import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component'; -import { ThemedHomePageComponent } from './themed-home-page.component'; -import { RecentItemListComponent } from './recent-item-list/recent-item-list.component'; -import { - ThemedTopLevelCommunityListComponent -} from './top-level-community-list/themed-top-level-community-list.component'; - -const DECLARATIONS = [ - HomePageComponent, - ThemedHomePageComponent, - TopLevelCommunityListComponent, - ThemedTopLevelCommunityListComponent, - ThemedHomeNewsComponent, - HomeNewsComponent, - RecentItemListComponent -]; - -@NgModule({ - imports: [ - CommonModule, - HomePageRoutingModule, - StatisticsModule.forRoot(), - ...DECLARATIONS - ], - exports: [ - ...DECLARATIONS, - ] -}) -export class HomePageModule { - -} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index e8f453d2e9..861468a7a3 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -20,7 +20,6 @@ import { StatisticsModule } from '../../app/statistics/statistics.module'; import { StoreModule } from '@ngrx/store'; import { StoreRouterConnectingModule } from '@ngrx/router-store'; import { TranslateModule } from '@ngx-translate/core'; -import { HomePageModule } from '../../app/home-page/home-page.module'; import { AppModule } from '../../app/app.module'; import { ItemPageModule } from '../../app/item-page/item-page.module'; import { RouterModule } from '@angular/router'; @@ -283,7 +282,6 @@ const DECLARATIONS = [ EditItemPageModule, ItemVersionsModule, FormsModule, - HomePageModule, HttpClientModule, IdlePreloadModule, InfoModule, diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index 779dba9bbf..85c14d3e8a 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -20,7 +20,6 @@ import { StatisticsModule } from '../../app/statistics/statistics.module'; import { StoreModule } from '@ngrx/store'; import { StoreRouterConnectingModule } from '@ngrx/router-store'; import { TranslateModule } from '@ngx-translate/core'; -import { HomePageModule } from '../../app/home-page/home-page.module'; import { AppModule } from '../../app/app.module'; import { ItemPageModule } from '../../app/item-page/item-page.module'; import { RouterModule } from '@angular/router'; @@ -64,7 +63,6 @@ const DECLARATIONS = [ EditItemPageModule, ItemVersionsModule, FormsModule, - HomePageModule, HttpClientModule, IdlePreloadModule, InfoModule,