Compare commits
1 Commits
master
...
fullscreen
Author | SHA1 | Date |
---|---|---|
Alex Martzios | ffbf692bf2 |
|
@ -41,11 +41,11 @@ const routes: Routes = [
|
||||||
loadChildren: () => import('./upload-dois/upload-dois.module').then(m => m.UploadDoisModule),
|
loadChildren: () => import('./upload-dois/upload-dois.module').then(m => m.UploadDoisModule),
|
||||||
data: {title: Irish.METADATA_PREFIX}, canActivate: [HasConsentGuard]
|
data: {title: Irish.METADATA_PREFIX}, canActivate: [HasConsentGuard]
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
path: 'contact-us',
|
// path: 'contact-us',
|
||||||
loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule),
|
// loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule),
|
||||||
data: {title: Irish.METADATA_PREFIX}
|
// data: {title: Irish.METADATA_PREFIX}
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
path: 'admin',
|
path: 'admin',
|
||||||
loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule),
|
loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule),
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {RouterModule} from '@angular/router';
|
|
||||||
import {ContactComponent} from './contact.component';
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: ContactComponent, canActivate: [], canDeactivate: [PreviousRouteRecorder]}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class ContactRoutingModule { }
|
|
|
@ -1,16 +1,16 @@
|
||||||
<schema2jsonld *ngIf="url" [URL]="url" [name]="title" type="other" [description]="description"></schema2jsonld>
|
<!-- <schema2jsonld *ngIf="url" [URL]="url" [name]="title" type="other" [description]="description"></schema2jsonld> -->
|
||||||
<div>
|
<div>
|
||||||
<div class="uk-section uk-container uk-container-large uk-flex uk-flex-center"
|
<div class="uk-section uk-container uk-container-large uk-flex uk-flex-center"
|
||||||
uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
|
uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
|
||||||
<div class="uk-padding-small uk-width-1-2@l uk-width-2-3@m uk-width-1-1">
|
<div class="uk-padding-small uk-width-1-2@l uk-width-2-3@m uk-width-1-1">
|
||||||
<contact-us [sending]="sending" [scrollspy]="true"
|
<contact-us [sending]="sending" [scrollspy]="true"
|
||||||
[contactForm]="contactForm" (sendEmitter)="send($event)">
|
[contactForm]="contactForm" (sendEmitter)="send($event)">
|
||||||
<h1 page-title class="uk-visible@m uk-margin-auto uk-text-center" uk-scrollspy-class>
|
<!-- <h1 page-title class="uk-visible@m uk-margin-auto uk-text-center" uk-scrollspy-class>
|
||||||
Contact us<span class="uk-text-primary">.</span>
|
Contact us<span class="uk-text-primary">.</span>
|
||||||
</h1>
|
</h1>
|
||||||
<h1 page-title class="uk-hidden@m uk-heading-large uk-margin-auto uk-text-center" uk-scrollspy-class>
|
<h1 page-title class="uk-hidden@m uk-heading-large uk-margin-auto uk-text-center" uk-scrollspy-class>
|
||||||
Contact us<span class="uk-text-primary">.</span>
|
Contact us<span class="uk-text-primary">.</span>
|
||||||
</h1>
|
</h1> -->
|
||||||
</contact-us>
|
</contact-us>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -14,9 +14,10 @@ import {BaseComponent} from '../openaireLibrary/sharedComponents/base/base.compo
|
||||||
templateUrl: './contact.component.html'
|
templateUrl: './contact.component.html'
|
||||||
})
|
})
|
||||||
export class ContactComponent extends BaseComponent implements OnInit {
|
export class ContactComponent extends BaseComponent implements OnInit {
|
||||||
public url: string = null;
|
// public url: string = null;
|
||||||
public sending = false;
|
public sending = false;
|
||||||
public contactForm: UntypedFormGroup;
|
public contactForm: UntypedFormGroup;
|
||||||
|
// @ViewChild('fsModal') fsModal;
|
||||||
@ViewChild('modal') modal;
|
@ViewChild('modal') modal;
|
||||||
|
|
||||||
constructor(protected _route: ActivatedRoute,
|
constructor(protected _route: ActivatedRoute,
|
||||||
|
@ -31,10 +32,10 @@ export class ContactComponent extends BaseComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.title = 'Contact us';
|
// this.title = 'Contact us';
|
||||||
this.description = 'Contact us';
|
// this.description = 'Contact us';
|
||||||
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
|
// this.url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||||
this.setMetadata();
|
// this.setMetadata();
|
||||||
this.reset();
|
this.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
import {NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {RouterModule} from '@angular/router';
|
// import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import {ContactComponent} from './contact.component';
|
import {ContactComponent} from './contact.component';
|
||||||
import {ContactRoutingModule} from "./contact-routing.module";
|
// import {ContactRoutingModule} from "./contact-routing.module";
|
||||||
import {EmailService} from "../openaireLibrary/utils/email/email.service";
|
import {EmailService} from "../openaireLibrary/utils/email/email.service";
|
||||||
import {RecaptchaModule} from "ng-recaptcha";
|
import {RecaptchaModule} from "ng-recaptcha";
|
||||||
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
||||||
|
@ -14,7 +14,7 @@ import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
ContactRoutingModule, CommonModule, RouterModule,
|
CommonModule,
|
||||||
AlertModalModule, RecaptchaModule,
|
AlertModalModule, RecaptchaModule,
|
||||||
Schema2jsonldModule, ContactUsModule
|
Schema2jsonldModule, ContactUsModule
|
||||||
],
|
],
|
||||||
|
|
|
@ -196,7 +196,7 @@
|
||||||
{{countSelectedFilters()}}
|
{{countSelectedFilters()}}
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
<a *ngIf="stakeholder" routerLink="/contact-us" id="feedback_switcher_toggle"
|
<a *ngIf="stakeholder" (click)="openFsModal(fsModal)" id="feedback_switcher_toggle"
|
||||||
class="uk-offcanvas-switcher uk-flex uk-flex-center uk-flex-middle uk-link-reset" uk-tooltip="Give us feedback">
|
class="uk-offcanvas-switcher uk-flex uk-flex-center uk-flex-middle uk-link-reset" uk-tooltip="Give us feedback">
|
||||||
<icon name="email" ratio="1.5" [flex]="true" customClass="uk-text-background" visuallyHidden="feedback"></icon>
|
<icon name="email" ratio="1.5" [flex]="true" customClass="uk-text-background" visuallyHidden="feedback"></icon>
|
||||||
</a>
|
</a>
|
||||||
|
@ -273,3 +273,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
<fs-modal #fsModal classTitle="uk-tile-default uk-border-bottom">
|
||||||
|
<contact></contact>
|
||||||
|
</fs-modal>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import {ChangeDetectorRef, Component} from "@angular/core";
|
import {ChangeDetectorRef, Component, ViewChild} from "@angular/core";
|
||||||
import {
|
import {
|
||||||
MonitorIndicatorStakeholderBaseComponent
|
MonitorIndicatorStakeholderBaseComponent
|
||||||
} from "../../openaireLibrary/monitor/monitor-indicator-stakeholder-base.component";
|
} from "../../openaireLibrary/monitor/monitor-indicator-stakeholder-base.component";
|
||||||
|
@ -15,12 +15,14 @@ import {SearchResearchResultsService} from "../../openaireLibrary/services/searc
|
||||||
import {CustomFilterService} from "../../openaireLibrary/shared/customFilter.service";
|
import {CustomFilterService} from "../../openaireLibrary/shared/customFilter.service";
|
||||||
import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
|
import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
|
||||||
import {Filter} from "../../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
import {Filter} from "../../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
||||||
|
import {FullScreenModalComponent} from "src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'monitor',
|
selector: 'monitor',
|
||||||
templateUrl: 'monitor.component.html'
|
templateUrl: 'monitor.component.html'
|
||||||
})
|
})
|
||||||
export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
|
export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
|
||||||
|
@ViewChild('fsModal') fsModal: FullScreenModalComponent;
|
||||||
|
|
||||||
constructor(protected _route: ActivatedRoute,
|
constructor(protected _route: ActivatedRoute,
|
||||||
protected _router: Router,
|
protected _router: Router,
|
||||||
|
@ -112,4 +114,16 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
|
||||||
}
|
}
|
||||||
return filters;
|
return filters;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
openFsModal(fsModal: FullScreenModalComponent) {
|
||||||
|
console.log('open fs feedback modal');
|
||||||
|
fsModal.title = 'Contact us';
|
||||||
|
fsModal.okButton = false;
|
||||||
|
fsModal.stayOpenInBack = true;
|
||||||
|
fsModal.open();
|
||||||
|
}
|
||||||
|
|
||||||
|
// closeFsModal() {
|
||||||
|
// console.log('close fs feedback modal');
|
||||||
|
// }
|
||||||
|
}
|
|
@ -12,6 +12,8 @@ import {SearchFilterModule} from "../../openaireLibrary/searchPages/searchUtils/
|
||||||
import {IconsService} from "../../openaireLibrary/utils/icons/icons.service";
|
import {IconsService} from "../../openaireLibrary/utils/icons/icons.service";
|
||||||
import {filters} from "../../openaireLibrary/utils/icons/icons";
|
import {filters} from "../../openaireLibrary/utils/icons/icons";
|
||||||
import {SliderUtilsModule} from "../../openaireLibrary/sharedComponents/slider-utils/slider-utils.module";
|
import {SliderUtilsModule} from "../../openaireLibrary/sharedComponents/slider-utils/slider-utils.module";
|
||||||
|
import {FullScreenModalModule} from "../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module";
|
||||||
|
import {ContactModule} from "../../contact/contact.module";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [CommonModule, RouterModule.forChild([
|
imports: [CommonModule, RouterModule.forChild([
|
||||||
|
@ -19,7 +21,7 @@ import {SliderUtilsModule} from "../../openaireLibrary/sharedComponents/slider-u
|
||||||
{path: ':topic/', component: MonitorComponent},
|
{path: ':topic/', component: MonitorComponent},
|
||||||
{path: ':topic/:category', component: MonitorComponent},
|
{path: ':topic/:category', component: MonitorComponent},
|
||||||
{path: ':topic/:category/:subCategory', component: MonitorComponent}
|
{path: ':topic/:category/:subCategory', component: MonitorComponent}
|
||||||
]), PageContentModule, SliderTabsModule, NumberRoundModule, IconsModule, ClickModule, RangeFilterModule, SearchFilterModule, SliderUtilsModule],
|
]), PageContentModule, SliderTabsModule, NumberRoundModule, IconsModule, ClickModule, RangeFilterModule, SearchFilterModule, SliderUtilsModule, FullScreenModalModule, ContactModule],
|
||||||
declarations: [MonitorComponent],
|
declarations: [MonitorComponent],
|
||||||
exports: [MonitorComponent]
|
exports: [MonitorComponent]
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue