diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4897548..6b648b7 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,5 +1,5 @@ import {NgModule} from '@angular/core'; -import { RouterModule, Routes} from '@angular/router'; +import {RouterModule, Routes} from '@angular/router'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component"; import {IsCommunity} from "./openaireLibrary/connect/communityGuard/isCommunity.guard"; @@ -13,7 +13,6 @@ const routes: Routes = [ {path: '', loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule)}, {path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'}, {path: 'about/learn-how', loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule)}, - {path: 'about/learn-in-depth', loadChildren: () => import('./learn-how/learnInDepth/learn-in-depth.module').then(m => m.LearnInDepthModule)}, {path: 'about/faq', loadChildren: () => import('./learn-how/faqs/faqs.module').then(m => m.FaqsModule)}, {path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule)}, {path: 'invite', loadChildren: () => import('./utils/subscribe/invite/invite.module').then(m => m.InviteModule)}, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9aba2db..9dbf088 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; @@ -21,16 +21,18 @@ import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {Meta} from "@angular/platform-browser"; import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo"; import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service"; -import {FormBuilder, FormGroup} from "@angular/forms"; +import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {QuickContactService} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.service"; import {EmailService} from "./openaireLibrary/utils/email/email.service"; +import {AlertModal} from "./openaireLibrary/utils/modal/alert"; +import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component"; +import {Composer} from "./openaireLibrary/utils/email/composer"; +import {NotificationHandler} from "./openaireLibrary/utils/notification-handler"; @Component({ selector: 'app-root', - styles: [` - `], template: ` -
+
@@ -82,14 +84,16 @@ import {EmailService} from "./openaireLibrary/utils/email/email.service"; [communityId]="community.communityId" [menuItems]=bottomMenuItems [properties]="properties" [darkBackground]="true" [centered]="true"> +
` }) -export class AppComponent { +export class AppComponent implements OnInit, OnDestroy { isClient: boolean = false; userMenuItems: MenuItem[] = []; menuItems: RootMenuItem [] = []; @@ -106,7 +110,11 @@ export class AppComponent { public showQuickContact: boolean; public showGetStarted: boolean = true; public contactForm: FormGroup; - subscriptions = []; + public sending = false; + public images: string[] = []; + @ViewChild('modal') modal: AlertModal; + @ViewChild('quickContact') quickContact: QuickContactComponent; + private subscriptions = []; layout: CustomizationOptions = null; constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private _communitiesService: CommunitiesService, private smoothScroll: SmoothScroll, @@ -148,6 +156,9 @@ export class AppComponent { this.init(); }, error => { this.init()})); + this.subscriptions.push(this.quickContactService.isDisplayed.subscribe(display => { + this.showQuickContact = display; + })); } ngOnDestroy() { @@ -174,10 +185,18 @@ export class AppComponent { private init() { let communityId: string = ConnectHelper.getCommunityFromDomain(this.properties.domain); this.showMenu = false; + if(typeof document !== "undefined") { + if(communityId) { + document.body.classList.add(communityId + 'App communityApp'); + } else { + document.body.classList.add('connectApp'); + } + } this.initAdminToolCommunity(communityId); this.buildMenu(communityId); // this.communityId = communityId; if (!communityId) { + this.reset(); this.userManagementService.fixRedirectURL = properties.afterLoginRedirectLink; } else { this.userManagementService.fixRedirectURL = null; @@ -354,10 +373,6 @@ export class AppComponent { rootItem: new MenuItem("communities", "Communities", restrictedData ? url + "/search/find/communities" : "", restrictedData ? "" : "/search/find/communities", false, [], ['/search/find/communities'], {}), items: [] }); - this.menuItems.push({ - rootItem: new MenuItem("contact-us", "Contact us", restrictedData ? url + "/contact-us" : "", restrictedData ? "" : "/contact-us", false, [], ['/contact-us'], {}), - items: [] - }); this.bottomMenuItems = [ new MenuItem("", "About", "https://openaire.eu/project-factsheets", "", false, [], [], {}), new MenuItem("", "News - Events", "https://openaire.eu/news-events", "", false, [], [], {}), @@ -375,4 +390,69 @@ export class AppComponent { } this.showMenu = true; } + + /** + * Contact methods + * */ + public send(event) { + if (event.valid === true) { + this.sendMail(this.properties.admins); + } + } + + public reset() { + if (this.quickContact) { + this.quickContact.close(); + } + this.contactForm = this.fb.group({ + name: this.fb.control('', Validators.required), + surname: this.fb.control('', Validators.required), + email: this.fb.control('', [Validators.required, Validators.email]), + affiliation: this.fb.control('', Validators.required), + community: this.fb.control('', Validators.required), + message: this.fb.control('', Validators.required), + recaptcha: this.fb.control('', Validators.required), + }); + } + + private sendMail(admins: string[]) { + this.sending = true; + this.subscriptions.push(this.emailService.contact(this.properties, + Composer.composeEmailForNewCommunity(this.contactForm.value, admins), + this.contactForm.value.recaptcha).subscribe( + res => { + if (res) { + this.sending = false; + this.reset(); + this.modalOpen(); + } else { + this.handleError('Email sent failed! Please try again.'); + } + }, + error => { + this.handleError('Email sent failed! Please try again.', error); + } + )); + } + + public modalOpen() { + this.modal.okButton = true; + this.modal.alertTitle = 'Your request has been successfully submitted'; + this.modal.message = 'Our team will respond to your submission soon.'; + this.modal.alertMessage = true; + this.modal.cancelButton = false; + this.modal.okButtonLeft = false; + this.modal.okButtonText = 'OK'; + this.modal.open(); + } + + handleError(message: string, error = null) { + if (error) { + console.error(error); + } + this.sending = false; + this.quickContact.close(); + NotificationHandler.rise(message, 'danger'); + this.contactForm.get('recaptcha').setValue(''); + } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8589415..9bb37b0 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,6 +28,7 @@ import {IsCommunity} from "./openaireLibrary/connect/communityGuard/isCommunity. import {SubscribeService} from "./openaireLibrary/utils/subscribe/subscribe.service"; import {RoleVerificationModule} from "./openaireLibrary/role-verification/role-verification.module"; import {QuickContactModule} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.module"; +import {AlertModalModule} from "./openaireLibrary/utils/modal/alertModal.module"; @NgModule({ @@ -46,7 +47,7 @@ import {QuickContactModule} from "./openaireLibrary/sharedComponents/quick-conta AppRoutingModule, BrowserTransferStateModule, BrowserAnimationsModule, - PageURLResolverModule, Schema2jsonldModule, RoleVerificationModule, QuickContactModule + PageURLResolverModule, Schema2jsonldModule, RoleVerificationModule, QuickContactModule, AlertModalModule ], declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index d65dea2..9522aff 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -384,7 +384,7 @@ -
+

Let us Help you Develop a
Collaborative Science
diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index fcd23cf..fa9d012 100644 --- a/src/app/communities/communities.component.ts +++ b/src/app/communities/communities.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Meta, Title} from '@angular/platform-browser'; import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; @@ -16,13 +16,14 @@ import {properties} from "../../environments/environment"; import {Subscriber} from "rxjs"; import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; +import {QuickContactService} from "../openaireLibrary/sharedComponents/quick-contact/quick-contact.service"; @Component({ selector: 'communities', templateUrl: 'communities.component.html', }) -export class CommunitiesComponent { +export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { private subscriptions = []; private user: User; @@ -37,8 +38,10 @@ export class CommunitiesComponent { public subscriberErrorMessage: string = ""; public errorCodes: ErrorCodes; private errorMessages: ErrorMessagesComponent; - - properties: EnvProperties; + public showQuickContact: boolean = true; + @ViewChild('contact') contact: ElementRef; + + public properties: EnvProperties = properties; public keyword: string = ""; public type: string = "all"; @@ -51,7 +54,8 @@ export class CommunitiesComponent { private _communitiesService: CommunitiesService, private helper: HelperService, private seoService: SEOService, - private userManagementService: UserManagementService) { + private userManagementService: UserManagementService, + private quickContactService: QuickContactService) { var description = "OpenAIRE - Connect, Community Dashboard, research community"; var title = "OpenAIRE - Connect"; @@ -67,7 +71,6 @@ export class CommunitiesComponent { } public ngOnInit() { - this.properties = properties; var url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(url, false); this._meta.updateTag({content: url}, "property='og:url'"); @@ -85,6 +88,20 @@ export class CommunitiesComponent { //this.getDivContents(); this.getPageContents(); } + + ngOnDestroy() { + this.subscriptions.forEach(subscription => { + if (subscription instanceof Subscriber) { + subscription.unsubscribe(); + } + }); + } + + ngAfterViewInit() { + if(typeof window !== "undefined") { + this.createObservers(); + } + } private getPageContents() { this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => { @@ -97,6 +114,27 @@ export class CommunitiesComponent { this.divContents = contents; })); } + + createObservers() { + let options = { + root: null, + rootMargin: '200px', + 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.contact.nativeElement); + this.subscriptions.push(intersectionObserver); + } public getCommunities() { this.loading = true; @@ -187,15 +225,7 @@ export class CommunitiesComponent { public quote(param: string): string { return StringUtils.quote(param); } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - } - + private handleError(message: string, error): number { var code = ""; try { diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 321e9c5..d1c0cd0 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -1,6 +1,6 @@
-
+
@@ -17,8 +17,6 @@
-
Our team will respond to your submission soon.
Press OK to redirect to OpenAIRE Monitor home page. -
diff --git a/src/app/learn-how/faqs/faqs.component.ts b/src/app/learn-how/faqs/faqs.component.ts index 186165a..35e3552 100644 --- a/src/app/learn-how/faqs/faqs.component.ts +++ b/src/app/learn-how/faqs/faqs.component.ts @@ -10,189 +10,188 @@ import {Subscriber} from "rxjs"; import {properties} from "../../../environments/environment"; @Component({ - selector: 'learn-in-depth', + selector: 'faqs', template: ` -
-
+ +
+
-
-
-
-

Frequently Asked Questions

-
-
+
+
+

Frequently Asked Questions

+
    -
  • - What is a "Research community"? -
  • + What is a "Research community"? + +
    • +
  • + What is the difference between a Community Gateway and the + Research Community Dashboard (RCD)? + +
    • +
  • + How can Research Community thematic services integrate with + the Research Community Dashboard (RCD)? + +
    • +
  • What does my Research Community gain in terms of Open + Science? +
    • -
  • - What is the difference between a Community Gateway and the - Research Community Dashboard (RCD)? -
    • -
  • - How can Research Community thematic services integrate with - the Research Community Dashboard (RCD)? -
    • -
  • What does my Research Community gain in terms of Open - Science? -
    • -
  • - How is the service part of the European Open Science Cloud? - +
    • +
  • + How is the service part of the European Open Science Cloud? + +
    • +
  • + Who owns the gateway? + +
    • +
  • + How is the gateway operated? + +
    • +
  • + What is the SLA of the service? + +
    • +
  • + What are the costs? +
    • -
  • - Who owns the gateway? -
    • -
  • - How is the gateway operated? - +
    • +
  • + In what other areas can my Research community collaborate with + OpenAIRE? +
    • -
  • - What is the SLA of the service? -
    • -
  • - What are the costs? -
    • -
  • - In what other areas can my Research community collaborate with - OpenAIRE? -
    • -
+
+ +
diff --git a/src/app/learn-how/learn-how.component.css b/src/app/learn-how/learn-how.component.css new file mode 100644 index 0000000..75c7388 --- /dev/null +++ b/src/app/learn-how/learn-how.component.css @@ -0,0 +1,6 @@ +.pattern-background { + background-image: url("~src/assets/connect-assets/about/pattern.svg"); + background-size: auto; + background-repeat: no-repeat; + background-position: left 90%; +} diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index a470410..798f1a2 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -14,11 +14,11 @@ import {properties} from "../../environments/environment"; template: `
-
+
-
+
@@ -173,7 +173,7 @@ import {properties} from "../../environments/environment";

Find the best for your community.

-
+
Profile
@@ -212,7 +212,8 @@ import {properties} from "../../environments/environment";

We look forward to working together and helping you unlock the full potential of your research community through open science.

Contact us
- ` + `, + styleUrls: ['learn-how.component.css'] }) export class LearnHowComponent implements OnInit { public pageContents = null; diff --git a/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts b/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts deleted file mode 100644 index 2a5fe1e..0000000 --- a/src/app/learn-how/learnInDepth/learn-in-depth-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {LearnInDepthComponent} from "./learn-in-depth.component"; -import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: LearnInDepthComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class LearnInDepthRoutingModule { } diff --git a/src/app/learn-how/learnInDepth/learn-in-depth.component.ts b/src/app/learn-how/learnInDepth/learn-in-depth.component.ts deleted file mode 100644 index 6e017c2..0000000 --- a/src/app/learn-how/learnInDepth/learn-in-depth.component.ts +++ /dev/null @@ -1,257 +0,0 @@ -import {Component, OnInit} from '@angular/core'; -import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; -import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties"; -import {ActivatedRoute, 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"; -import {HelperService} from "../../openaireLibrary/utils/helper/helper.service"; -import {Subscriber} from "rxjs"; -import {properties} from "../../../environments/environment"; - -@Component({ - selector: 'learn-in-depth', - template: ` -
-
-
- -
-
-
-
-
-
-
-
-

Let’s set up a Gateway for your Community Together. -

-
-
You don’t have to go alone.
- -
We work with you in 4 collaborative steps to identify your needs, putting in - practice our expertise on open science so you get the most out of OpenAIRE’s operational - services. -
-
-
-
- -
-
-
-
-
-
-
-
-
- - -
-
-

1. Analyse your needs

-
"Identify the scope and goals. Understand open science practices within EOSC - and the OpenAIRE services." -
-

In this stage, you get to talk to the OpenAIRE team. Share your expectations with us and let us give you - all the details about the operational OpenAIRE services, which will be integrated into the Gateway for - your community.

-

Here are the most important questions that the OpenAIRE team will ask you, in order to understand your - scope and goals:

-
    -
  • Do you want a gateway, where researchers can have access to all research products of a discipline? Do - you want a gateway that gathers any research outcome, produced thanks to the funding and services of a - given research infrastructure? -
    • -
  • Is your community (in)formally organized in sub-communities? Would you like to browse research - products and get statistics also for these sub-communities? For example, the European Grid - Infrastructure (EGI) features “virtual organizations” that represent discipline-specific - communities and/or specific research projects. The research infrastructure DARIAH, on the other hand, is - organised in national nodes (e.g. DARIAH-IT, DARIAH-DE). -
    • -
  • How can the OpenAIRE team identify the research products of your community, among all those available - in the OpenAIRE Graph? Through a series of steps: set of keywords, acknowledgment statements, set of - projects, set of repositories, etc. This can be partial and provisional information that will serve as a - starting point to the OpenAIRE team. You will be able to refine and update this information, in the - second phase “Develop a pilot”. -
    • -
-
-
-
-
- - -
-
-

2. Develop a pilot

-
"We translate your needs into rules and processes and we configure - operational OpenAIRE services." -
-

Based on the information gathered in phase 1 “Analyse your needs”, the OpenAIRE team will set - up a pilot Gateway. We will configure the OpenAIRE mining algorithms to identify research products of the - OpenAIRE Graph that are relevant to your community. Those, together with some basic statistics, will be - available in the pilot version of the Community Gateway that will be deployed on the OpenAIRE BETA - infrastructure.

-

The OpenAIRE team will give you a demo of the Community Gateway, with details on how to refine and update - the configuration of the Community Gateway, both in terms of criteria for including research products and - in terms of logo and visible portal pages.

-
-
-
-
- - -
-
-

3. Test and Validate

-
"You validate and test your new Community Gateway (portal). If needed, we - further refine and adapt to your needs." -
-

Upon the completion of phase 2, take the time you need to test all its features, from search and browse - for research products, to addition/removal of statistics from the portal. You can report any issue you - might find and ask questions directly to the dedicated OpenAIRE team, via a specially designed - collaboration tool.

-

Typically, this phase takes some months, as you will have to go through certain procedures. Change the - configuration of the criteria to include research products, wait for the new configuration to be applied - on the OpenAIRE graph and validate the results, before you actually decide that the coverage of research - products for your community is adequate.

-

For some communities, the OpenAIRE team may also be able to implement dedicated mining algorithms (e.g. - to find acknowledgement statements to your community/infrastructure in the full-texts of research - articles) that may require several rounds of application, validation, and fine-tuning, before it reaches a - high precision and recall. Your feedback is very important to minimize the effort and time needed for this - process to complete.

-
- -
-
-
-
-
- -
-
-

4. Roll out the service

-
"We jointly roll out your new portal. You take over the business operations - and start engaging your researchers." -
-

Here we are: the coverage of research products is good, interesting statistics and charts have been - selected, and the portal pages available for end-users are ready. We can roll out the Community Gateway - and make it available to all the researchers of the community!

-

You, as a Community manager, become the main “promoter” of the Community Gateway. Engage the - researchers of your community and, when applicable, inform the managers of the research infrastructure - about the availability of tools for impact monitoring.

-

Remember that you will still be able to change the configuration of the Community Gateway in order to - address any issue that may arise and to follow the evolution of the community (e.g. a new project or a new - content provider that was not previously available in OpenAIRE).

-

Remember that you don’t have to go alone: the dedicated issue tracker you used in the “Test - and Validate” phase is always available for you to contact the OpenAIRE team and ask for - support.

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

Let us Help you develop a Collaborative Science -
- Gateway. - - It is fast. It is reliable.

-
Get in touch with our team to find out how.
-
CONTACT US
- - - -
-
- ` -}) -export class LearnInDepthComponent implements OnInit { - public pageTitle: string = "OpenAIRE - Connect | Learn In Depth"; - public pageDescription: string = "Work in 4 collaborative steps to identify your needs, putting in practice our expertise on open science so you get the most out of OpenAIRE’s operational services."; - public breadcrumbs: Breadcrumb[] = [ - {name: 'home', route: '/'}, - {name: 'about', route: '/about'}, - {name: 'learn in-depth'} - ]; - subscriptions = []; - public pageContents = null; - public divContents = null; - - public url: string = null; - - properties: EnvProperties; - - constructor( - private route: ActivatedRoute, - private _router: Router, - private _meta: Meta, - private _title: Title, - private seoService: SEOService, - private _piwikService: PiwikService, - private helper: HelperService) { - } - - public ngOnInit() { - - this.properties = properties; - - 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.baseLink + this._router.url; - this.seoService.createLinkForCanonicalURL(this.url); - this.updateUrl(this.url); - this.updateTitle(this.pageTitle); - this.updateDescription(this.pageDescription); - - //this.getDivContents(); - this.getPageContents(); - } - - private getPageContents() { - this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => { - this.pageContents = contents; - })); - } - - private getDivContents() { - this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => { - this.divContents = contents; - })); - } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - } - - - private updateDescription(description: string) { - this._meta.updateTag({content: description}, "name='description'"); - this._meta.updateTag({content: description}, "property='og:description'"); - } - - 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 updateUrl(url: string) { - this._meta.updateTag({content: url}, "property='og:url'"); - } -} diff --git a/src/app/learn-how/learnInDepth/learn-in-depth.module.ts b/src/app/learn-how/learnInDepth/learn-in-depth.module.ts deleted file mode 100644 index 315345d..0000000 --- a/src/app/learn-how/learnInDepth/learn-in-depth.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {RouterModule} from '@angular/router'; - -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {PiwikService} from '../../openaireLibrary/utils/piwik/piwik.service'; - -import {LearnInDepthComponent} from "./learn-in-depth.component"; -import {LearnInDepthRoutingModule} from "./learn-in-depth-routing.module"; -import {HelperModule} from "../../openaireLibrary/utils/helper/helper.module"; -import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard"; -import {Schema2jsonldModule} from "../../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; -import {SEOServiceModule} from "../../openaireLibrary/sharedComponents/SEO/SEOService.module"; -import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; -import {HtmlPagesModule} from "../../htmlPages/htmlPages.module"; - -@NgModule({ - imports: [ - CommonModule, RouterModule, LearnInDepthRoutingModule, HelperModule, - Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, HtmlPagesModule - ], - declarations: [ - LearnInDepthComponent - ], - exports: [ - LearnInDepthComponent - ], - providers:[ - PreviousRouteRecorder, PiwikService, IsRouteEnabled - ] -}) -export class LearnInDepthModule { } diff --git a/src/app/my-communities/my-communities.component.html b/src/app/my-communities/my-communities.component.html index 7d57adf..a0e789f 100644 --- a/src/app/my-communities/my-communities.component.html +++ b/src/app/my-communities/my-communities.component.html @@ -5,7 +5,7 @@
-
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5859789..bc5f586 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5859789119322e48814a3a90c38265e31523be8e +Subproject commit bc5f5860f955c47eb4205e7dc6f2d2450d5edaf6 diff --git a/src/app/searchPages/communities/searchCommunities.component.ts b/src/app/searchPages/communities/searchCommunities.component.ts index 7b96a56..92bf3e0 100644 --- a/src/app/searchPages/communities/searchCommunities.component.ts +++ b/src/app/searchPages/communities/searchCommunities.component.ts @@ -12,7 +12,10 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn import {StringUtils} from "../../openaireLibrary/utils/string-utils.class"; import {UserManagementService} from "../../openaireLibrary/services/user-management.service"; import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; -import {NewSearchPageComponent} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; +import { + NewSearchPageComponent, + SearchForm +} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {properties} from "../../../environments/environment"; import {Subscriber} from "rxjs"; @@ -28,6 +31,7 @@ import {Subscriber} from "rxjs"; [disableForms]="disableForms" [showIndexInfo]=false [simpleView]="true" + [searchForm]="searchForm" [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [simpleSearchLink]="searchLink" [entitiesSelection]="false" [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs" [basicMetaDescription]="['Research communities', 'Discover OpenAIRE research gateways for research communities.']"> @@ -49,6 +53,7 @@ export class SearchCommunitiesComponent { public baseUrl: string = null; public fieldIds: string[] = ["q"]; public refineFields: string[] = this.searchFields.COMMUNITIES_SEARCH_FIELDS; + public searchForm: SearchForm = {dark: false, class: 'search-form'}; public fieldIdsMap = { ["q"]: { name: "All fields", diff --git a/src/assets/connect-assets/about/1.svg b/src/assets/connect-assets/about/1.svg deleted file mode 100644 index 06b5a13..0000000 --- a/src/assets/connect-assets/about/1.svg +++ /dev/null @@ -1 +0,0 @@ -about 1 \ No newline at end of file diff --git a/src/assets/connect-assets/about/2.svg b/src/assets/connect-assets/about/2.svg deleted file mode 100644 index fad2dc6..0000000 --- a/src/assets/connect-assets/about/2.svg +++ /dev/null @@ -1 +0,0 @@ -about 2 \ No newline at end of file diff --git a/src/assets/connect-assets/about/3.svg b/src/assets/connect-assets/about/3.svg deleted file mode 100644 index 56f0c5f..0000000 --- a/src/assets/connect-assets/about/3.svg +++ /dev/null @@ -1 +0,0 @@ -about 3 \ No newline at end of file diff --git a/src/assets/connect-assets/about/4.svg b/src/assets/connect-assets/about/4.svg deleted file mode 100644 index 63e93a3..0000000 --- a/src/assets/connect-assets/about/4.svg +++ /dev/null @@ -1 +0,0 @@ -about 4 \ No newline at end of file diff --git a/src/assets/connect-assets/about/background.png b/src/assets/connect-assets/about/background.png deleted file mode 100644 index 54752ae..0000000 Binary files a/src/assets/connect-assets/about/background.png and /dev/null differ diff --git a/src/assets/connect-assets/about/cycle.svg b/src/assets/connect-assets/about/cycle.svg deleted file mode 100644 index d6bb241..0000000 --- a/src/assets/connect-assets/about/cycle.svg +++ /dev/null @@ -1 +0,0 @@ -about \ No newline at end of file diff --git a/src/assets/connect-assets/about/gifs/content.gif b/src/assets/connect-assets/about/gifs/content.gif deleted file mode 100644 index 2417a11..0000000 Binary files a/src/assets/connect-assets/about/gifs/content.gif and /dev/null differ diff --git a/src/assets/connect-assets/about/gifs/help.gif b/src/assets/connect-assets/about/gifs/help.gif deleted file mode 100644 index f7d35ff..0000000 Binary files a/src/assets/connect-assets/about/gifs/help.gif and /dev/null differ diff --git a/src/assets/connect-assets/about/gifs/links.gif b/src/assets/connect-assets/about/gifs/links.gif deleted file mode 100644 index 3dcc2b5..0000000 Binary files a/src/assets/connect-assets/about/gifs/links.gif and /dev/null differ diff --git a/src/assets/connect-assets/about/gifs/profile.gif b/src/assets/connect-assets/about/gifs/profile.gif deleted file mode 100644 index d7d043c..0000000 Binary files a/src/assets/connect-assets/about/gifs/profile.gif and /dev/null differ diff --git a/src/assets/connect-assets/about/gifs/statistics.gif b/src/assets/connect-assets/about/gifs/statistics.gif deleted file mode 100644 index 2ef8d45..0000000 Binary files a/src/assets/connect-assets/about/gifs/statistics.gif and /dev/null differ diff --git a/src/assets/connect-assets/about/gifs/users.gif b/src/assets/connect-assets/about/gifs/users.gif deleted file mode 100644 index abd9f73..0000000 Binary files a/src/assets/connect-assets/about/gifs/users.gif and /dev/null differ diff --git a/src/assets/connect-assets/about/pattern.svg b/src/assets/connect-assets/about/pattern.svg new file mode 100644 index 0000000..edf62e8 --- /dev/null +++ b/src/assets/connect-assets/about/pattern.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.css index 0b01446..9a0a3bd 100644 --- a/src/assets/connect-custom.css +++ b/src/assets/connect-custom.css @@ -6,12 +6,19 @@ Custom connect css /*buttons*/ --button-primary-background: var(--connect-color); --button-primary-background-image: none; - --button-secondary-background: var(--secondary-color); - --button-secondary-background-image: none; --button-primary-color: var(--text-default-color); + --button-secondary-background: var(--light-color); + --button-secondary-background-image: none; + --button-secondary-border-color: var(--grey-color); + --button-secondary-color: var(--grey-color); + --button-secondary-background-hover: var(--secondary-color); + --button-secondary-border-color-hover: var(--secondary-color); + --button-secondary-background-image-hover: none; + --button-secondary-color-hover: var(--light-color); /*backgrounds*/ --background-primary: var(--connect-color); + --background-primary-rgb: var(--connect-color-rgb); --background-primary-image:none; --background-secondary: var(--grey-color); --background-secondary-image:none; @@ -21,6 +28,11 @@ Custom connect css --text-secondary-color: var(--primary-color); } +.connectApp .search-form { + background-color: rgba(var(--secondary-color-rgb), 0.2); + background-image: none; +} + /*.whiteBackground { background-color: #fff; }*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 46e2d2d..e032e8c 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 46e2d2d0ce2ea045c627fa676e555dade9247620 +Subproject commit e032e8ce0a597da6e447451e53ed7e6bdfed2323