From 82f2baf86550ee46eda469e66ed6aae24083ea0d Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 22 Feb 2024 12:57:52 +0200 Subject: [PATCH] [plugins-functionality | WIP] move affiliations component to be used in library - plugins --- .../affiliations/affiliations.component.html | 69 ------------------- .../affiliations/affiliations.component.less | 18 ----- .../affiliations/affiliations.component.ts | 58 ---------------- src/app/affiliations/affiliations.module.ts | 26 ------- src/app/community/community.module.ts | 2 +- .../organizations/organizationsPage.module.ts | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 8 files changed, 4 insertions(+), 175 deletions(-) delete mode 100644 src/app/affiliations/affiliations.component.html delete mode 100644 src/app/affiliations/affiliations.component.less delete mode 100644 src/app/affiliations/affiliations.component.ts delete mode 100644 src/app/affiliations/affiliations.module.ts diff --git a/src/app/affiliations/affiliations.component.html b/src/app/affiliations/affiliations.component.html deleted file mode 100644 index c8b6e9f..0000000 --- a/src/app/affiliations/affiliations.component.html +++ /dev/null @@ -1,69 +0,0 @@ - -
- -
-

- {{organization.name}} -

-
-
- - - - -
-
-
-
- - - - - - -
-
-
-
- -
-
-

- Supporting Organizations -

- - - Browse all - - -
-
-
-
- - - - - - -
-
-
-
- - - - - diff --git a/src/app/affiliations/affiliations.component.less b/src/app/affiliations/affiliations.component.less deleted file mode 100644 index e7fcafc..0000000 --- a/src/app/affiliations/affiliations.component.less +++ /dev/null @@ -1,18 +0,0 @@ -.affiliationCard { - width: 260px !important; - height: 260px !important; -} - -.supportingOrganizations a { - img, svg { - -webkit-filter: grayscale(1); - filter: grayscale(1); - transition-duration: 0.3s; - } - - &:hover img, svg { - -webkit-filter: grayscale(0); - filter: grayscale(0); - transition-duration: 0.3s; - } -} diff --git a/src/app/affiliations/affiliations.component.ts b/src/app/affiliations/affiliations.component.ts deleted file mode 100644 index e5e043b..0000000 --- a/src/app/affiliations/affiliations.component.ts +++ /dev/null @@ -1,58 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; -import {AffiliationService} from "../openaireLibrary/connect/affiliations/affiliation.service"; -import {Affiliation} from "../openaireLibrary/utils/entities/CuratorInfo"; -import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; -import {Subscriber} from "rxjs"; -import {properties} from "../../environments/environment"; - -@Component({ - selector: 'affiliations', - templateUrl: './affiliations.component.html', - styleUrls: ['./affiliations.component.less'] -}) -export class AffiliationsComponent { - @Input() getAffiliationsFromAPI: boolean = false; - @Input() longView: boolean = false; - @Input() communityFirstPage: boolean = false; - @Input() affiliationsInSlider: number = 5; - @Input() affiliations: Affiliation[] = []; - @Input() sliderOptions = ''; - @Input() arrows = true; - - public showLoading: boolean = false; - public communityId: string; - public properties: EnvProperties = properties; - private subscriptions = []; - - constructor(private route: ActivatedRoute, private affiliationService: AffiliationService) { - } - - public ngOnInit() { - this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain); - if (this.getAffiliationsFromAPI) { - this.showLoading = true; - this.affiliationService.initAffiliations(this.communityId); - this.subscriptions.push(this.affiliationService.affiliations.subscribe( - affiliations => { - this.affiliations = affiliations.filter((affiliation) => this.longView || !!affiliation['logo_url']); - this.showLoading = false; - }, - error => { - console.error("Affiliations Component: Error getting affiliations for community with id: " + this.communityId, error); - this.showLoading = false; - } - )); - } - } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - this.affiliationService.clearSubscriptions(); - } -} diff --git a/src/app/affiliations/affiliations.module.ts b/src/app/affiliations/affiliations.module.ts deleted file mode 100644 index da768dd..0000000 --- a/src/app/affiliations/affiliations.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {NgModule} from '@angular/core'; - -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard' -import {RouterModule} from '@angular/router'; - -import {AffiliationsComponent} from './affiliations.component'; -import {AffiliationService} from "../openaireLibrary/connect/affiliations/affiliation.service"; -import {CommonModule} from "@angular/common"; -import {UrlPrefixModule} from "../openaireLibrary/utils/pipes/url-prefix.module"; - -@NgModule({ - imports: [ - CommonModule, RouterModule, UrlPrefixModule - ], - declarations: [ - AffiliationsComponent - ], - providers:[PreviousRouteRecorder, IsRouteEnabled, AffiliationService], - exports: [ - AffiliationsComponent - ] -}) - - -export class AffiliationsModule{} diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index 60c02c3..e142c6b 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -24,7 +24,7 @@ import {SearchProjectsServiceModule} from '../openaireLibrary/connect/projects/s import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module"; import {CuratorsModule} from "../openaireLibrary/connect/components/curators/curators.module"; -import {AffiliationsModule} from "../affiliations/affiliations.module"; +import {AffiliationsModule} from "../openaireLibrary/connect/affiliations/affiliations.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {MatSelectModule} from "@angular/material/select"; import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtils/entitiesSelection.module"; diff --git a/src/app/htmlPages/organizations/organizationsPage.module.ts b/src/app/htmlPages/organizations/organizationsPage.module.ts index ab19356..e504e54 100644 --- a/src/app/htmlPages/organizations/organizationsPage.module.ts +++ b/src/app/htmlPages/organizations/organizationsPage.module.ts @@ -6,7 +6,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {OrganizationsPageComponent} from './organizationsPage.component'; import {OrganizationsPageRoutingModule} from './organizationsPage-routing.module'; -import {AffiliationsModule} from "../../affiliations/affiliations.module"; +import {AffiliationsModule} from "../../openaireLibrary/connect/affiliations/affiliations.module"; import {HelperModule} from "../../openaireLibrary/utils/helper/helper.module"; import {CommonModule} from "@angular/common"; import {HtmlPagesModule} from "../htmlPages.module"; diff --git a/src/assets/common-assets b/src/assets/common-assets index 6cef9eb..651102a 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960 +Subproject commit 651102a5ba049b71bed8eb6a85a8d02cefcb24cc diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 52eca9a..37639ea 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9 +Subproject commit 37639eab68c63a506b7df10c42e3379c4a05d94d