Skip to content

Commit 18dbb90

Browse files
committed
refactor(home): move according components to home app [WIP]
1 parent 52c4ba5 commit 18dbb90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+407
-949
lines changed

apps/datahub/src/app/app.module.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
LOGIN_URL,
1414
provideGn4,
1515
provideRepositoryUrl,
16-
RouterService,
1716
ThemeService,
1817
TRANSLATE_DEFAULT_CONFIG,
1918
UiElementsModule,
@@ -37,9 +36,6 @@ import { DatasetPageComponent } from './dataset/dataset-page/dataset-page.compon
3736
import { SearchHeaderComponent } from './search/search-header/search-header.component'
3837
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
3938
import { SearchResultsComponent } from './search/search-results/search-results.component'
40-
import { HomePageComponent } from './home/home-page/home-page.component'
41-
import { AppRouterService } from './app.router.service'
42-
import { HomeHeaderComponent } from './home/home-header/home-header.component'
4339
import { MatIconModule } from '@angular/material/icon'
4440
import { MatTabsModule } from '@angular/material/tabs'
4541
import { DatasetApisComponent } from './dataset/dataset-apis/dataset-apis.component'
@@ -71,8 +67,6 @@ import { MelModule, MelEmbeddedTranslateLoader } from '@mel-dataplatform/mel'
7167
SearchPageComponent,
7268
SearchHeaderComponent,
7369
SearchResultsComponent,
74-
HomePageComponent,
75-
HomeHeaderComponent,
7670
DatasetPageComponent,
7771
DatasetApisComponent,
7872
DatasetHeaderComponent,
@@ -153,7 +147,6 @@ import { MelModule, MelEmbeddedTranslateLoader } from '@mel-dataplatform/mel'
153147
provide: LOGIN_URL,
154148
useFactory: () => '${current_url}?login',
155149
},
156-
{ provide: RouterService, useClass: AppRouterService },
157150
],
158151
bootstrap: [AppComponent],
159152
})

apps/home/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
"buildTarget": "home:build:production"
6565
},
6666
"development": {
67-
"buildTarget": "home:build:development"
67+
"buildTarget": "home:build:development",
68+
"proxyConfig": "proxy-config.js"
6869
}
6970
},
7071
"defaultConfiguration": "development"
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
<mel-dataplatform-nx-welcome></mel-dataplatform-nx-welcome>
2-
<router-outlet></router-outlet>
1+
<div class="h-full flex flex-col">
2+
<div class="flex-grow" gnUiSearchRouterContainer="mainSearch">
3+
<router-outlet></router-outlet>
4+
</div>
5+
<mel-datahub-footer></mel-datahub-footer>
6+
</div>

apps/home/src/app/app.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

apps/home/src/app/app.component.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { Component } from '@angular/core'
2-
import { RouterModule } from '@angular/router'
3-
import { NxWelcomeComponent } from './nx-welcome.component'
42

53
@Component({
6-
standalone: true,
7-
imports: [NxWelcomeComponent, RouterModule],
8-
selector: 'mel-dataplatform-root',
4+
selector: 'mel-datahub-home-root',
95
templateUrl: './app.component.html',
106
styleUrl: './app.component.css',
117
})

apps/home/src/app/app.config.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

apps/home/src/app/app.module.ts

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
import { importProvidersFrom, isDevMode, NgModule } from '@angular/core'
2+
import { BrowserModule } from '@angular/platform-browser'
3+
import { RouterModule } from '@angular/router'
4+
import { AppComponent } from './app.component'
5+
import {
6+
DefaultRouterModule,
7+
FeatureAuthModule,
8+
FeatureCatalogModule,
9+
FeatureRecordModule,
10+
FeatureSearchModule,
11+
FeatureDatavizModule,
12+
FeatureMapModule,
13+
LOGIN_URL,
14+
provideGn4,
15+
provideRepositoryUrl,
16+
ThemeService,
17+
TRANSLATE_DEFAULT_CONFIG,
18+
UiElementsModule,
19+
UiLayoutModule,
20+
UiInputsModule,
21+
UiWidgetsModule,
22+
UiMapModule,
23+
RouterService,
24+
} from 'geonetwork-ui'
25+
import {
26+
TranslateLoader,
27+
TranslateModule,
28+
TranslateService,
29+
} from '@ngx-translate/core'
30+
import { StoreModule } from '@ngrx/store'
31+
import { EffectsModule } from '@ngrx/effects'
32+
import { StoreDevtoolsModule } from '@ngrx/store-devtools'
33+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
34+
import { MatIconModule } from '@angular/material/icon'
35+
import { MatTabsModule } from '@angular/material/tabs'
36+
import { ReactiveFormsModule } from '@angular/forms'
37+
import { MatAutocompleteModule } from '@angular/material/autocomplete'
38+
import { OverlayModule } from '@angular/cdk/overlay'
39+
import { FormsModule } from '@angular/forms'
40+
import { MatTooltipModule } from '@angular/material/tooltip'
41+
import { MelModule, MelEmbeddedTranslateLoader } from '@mel-dataplatform/mel'
42+
import { HomeHeaderComponent } from './home/home-header/home-header.component'
43+
import { HomePageComponent } from './home/home-page/home-page.component'
44+
import { AppRouterService } from './app.router.service'
45+
46+
@NgModule({
47+
declarations: [AppComponent, HomeHeaderComponent, HomePageComponent],
48+
imports: [
49+
MelModule,
50+
BrowserModule,
51+
BrowserAnimationsModule,
52+
UiWidgetsModule,
53+
UiElementsModule,
54+
UiLayoutModule,
55+
UiInputsModule,
56+
UiMapModule,
57+
FeatureSearchModule,
58+
FeatureCatalogModule,
59+
FeatureRecordModule,
60+
FeatureMapModule,
61+
MatAutocompleteModule,
62+
MatIconModule,
63+
MatTabsModule,
64+
OverlayModule,
65+
FormsModule,
66+
MatTooltipModule,
67+
FeatureDatavizModule,
68+
TranslateModule.forRoot({
69+
...TRANSLATE_DEFAULT_CONFIG,
70+
loader: {
71+
provide: TranslateLoader,
72+
useClass: MelEmbeddedTranslateLoader,
73+
},
74+
}),
75+
ReactiveFormsModule,
76+
StoreModule.forRoot(
77+
{},
78+
{
79+
metaReducers: [],
80+
runtimeChecks: {
81+
strictActionImmutability: false,
82+
strictStateImmutability: false,
83+
},
84+
}
85+
),
86+
EffectsModule.forRoot([]),
87+
StoreDevtoolsModule.instrument({ logOnly: !isDevMode() }),
88+
DefaultRouterModule.forRoot({
89+
searchStateId: 'mainSearch',
90+
searchRouteComponent: HomePageComponent,
91+
recordRouteComponent: HomePageComponent,
92+
}),
93+
RouterModule.forRoot([], {
94+
initialNavigation: 'enabledBlocking',
95+
scrollPositionRestoration: 'enabled',
96+
}),
97+
],
98+
providers: [
99+
importProvidersFrom(FeatureAuthModule),
100+
provideGn4(),
101+
provideRepositoryUrl(() => '/geonetwork/srv/api'),
102+
{ provide: RouterService, useClass: AppRouterService },
103+
{
104+
provide: LOGIN_URL,
105+
useFactory: () => '${current_url}?login',
106+
},
107+
],
108+
bootstrap: [AppComponent],
109+
})
110+
export class AppModule {
111+
constructor(translate: TranslateService) {
112+
translate.setDefaultLang('fr')
113+
translate.use('fr')
114+
115+
ThemeService.applyCssVariables(
116+
'#E30513',
117+
'#007A80',
118+
'#212029',
119+
'white',
120+
'Lato',
121+
'Montserrat'
122+
)
123+
}
124+
}

apps/datahub/src/app/app.router.service.ts renamed to apps/home/src/app/app.router.service.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import { HomePageComponent } from './home/home-page/home-page.component'
66
@Injectable()
77
export class AppRouterService extends RouterService {
88
override buildRoutes(): Routes {
9-
const routes = super.buildRoutes()
10-
const routesWithoutRoot = routes.filter((route) => route.path !== '')
119
return [
12-
...routesWithoutRoot,
1310
{
1411
path: '',
1512
component: HomePageComponent,

apps/home/src/app/app.routes.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/datahub/src/app/home/home-header/home-header.component.html renamed to apps/home/src/app/home/home-header/home-header.component.html

File renamed without changes.

0 commit comments

Comments
 (0)