-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #605 from geonetwork/ME/search-bar
Editor / Implement search bar and associated route
- Loading branch information
Showing
63 changed files
with
1,153 additions
and
630 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,3 @@ | ||
| <router-outlet></router-outlet> | ||
| <div gnUiSearchRouterContainer="editor"> | ||
| <router-outlet></router-outlet> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,83 @@ | ||
| import { importProvidersFrom, NgModule } from '@angular/core' | ||
| import { RouterModule } from '@angular/router' | ||
| import { TranslateModule } from '@ngx-translate/core' | ||
| import { StoreModule } from '@ngrx/store' | ||
| import { EffectsModule } from '@ngrx/effects' | ||
| import { FeatureSearchModule } from '@geonetwork-ui/feature/search' | ||
| import { FeatureRecordModule } from '@geonetwork-ui/feature/record' | ||
| import { FeatureCatalogModule } from '@geonetwork-ui/feature/catalog' | ||
| import { | ||
| FeatureSearchModule, | ||
| SearchFacade, | ||
| } from '@geonetwork-ui/feature/search' | ||
| DefaultRouterModule, | ||
| RouterService, | ||
| } from '@geonetwork-ui/feature/router' | ||
| import { Configuration } from '@geonetwork-ui/data-access/gn4' | ||
| import { getGlobalConfig, getThemeConfig } from '@geonetwork-ui/util/app-config' | ||
| import { ThemeService } from '@geonetwork-ui/util/shared' | ||
| import { | ||
| TRANSLATE_DEFAULT_CONFIG, | ||
| UtilI18nModule, | ||
| } from '@geonetwork-ui/util/i18n' | ||
| import { TranslateModule } from '@ngx-translate/core' | ||
| import { AppCommonModule } from './app.common.module' | ||
| import { AppComponent } from './app.component' | ||
| import { appRoutes } from './app.routes' | ||
| import { FeatureCatalogModule } from '@geonetwork-ui/feature/catalog' | ||
| import { DashboardSearchService } from './dashboard/dashboard-search.service' | ||
| import { FeatureAuthModule } from '@geonetwork-ui/feature/auth' | ||
| import { BrowserModule } from '@angular/platform-browser' | ||
| import { BrowserAnimationsModule } from '@angular/platform-browser/animations' | ||
| import { extModules } from './build-specifics' | ||
| import { DashboardPageComponent } from './dashboard/dashboard-page.component' | ||
| import { EditorRouterService } from './router.service' | ||
|
|
||
| @NgModule({ | ||
| declarations: [AppComponent], | ||
| imports: [ | ||
| BrowserModule, | ||
| BrowserAnimationsModule, | ||
| StoreModule.forRoot( | ||
| {}, | ||
| { | ||
| runtimeChecks: { | ||
| strictStateImmutability: false, | ||
| strictActionImmutability: false, | ||
| }, | ||
| } | ||
| ), | ||
| RouterModule.forRoot(appRoutes, { initialNavigation: 'enabledBlocking' }), | ||
| DefaultRouterModule.forRoot({ | ||
| searchStateId: 'editor', | ||
| searchRouteComponent: DashboardPageComponent, | ||
| recordRouteComponent: null, | ||
| }), | ||
| ...extModules, | ||
| ], | ||
| providers: [ | ||
| SearchFacade, | ||
| DashboardSearchService, | ||
| { provide: RouterService, useClass: EditorRouterService }, | ||
| importProvidersFrom(FeatureAuthModule), | ||
| importProvidersFrom(FeatureSearchModule), | ||
| importProvidersFrom(FeatureCatalogModule), | ||
| importProvidersFrom(FeatureRecordModule), | ||
| importProvidersFrom(UtilI18nModule), | ||
| importProvidersFrom(TranslateModule.forRoot(TRANSLATE_DEFAULT_CONFIG)), | ||
| importProvidersFrom(AppCommonModule), | ||
| { | ||
| provide: Configuration, | ||
| useFactory: () => | ||
| new Configuration({ | ||
| basePath: getGlobalConfig().GN4_API_URL, | ||
| }), | ||
| }, | ||
| importProvidersFrom(EffectsModule.forRoot()), | ||
| ], | ||
| bootstrap: [AppComponent], | ||
| }) | ||
| export class AppModule {} | ||
| export class AppModule { | ||
| constructor() { | ||
| ThemeService.applyCssVariables( | ||
| getThemeConfig().PRIMARY_COLOR, | ||
| getThemeConfig().SECONDARY_COLOR, | ||
| getThemeConfig().MAIN_COLOR || '#475569', | ||
| getThemeConfig().BACKGROUND_COLOR, | ||
| getThemeConfig().MAIN_FONT || "'Rubik', sans-serif", | ||
| getThemeConfig().TITLE_FONT || "'Readex Pro', sans-serif", | ||
| getThemeConfig().FONTS_STYLESHEET_URL || | ||
| 'https://fonts.googleapis.com/css2?family=Readex+Pro&family=Rubik&display=swap' | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 6 additions & 32 deletions
38
apps/metadata-editor/src/app/dashboard/dashboard-page.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 0 additions & 48 deletions
48
apps/metadata-editor/src/app/dashboard/dashboard-search.service.ts
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
apps/metadata-editor/src/app/dashboard/search-header/search-header.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.