MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[develop | DONE | CHANGED] simple search add link to advanced, apply minor style changes for advanced search pages

This commit is contained in:
argirok 2023-12-04 13:27:58 +02:00
parent 35deb2fc4a
commit aa8f748ea8
14 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/search/links-resolver.ts
View File

@ -69,6 +69,11 @@ export class LinksResolver {
properties.searchLinkToDataset= "/" + alias + this.default.searchLinkToDataset;
properties.searchLinkToSoftwareLanding= "/" + alias + this.default.searchLinkToSoftwareLanding;
properties.searchLinkToOrp= "/" + alias + this.default.searchLinkToOrp;
properties.searchLinkToAdvancedResults= "/" + alias + this.default.searchLinkToAdvancedResults;
properties.searchLinkToAdvancedPublications= "/" + alias + this.default.searchLinkToAdvancedPublications;
properties.searchLinkToAdvancedDatasets= "/" + alias + this.default.searchLinkToAdvancedDatasets;
properties.searchLinkToAdvancedSoftware= "/" + alias + this.default.searchLinkToAdvancedSoftware;
properties.searchLinkToAdvancedOrps= "/" + alias + this.default.searchLinkToAdvancedOrps;
}
public static resetProperties() {

1
src/app/search/resultLanding.module.ts
View File

@ -6,6 +6,7 @@ import {RouterModule} from "@angular/router";
// Search Pages
{ path: '', redirectTo: 'find/research-outcomes', pathMatch: 'full'},
{ path: 'find/research-outcomes', loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.MonitorSearchResearchResultsModule)},
{ path: 'advanced/research-outcomes', loadChildren: () => import('./searchPages/advanced/searchResearchResults.module').then(m => m.MonitorAdvancedSearchResearchResultsModule)},
// Landing Pages
{ path: 'result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: {hasMenuSearchBar: true}},
{ path: 'publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasMenuSearchBar: true}},

4
src/app/search/searchPages/advanced/searchDataproviders.component.ts
View File

@ -10,8 +10,8 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
[customFilters]=customFilters
[hasPrefix]="false"
[showBreadcrumb]="false"
[showSwitchSearchLink]="false"
[searchForm]="{dark: false, class: 'search-form'}"
[showSwitchSearchLink]="true"
[searchForm]="{dark: false, class: 'irish-advanced-search-form'}"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'">
</search-dataproviders>
`

4
src/app/search/searchPages/advanced/searchOrganizations.component.ts
View File

@ -9,8 +9,8 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
<search-organizations *ngIf="customFilters" [simpleView]="false" [showSwitchSearchLink]="true" [customFilters]="customFilters"
[hasPrefix]="false"
[showBreadcrumb]="false"
[showSwitchSearchLink]="false"
[searchForm]="{dark: false, class: 'search-form'}"
[showSwitchSearchLink]="true"
[searchForm]="{dark: false, class: 'irish-advanced-search-form'}"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'">
</search-organizations>
`

4
src/app/search/searchPages/advanced/searchProjects.component.ts
View File

@ -10,8 +10,8 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
[customFilters]=customFilters
[hasPrefix]="false"
[showBreadcrumb]="false"
[showSwitchSearchLink]="false"
[searchForm]="{dark: false, class: 'search-form'}"
[showSwitchSearchLink]="true"
[searchForm]="{dark: false, class: 'irish-advanced-search-form'}"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'"
>
</search-projects>

10
src/app/search/searchPages/advanced/searchResearchResults.component.ts
View File

@ -10,11 +10,17 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
[customFilters]=customFilters [hasPrefix]="false"
[showBreadcrumb]="false"
[showSwitchSearchLink]="true"
[searchForm]="{dark: false, class: 'search-form'}"
[searchForm]="{dark: false, class: 'irish-advanced-search-form'}"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
></search-research-results>
`
`,styles:[`
.irish-advanced-search-form #searchForm{
margin-top:0px;
padding-top:0px;
}
`]
})
export class MonitorAdvancedSearchResearchResultsComponent extends SearchBaseComponent implements OnInit{
constructor(protected route: ActivatedRoute,

3
src/app/search/searchPages/simple/searchDataProviders.module.ts
View File

@ -6,10 +6,11 @@ import {SearchDataProvidersRoutingModule} from './searchDataProviders-routing.mo
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from '../../../openaireLibrary/searchPages/searchDataProviders.module';
import {SearchInputModule} from "../../../openaireLibrary/sharedComponents/search-input/search-input.module";
import {RouterModule} from "@angular/router";
@NgModule({
imports: [
CommonModule, FormsModule,
CommonModule, FormsModule, RouterModule,
SearchDataProvidersModule, SearchDataProvidersRoutingModule, SearchInputModule
],

9
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -7,8 +7,13 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
selector: 'monitor-search-dataproviders',
template: `
<div class=" uk-flex uk-flex-center ">
<div search-input [(value)]="keyword" [placeholder]="'Search content providers'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
<div>
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedDataProviders" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search content providers'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
</div>
</div>
<search-dataproviders *ngIf="customFilters"
[customFilters]=customFilters

9
src/app/search/searchPages/simple/searchOrganizations.component.ts
View File

@ -7,8 +7,13 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
selector: 'monitor-search-organizations',
template: `
<div class=" uk-flex uk-flex-center ">
<div search-input [(value)]="keyword" [placeholder]="'Search organizations'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
<div>
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedOrganizations" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search organizations'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
</div>
</div>
<search-organizations *ngIf="customFilters" [customFilters]="customFilters"
[hasPrefix]="false"

3
src/app/search/searchPages/simple/searchOrganizations.module.ts
View File

@ -7,11 +7,12 @@ import {MonitorSearchOrganizationsComponent} from './searchOrganizations.compone
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchOrganizationsModule} from "../../../openaireLibrary/searchPages/searchOrganizations.module";
import {SearchInputModule} from "../../../openaireLibrary/sharedComponents/search-input/search-input.module";
import {RouterModule} from "@angular/router";
@NgModule({
imports: [
CommonModule, FormsModule,
CommonModule, FormsModule, RouterModule,
SearchOrganizationsRoutingModule, SearchOrganizationsModule, SearchInputModule
],

9
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -7,8 +7,13 @@ import {CustomFilterService} from "../../../shared/customFilter.service";
selector: 'monitor-search-projects',
template: `
<div class=" uk-flex uk-flex-center ">
<div search-input [(value)]="keyword" [placeholder]="'Search projects'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
<div>
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedProjects" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search projects'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
</div>
</div>
<search-projects *ngIf="customFilters"
[customFilters]="customFilters" [hasPrefix]="false"

3
src/app/search/searchPages/simple/searchProjects.module.ts
View File

@ -7,10 +7,11 @@ import {MonitorSearchProjectsComponent} from './searchProjects.component';
import {SearchProjectsModule} from "../../../openaireLibrary/searchPages/searchProjects.module";
import {PreviousRouteRecorder} from "../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
import {SearchInputModule} from "../../../openaireLibrary/sharedComponents/search-input/search-input.module";
import {RouterModule} from "@angular/router";
@NgModule({
imports: [
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule, SearchInputModule
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule, SearchInputModule, RouterModule
],
declarations: [

7
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -7,8 +7,13 @@ import {SearchBaseComponent} from "../searchBaseComponent";
selector: 'monitor-search-results',
template: `
<div class=" uk-flex uk-flex-center ">
<div search-input [(value)]="keyword" [placeholder]="'Search research outputs'"
<div>
<div class=" uk-flex uk-flex-right">
<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="parameters">Advanced search</a>
</div>
<div search-input [(value)]="keyword" [placeholder]="'Search research outputs'"
[searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m"></div>
</div>
</div>
<search-research-results *ngIf="customFilters" [customFilters]="customFilters" resultType="result"
[openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/research-outcomes'"

3
src/app/search/searchPages/simple/searchResearchResults.module.ts
View File

@ -7,10 +7,11 @@ import {MonitorSearchResearchResultsComponent} from './searchResearchResults.com
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../../openaireLibrary/searchPages/searchResearchResults.module";
import {SearchInputModule} from "../../../openaireLibrary/sharedComponents/search-input/search-input.module";
import {RouterModule} from "@angular/router";
@NgModule({
imports: [
CommonModule, FormsModule,
CommonModule, FormsModule, RouterModule,
SearchResearchResultsRoutingModule, SearchResearchResultsModule, SearchInputModule
],