@@ -589,15 +589,13 @@ import {StakeholderEntities} from "../openaireLibrary/monitor/entities/stakehold
}
`]
})
-export class HowItWorksComponent {
-
+export class AboutComponent {
public url: string = null;
- public pageTitle: string = "OpenAIRE - Monitor | How it works";
- public description: string = "OpenAIRE - Monitor | How it works";
- public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'About - How it works'}];
+ public pageTitle: string = "OpenAIRE - Monitor | About";
+ public description: string = "OpenAIRE - Monitor | About - How it works";
+ public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'About'}];
public properties: EnvProperties = properties;
public sections: string[] = [StakeholderEntities.FUNDERS, StakeholderEntities.RIS, StakeholderEntities.ORGANIZATIONS];
- public activeSection: string = StakeholderEntities.FUNDERS;
public offset: number;
public stakeholderEntities = StakeholderEntities;
public shouldSticky: boolean = true;
diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts
index 2965597..e650a83 100644
--- a/src/app/about/about.module.ts
+++ b/src/app/about/about.module.ts
@@ -2,8 +2,7 @@ import {CommonModule} from "@angular/common";
import {NgModule} from "@angular/core";
import {RouterModule} from "@angular/router";
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
-import {HowItWorksComponent} from "./how-it-works.component";
-import {FaqsComponent} from "./faqs.component";
+import {AboutComponent} from "./about.component";
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {SliderTabsModule} from "../openaireLibrary/sharedComponents/tabs/slider-tabs.module";
@@ -11,25 +10,15 @@ import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
import {YouWeComponent} from "./you-we.component";
@NgModule({
- declarations: [HowItWorksComponent, FaqsComponent, YouWeComponent],
+ declarations: [AboutComponent, YouWeComponent],
imports: [CommonModule, RouterModule.forChild([
{
path: '',
- redirectTo: 'how-it-works',
- canDeactivate: [PreviousRouteRecorder],
- pathMatch: 'full'
- },
- {
- path: 'how-it-works',
- component: HowItWorksComponent,
+ component: AboutComponent,
data: {extraOffset: 50}
- },
- {
- path: 'faqs',
- component: FaqsComponent
- },
+ }
]), BreadcrumbsModule, SliderTabsModule, HelperModule],
- exports: [HowItWorksComponent, FaqsComponent],
+ exports: [AboutComponent],
providers: [PreviousRouteRecorder, PiwikService]
})
export class AboutModule {}
diff --git a/src/app/about/faqs.component.html b/src/app/about/faqs.component.html
deleted file mode 100644
index d5634e7..0000000
--- a/src/app/about/faqs.component.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
Frequently Asked
Questions.
-
-
-
-
-
-
-
-
-
-
Frequently Asked
Questions.
-
-
-
-
-
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 2d25307..744024d 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -9,6 +9,10 @@ const routes: Routes = [
path: 'about',
loadChildren: () => import('./about/about.module').then(m => m.AboutModule)
},
+ {
+ path: 'support',
+ loadChildren: () => import('./support/support.module').then(m => m.SupportModule)
+ },
{
path: 'methodology',
loadChildren: () => import('./openaireLibrary/monitor/methodology/methodology.module').then(m => m.MethodologyModule)
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0f677b6..d2e0857 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -180,12 +180,8 @@ export class AppComponent {
new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {})
);
this.resourcesService.setResources(this.menuItems);
- let about = new MenuItem("about", "About", "", "", false, [], null, {});
- about.items = [
- new MenuItem("how-it-works", "How it works", "", "/about/how-it-works", false, [], null, {}),
- new MenuItem("faqs", "FAQs", "", "/about/faqs", false, [], null, {})
- ]
- this.menuItems.push(about);
+ this.menuItems.push(new MenuItem("support", "Support", "", "/support", false, [], null, {}));
+ this.menuItems.push(new MenuItem("about", "About", "", "/about", false, [], null, {}));
this.bottomMenuItems = [
new MenuItem("", "About", "https://beta.openaire.eu/project-factsheets", "", false, [], [], {}),
new MenuItem("", "News - Events", "https://beta.openaire.eu/news-events", "", false, [], [], {}),
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 99492a2..76cb586 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 99492a2f08439c96018177b1272b78db40f1d9be
+Subproject commit 76cb586ebd44c3b6aef3cf29ddc21b944398e26d
diff --git a/src/app/support/support.component.html b/src/app/support/support.component.html
new file mode 100644
index 0000000..fd52ea2
--- /dev/null
+++ b/src/app/support/support.component.html
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
How can we help you?
+
Monitor expert support team is ready and excited to help.
+
Contact Us
+
+
+
+
+
+
+
Frequently Asked Questions
+
+
+
+
+
+
+
+
How can we help you?
+
Monitor expert support team is ready and excited to help.
+
Contact Us
+
+
+
+
+
Frequently Asked Questions
+
+
+
diff --git a/src/app/support/support.component.less b/src/app/support/support.component.less
new file mode 100644
index 0000000..81749e7
--- /dev/null
+++ b/src/app/support/support.component.less
@@ -0,0 +1,44 @@
+@import (reference) "~../../assets/openaire-theme/less/_import-variables";
+
+@faqs-curator-image-size: 136px;
+@faqs-contact-us-height: 450px;
+
+.contact-us {
+ height: @faqs-contact-us-height;
+
+ img {
+ position: absolute;
+ width: @faqs-curator-image-size;
+ height: @faqs-curator-image-size;
+ object-fit: cover;
+ border-radius: 18px;
+
+
+ &.one {
+ top: @global-medium-gutter;
+ right: @global-medium-gutter + (@faqs-curator-image-size/2);
+ transform: rotate(10deg);
+ }
+
+ &.two {
+ bottom: @global-medium-gutter;
+ right: @global-medium-gutter + (@faqs-curator-image-size);
+ transform: rotate(-10deg);
+ object-position: top;
+ }
+
+ &.three {
+ top: 0;
+ left: @global-medium-gutter + (@faqs-curator-image-size);
+ transform: rotate(-10deg);
+ object-position: -60px;
+ }
+
+ &.four {
+ bottom: 2*@global-medium-gutter;
+ left: 2*@global-medium-gutter;
+ transform: rotate(-10deg);
+ object-position: 0;
+ }
+ }
+}
diff --git a/src/app/about/faqs.component.ts b/src/app/support/support.component.ts
similarity index 90%
rename from src/app/about/faqs.component.ts
rename to src/app/support/support.component.ts
index 0a27ab1..2842108 100644
--- a/src/app/about/faqs.component.ts
+++ b/src/app/support/support.component.ts
@@ -10,17 +10,18 @@ import {Subscriber} from "rxjs";
import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
@Component({
- selector: 'faqs',
- templateUrl: 'faqs.component.html'
+ selector: 'support',
+ templateUrl: 'support.component.html',
+ styleUrls: ['support.component.less']
})
-export class FaqsComponent {
+export class SupportComponent {
public pageContents = null;
public divContents = null;
public url: string = null;
- public pageTitle: string = "OpenAIRE - Monitor | FAQs";
- public description: string = "OpenAIRE - Monitor | FAQs";
- public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'FAQs'}];
+ public pageTitle: string = "OpenAIRE - Monitor | Support";
+ public description: string = "OpenAIRE - Monitor | Support";
+ public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Support'}];
public properties: EnvProperties = properties;
subscriptions = [];
diff --git a/src/app/support/support.module.ts b/src/app/support/support.module.ts
new file mode 100644
index 0000000..8a52b81
--- /dev/null
+++ b/src/app/support/support.module.ts
@@ -0,0 +1,22 @@
+import {CommonModule} from "@angular/common";
+import {NgModule} from "@angular/core";
+import {RouterModule} from "@angular/router";
+import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {SupportComponent} from "./support.component";
+import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
+import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
+import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
+
+@NgModule({
+ declarations: [SupportComponent],
+ imports: [CommonModule, RouterModule.forChild([
+ {
+ path: '',
+ component: SupportComponent,
+ data: {extraOffset: 50}
+ }
+ ]), BreadcrumbsModule, HelperModule],
+ exports: [SupportComponent],
+ providers: [PreviousRouteRecorder, PiwikService]
+})
+export class SupportModule {}
diff --git a/src/assets/common-assets b/src/assets/common-assets
index f15bbfa..ad68833 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit f15bbfa7265f170e06b256f086f2acedfa3f72e0
+Subproject commit ad6883318d1268cd61871fb6dfb974639aa3a2fc
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index c92a0de..66c6aae 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit c92a0dea1b7fc51f0cf272f8d4343735d000a23b
+Subproject commit 66c6aae50223b0b378156e217ea3572e266eedc3