From 732e96512d363bd6bdc077a614f94f3a3407b8c5 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 26 Oct 2022 13:49:01 +0300 Subject: [PATCH 1/8] [Library]: timeout-interceptor.service.ts: #8186 - Added properties.claimsAPIURL in TIMEOUT_WHITELIST to exclude claims requests from timeout interceptor. --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 68e0aa98..81a29287 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 68e0aa98a83b3db6d8ab558394f3019b8b515bc6 +Subproject commit 81a29287d4cccb5db023c9978f1c18a41d4afe6f From b3ac3b3391828d16b22546c12a303a6631f87e77 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Mon, 31 Oct 2022 14:01:13 +0200 Subject: [PATCH 2/8] help button: release at the bottom, update submodules --- explore/src/app/app.component.ts | 2 +- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index 538570f3..8c2e7a3e 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -51,9 +51,9 @@ import {LayoutService} from './openaireLibrary/dashboard/sharedComponents/sideba ratio="1"> - + ` }) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 81a29287..f53ca8fd 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 81a29287d4cccb5db023c9978f1c18a41d4afe6f +Subproject commit f53ca8fde82ab31581b2248550e71272d589c905 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 3c6346c2..3b874be6 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 3c6346c2d30921b9aa5409ef4bcb2c09376f2c2e +Subproject commit 3b874be6dfb7041f358c2ba86d3e1ec4e58f388b From a358686a3ddd72eaece91033e4bd93adfe968954 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Tue, 1 Nov 2022 11:29:40 +0200 Subject: [PATCH 3/8] remove help button when reaching footer by scroll, update submodules --- explore/src/app/app.component.ts | 32 +++++++++++++++++++++++++++++-- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index 8c2e7a3e..f46da4f7 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, ElementRef, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; import {MenuItem} from './openaireLibrary/sharedComponents/menu'; @@ -51,9 +51,9 @@ import {LayoutService} from './openaireLibrary/dashboard/sharedComponents/sideba ratio="1"> + - ` }) @@ -70,6 +70,7 @@ export class AppComponent { public sending: boolean = false; @ViewChild('quickContact') quickContact: QuickContactComponent; @ViewChild('modal') modal: AlertModal; + @ViewChild('bottom', {read: ElementRef}) bottom: ElementRef; subscriptions = []; @@ -126,6 +127,33 @@ export class AppComponent { this.userManagementService.clearSubscriptions(); this.smoothScroll.clearSubscriptions(); } + + ngAfterViewInit() { + if (typeof window !== "undefined") { + this.createObservers(); + } + } + + createObservers() { + let options = { + root: null, + rootMargin: '300px', + threshold: 1.0 + }; + let intersectionObserver = new IntersectionObserver(entries => { + entries.forEach(entry => { + if (entry.isIntersecting && this.showQuickContact) { + this.showQuickContact = false; + this.quickContactService.setDisplay(this.showQuickContact); + } else if (!entry.isIntersecting && !this.showQuickContact) { + this.showQuickContact = true; + this.quickContactService.setDisplay(this.showQuickContact); + } + }); + }, options); + intersectionObserver.observe(this.bottom.nativeElement); + this.subscriptions.push(intersectionObserver); + } buildMenu() { this.userMenuItems = []; diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index f53ca8fd..c862be75 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f53ca8fde82ab31581b2248550e71272d589c905 +Subproject commit c862be75613fa1cf08a3bf276b9f4e1b56a3321c diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 3b874be6..35ab282e 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 3b874be6dfb7041f358c2ba86d3e1ec4e58f388b +Subproject commit 35ab282e53ad5b7790bc431820a4400cfc36c977 From ab302e040f489ebc7b80f32365f11f4274f9ac2b Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Tue, 1 Nov 2022 13:27:21 +0200 Subject: [PATCH 4/8] remove options from footer observer --- explore/src/app/app.component.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index f46da4f7..8b3323d9 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -135,11 +135,6 @@ export class AppComponent { } createObservers() { - let options = { - root: null, - rootMargin: '300px', - threshold: 1.0 - }; let intersectionObserver = new IntersectionObserver(entries => { entries.forEach(entry => { if (entry.isIntersecting && this.showQuickContact) { @@ -150,7 +145,7 @@ export class AppComponent { this.quickContactService.setDisplay(this.showQuickContact); } }); - }, options); + }); intersectionObserver.observe(this.bottom.nativeElement); this.subscriptions.push(intersectionObserver); } From 9d755ff1db021c70092ecc35d0021e32f42dff8b Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Tue, 1 Nov 2022 13:36:36 +0200 Subject: [PATCH 5/8] tweak options for footer observer --- explore/src/app/app.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index 8b3323d9..d8b467ae 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -135,6 +135,11 @@ export class AppComponent { } createObservers() { + let options = { + root: null, + rootMargin: '0px', + threshold: 0.1 + }; let intersectionObserver = new IntersectionObserver(entries => { entries.forEach(entry => { if (entry.isIntersecting && this.showQuickContact) { @@ -145,7 +150,7 @@ export class AppComponent { this.quickContactService.setDisplay(this.showQuickContact); } }); - }); + }, options); intersectionObserver.observe(this.bottom.nativeElement); this.subscriptions.push(intersectionObserver); } From 89ace018268fa44d1f4a626f52633beebb39f454 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Thu, 3 Nov 2022 12:22:18 +0200 Subject: [PATCH 6/8] remove fos/sdg assets, vocabulary and components from explore project, update submodules --- explore/src/app/app-routing.module.ts | 4 +- explore/src/app/fos/fos-routing.module.ts | 13 - explore/src/app/fos/fos.component.html | 159 -- explore/src/app/fos/fos.component.less | 5 - explore/src/app/fos/fos.component.ts | 219 --- explore/src/app/fos/fos.module.ts | 34 - explore/src/app/home/home.component.html | 4 +- explore/src/app/openaireLibrary | 2 +- explore/src/app/sdg/sdg-routing.module.ts | 13 - explore/src/app/sdg/sdg.component.html | 72 - explore/src/app/sdg/sdg.component.less | 30 - explore/src/app/sdg/sdg.component.ts | 97 -- explore/src/app/sdg/sdg.module.ts | 34 - explore/src/assets/common-assets | 2 +- .../assets/explore-assets/fos-hero-img.svg | 1 - .../src/assets/explore-assets/fos-icon.svg | 1 - .../src/assets/explore-assets/sdg-badge.png | Bin 60205 -> 0 bytes .../src/assets/explore-assets/sdg-dot-img.svg | 406 ----- .../assets/explore-assets/sdg-hero-img.svg | 1 - explore/src/assets/explore-assets/sdgs/g1.png | Bin 2446 -> 0 bytes .../src/assets/explore-assets/sdgs/g10.png | Bin 850 -> 0 bytes .../src/assets/explore-assets/sdgs/g11.png | Bin 1092 -> 0 bytes .../src/assets/explore-assets/sdgs/g12.png | Bin 1394 -> 0 bytes .../src/assets/explore-assets/sdgs/g13.png | Bin 1779 -> 0 bytes .../src/assets/explore-assets/sdgs/g14.png | Bin 1715 -> 0 bytes .../src/assets/explore-assets/sdgs/g15.png | Bin 871 -> 0 bytes .../src/assets/explore-assets/sdgs/g16.png | Bin 1091 -> 0 bytes .../src/assets/explore-assets/sdgs/g17.png | Bin 1573 -> 0 bytes explore/src/assets/explore-assets/sdgs/g2.png | Bin 1378 -> 0 bytes explore/src/assets/explore-assets/sdgs/g3.png | Bin 1099 -> 0 bytes explore/src/assets/explore-assets/sdgs/g4.png | Bin 795 -> 0 bytes explore/src/assets/explore-assets/sdgs/g5.png | Bin 998 -> 0 bytes explore/src/assets/explore-assets/sdgs/g6.png | Bin 808 -> 0 bytes explore/src/assets/explore-assets/sdgs/g7.png | Bin 1309 -> 0 bytes explore/src/assets/explore-assets/sdgs/g8.png | Bin 821 -> 0 bytes explore/src/assets/explore-assets/sdgs/g9.png | Bin 1183 -> 0 bytes explore/src/assets/openaire-theme | 2 +- explore/src/assets/vocabulary/fos.json | 1521 ----------------- explore/src/assets/vocabulary/sdg.json | 101 -- 39 files changed, 7 insertions(+), 2714 deletions(-) delete mode 100644 explore/src/app/fos/fos-routing.module.ts delete mode 100644 explore/src/app/fos/fos.component.html delete mode 100644 explore/src/app/fos/fos.component.less delete mode 100644 explore/src/app/fos/fos.component.ts delete mode 100644 explore/src/app/fos/fos.module.ts delete mode 100644 explore/src/app/sdg/sdg-routing.module.ts delete mode 100644 explore/src/app/sdg/sdg.component.html delete mode 100644 explore/src/app/sdg/sdg.component.less delete mode 100644 explore/src/app/sdg/sdg.component.ts delete mode 100644 explore/src/app/sdg/sdg.module.ts delete mode 100644 explore/src/assets/explore-assets/fos-hero-img.svg delete mode 100644 explore/src/assets/explore-assets/fos-icon.svg delete mode 100644 explore/src/assets/explore-assets/sdg-badge.png delete mode 100644 explore/src/assets/explore-assets/sdg-dot-img.svg delete mode 100644 explore/src/assets/explore-assets/sdg-hero-img.svg delete mode 100644 explore/src/assets/explore-assets/sdgs/g1.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g10.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g11.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g12.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g13.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g14.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g15.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g16.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g17.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g2.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g3.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g4.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g5.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g6.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g7.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g8.png delete mode 100644 explore/src/assets/explore-assets/sdgs/g9.png delete mode 100644 explore/src/assets/vocabulary/fos.json delete mode 100644 explore/src/assets/vocabulary/sdg.json diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index dcba415f..d1b545e1 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -8,8 +8,8 @@ const routes: Routes = [ {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)}, {path: 'home', redirectTo: '', pathMatch: 'full'}, {path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)}, - {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.SdgModule)}, - {path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.FosModule), data: {extraOffset: 100}}, + {path: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)}, + {path: 'fields-of-science', loadChildren: () => import('./openaireLibrary/fos/fos.module').then(m => m.FosModule), data: {extraOffset: 100}}, {path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}}, // ORCID Pages {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)}, diff --git a/explore/src/app/fos/fos-routing.module.ts b/explore/src/app/fos/fos-routing.module.ts deleted file mode 100644 index b0bc5bf0..00000000 --- a/explore/src/app/fos/fos-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -import {FosComponent} from './fos.component'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: FosComponent, canDeactivate: [PreviousRouteRecorder] } - ]) - ] -}) -export class FosRoutingModule { } diff --git a/explore/src/app/fos/fos.component.html b/explore/src/app/fos/fos.component.html deleted file mode 100644 index 8092553e..00000000 --- a/explore/src/app/fos/fos.component.html +++ /dev/null @@ -1,159 +0,0 @@ - -
-
- -
-
-
-
-
- - Beta - -
-

- Fields of Science . -

-
- We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Research Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential. -
-
- Our work is based on the work from our partner Athena Research Center: SciNoBo : A Hierarchical Multi-Label Classifier of Scientific Publications - https://doi.org/10.1145/3487553.3524677 -
- - -
-
-
- -
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- - -
-
-
-
-
-
-
-
-
- - -
- - -
-
-
-
- - - - -
-
-

- - -

-
-
-

- - -

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

No results were found.

-
- -
- -
diff --git a/explore/src/app/fos/fos.component.less b/explore/src/app/fos/fos.component.less deleted file mode 100644 index c8020e14..00000000 --- a/explore/src/app/fos/fos.component.less +++ /dev/null @@ -1,5 +0,0 @@ -@import (reference) "~src/assets/openaire-theme/less/_import-variables"; - -.custom-bottom-border { - border-bottom: 5px solid fade(@explore-color, @global-opacity); -} diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts deleted file mode 100644 index 422149e5..00000000 --- a/explore/src/app/fos/fos.component.ts +++ /dev/null @@ -1,219 +0,0 @@ -import {HttpClient} from "@angular/common/http"; -import {ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild} from "@angular/core"; -import {Subscription} from "rxjs"; - -import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; -import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; -import {properties} from "src/environments/environment"; -import {FormBuilder, FormControl} from "@angular/forms"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Meta, Title} from "@angular/platform-browser"; -import {Location} from "@angular/common"; -import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; -import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; -import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; -import {debounceTime, distinctUntilChanged} from "rxjs/operators"; -import Timeout = NodeJS.Timeout; - -declare var UIkit; - -@Component({ - selector: 'fos', - templateUrl: 'fos.component.html', - styleUrls: ['fos.component.less'] -}) -export class FosComponent implements OnInit, OnDestroy { - public url: string = null; - public pageTitle: string = "OpenAIRE | Fields of Science"; - public pageDescription: string = "We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Research Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential."; - - public fos: any[] = []; - public fosOptions: string[] = []; - public activeSection: string; - - public keywordControl: FormControl; - public keyword: string; - - public viewResults = []; - - public result = []; - - properties: EnvProperties = properties; - public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Fields of Science'}]; - - private subscriptions: Subscription[] = []; - private observer: IntersectionObserver; - private timeout: Timeout; - @ViewChild('tabs') tabs: ElementRef; - public sliderInit: boolean = false; - - constructor( - private httpClient: HttpClient, - private fb: FormBuilder, - private location: Location, - private route: ActivatedRoute, - private _router: Router, - private _meta: Meta, - private _title: Title, - private seoService: SEOService, - private _piwikService: PiwikService, - private cdr: ChangeDetectorRef - ) {} - - ngOnInit() { - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe()); - } - this.url = this.properties.domain + this.properties.baseLink + this._router.url; - this.seoService.createLinkForCanonicalURL(this.url); - this.updateUrl(this.url); - this.updateTitle(this.pageTitle); - this.updateDescription(this.pageDescription); - this.httpClient.get(properties.domain+'/assets/vocabulary/fos.json').subscribe(data => { - this.fos = data['fos']; - this.convertFosToOptions(); - if (typeof document !== 'undefined') { - setTimeout(()=> { - let slider = UIkit.slider(this.tabs.nativeElement); - slider.clsActive = 'uk-slider-active'; - slider.updateActiveClasses(); - this.sliderInit = true; - slider.slides.forEach(item => { - item.classList.remove('uk-active'); - }); - if (this.route.snapshot.fragment) { - this.activeSection = this.route.snapshot.fragment; - let i = this.fos.findIndex(item => item.id == this.route.snapshot.fragment); - slider.show(i); - } else { - this.activeSection = this.fos[0].id; - } - this.cdr.detectChanges(); - }); - } - this.subscriptions.push(this.route.fragment.subscribe(fragment => { - if(fragment) { - this.activeSection = fragment; - if(this.tabs) { - let slider = UIkit.slider(this.tabs.nativeElement); - let i = this.fos.findIndex(item => item.id == fragment); - slider.show(i); - } - } else { - this.activeSection = this.fos[0].id; - } - })); - this.keywordControl = this.fb.control(''); - this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => { - this.keyword = value; - this.findMatches(this.keyword); - if (typeof document !== 'undefined') { - setTimeout(() => { - this.setObserver(); - }); - } - })); - }); - } - - public ngOnDestroy() { - for (let sub of this.subscriptions) { - sub.unsubscribe(); - } - if(this.observer) { - this.observer.disconnect(); - } - } - - private setObserver() { - if(this.observer) { - this.observer.disconnect(); - } - this.observer = new IntersectionObserver((entries) => { - entries.forEach(entry => { - if(entry.isIntersecting) { - if(this.timeout) { - clearTimeout(this.timeout); - } - this.timeout = setTimeout(() => { - this._router.navigate(['./'], {fragment: entry.target.id, relativeTo: this.route, state: {disableScroll: true}}); - }, 200); - } - }); - }, {threshold: 0.25, rootMargin: '-100px'}); - this.fos.forEach(fos => { - let element = document.getElementById(fos.id); - if(element) { - this.observer.observe(element); - } - }); - } - - convertFosToOptions() { - this.fosOptions = []; - this.fos.forEach(fos => { - this.fosOptions.push(fos.id); - if(fos.children) { - fos.children.forEach(child => { - this.fosOptions.push(child.id); - if(child.children) { - child.children.forEach(child2 => { - this.fosOptions.push(child2.id); - }); - } - }); - } - }); - } - - findMatches(value: string) { - this.viewResults = JSON.parse(JSON.stringify(this.fos)); - let matchLevel1: boolean = false; - let matchLevel2: boolean = false; - // 1st level search - if(this.viewResults.length) { - this.viewResults = this.viewResults.filter(item => { - matchLevel1 = !!item.id.includes(value?.toLowerCase()); - // // 2nd level search - if(item.children?.length && !matchLevel1) { - item.children = item.children.filter(subItem => { - matchLevel2 = !!subItem.id.includes(value?.toLowerCase()); - // 3rd level search - if(subItem.children?.length && !matchLevel2) { - subItem.children = subItem.children.filter(subSubItem => subSubItem.id.includes(value?.toLowerCase())); - } - return subItem.children?.length > 0 || matchLevel2; - }); - } - return item.children?.length > 0; - }); - } - } - - highlightKeyword(name) { - if(name.includes(this.keyword.toLowerCase())) { - return name.replace(new RegExp(this.keyword, "gi"), (matchedValue) => `${matchedValue}`); - } else { - return name; - } - } - - public urlEncodeAndQuote(str: string): string { - return StringUtils.quote(StringUtils.URIEncode(str)); - } - - private updateUrl(url: string) { - this._meta.updateTag({content: url}, "property='og:url'"); - } - - private updateTitle(title: string) { - var _title = ((title.length > 50) ? title.substring(0, 50) : title); - this._title.setTitle(_title); - this._meta.updateTag({content: _title}, "property='og:title'"); - } - - private updateDescription(description: string) { - this._meta.updateTag({content: description}, "name='description'"); - this._meta.updateTag({content: description}, "property='og:description'"); - } -} diff --git a/explore/src/app/fos/fos.module.ts b/explore/src/app/fos/fos.module.ts deleted file mode 100644 index 6d19c93a..00000000 --- a/explore/src/app/fos/fos.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import {CommonModule} from "@angular/common"; -import {NgModule} from "@angular/core"; -import {FormsModule} from "@angular/forms"; -import {RouterModule} from "@angular/router"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; -import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; -import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; -import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; -import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; -import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; - -import {FosRoutingModule} from './fos-routing.module'; -import {FosComponent} from './fos.component'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, - FosRoutingModule, BreadcrumbsModule, IconsModule, - SearchInputModule, Schema2jsonldModule, SEOServiceModule - ], - declarations: [ - FosComponent - ], - providers: [ - PreviousRouteRecorder, PiwikService - ], - exports: [ - FosComponent - ] -}) -export class FosModule { - -} \ No newline at end of file diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index 62980d3e..e84635bf 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -47,14 +47,14 @@ - SDGs logo + SDGs logo Sustainable Development Goals (SDGs) - FOS logo + FOS logo Fields of Science (FoS) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index c862be75..3bd6a28c 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c862be75613fa1cf08a3bf276b9f4e1b56a3321c +Subproject commit 3bd6a28c1b90980135c04d6d4b52714357fa1853 diff --git a/explore/src/app/sdg/sdg-routing.module.ts b/explore/src/app/sdg/sdg-routing.module.ts deleted file mode 100644 index 81eea798..00000000 --- a/explore/src/app/sdg/sdg-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -import {SdgComponent} from './sdg.component'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: SdgComponent, canDeactivate: [PreviousRouteRecorder] } - ]) - ] -}) -export class SdgRoutingModule { } diff --git a/explore/src/app/sdg/sdg.component.html b/explore/src/app/sdg/sdg.component.html deleted file mode 100644 index 0e22a05d..00000000 --- a/explore/src/app/sdg/sdg.component.html +++ /dev/null @@ -1,72 +0,0 @@ - -
-
- -
-
-
-
-
- - Beta - -

- Science for UN Sustainable Development Goals -

-

- Laying the foundation for new approaches and solutions. -

-
- We have developed a classification scheme for UN Sustainable Development Goals, to view contributions of research towards complex challenges for humanity such as climate change, biodiversity loss, pollution and poverty reduction. -
-
- - -
-
-
- -
- -
-
-
-
-
-
- -
- -
diff --git a/explore/src/app/sdg/sdg.component.less b/explore/src/app/sdg/sdg.component.less deleted file mode 100644 index 481aa9b9..00000000 --- a/explore/src/app/sdg/sdg.component.less +++ /dev/null @@ -1,30 +0,0 @@ -@import (reference) "~src/assets/openaire-theme/less/_import-variables"; - -@sdgs: #E6233D, #DF9F00, #19A220, #D70023, #FF0B00, #00BFE8, #FFC300, #B10240, #FF5D00, -#F50D86, #FF8A00, #CA8A03, #2B772B, #0098DF, #00B91C, #0069A2, #1C336A; - -custom-sdg-dot:after { - content: ""; - background-image: url("~src/assets/explore-assets/sdg-dot-img.svg"); - display: inline-block; - background-size: 100% 100%; - height: 18px; - width: 18px; - margin-left: 10px; -} - -.sdg-card { - width: 265px; - height: 255px; - - img { - height: @global-control-height; - width: auto; - } - - each(@sdgs, { - &.sdg-@{index} { - background-color: @value !important; - } - }) -} diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts deleted file mode 100644 index c2530bd8..00000000 --- a/explore/src/app/sdg/sdg.component.ts +++ /dev/null @@ -1,97 +0,0 @@ -import {HttpClient} from "@angular/common/http"; -import {Component, OnDestroy, OnInit} from "@angular/core"; -import {Subscription} from "rxjs"; - -import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; -import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; -import {properties} from "src/environments/environment"; -import {RefineFieldResultsService} from "../openaireLibrary/services/refineFieldResults.service"; -import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields"; -import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; -import {Router} from '@angular/router'; -import {Meta, Title} from "@angular/platform-browser"; -import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; -import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; - -@Component({ - selector: 'sdg', - templateUrl: 'sdg.component.html', - styleUrls: ['sdg.component.less'] -}) -export class SdgComponent implements OnInit, OnDestroy { - public url: string = null; - public pageTitle: string = "OpenAIRE | Sustainable Development Goals"; - public pageDescription: string = "Laying the foundation for new approaches and solutions. We have developed a classification scheme for UN Sustainable Development Goals, to view contributions of research towards complex challenges for humanity such as climate change, biodiversity loss, pollution and poverty reduction."; - - private sdgs: any = []; - private sdgsResearchOutcomes: any = []; - public displayedSdgs: any = []; - - public loading: boolean; - properties: EnvProperties = properties; - openaireEntities = OpenaireEntities; - public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Sustainable Development Goals'}]; - - subscriptions: Subscription[] = []; - - constructor( - private httpClient: HttpClient, private refineFieldResultsService: RefineFieldResultsService, - private _router: Router, - private _meta: Meta, - private _title: Title, - private seoService: SEOService, - private _piwikService: PiwikService - ) {} - - ngOnInit() { - this.loading = true; - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe()); - } - this.url = this.properties.domain + this.properties.baseLink + this._router.url; - this.seoService.createLinkForCanonicalURL(this.url); - this.updateUrl(this.url); - this.updateTitle(this.pageTitle); - this.updateDescription(this.pageDescription); - this.httpClient.get(properties.domain+'/assets/vocabulary/sdg.json').subscribe(data => { - this.sdgs = data['sdg']; - }); - this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['sdg'], 'result', this.properties, null).subscribe(data => { - this.sdgsResearchOutcomes = data[1][0].values; - let merged =[]; - for(let i=0; i innerItem.id === this.sdgs[i].id)) - }); - } - this.displayedSdgs = merged; - this.loading = false; - }); - } - - public ngOnDestroy() { - for (let sub of this.subscriptions) { - sub.unsubscribe(); - } - } - - public urlEncodeAndQuote(str: string): string { - return StringUtils.quote(StringUtils.URIEncode(str)); - } - - private updateUrl(url: string) { - this._meta.updateTag({content: url}, "property='og:url'"); - } - - private updateTitle(title: string) { - var _title = ((title.length > 50) ? title.substring(0, 50) : title); - this._title.setTitle(_title); - this._meta.updateTag({content: _title}, "property='og:title'"); - } - - private updateDescription(description: string) { - this._meta.updateTag({content: description}, "name='description'"); - this._meta.updateTag({content: description}, "property='og:description'"); - } -} diff --git a/explore/src/app/sdg/sdg.module.ts b/explore/src/app/sdg/sdg.module.ts deleted file mode 100644 index 80e52faa..00000000 --- a/explore/src/app/sdg/sdg.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import {CommonModule} from "@angular/common"; -import {NgModule} from "@angular/core"; -import {FormsModule} from "@angular/forms"; -import {RouterModule} from "@angular/router"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; -import {RefineFieldResultsServiceModule} from "../openaireLibrary/services/refineFieldResultsService.module"; -import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; -import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; -import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; -import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; - -import {SdgRoutingModule} from './sdg-routing.module'; -import {SdgComponent} from './sdg.component'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, - SdgRoutingModule, BreadcrumbsModule, RefineFieldResultsServiceModule, - LoadingModule, Schema2jsonldModule, SEOServiceModule - ], - declarations: [ - SdgComponent - ], - providers: [ - PreviousRouteRecorder, PiwikService - ], - exports: [ - SdgComponent - ] -}) -export class SdgModule { - -} \ No newline at end of file diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 050fcbce..99fab067 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 050fcbce9343f849956800b4634f62fefee7e210 +Subproject commit 99fab0671bee8251230599ef9bc3034aff39c141 diff --git a/explore/src/assets/explore-assets/fos-hero-img.svg b/explore/src/assets/explore-assets/fos-hero-img.svg deleted file mode 100644 index 64b8ab87..00000000 --- a/explore/src/assets/explore-assets/fos-hero-img.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-assets/fos-icon.svg b/explore/src/assets/explore-assets/fos-icon.svg deleted file mode 100644 index dbac42f5..00000000 --- a/explore/src/assets/explore-assets/fos-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-assets/sdg-badge.png b/explore/src/assets/explore-assets/sdg-badge.png deleted file mode 100644 index abde511e9d42256997fbe7f953360228f97adc5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60205 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 IX>rr#A86UcJ!cKyII4bbwwMa*hQjJ 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 diff --git a/explore/src/assets/explore-assets/sdg-dot-img.svg b/explore/src/assets/explore-assets/sdg-dot-img.svg deleted file mode 100644 index e4df5445..00000000 --- a/explore/src/assets/explore-assets/sdg-dot-img.svg +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/explore/src/assets/explore-assets/sdg-hero-img.svg b/explore/src/assets/explore-assets/sdg-hero-img.svg deleted file mode 100644 index d76063bf..00000000 --- a/explore/src/assets/explore-assets/sdg-hero-img.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-assets/sdgs/g1.png b/explore/src/assets/explore-assets/sdgs/g1.png deleted file mode 100644 index f4f1af497e75fffe07074cc799cea21c434c66c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2446 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 M07*qoM6N<$f>)!cj{pDw diff --git a/explore/src/assets/explore-assets/sdgs/g10.png b/explore/src/assets/explore-assets/sdgs/g10.png deleted file mode 100644 index 2ab9168ccebf045ade02a69206932ce4a88abc63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 850 zcmV-Y1FigtP)(7?P{nE_Nbv!RD|fo`1Bl;1a9cN_CdR~S%w(?rGn1LlH0j)%w1^9D`O{?Xob#J= z=G=2{1Pw5xlqr~LcHSuUq2m%9RoXP}L%IIeNj9e6_p z*8@vA1V`JUq{1N=*=I!ETo6W%KWVQN2l8Sg^&|*iY}NoohtAlvG3F zhDE$%zqnvK0)G_r$4){K%X&Resnls|wcd$D;$r}O5T9otQ$gm3y#erB-?k<9l0mzn zXSmL5-Wfg^PnILwo+QH1p844dx*;A8mw9OCMZ8cUcg0PxDUwd5f{ACt77!uLH7 z?tlT!;NN9v0!jnCe_g>bdJVt7p*gCe$!r!i(P{YSad8rI+h8|1PnNZl;_>KWw6JN! z=@X(Vhaz^tBTyAty^F|;Lbl}vq+%KuIcj&T04vfPIW0NW%V55D5xNd=dkRm$X-@wY zu%rqq>!y&^YKAfy-f_4Oua@c@=5|4bBKkJwqf-41^W4wpyyD8@%Qc8M_hi>QwydKR zi@m_yaCBbf65e4!#N*+rc2jNRuZTyVK@HS`%V{f&t|ILx06rY5>a~MQ@ck0LZ+qKj zxPeGH>a69a{YGpsKP*?KbpS?pNQi_Y)!aa)!wsah54L-tQgE;CS{_(lTx1q*`r(5s zl{96u+wfi0+xZOkg;VL2bres(dU=y9ciVy zvmbLW=S_r*rPtt-<|F9A%0lXOvlf^QWuq}l$>bD1o^+Z_cyQw=VaePAlzXvqXoDTN zyUw}E91ld!OJ^S9=AZ=~XgLAC1+5PU1}E*@n;$~_D}wv5_UJ2O&ny3aLgW*OoWW0m cM;cx79|a9c7dz3f3IG5A07*qoM6N<$f|i+(p8x;= diff --git a/explore/src/assets/explore-assets/sdgs/g11.png b/explore/src/assets/explore-assets/sdgs/g11.png deleted file mode 100644 index 0344d7cf6ddd89e37e3795fe035c0ed2e0b9de16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1092 zcmV-K1iSl*P)X00004b3#c}2nYxW zd;6&Ex&qW!{)A`B8yQ?$G& zmx}}iMNmXkL{KW1LT?OIvZ2kWL0q%ZCL$0Gy%2FhLvbB{zwsP-nP$HCeH}mM#sh!O zIq&zJ=lsuep5=UnW*J*eP0d6^KTi?gStu0V%&0PxSRs=XLJ*upw?0MwTL`|MRc98t z2L!WNshCV&3$8@jQ$gV#`sYB0Fh4{8OH*I*N(i)-5I*@kT`%U3hWUS42(qpva@$z< zRu=2#wcuKm?hJ}Y(MxVem>azn#ViOp_ge(!f#%58q>;=^uu)MA!M7pw4RGI*5L}1i z^WoI(=vyS_PcYuqkOd+4Jii|R`@!f^5j037V%rCLCFT;}T^~WnmGRrJ;1rkwPL_;d z-XIBnw-G`EKtIr>lmrcut-*q?(RpP5sS)Cs=50LhEtiVc$TAooMCj)5YPV_8&J-{sRQBdBA zUf1yelT!$umEbaj^oxd?*0BT88H|sBmlJZzmP^q0S@Q{XW@j)Zl7V}*6b>|`yjB?5vtjT$GDG4SFQSUGkEGBnU zf@XD@Yr(ss}Kf-0r6LgzUtd%#L`xIA&dzC0000< KMNUMnLSTYnr}Z8H diff --git a/explore/src/assets/explore-assets/sdgs/g12.png b/explore/src/assets/explore-assets/sdgs/g12.png deleted file mode 100644 index 3e1288ff7ef29d9891898e920797814f46506e9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1394 zcmV-&1&#WNP)g1zf1ULe;(Frz1t`cqoGa-Mk8t37^0KJF7 zIpDB%`2XSEZ{T$>3;vdrzm-#vUdhW9;N)tYNOXQ-d^cFm1b^h&hF!dccXt3+w-)&l zge%QTWArm-JC%6p< zd9DYCCj6fvNeBe>spAII1*!1IvGcx*jfIzE$&;TOdn^k7d#=bH}r2lL*A>zC-QWjtBO{ko5mFY{!(C6ae2 z*q?~f(;4Sone*Y;%lq3Iy9=f70MCLMy!)<0^8Y@36c@we@Sy)A*9IM*%-|_-NFZJT z=}py;MjbeMGIq-cCU&m4+ikqMbA7-|U@ZJDPSpbc0+iuCeuhG9 zimOTB8IFOeE5@;@au{4&c{iT1DRvO|U)4mcr^VvAT;2s9US+k8yBfxl;>m7+d|$2P z>ceG9ybHK{%KM-Z{0aKPYhkHb!j8I_Cj{edI{rO3$Akx;aCKGMRH|xbgUhhknoOYC zH279kW8a<*+}n8{v)(=(H^s#j@{sCyDV5bD@LhqOt$?{(v7(y7N`<3dfp;Ue7Y6&1 z<2o6OiH;j82Rn%ewJ}U0*CaSiV|5FDzJ>8cspB>^Hc-kzg-Y~_Nz5jxqgLG^rpJ0c z&kL0;ki|5%i?N|n@8L9~nAf#`1=vt2hU1;^F09A#P}x5X+)^|fDppO)u~JT9wM+oV zap>Cun^uQ`24Exg4v6Vd=Noa}Ew4%7AAo@w%633mqvQ6(ZfiWCuQDFfUS`3j7drMT z!oK=UV2>R+%r5piYrurW%Vx%x!Tm)oo-?1t$08I9&{Q2ii3g@It6vnGr$v>r3pVc1 zBOq;>qU~Pn+yV2tXU95mM#60Y8f{^!#(6l-LT?l39`tRY2bZ!5FYUsXgfH@ue>8S< z3+&pm6QFMx%mVj;nD(ODI&8+p8+4l(TmDl$539v$b$h87+vCykFKB4ugFRGJblmGY zU=A+N$-o@!8Tb%*;7pwsEB{`u1*1W>f4>=L7N;MJ1NPy|gKd0eH8nTO?>zSW{)D)T zy#x1cTw}G=&dNT*P%HloKyEg80~oKVc&MDjt705Wo?Yo^a~{O@_GN+Fd9DUefNnYb z_VHf>J3m9hhRol_?4n!;w{3LmzZfR4zcxhN-b#*T<}H1YjvB|F`aY0b8`=o`jXb;` zc%ZXR<(b51w!p6b<8YT2F!x882~2DL8@f$-KeSduTT=_lQt$xq*Y6%+%CpPNm9YAA zcsbXP1TIjXAI@Rud<<@Y(*s(TN`LSkSPzDWVk8(8K0-rdQ8L@ix54h%BACw^e_P4v z^f|gZZ3({|*b(^b07*qoM6N<$g5boa A4FCWD diff --git a/explore/src/assets/explore-assets/sdgs/g13.png b/explore/src/assets/explore-assets/sdgs/g13.png deleted file mode 100644 index ec1b3fc0ef4b34da12af89c75a2823133e388859..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1779 zcmV z;UsGdBqi7{klKywUSKQGr-f7%9UVNp5X=w6-{JZm_!P85+}~?SEwYeYJ`g;X>)v2{ zur^pOV;1h-T<}#O@gG-rSu5BgEY1ok?@DYD_y&9go&zuXxen<{WFgrTMO%Xlz>#1b z;O=IPqj@^Phr?ul<*G?a!m%W%73>R!gIzKf%dcIaKY-?aJD3XL-*cYt@>40YkaWj3 z0;h#ZZJa|eDsea803U~EpXWNA3I3BdL3HTXCxB640LZeENPGr2H-Og|b3qx>g=E7d zj$p8}z@9)8&JuU*N3c3rDe;isKMh7QvG4LGhQ2}kJ{Ig>Ksf4pisvSPnT-8!-q^Wh zQLIm099Db-u0@MuG`$*(2JXIQD?S5jfGJF9VgXsr+Zb>g(7cO8w=j6!3MMnY7L_WQ zlZUA3V+z=zNL%9f>D;e8kB zLN=t6gLv{LU@$5xl2qBD;2H2N*bEqS9s>)Qgej%8Fqfe`tcmItWyHMw5EzFp=d+Y7 zMK%-%C-KA>V7}C(%8HX}2mQgDU>;Z>yozG)D+}{kFOW6G6}eCxU%xdN%0WNw%*&kv z1fr+#z%@YADLc4IR4@&g3T_0SgoWyfvcD>`3@?OKX9lBfk0g67)NlrZfqK zK~Lm%5?H0|h>7PM_*}3F7y{hcmw^>ev(yWV*()pcr0ERvGFUwhw6rSXj=lm0$9&uf z10KMaCh9HY0#q55XFmkvzQn=e@t_}yS1P{l`+V~^y+y})W}Q(!)}3^bZP0kj}t?mX2ApxhwV6y{(~ z?%i4(@V!CKyzO{qhdQE*=>~0*eT19iKwia?r^FrV%S7!^;^ggYB)(X)4TXZw+0nT3 z7lMnxJOc=F827`#(D1xXR*Xw`*(%qD#wX%WcQedt(Ce#%>sNs^eO426|UIxMgAZzuMD(JAo zF{Pae%)7Ct)u-KUb=&)D_C9B@)W2OAgQl)=R86J^NEh!7*KAJ)FC+>PP4^C<>6djci9QL&wl*DU zWbIcyYB3`2UbKW6zZ+=>q0D0#$(lxNEVcm_9BJZN)4*gc%X`Q3o!P?1zKnR1p=FL| zoNrrS$ZPQ|!XE(oaut(ShY`@AV4W;kqrIslPh6mWku2|6pT7&rws^YI4OnU+P=K??mK1eZes zVQc6zje--O4c-E}gr%dt9M6J{u;xyid@DC6tQo%zv?Pmu15%zvxu6C^Bkn{TUAr@|LbBQRuuL*lqqxHw$t@S>g809W*V(ZWY9&$jbM2jN zRRD2YItf~CZVt?;68F%~NNixUA#edSeRo%4`k%XJUew%e?zI3vd-%Pus<~#7{~zY# V3*#EX>n8vJ002ovPDHLkV1isxL(u>L diff --git a/explore/src/assets/explore-assets/sdgs/g14.png b/explore/src/assets/explore-assets/sdgs/g14.png deleted file mode 100644 index 3af71012267791c7e944fe5fe8c54457f1502b54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1715 zcmV;k22A;hP)M*u38Mbw;wwR)uc5JQnz4iM&&RHJSr(0tmoaCQ# z-}iIf*ZH68?OgYh7#bQnCnF=HDUnF@GdmJIJC^x6a344wRDl(s0l9+;A(PECWpHrt z-ptI*GUiVP1_qYoT`drqw9WGjzm6f%g>)${=xEkCFE(vno z%#FZ}tp%OnJWvMaf|G%v(gfU8mAf?_ikK#W@n9d&Ju1_j?$)?*J`RlQ>gwt#C@4@) z8C~IfU0As<#MTMi7Xn?YTvyO#+_@Pyc_Nq?2x*;m-XG9H<9yMZKu(grSb_zv!U6{M z`nI;VrsCpa6({8ak);1|?R?x?%k@`4^2uNgGP%qK>@`55Yrs#Smo<$u4dSMh>y^+$ zTo{OZK@3iVaUQqB(X<6Ufe~+;5OjyFUbl?#>uF1;|?8s^mhTHH-e% z%X~JAPG;@^#+1VV*DYFIU50`&WI(t2F3=kj(J`L)%Ozwm$===gqkdPo2CNE-&5SER zG0?PSof*G+82vX4nf|5^l9 zXmDzQFFHFrHx(8Z?hXDe;hFAncUs15sRv(!-65E@f^ruJQd*}A!i~hC+4`e#8j7x@ zt#zjXH`f3*IL9n=){JIScdWEr|6`!c><|Mn35LsfA2y*b<>Co2T$jIFDzuPEm6S^o z`aca_2D!h}?`RD5#f`?ZYAkvsG=~?=vKG*m&cx}I1_I-|ySpb6*v62_5rfrO`yC`R z3f&gcQHO*)eGP06#LvJMUW{p*_GR8P1|(p&U>)*+^q@7(jYq9+_E_IMKFl%h_NXt(SzJxxs{5%y1&1FDV26-O3&gVmi|k@To#zkZ(77saVT!m?L6o#B~9j*p9qiY$(Yh8D6SKMo!R7Dh=~i(UiIv1kJ_R_P1CO~CHJdUQ-6G75*JE+G-q z+oCFY&qPDSHEjM`;>Kegx|WB!$qMTjgv4&JjOw`p3tGtT1XgR~&02K0lELdk)}dxB zUc-4Msmp+#aO0_M$LriTN-7evFY&;$aY_!9^&?P^vdt(nXwL^`&*6xqs2JLV>lcH! zXjin98-E07VTVVHE?mVSTbY-a*BA*I2QLDfutN&D@DSC!5^+~YN=6;*WpD>%?qDI$ zunZQR%BlVg8@(lE9bIY3c>z>LLixP>G?sWUMex5~>au1?EW$dq#wv$!DeX%Igk}#@ zE-Cx#@>D`kLdf3eXboMYb?q8np-dP8^H@XcSRzt~vi4I8BB25-^gP0Mk07YU?H`KGPC2*k_RCBG7l;uAseJMJhUZpZ+G4l}nd!(_lg1L<>4>|A=bW`@8Q5-L z6$u$Ti$N@mnz@=9^c2;)j%)iCtz<`N$7h*HHT#iTE6V9U(|vhBvU&5z_}T3Fb!Cw5 z#u7E8>l38t)+orcWbaFG&fyHZi)-6nKXt}pEv@4DQL0uY&i$ zzR{Yi&;xn0d(_x#`?)j|*tmPfMc4Z+?_a8tb)hyOfuMIoe9t!i}1k3`RZh=#*e-bCYlELdRF~+hEG{A0nfB~Ol zTL^+FiSOLc3r@6hoeA&guj>&Hlcz9H4twA)$AZcit_Q&Mce2jtmcUZ@3J-(82CgG@ z5^9;-;rft~GM>BA0(2PVe%J^}$V_*3WIySsgmcgdtKl$A0G(H42)u^-&>b9ok!>gu zJU__5Q5cauA?Eobef!`_h+NTOU`FPGS!shR#@ln*Q{1R;gQ+W|DSipALWA!#a}o9o zz;~Tab3XCeOt=Hde3LWAO??xb4H@`W#M+*zMm~bocv*-KMtu)7Rp zL$qOHZPIBqy9GxuXc_&dmib}Pff=w2ESYW|n^(uuyBGYFHbQ+NRV zNy1&kd}k$V`NZ8k{=MixCF0(ftmPB;$Xo>XLpkCWqLQ`$THLgIK23WCk^2KtvX(D$ zE8b@CC-5fX{+X1l<^6<)KON6~XLgb3s~476)0)?bz6!;xZ&v(QKNv2= xpDVtg5I6f_PKVG)+-4ywO$qQ>G%4AZn2L z*?X^duf6tKdvcGoVvC~aHO%#e?_e~13KMdzp#kHMVW%A|g30h9j0Z(cY%LKlV{9zc z1`*qNMsNj=HHtv3@6W?a&=&rLOYlc7mvcai8*|TM@E0%}w9^GT!(G_W#1nM(4+~*h z=zN{$QP=@z5p%C4N|<*b&jsDr;@D%^w>X%YU`b-HVCFnF8iWmpS45#j_zTZn@J zbnNB=;2AIu^l~pSI9*_UvzQ2jH}Xea_jtnEE#7tMN`%}fq=Gq~*)@$?Uz2etvRW81UvCU^|r0tMMuGG zg2&8x`oJ*g5ylwA?)fKh1SY`&1bFJ2w0t7`?%?HlM8uyJb0_>TAtmQCZdSoM4Buv} z4ETE9e=AAE{iR0H5FQ7?sBTI7g+WU(x+l!1$cW$OhT@)RTxJw);C((gLAlLXsKltT zRj?II+jzrbV}2M3?V+4B|0DeuKMWBX?G4jm47>;iZ7E{T(C>XjeE&e62z&Vi&o|(` z;E|_G5aG$#2Nj6;`GG{R9R}rGmi0$n7e2L_5;asy7t+L3ij6SHt@Sp1*=M zq#AyRR~POk2D8_>v^Ny~HLRw8T`56k_H+`1^i}u>K8Fghnx4oCzA(mGVo+PWlC~^* zUUI6Nu88*5-5tcR*X!AF0~x%IdC5(`$AT5D zNS_Mugc*$aJl#x$*Ki~CFR*fID8@4%A3cr4-qCpMo#eZH%&>YvA)YGV)2E}Eh&gon z35;|DP(w{<$(29cRlQ3Z6Y)hS_Ht7Z8SZ~*pAh2qy7zh`*?#B8S{7IB$FfdGIqDE# za(f31&h&-Z|2KBS-lEB>9HZ&Jh%g?!b!rfUEI002ov JPDHLkV1mG115N+{ diff --git a/explore/src/assets/explore-assets/sdgs/g17.png b/explore/src/assets/explore-assets/sdgs/g17.png deleted file mode 100644 index 7f06e0e9b03131bf541cb98015d4ea3bf421b4cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1573 zcmV+=2HN?FP)!uDFZF7_`QqU|fUZju2251%Vof2$6^qv=S&s>2w11>6c(!3l5x?1T;QE<6k0fa&8(jEnSPB2Y z@o*-b6^@MKJ{<=t>sq@`;}|}bMIM3n@HV^xpTiam?B)Hz{5}ybkEoo>eKJg}%YpqG zXW_$HWC+{?FTx{P1y4kDc0S;*Y(_reM5!rXrc zrOf%MUdEYt5CczwHqaU_f@ZKZocM_Q#@Y&sxea+|in>65XaZk=DY6(pgUWQ&3Oi?_ z_miP3Sk0$_#dI_r0-N9nu*mXYIDd_~hWm8r1vkU7U{P9#zrl7mG#r`4eLi#lbZ%l? zkB38NFkG|25W54Nx)+SV^>p_gB1Y$9+6}2}5}Pb7DN+ ztAuvV9F1FfuZ8#OboIqMtJK|>g)u$;78Dr^rzZ@H9B;GDgf}Rwqr5QF;vglBqs&S-(+?@k7L#vb%I(UZU-W$*T3Cxts=u zdu`Y@&xTL6^R)UNl-LST&5XoxunJxWt9c_RRQ9#fZU1{-nBJKcXPWNQq8W&F=spiHC7xU~v zV9vbEk>{~Hc?b;eB)!MD#-0Fc$MmUseoA?Q*$K9t(rayWgkt7>l{RjBczl+@0A9|D z;xf-(JIo``+VWdv^U#E{vTF)YeuT&%8 z(dc)89|nFx`H?X@-DVnKjwyAH!lKgUjaUuiG0=iAgto*WSe}glizUaXTAzo$pnwc# zZ1(unSzF9ad2|nCjJq#fH9no=xa-Gr1xK~Ar53>YWJioKw|B=*Ttj7a_x7$5>~3vW zYvDS$6V!es`5lY2R^u_zo>r3$qdjV6`U$KNzxRs3&mj*8bLSZUeR7PVW0(~p+s)(E z-nQ5lWb2{Ue;OhJexvn;Yru9=Bph!ct_D@mj{?8bMHN&Byv*qu@Tm6u-;myMjA`&M X!HH6UM>jaH00000NkvXXu0mjfQ5^av diff --git a/explore/src/assets/explore-assets/sdgs/g2.png b/explore/src/assets/explore-assets/sdgs/g2.png deleted file mode 100644 index 379479a080e8735d0217a797762f1df756379814..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1378 zcmV-o1)chdP)AvLOHgNpu0h@c`1WG`NdXku^A^LR+1c3|#x3Y(rJI_Xx`O#(>@!*S8uvzYL9=*a0f~WNFzCkF zt2jE%xQ-x4L+n@pQ3V4v*qvqUj*X4=7y$uWiSAA2r=)W_oxNsYq&EYU%G*`(X4Tve z;kZ67F7AvL_V)HB78VvZlCEt4eUFsvNKH*0UIgeJ0BvR6C$hoEOw@p=pPa}3kH;~3F*qp%53fJ?Oo_LPESwohq>xVz?d>L zHa3oEN2tfOMK3{WAPR^hf4h#%r!N?wTn+W=%-|ydR6f|lZ_Fuuw^?*G9*k=Jd z9|@?iDFXl-Be@c1JE@Z|*ij8Q|4EMf`}1HIKLebhqc=%)KhW{OV^4)G_OtfWTG?_a2JB zNg!y5n_=ceh+QYTl2G&X0{#iocr0o_AttT@gwk^dZ@YVVc=+wi%*-+ACMPG?0Z8>z zL;*jXkdSaN6x4z)pN-JLd@X?M@zJs(fOzxEVW^g%r2uMRo42ydM&(>BAU!?(5W#K) z(9`kp@du2cw2mwQsYzZ5v(4D3doO#L){wE1U6YIBy8yJFTKbgdCyef^0tQ4S&)2|6 z8!7wVSO@Sl7?UoE!ahR!j)w&VjaOr!!Zo`b7$hJu$OxkCZ8SSO!O~#C#xs3*rx!Uh zbb2I4m)rXCb;bgq4;VPj(5!+!K#Y0;`jbJ{Dg-nOA@;TkP&b2H%&b>IufA3;K(!3& z5as`3UFzN+)2C_#=o%*4HJ4p1G{ikeOQ>fjwhEAwNh6a-QD_IP_N8O3%4QdGa-k2= z-ZzHY`wdJZ?oBIzTwDEjn3(X#B1GBRv?bLHS5X1nU1tpO_JtEX zOF*=n{y^SE+L2#%p1SZ&mJA|L7{((yGPqf|30cQnZQ;KF6A;N?`1~3lZH&Lse7U2n z*^i>qC1C535}cOcNR8ALL5>7O4eto)f1k0ABtF)M{hf~JZFNjl+Ble%;CweuH$=cx kFvQCJ*m{>r&r&b-H%{Jl1Ye-vg#Z8m07*qoM6N<$f)C)3&Hw-a diff --git a/explore/src/assets/explore-assets/sdgs/g3.png b/explore/src/assets/explore-assets/sdgs/g3.png deleted file mode 100644 index 3cb1cf28cc2baf9bd60e9b7024261f8ac710ca1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1099 zcmV-R1ho5!P)*#*%MPVUNtCqb?XOg4nK@f;87`|XjASV@rK4G>!c62Ld`9`pop zkp2^lbR-EsGo+Fr_>TqT(?1T<>DP2A!jKyWp}U|Ea(hJ%T^x^h;2y}(BHAL|;S3XC zAP({C)2s9(*p^_h3dCaHWErC`rmb4eL4TvO3E#nC6OQ%qcoK+JVi1FEiro;s5~zcu zgt2{{Mi|FaaCRNk;W*I?TWq75uaE37w#!@FGTs;6k4`HI9CpXyEucDVz_Du2wO~Jo z$;UtzwiT`o%|y>NOu)g|J_RqpD4;t0?lv&?x0xG{%^=IhB%wcjZEGJH`>io^xb&vk zh^}6`ju76D-C{5w90fCQcF7hzp7tq|!C&@;Kp=+xOQ3Sl2i7d;kMPJdgjK_tKxMZJ z^Z`o9LTt`^B8+2g^3TCRuo|cqH{)oX39Jk~2AVe!{moW{N7Anaxr|*fHuJOqVCSME zTN$_OzR*wgN_eFRg5d;w%>q8qendOl1fRmVI83 zwobn+9|qlM2u`Aptq!P`lFjLKjkYc>y2!}K6QJ7E-df6>^_Ek!JLuKcqMu;XSJ2LI z3eLC)=ZLV5K^+24(!-F^tJW@|>}=<;#OU=@1{GYVmoh)wMobISDVB%+j7^_QyWA-_ zv)auI>*DAgm)eBnc2!K6Que_Ms7`UC7nPq-kxHdLmQp9N`Z4}jC@0qE%vd}-%JphUL6ySJ zQP~L_;5{6KRywA;N+dC=7;8ODfbD_(ly`|^Qp#wvjbdI9HcMg8xmXBWU@3UL7fy9H zgN)rHjIEfl&;;w?G#rAH#P}YB4WcxoW~?P!*fMT9m~U|h%w%2c{3jVi)HvGjfH}}J z1iV#1*kPWngl;e}pRlOm3zhS*3z}ov3kgKf5T0*^HPAl@id_l`J4T~bL0Dx+!s38$ zsF?Z#(3WfcA*e6UT)c`J9s*>)LzfFPfPaR^Py@Ay`_z6jo$gNIbh(bkgV(N;T)&bC zi-CSnX@E`e0rtQmaNEfzDE2L>uo%P*(Y@$6^vRQOTLxGe2-|;)!W5yE-9Lk0R&qPGhiqbI`FBzSYi5ySI`J& z-~pTkPs1lN%*bZ0cY{uCghy+=q(-wAJfW6DHOz;(FdCwn$V_G-VLG1{xB-{o5sZPw zFdOs&8x@)%%+v2hcxYUO9icJ_%u*}V!&SHq?^F*Sofm+e^@yHSwPEp~*qgdX?fY;U zu0R{;BbUH*r~sYU1yJylOml+{XUvzdZ%zAAn45MQ3DbfI2h_&hgX>|SX39#K0{T#= z;~T7in@}IFrv@>$i^p)CmTg`ZGScYK&-!8wInU_9IqM5e`%D-GIwjBg*TD7i6f`K> zHQSk)iD2gHz|1rvq0j4%%!Ap~fDVJnL4c)ce-?xdrgYkze#JC(*1`K0 ZzW_XH^}JPE{h0s&002ovPDHLkV1fc$Zu$TK diff --git a/explore/src/assets/explore-assets/sdgs/g5.png b/explore/src/assets/explore-assets/sdgs/g5.png deleted file mode 100644 index 2c4f51cfdbdb07b1a6dcff7a0ca70528af318b3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 998 zcmVNklAuK3$5Go3xhp1l4 zCXn*du9wN!}ubR$UEGp=}`PI41+fX;`jJZ{TIZ=p-^a)!C=TW8jai8z^rYOIO4v( zzR7mGeI|zKIGY%I8QZK@Ya2wtSd@OhztC(pUqzR$L_Uz1)Ql`nVXS5>!dM8^kEO^n zpU+pprVj#vz+8*P(uBcSAZwrT$zcAA*yHgS_wcb;!Qu!OlhxmcT{Ct$*iDd~ksFYY zF}Fn&3GYK1rCfjDSy=GBP z^a)sikx!2_rh~u=&SF=JE&x_CzoGg_#Jf>c0U=wC!CiDVtt7hqb#-+Cx7+Pt@iCYI zUV-@%b<9DCpCaTjHnC8|TpT2W(Mh7-f$a%=Bp?Ya0_LD=Rf)eLq=L24Bq3wTL~bCO&>&Y1gEc^|ToyVxo9JgCtum9zbe?&H*S3@S!9*oc z^^oQxON1``F7RO1K^#&ePQ&OC$}E)M*{GCmbq84vRrjN|xzzTyR>Cig`PhF_jiZgm z>-A3L3BO<}SIiIjKFAMX9B+>?CrC>mJ&BwqSpvD!(hdfE@eT%A5oI{d>Ns)W>mtP# z#t!5l&Y7fJz&H!pf<6p(p{rI)5HE$g4NW_b{#t`>9NDUnUWQXYT{Tn5E@Y5#G=F++&uC#M}q zLy|sFlI*sq8w`pVG9xK3#K-|j8s(7pKN2+a)T`vs7(eiv*Osgtdc@Kr#3?h0<6$=4 z_TLc8Uw|c23LuZ*xK@gXjMCWUdUX-;n;}K48voV9(;=4MGr1LwKzeq<9-{jG1SsmS UXR%71xBvhE07*qoM6N<$f>r(3g8%>k diff --git a/explore/src/assets/explore-assets/sdgs/g6.png b/explore/src/assets/explore-assets/sdgs/g6.png deleted file mode 100644 index 6b3c25856ebe3b6998cab4a684232d89472328e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmV+@1K0eCP) z2@!eWLB{Pt8kf{WE-~d&UM7TS9$i9>Fmk_~t^fM%wZFCY zcP3jX6y9Yrnb)Xj4Q8J#e_FEH?A)SJ0l{n*_#F4^fWIjQ9NyS`KEGAq-2krwzV3sG z_fwzv_rG}{^XB2N5V($;sc17Ah)PgBszrHp3GGKuc*y6_LtqRhJ{c*c(@~Sav$?r| zUZJ6ABILr4%{`Z+B=$p>qA4j0P@2j+pAP&amlX*U+8LXJe!4u5O7J$Z$;%>e4&za` zA$E>Z(12OTQj2KdvLnH}9`B(DT!yg~DJ{0$Colu^R|nSlzJ)3S-XFxO@ZOEU+Bj{X zHqvjO=u~5T;0IZC1^qjLg>(=r!Qauf!v^lLFHw_Qy|hR#K_!1$lyEmh11 z-=IIs7&l-%7#zzPuRt82y|vZp3(?8?Z`2qZvDof3XE`A+XCBZ_}^A z{LQ37dvXoUH2!^fH(9Xqb=iLl?v+~|uSO=k*91~9oXc9Y6RD>7tqz}#Z7da~^dF%? z#;gkW7De?$Rcr+6WqdmCm4J0@V_?0WKF9H9LQlJTco|?-$yjOBYwCE}Bh*u{-e_8M zG-H(t@LmR0qNwBXSUjPs}}+&ZhaqG@$G^vmxCTo^K524rhW4{5mTmMzr54SP^0000*XNP)%lLQ?9uL;*+8<2?gj6yO`hfYXOm>U%!HDBQxxsii zq-0mx#(TmkCR8PR58)$qA27-mb!7IT%bG31W>NpKQfGO4s+>ZF1pdZ``x5AZSobI0x3~;5tqHt%l ztf1o9i2-f+JsaGAJ)=^MnF8jf`+flQgf1QdZ4>2d`8^PYzoiP}?}F)sQZ0WDbdzp( zoB?OcLb&{#9VIEYV`irq(xM|>>mQ(-K)x~SN~{{<`rSD8M$_;?h|3gx0=z4SV~ z0G84CRI1oLOx>W1bgla{7z`f2RcHX2Cc_dL`!s$$m;uiRnX|ktn~wFjTNa;l#ez#^ zgTTW+Zo}XF*7~2oV0r?Kg=OF=c0YUqEyC>Pc+nH8)Oq|Mg0r9%IL?)A2*&)v+uXKY z1^0k4(J>gK?kyTmL@$raOy4yW<9hQ`>pcSdgOx10N#))~T(t*--v&*W@Qww_xz9kMdr7-0xLjS6qNT0bkV<%XhA8( z?&U+^Uzp9Q$)ywrkCgE?6IL5YwOVnQ0J#h9%_#QtF^Ifd4`qxuk?fd)vT@M=ZS%}- TM1Sa_00000NkvXXu0mjf5C4RU diff --git a/explore/src/assets/explore-assets/sdgs/g8.png b/explore/src/assets/explore-assets/sdgs/g8.png deleted file mode 100644 index 0439c5d5d98762f9f181baeb301bf66588efad67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 821 zcmV-51Iqk~P)?4#08Rw3rd!WA+qFxtYs@Sku_N})(}Rr zuY;6a$Q5^#JJ)V(w<61hq8Kwizu)wH`DW($n$dhWnp3~t@6375^M9ZBSD)<49 zp|l{P2oA*g0ayed;1Ilp?r^WkMWcB3<9so^hl6l4qHV+ay-7t8?1a;^un>O1Ca8e+ zP?RLeN7kB(%6s9+Bk_fI`3$k^AIE5fpCUp92g8Y)V@(q8^NZrBH#Xa#FO>1pt2E)r z;clL-0CRW@F2XP{x3i&?_pjs?#Zg-fj>2m2cpk!5UVM`)j9s^|TgqAud*C|sfXm=u zD1x7#0mxBdz9PG<+V8u?%5p<8~q6l_~7gj}N_LtT86&6HP=JzSMp&4M) zmw`v>1Ts=1Y^_qxRbLcAd&s134#QJA<4APsQJNPwV?-Uprjpe(lw((kjfG+jq;*AY zQH)LcmcXbkfJf8|{5m|sX%%)BlukWX9lNnJP#w?j@Y}JMcKs2>QD-c6z&bG6aySjG zBC4*eHhWLd_BG4{qrD5}dAJ(`kGMgiw#5c82Pfe$D0Bmg!Ti~0Q^5(N?MpDy0dPC+ zeU=^Y{H%A?iqy$J0_-UZ#|dH^%nip+SZBd>sDKx+9_&dcjT=+g%`{ka48~)@9<)D= z)X3~huUyev+*{$#z}!y;PsqPFO4MWWMH||$ynSY+W-G9+s6*Xhk%5-6Hcr$~Vs=^t zQzE+DB~3KoNXc)tl|pekm>E zY@P!pQAmDi>K2m!*KPzS+OiZMPA>=kHJ|+kIZ{T-I;7s;00000NkvXXu0mjf;Cy_Z diff --git a/explore/src/assets/explore-assets/sdgs/g9.png b/explore/src/assets/explore-assets/sdgs/g9.png deleted file mode 100644 index 82d511148b724bede31be1a41f5568de34078d3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1183 zcmV;Q1YrA#P)m-j_Rf?rZ2C z_&DdDv-kR~z4uyc@0%#==GD>BaW-9Ug=b+WR6$!Jk@%-OrV_;4&K7em=;8-y>3koA>o2%h57zGz)81CTrzpx#a!8?fmQAj+mFrtoX8ax3PLQlxm zM+Xi&YIp%Y%{Tg-!ib(v=cQ1QM=aaGbl`880kw!9&DJQNa6dY{55K`+IJXD~j??A` z_!T~f>RdrrNcdekKLa}9bl(goXBz?U_Q8_Cb=-~qIsZpEN#|Ck{uB%u(bdp9P25p_ z865m7%u15`1tk%VLO9T$=eOWCFm>j_D>(O;ZTNl?x6%oRw7L|d0WSQ=rlT2z}s*p7*KVH?AL)z;oy|-U5ZK=2`iwAKGyRtSC@36^Ch%$>h1## zSqv7#BG`tZ_H4quJA?0cg3Do~8*JA1PoO@tjHZOcbUj3)si63&;CH9&2(*HE?K+xT z=~F$3-|kj@pccM>b{GPdT&tI}wgCrpsw@!%hw^NR8xGdveAjn;d=-X4GxP;#$K9z0 z!+)lC#=ZsTQJ4&Cz~%czVMkzuo>M?Des%`jd)<)^!diF}T3m)~HbN?1!M7=J6UF zz}?7TOkLR5xkteL+@)z!N8v3zi~s}3XnqpPAw9SZjy5o|-vEtyHyER%&e~RR5bMEd zce8jZc=1|ze5+8n_3Wx37bx&|PObhBg-= z?9vzqFJ|t?^etN0X}45Pg!^F=tO5@P?o`==u_$4q`gT0Cu%|9OizAK)0jroPp_moP zyetnhk>1tke8M;K{Vs#c2=tufly1iX)59R^BpfY=_ZAGrt;I%vL1FsY&hxlY{-MIY za1E_qMsE!qfQ!L3PJ*eVh;6LNAAteq8QT-cHDLXYwLdjt-kDa;jwM-}&oj8y|20J1 zb-ETTY3G5b%U$piJRJl~FZ0(z(HyH3eNX4Nd$D-%HzO3*A?vq=#(yB|z{9?$md=Os zu(eh2el%G8HMAMbdc6Pu002ovPDHLkV1mnZEO`I` diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 35ab282e..c2bf664c 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 35ab282e53ad5b7790bc431820a4400cfc36c977 +Subproject commit c2bf664ce363f49f64ca5b05f3456dd902dcad5b diff --git a/explore/src/assets/vocabulary/fos.json b/explore/src/assets/vocabulary/fos.json deleted file mode 100644 index 5170296e..00000000 --- a/explore/src/assets/vocabulary/fos.json +++ /dev/null @@ -1,1521 +0,0 @@ -{ - "fos":[ - { - "code": "01", - "id": "01 natural sciences", - "label": "natural sciences", - "level": 1, - "children": [ - { - "code": "0101", - "id": "0101 mathematics", - "label": "mathematics", - "level": 2, - "children": [ - { - "code": "010101", - "id": "010101 applied mathematics", - "label": "applied mathematics", - "level": 3 - }, - { - "code": "010102", - "id": "010102 general mathematics", - "label": "general mathematics", - "level": 3 - }, - { - "code": "010103", - "id": "010103 numerical & computational mathematics", - "label": "numerical & computational mathematics", - "level": 3 - }, - { - "code": "010104", - "id": "010104 statistics & probability", - "label": "statistics & probability", - "level": 3 - } - ] - - }, - { - "code": "0102", - "id": "0102 computer and information sciences", - "label": "computer and information sciences", - "level": 2, - "children": [ - { - "code": "010201", - "id": "010201 computation theory & mathematics", - "label": "computation theory & mathematics", - "level": 3 - } - ] - }, - { - "code": "0103", - "id": "0103 physical sciences", - "label": "physical sciences", - "level": 2, - "children": [ - { - "code": "010301", - "id": "010301 acoustics", - "label": "acoustics", - "level": 3 - }, - { - "code": "010302", - "id": "010302 applied physics", - "label": "applied physics", - "level": 3 - }, - { - "code": "010303", - "id": "010303 astronomy & astrophysics", - "label": "010303 astronomy & astrophysics", - "level": 3 - }, - { - "code": "010304", - "id": "010304 chemical physics", - "label": "chemical physics", - "level": 3 - }, - { - "code": "010305", - "id": "010305 fluids & plasmas", - "label": "fluids & plasmas", - "level": 3 - }, - { - "code": "010306", - "id": "010306 general physics", - "label": "general physics", - "level": 3 - }, - { - "code": "010307", - "id": "010307 mathematical physics", - "label": "mathematical physics", - "level": 3 - }, - { - "code": "010308", - "id": "010308 nuclear & particles physics", - "label": "nuclear & particles physics", - "level": 3 - }, - { - "code": "010309", - "id": "010309 optics", - "label": "010309 optics", - "level": 3 - } - ] - }, - { - "code": "0104", - "id": "0104 chemical sciences", - "label": "chemical sciences", - "level": 2, - "children": [ - { - "code": "010401", - "id": "010401 analytical chemistry", - "label": "analytical chemistry", - "level": 3 - }, - { - "code": "010402", - "id": "010402 general chemistry", - "label": "general chemistry", - "level": 3 - }, - { - "code": "010403", - "id": "010403 inorganic & nuclear chemistry", - "label": "inorganic & nuclear chemistry", - "level": 3 - }, - { - "code": "010404", - "id": "010404 medicinal & biomolecular chemistry", - "label": "medicinal & biomolecular chemistry", - "level": 3 - }, - { - "code": "010405", - "id": "010405 organic chemistry", - "label": "organic chemistry", - "level": 3 - }, - { - "code": "010406", - "id": "010406 physical chemistry", - "label": "physical chemistry", - "level": 3 - }, - { - "code": "010407", - "id": "010407 polymers", - "label": "polymers", - "level": 3 - } - ] - }, - { - "code": "0105", - "id": "0105 earth and related environmental sciences", - "label": "earth and related environmental sciences", - "level": 2, - "children": [ - { - "code": "010501", - "id": "010501 environmental sciences", - "label": "environmental sciences", - "level": 3 - }, - { - "code": "010502", - "id": "010502 geochemistry & geophysics", - "label": "geochemistry & geophysics", - "level": 3 - }, - { - "code": "010503", - "id": "010503 geology", - "label": "geology", - "level": 3 - }, - { - "code": "010504", - "id": "010504 meteorology & atmospheric sciences", - "label": "meteorology & atmospheric sciences", - "level":3 - }, - { - "code": "010505", - "id": "010505 oceanography", - "label": "oceanography", - "level":3 - }, - { - "code": "010506", - "id": "010506 paleontology", - "label": "paleontology", - "level":3 - } - ] - }, - { - "code": "0106", - "id": "0106 biological sciences", - "label": "biological sciences", - "level": 2, - "children": [ - { - "code": "010601", - "id": "010601 ecology", - "label": "ecology", - "level":3 - }, - { - "code": "010602", - "id": "010602 entomology", - "label": "entomology", - "level":3 - }, - { - "code": "010603", - "id": "010603 evolutionary biology", - "label": "evolutionary biology", - "level":3 - }, - { - "code": "010604", - "id": "010604 marine biology & hydrobiology", - "label": "marine biology & hydrobiology", - "level":3 - }, - { - "code": "010605", - "id": "010605 ornithology", - "label": "ornithology", - "level":3 - }, - { - "code": "010606", - "id": "010606 plant biology & botany", - "label": "plant biology & botany", - "level":3 - }, - { - "code": "010607", - "id": "010607 zoology", - "label": "zoology", - "level":3 - }, - { - "code": "010608", - "id": "010608 biotechnology", - "label": "biotechnology", - "level":3 - } - ] - } - ] - }, - { - "code": "02", - "id": "02 engineering and technology", - "label": "engineering and technology", - "level": 1, - "children": [ - { - "code": "0201", - "id": "0201 civil engineering", - "label": "civil engineering", - "level": 2, - "children": [ - { - "code": "020101", - "id": "020101 civil engineering", - "label": "civil engineering", - "level":3 - } - ] - }, - { - "code": "0202", - "id": "0202 electrical engineering, electronic engineering, information engineering", - "label": "0202 electrical engineering, electronic engineering, information engineering", - "level": 2, - "children": [ - { - "code": "020201", - "id": "020201 artificial intelligence & image processing", - "label": "artificial intelligence & image processing", - "level":3 - }, - { - "code": "020202", - "id": "020202 computer hardware & architecture", - "label": "computer hardware & architecture", - "level":3 - }, - { - "code": "020203", - "id": "020203 distributed computing", - "label": "distributed computing", - "level":3 - }, - { - "code": "020204", - "id": "020204 information systems", - "label": "information systems", - "level":3 - }, - { - "code": "020205", - "id": "020205 medical informatics", - "label": "medical informatics", - "level":3 - }, - { - "code": "020206", - "id": "020206 networking & telecommunications", - "label": "networking & telecommunications", - "level":3 - }, - { - "code": "020207", - "id": "020207 software engineering", - "label": "software engineering", - "level":3 - }, - { - "code": "020208", - "id": "020208 electrical & electronic engineering", - "label": "electrical & electronic engineering", - "level":3 - }, - { - "code": "020209", - "id": "020209 energy", - "label": "energy", - "level":3 - }, - { - "code": "020210", - "id": "020210 optoelectronics & photonics", - "label": "optoelectronics & photonics", - "level":3 - } - ] - },{ - "code": "0203", - "id": "0203 mechanical engineering", - "label": "mechanical engineering", - "level": 2, - "children": [ - { - "code": "020301", - "id": "020301 aerospace & aeronautics", - "label": "aerospace & aeronautics", - "level":3 - }, - { - "code": "020302", - "id": "020302 automobile design & engineering", - "label": "automobile design & engineering", - "level":3 - }, - { - "code": "020303", - "id": "020303 mechanical engineering & transports", - "label": "mechanical engineering & transports", - "level":3 - } - ] - },{ - "code": "0204", - "id": "0204 chemical engineering", - "label": "chemical engineering", - "level": 2, - "children": [ - { - "code": "020401", - "id": "020401 chemical engineering", - "label": "chemical engineering", - "level":3 - } - ] - },{ - "code": "0205", - "id": "0205 materials engineering", - "label": "materials engineering", - "level": 2, - "children": [ - { - "code": "020501", - "id": "020501 mining & metallurgy", - "label": "mining & metallurgy", - "level":3 - }, - { - "code": "020502", - "id": "020502 materials", - "label": "materials", - "level":3 - } - ] - },{ - "code": "0206", - "id": "0206 medical engineering", - "label": "medical engineering", - "level": 2, - "children": [ - { - "code": "020601", - "id": "020601 biomedical engineering", - "label": "biomedical engineering", - "level":3 - }, - { - "code": "020602", - "id": "020602 bioinformatics", - "label": "bioinformatics", - "level":3 - } - ] - },{ - "code": "0207", - "id": "0207 environmental engineering", - "label": "environmental engineering", - "level": 2, - "children": [ - { - "code": "020701", - "id": "020701 environmental engineering", - "label": "environmental engineering", - "level":3 - } - ] - },{ - "code": "0208", - "id": "0208 environmental biotechnology", - "label": "environmental biotechnology", - "level": 2, - "children": [ - { - "code": "020801", - "id": "020801 environmental engineering", - "label": "environmental engineering", - "level":3 - } - ] - },{ - "code": "0209", - "id": "0209 industrial biotechnology", - "label": "industrial biotechnology", - "level": 2, - "children": [ - { - "code": "020901", - "id": "020901 industrial engineering & automation", - "label": "industrial engineering & automation", - "level":3 - } - ] - },{ - "code": "0210", - "id": "0210 nano-technology", - "label": "nano-technology", - "level": 2, - "children": [ - { - "code": "021001", - "id": "021001 nanoscience & nanotechnology", - "label": "nanoscience & nanotechnology", - "level":3 - } - ] - },{ - "code": "0211", - "id": "0211 other engineering and technologies", - "label": "other engineering and technologies", - "level": 2, - "children": [ - { - "code": "021101", - "id": "021101 geological & geomatics engineering", - "label": "geological & geomatics engineering", - "level":3 - }, - { - "code": "021102", - "id": "021102 mining & metallurgy", - "label": "mining & metallurgy", - "level":3 - }, - { - "code": "021103", - "id": "021103 operations research", - "label": "operations research", - "level":3 - }, - { - "code": "021104", - "id": "021104 architecture", - "label": "architecture", - "level":3 - }, - { - "code": "021105", - "id": "021105 building & construction", - "label": "building & construction", - "level":3 - }, - { - "code": "021106", - "id": "021106 design practice & management", - "label": "design practice & management", - "level":3 - }, - { - "code": "021107", - "id": "021107 urban & regional planning", - "label": "urban & regional planning", - "level":3 - }, - { - "code": "021108", - "id": "021108 energy", - "label": "energy", - "level":3 - }, - { - "code": "021109", - "id": "021109 optoelectronics & photonics", - "label": "optoelectronics & photonics", - "level":3 - }, - { - "code": "021110", - "id": "021110 strategic, defence & security studies", - "label": "strategic, defence & security studies", - "level":3 - } - ] - } - ] - }, - { - "code": "03", - "id": "03 medical and health sciences", - "label": "medical and health sciences", - "level": 1, - "children": [ - { - "code": "0301", - "id": "0301 basic medicine", - "label": "basic medicine", - "level": 2, - "children": [ - { - "code": "030101", - "id": "030101 anatomy & morphology", - "label": "anatomy & morphology", - "level":3 - }, - { - "code": "030102", - "id": "030102 biochemistry & molecular biology", - "label": "biochemistry & molecular biology", - "level":3 - }, - { - "code": "030103", - "id": "030103 biophysics", - "label": "biophysics", - "level":3 - }, - { - "code": "030104", - "id": "030104 developmental biology", - "label": "developmental biology", - "level":3 - }, - { - "code": "030105", - "id": "030105 genetics & heredity", - "label": "genetics & heredity", - "level":3 - }, - { - "code": "030106", - "id": "030106 microbiology", - "label": "microbiology", - "level":3 - }, - { - "code": "030107", - "id": "030107 microscopy", - "label": "microscopy", - "level":3 - }, - { - "code": "030108", - "id": "030108 mycology & parasitology", - "label": "mycology & parasitology", - "level":3 - }, - { - "code": "030109", - "id": "030109 nutrition & dietetics", - "label": "nutrition & dietetics", - "level":3 - }, - { - "code": "030110", - "id": "030110 physiology", - "label": "physiology", - "level":3 - }, - { - "code": "030111", - "id": "030111 toxicology", - "label": "toxicology", - "level":3 - }, - { - "code": "030112", - "id": "030112 virology", - "label": "virology", - "level":3 - } - ] - }, - { - "code": "0302", - "id": "0302 clinical medicine", - "label": "clinical medicine", - "level": 2, - "children": [ - { - "code": "030201", - "id": "030201 allergy", - "label": "allergy", - "level":3 - }, - { - "code": "030202", - "id": "030202 anesthesiology", - "label": "anesthesiology", - "level":3 - }, - { - "code": "030203", - "id": "030203 arthritis & rheumatology", - "label": "arthritis & rheumatology", - "level":3 - }, - { - "code": "030204", - "id": "030204 cardiovascular system & hematology", - "label": "cardiovascular system & hematology", - "level":3 - }, - { - "code": "030205", - "id": "030205 complementary & alternative medicine", - "label": "complementary & alternative medicine", - "level":3 - }, - { - "code": "030206", - "id": "030206 dentistry", - "label": "dentistry", - "level":3 - }, - { - "code": "030207", - "id": "030207 dermatology & venereal diseases", - "label": "dermatology & venereal diseases", - "level":3 - }, - { - "code": "030208", - "id": "030208 emergency & critical care medicine", - "label": "emergency & critical care medicine", - "level":3 - }, - { - "code": "030209", - "id": "030209 endocrinology & metabolism", - "label": "endocrinology & metabolism", - "level":3 - }, - { - "code": "030210", - "id": "030210 environmental & occupational health", - "label": "environmental & occupational health", - "level":3 - }, - { - "code": "030211", - "id": "030211 gastroenterology & hepatology", - "label": "gastroenterology & hepatology", - "level":3 - }, - { - "code": "030212", - "id": "030212 general & internal medicine", - "label": "general & internal medicine", - "level":3 - }, - { - "code": "030213", - "id": "030213 general clinical medicine", - "label": "general clinical medicine", - "level":3 - }, - { - "code": "030214", - "id": "030214 geriatrics", - "label": "geriatrics", - "level":3 - }, - { - "code": "030215", - "id": "030215 immunology", - "label": "immunology", - "level":3 - }, - { - "code": "030216", - "id": "030216 legal & forensic medicine", - "label": "legal & forensic medicine", - "level":3 - }, - { - "code": "030217", - "id": "030217 neurology & neurosurgery", - "label": "neurology & neurosurgery", - "level":3 - }, - { - "code": "030218", - "id": "030218 nuclear medicine & medical imaging", - "label": "nuclear medicine & medical imaging", - "level":3 - }, - { - "code": "030219", - "id": "030219 obstetrics & reproductive medicine", - "label": "obstetrics & reproductive medicine", - "level":3 - }, - { - "code": "030220", - "id": "030220 oncology & carcinogenesis", - "label": "oncology & carcinogenesis", - "level":3 - }, - { - "code": "030221", - "id": "030221 ophthalmology & optometry", - "label": "ophthalmology & optometry", - "level":3 - }, - { - "code": "030222", - "id": "030222 orthopedics", - "label": "orthopedics", - "level":3 - }, - { - "code": "030223", - "id": "030223 otorhinolaryngology", - "label": "otorhinolaryngology", - "level":3 - }, - { - "code": "030224", - "id": "030224 pathology", - "label": "pathology", - "level":3 - }, - { - "code": "030225", - "id": "030225 pediatrics", - "label": "pediatrics", - "level":3 - }, - { - "code": "030226", - "id": "030226 pharmacology & pharmacy", - "label": "pharmacology & pharmacy", - "level":3 - }, - { - "code": "030227", - "id": "030227 psychiatry", - "label": "psychiatry", - "level":3 - }, - { - "code": "030228", - "id": "030228 respiratory system", - "label": "respiratory system", - "level":3 - }, - { - "code": "030229", - "id": "030229 sport sciences", - "label": "sport sciences", - "level":3 - }, - { - "code": "030230", - "id": "030230 surgery", - "label": "surgery", - "level":3 - }, - { - "code": "030231", - "id": "030231 tropical medicine", - "label": "tropical medicine", - "level":3 - }, - { - "code": "030232", - "id": "030232 urology & nephrology", - "label": "urology & nephrology", - "level":3 - } - ] - }, - { - "code": "0303", - "id": "0303 health sciences", - "label": "health sciences", - "level": 2, - "children": [ - { - "code": "030301", - "id": "030301 anatomy & morphology", - "label": "anatomy & morphology", - "level":3 - }, - { - "code": "030302", - "id": "030302 biochemistry & molecular biology", - "label": "biochemistry & molecular biology", - "level":3 - }, - { - "code": "030303", - "id": "030303 biophysics", - "label": "biophysics", - "level":3 - }, - { - "code": "030304", - "id": "030304 developmental biology", - "label": "developmental biology", - "level":3 - }, - { - "code": "030305", - "id": "030305 genetics & heredity", - "label": "genetics & heredity", - "level":3 - }, - { - "code": "030306", - "id": "030306 microbiology", - "label": "microbiology", - "level":3 - }, - { - "code": "030307", - "id": "030307 microscopy", - "label": "microscopy", - "level":3 - }, - { - "code": "030308", - "id": "030308 mycology & parasitology", - "label": "mycology & parasitology", - "level":3 - }, - { - "code": "030309", - "id": "030309 nutrition & dietetics", - "label": "nutrition & dietetics", - "level":3 - }, - { - "code": "030310", - "id": "030310 physiology", - "label": "physiology", - "level":3 - }, - { - "code": "030311", - "id": "030311 toxicology", - "label": "toxicology", - "level":3 - }, - { - "code": "030312", - "id": "030312 virology", - "label": "virology", - "level":3 - } - ] - }, - { - "code": "0304", - "id": "0304 medical biotechnology", - "label": "medical biotechnology", - "level": 2 - }, - { - "code": "0305", - "id": "0305 other medical science", - "label": "other medical science", - "level": 2, - "children": [ - { - "code": "030501", - "id": "030501 epidemiology", - "label": "epidemiology", - "level":3 - }, - { - "code": "030502", - "id": "030502 gerontology", - "label": "gerontology", - "level":3 - }, - { - "code": "030503", - "id": "030503 health policy & services", - "label": "health policy & services", - "level":3 - }, - { - "code": "030504", - "id": "030504 nursing", - "label": "nursing", - "level":3 - }, - { - "code": "030505", - "id": "030505 public health", - "label": "public health", - "level":3 - }, - { - "code": "030506", - "id": "030506 rehabilitation", - "label": "rehabilitation", - "level":3 - }, - { - "code": "030507", - "id": "030507 speech-language pathology & audiology", - "label": "speech-language pathology & audiology", - "level":3 - }, - { - "code": "030508", - "id": "030508 substance abuse", - "label": "substance abuse", - "level":3 - } - ] - } - ] - },{ - "code": "04", - "id": "04 agricultural and veterinary sciences", - "label": "agricultural and veterinary sciences", - "level": 1, - "children": [ - { - "code": "0401", - "id": "0401 agriculture, forestry, and fisheries", - "label": "agriculture, forestry, and fisheries", - "level": 2, - "children": [ - { - "code": "040101", - "id": "040101 forestry", - "label": "forestry", - "level":3 - }, - { - "code": "040102", - "id": "040102 fisheries", - "label": "fisheries", - "level":3 - }, - { - "code": "040103", - "id": "040103 agronomy & agriculture", - "label": "agronomy & agriculture", - "level":3 - } - ] - }, - { - "code": "0402", - "id": "0402 animal and dairy science", - "label": "animal and dairy science", - "level": 2, - "children": [ - { - "code": "040201", - "id": "040201 dairy & animal science", - "label": "dairy & animal science", - "level":3 - } - ] - }, - { - "code": "0403", - "id": "0403 veterinary science", - "label": "veterinary science", - "level": 2, - "children": [ - { - "code": "040301", - "id": "040301 veterinary sciences", - "label": "veterinary sciences", - "level":3 - } - ] - },{ - "code": "0404", - "id": "0404 agricultural biotechnology", - "label": "agricultural biotechnology", - "level": 2, - "children": [ - { - "code": "040401", - "id": "040401 food science", - "label": "food science", - "level":3 - } - ] - }, - { - "code": "0405", - "id": "0405 other agricultural sciences", - "label": "other agricultural sciences", - "level": 2, - "children": [ - { - "code": "040501", - "id": "040501 horticulture", - "label": "horticulture", - "level":3 - }, - { - "code": "040502", - "id": "040502 food science", - "label": "food science", - "level":3 - } - ] - } - ] - }, - - { - "code": "05", - "id": "05 social sciences", - "label": "social sciences", - "level": 1, - "children": [ - { - "code": "0501", - "id": "0501 psychology and cognitive sciences", - "label": "0501 psychology and cognitive sciences", - "level": 2, - "children": [ - { - "code": "050101", - "id": "050101 languages & linguistics", - "label": "languages & linguistics", - "level":3 - }, - { - "code": "050102", - "id": "050102 behavioral science & comparative psychology", - "label": "behavioral science & comparative psychology", - "level":3 - }, - { - "code": "050103", - "id": "050103 clinical psychology", - "label": "clinical psychology", - "level":3 - }, - { - "code": "050104", - "id": "050104 developmental & child psychology", - "label": "developmental & child psychology", - "level":3 - }, - { - "code": "050105", - "id": "050105 experimental psychology", - "label": "experimental psychology", - "level":3 - }, - { - "code": "050106", - "id": "050106 general psychology & cognitive sciences", - "label": "general psychology & cognitive sciences", - "level":3 - }, - { - "code": "050107", - "id": "050107 human factors", - "label": "human factors", - "level":3 - }, - { - "code": "050108", - "id": "050108 psychoanalysis", - "label": "psychoanalysis", - "level":3 - }, - { - "code": "050109", - "id": "050109 social psychology", - "label": "social psychology", - "level":3 - } - ] - }, - { - "code": "0502", - "id": "0502 economics and business", - "label": "economics and business", - "level": 2, - "children": [ - { - "code": "050201", - "id": "050201 accounting", - "label": "accounting", - "level":3 - }, - { - "code": "050202", - "id": "050202 agricultural economics & policy", - "label": "agricultural economics & policy", - "level":3 - }, - { - "code": "050203", - "id": "050203 business & management", - "label": "business & management", - "level":3 - }, - { - "code": "050204", - "id": "050204 development studies", - "label": "development studies", - "level":3 - }, - { - "code": "050205", - "id": "050205 econometrics", - "label": "econometrics", - "level":3 - }, - { - "code": "050206", - "id": "050206 economic theory", - "label": "economic theory", - "level":3 - }, - { - "code": "050207", - "id": "050207 economics", - "label": "economics", - "level":3 - }, - { - "code": "050208", - "id": "050208 finance", - "label": "finance", - "level":3 - }, - { - "code": "050209", - "id": "050209 industrial relations", - "label": "industrial relations", - "level":3 - }, - { - "code": "050210", - "id": "050210 logistics & transportation", - "label": "logistics & transportation", - "level":3 - }, - { - "code": "050211", - "id": "050211 marketing", - "label": "marketing", - "level":3 - }, - { - "code": "050212", - "id": "050212 sport, leisure & tourism", - "label": "sport, leisure & tourism", - "level":3 - } - ] - }, - { - "code": "0503", - "id": "0503 education", - "label": "education", - "level": 2, - "children": [ - { - "code": "050301", - "id": "050301 education", - "label": "education", - "level":3 - } - ] - }, - { - "code": "0504", - "id": "0504 sociology", - "label": "sociology", - "level": 2, - "children": [ - { - "code": "050401", - "id": "050401 social sciences methods", - "label": "social sciences methods", - "level":3 - }, - { - "code": "050402", - "id": "050402 sociology", - "label": "sociology", - "level":3 - } - ] - }, - { - "code": "0505", - "id": "0505 law", - "label": "law", - "level": 2, - "children": [ - { - "code": "050501", - "id": "050501 criminology", - "label": "criminology", - "level":3 - }, - { - "code": "050502", - "id": "050502 law", - "label": "law", - "level":3 - } - ] - }, - { - "code": "0506", - "id": "0506 political science", - "label": "political science", - "level": 2, - "children": [ - { - "code": "050601", - "id": "050601 international relations", - "label": "international relations", - "level":3 - }, - { - "code": "050602", - "id": "050602 political science & public administration", - "label": "political science & public administration", - "level":3 - } - ] - }, - { - "code": "0507", - "id": "0507 social and economic geography", - "label": "social and economic geography", - "level": 2, - "children": [ - { - "code": "050701", - "id": "050701 cultural studies", - "label": "cultural studies", - "level":3 - }, - { - "code": "050702", - "id": "050702 demography", - "label": "demography", - "level":3 - }, - { - "code": "050703", - "id": "050703 geography", - "label": "geography", - "level":3 - } - ] - }, - { - "code": "0508", - "id": "0508 media and communications", - "label": "media and communications", - "level": 2, - "children": [ - { - "code": "050801", - "id": "050801 communication & media studies", - "label": "communication & media studies", - "level":3 - } - ] - }, - { - "code": "0509", - "id": "0509 other social sciences", - "label": "other social sciences", - "level": 2, - "children": [ - { - "code": "050901", - "id": "050901 criminology", - "label": "criminology", - "level":3 - }, - { - "code": "050902", - "id": "050902 family studies", - "label": "family studies", - "level":3 - }, - { - "code": "050903", - "id": "050903 gender studies", - "label": "gender studies", - "level":3 - }, - { - "code": "050904", - "id": "050904 information & library sciences", - "label": "information & library sciences", - "level":3 - }, - { - "code": "050905", - "id": "050905 science studies", - "label": "science studies", - "level":3 - }, - { - "code": "050906", - "id": "050906 social work", - "label": "social work", - "level":3 - } - ] - } - ] - }, - { - "code": "06", - "id": "06 humanities and the arts", - "label": "humanities and the arts", - "level": 1, - "children": [ - { - "code": "0601", - "id": "0601 history and archaeology", - "label": "history and archaeology", - "level": 2, - "children": [ - { - "code": "060101", - "id": "060101 anthropology", - "label": "anthropology", - "level":3 - }, - { - "code": "060102", - "id": "060102 archaeology", - "label": "archaeology", - "level":3 - }, - { - "code": "060103", - "id": "060103 classics", - "label": "classics", - "level":3 - }, - { - "code": "060104", - "id": "060104 history", - "label": "history", - "level":3 - }, - { - "code": "060105", - "id": "060105 history of science, technology & medicine", - "label": "history of science, technology & medicine", - "level":3 - }, - { - "code": "060106", - "id": "060106 history of social sciences", - "label": "history of social sciences", - "level":3 - } - ] - }, - { - "code": "0602", - "id": "0602 languages and literature", - "label": "languages and literature", - "level": 2, - "children": [ - { - "code": "060201", - "id": "060201 languages & linguistics", - "label": "languages & linguistics", - "level":3 - }, - { - "code": "060202", - "id": "060202 literary studies", - "label": "literary studies", - "level":3 - } - ] - }, - { - "code": "0603", - "id": "0603 philosophy, ethics and religion", - "label": "philosophy, ethics and religion", - "level": 2, - "children": [ - { - "code": "060301", - "id": "060301 applied ethics", - "label": "applied ethics", - "level":3 - }, - { - "code": "060302", - "id": "060302 philosophy", - "label": "philosophy", - "level":3 - }, - { - "code": "060303", - "id": "060303 religions & theology", - "label": "religions & theology", - "level":3 - } - ] - }, - { - "code": "0604", - "id": "0604 arts", - "label": "arts", - "level": 2, - "children": [ - { - "code": "060401", - "id": "060401 art practice, history & theory", - "label": "art practice, history & theory", - "level":3 - }, - { - "code": "060402", - "id": "060402 drama & theater", - "label": "drama & theater", - "level":3 - }, - { - "code": "060403", - "id": "060403 folklore", - "label": "folklore", - "level":3 - }, - { - "code": "060404", - "id": "060404 music", - "label": "music", - "level":3 - } - ] - } - ] - } - ] - -} - diff --git a/explore/src/assets/vocabulary/sdg.json b/explore/src/assets/vocabulary/sdg.json deleted file mode 100644 index 4e682eea..00000000 --- a/explore/src/assets/vocabulary/sdg.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "sdg":[ - { - "code": "1", - "id": "1. No poverty", - "label": "No poverty", - "html": "No
poverty" - }, - { - "code": "2", - "id": "2. Zero hunger", - "label": "Zero hunger", - "html": "Zero
hunger" - },{ - "code": "3", - "id": "3. Good health", - "label": "Good health", - "html": "Good
health" - }, - { - "code": "4", - "id": "4. Education", - "label": "Education", - "html": "Education" - }, - { - "code": "5", - "id": "5. Gender equality", - "label": "Gender equality", - "html": "Gender
equality" - },{ - "code": "6", - "id": "6. Clean water", - "label": "Clean water", - "html": "Clean
water" - }, - { - "code": "7", - "id": "7. Clean energy", - "label": "Clean energy", - "html": "Clean
energy" - }, - { - "code": "8", - "id": "8. Economic growth", - "label": "Economic growth", - "html": "Economic
growth" - },{ - "code": "9", - "id": "9. Industry and infrastructure", - "label": "Industry and infrastructure", - "html": "Industry and
infrastructure" - }, - { - "code": "10", - "id": "10. No inequality", - "label": "No inequality", - "html": "No
inequality" - }, - { - "code": "11", - "id": "11. Sustainability", - "label": "Sustainability", - "html": "Sustainability" - },{ - "code": "12", - "id": "12. Responsible consumption", - "label": "Responsible consumption", - "html": "Responsible
consumption" - }, - { - "code": "13", - "id": "13. Climate action", - "label": "Climate action", - "html": "Climate
action" - }, - { - "code": "14", - "id": "14. Life underwater", - "label": "Life underwater", - "html": "Life
underwater" - },{ - "code": "15", - "id": "15. Life on land", - "label": "Life on land", - "html": "Life on
land" - }, - { - "code": "16", - "id": "16. Peace & justice", - "label": "Peace & justice", - "html": "Peace &
justice" - }, - { - "code": "17", - "id": "17. Partnership", - "label": "Partnership", - "html": "Partnership" - } - ] -} From b01e3f8ca87628b1809a0bd9c67051e192e4d8e2 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Thu, 3 Nov 2022 16:05:26 +0200 Subject: [PATCH 7/8] create fos/sdg components to call library components in order to use extra parameters, update submodules --- explore/src/app/app-routing.module.ts | 4 ++-- explore/src/app/fos/fos-routing.module.ts | 17 +++++++++++++++ explore/src/app/fos/fos.component.ts | 16 ++++++++++++++ explore/src/app/fos/fos.module.ts | 26 +++++++++++++++++++++++ explore/src/app/openaireLibrary | 2 +- explore/src/app/sdg/sdg-routing.module.ts | 17 +++++++++++++++ explore/src/app/sdg/sdg.component.ts | 15 +++++++++++++ explore/src/app/sdg/sdg.module.ts | 26 +++++++++++++++++++++++ explore/src/assets/openaire-theme | 2 +- 9 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 explore/src/app/fos/fos-routing.module.ts create mode 100644 explore/src/app/fos/fos.component.ts create mode 100644 explore/src/app/fos/fos.module.ts create mode 100644 explore/src/app/sdg/sdg-routing.module.ts create mode 100644 explore/src/app/sdg/sdg.component.ts create mode 100644 explore/src/app/sdg/sdg.module.ts diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index d1b545e1..106f02f2 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -8,8 +8,8 @@ const routes: Routes = [ {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)}, {path: 'home', redirectTo: '', pathMatch: 'full'}, {path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)}, - {path: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)}, - {path: 'fields-of-science', loadChildren: () => import('./openaireLibrary/fos/fos.module').then(m => m.FosModule), data: {extraOffset: 100}}, + {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)}, + {path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}}, {path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}}, // ORCID Pages {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)}, diff --git a/explore/src/app/fos/fos-routing.module.ts b/explore/src/app/fos/fos-routing.module.ts new file mode 100644 index 00000000..f5d36cd6 --- /dev/null +++ b/explore/src/app/fos/fos-routing.module.ts @@ -0,0 +1,17 @@ +import {NgModule} from "@angular/core"; +import {RouterModule} from "@angular/router"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {ExploreFosComponent} from "./fos.component"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + component: ExploreFosComponent, + canDeactivate: [PreviousRouteRecorder] + } + ]) + ] +}) +export class LibFosRoutingModule { } \ No newline at end of file diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts new file mode 100644 index 00000000..d5f9e33f --- /dev/null +++ b/explore/src/app/fos/fos.component.ts @@ -0,0 +1,16 @@ +import {Component} from "@angular/core"; +import {properties} from "../../environments/environment"; + +@Component({ + selector: 'explore-fos', + template: ` + + ` +}) +export class ExploreFosComponent { + piwikSiteId = properties.piwikSiteId; + + constructor() { + + } +} \ No newline at end of file diff --git a/explore/src/app/fos/fos.module.ts b/explore/src/app/fos/fos.module.ts new file mode 100644 index 00000000..bf657703 --- /dev/null +++ b/explore/src/app/fos/fos.module.ts @@ -0,0 +1,26 @@ +import {CommonModule} from "@angular/common"; +import {NgModule} from "@angular/core"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {LibFosRoutingModule} from "./fos-routing.module"; +import {FosRoutingModule} from "../openaireLibrary/fos/fos-routing.module"; +import {FosModule} from "../openaireLibrary/fos/fos.module"; +import {ExploreFosComponent} from "./fos.component"; + +@NgModule({ + imports: [ + CommonModule, + LibFosRoutingModule, + FosRoutingModule, + FosModule + ], + declarations: [ + ExploreFosComponent + ], + exports: [ + ExploreFosComponent + ], + providers: [ + PreviousRouteRecorder + ] +}) +export class LibFosModule { } \ No newline at end of file diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 3bd6a28c..1f30f9d8 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3bd6a28c1b90980135c04d6d4b52714357fa1853 +Subproject commit 1f30f9d88aac7499585cde51fcf656466edeb7a8 diff --git a/explore/src/app/sdg/sdg-routing.module.ts b/explore/src/app/sdg/sdg-routing.module.ts new file mode 100644 index 00000000..2634df2c --- /dev/null +++ b/explore/src/app/sdg/sdg-routing.module.ts @@ -0,0 +1,17 @@ +import {NgModule} from "@angular/core"; +import {RouterModule} from "@angular/router"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {ExploreSdgComponent} from "./sdg.component"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + component: ExploreSdgComponent, + canDeactivate: [PreviousRouteRecorder] + } + ]) + ] +}) +export class LibSdgRoutingModule { } \ No newline at end of file diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts new file mode 100644 index 00000000..7c90088a --- /dev/null +++ b/explore/src/app/sdg/sdg.component.ts @@ -0,0 +1,15 @@ +import {Component} from "@angular/core"; +import {properties} from "../../environments/environment"; + +@Component({ + selector: 'explore-sdg', + template: ` + + ` +}) +export class ExploreSdgComponent { + piwikSiteId = properties.piwikSiteId; + + constructor() { + } +} \ No newline at end of file diff --git a/explore/src/app/sdg/sdg.module.ts b/explore/src/app/sdg/sdg.module.ts new file mode 100644 index 00000000..dcded98a --- /dev/null +++ b/explore/src/app/sdg/sdg.module.ts @@ -0,0 +1,26 @@ +import {CommonModule} from "@angular/common"; +import {NgModule} from "@angular/core"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {LibSdgRoutingModule} from "./sdg-routing.module"; +import {SdgRoutingModule} from "../openaireLibrary/sdg/sdg-routing.module"; +import {SdgModule} from "../openaireLibrary/sdg/sdg.module"; +import {ExploreSdgComponent} from "./sdg.component"; + +@NgModule({ + imports: [ + CommonModule, + LibSdgRoutingModule, + SdgRoutingModule, + SdgModule + ], + declarations: [ + ExploreSdgComponent + ], + exports: [ + ExploreSdgComponent + ], + providers: [ + PreviousRouteRecorder + ] +}) +export class LibSdgModule { } \ No newline at end of file diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index c2bf664c..a1cc7cb3 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c2bf664ce363f49f64ca5b05f3456dd902dcad5b +Subproject commit a1cc7cb31617c565d3ba94fae629e3e15a8e8bf9 From 93abf84ee421865bd34ac5d17591be6d005e9f8e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 7 Nov 2022 13:06:01 +0200 Subject: [PATCH 8/8] Updated libraries --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 1f30f9d8..cb57b783 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1f30f9d88aac7499585cde51fcf656466edeb7a8 +Subproject commit cb57b78351af8ce08e178ff1bc69d73c43044cc2 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index a1cc7cb3..67483e8b 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit a1cc7cb31617c565d3ba94fae629e3e15a8e8bf9 +Subproject commit 67483e8b95c23aa8dcb2d1203e1fe89a4d7f033f