MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Merge remote-tracking branch 'origin/develop' into explore-redesign

This commit is contained in:
Konstantina Galouni 2023-04-06 12:10:27 +03:00
parent 40d0a2a24c 36f4bd1c60
commit 0db79b0ffd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
explore/src/app/contact/contact.component.html
View File

@ -7,7 +7,7 @@
<div class="uk-section uk-padding-remove-top uk-container uk-container-large uk-flex uk-flex-center" <div class="uk-section uk-padding-remove-top 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 #contactUs [sending]="sending" [scrollspy]="true"
[contactForm]="contactForm" (sendEmitter)="send($event)"> [contactForm]="contactForm" (sendEmitter)="send($event)">
<h1 page-title class="uk-margin-auto uk-text-center" uk-scrollspy-class> <h1 page-title class="uk-margin-auto uk-text-center" uk-scrollspy-class>
Contact us to <br> learn more<span class="uk-text-primary">.</span> Contact us to <br> learn more<span class="uk-text-primary">.</span>

7
explore/src/app/contact/contact.component.ts
View File

@ -14,6 +14,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
import {Subscriber} from "rxjs"; import {Subscriber} from "rxjs";
import {properties} from "../../environments/environment"; import {properties} from "../../environments/environment";
import {NotificationHandler} from "../openaireLibrary/utils/notification-handler"; import {NotificationHandler} from "../openaireLibrary/utils/notification-handler";
import {ContactUsComponent} from "../openaireLibrary/contact-us/contact-us.component";
@Component({ @Component({
selector: 'contact', selector: 'contact',
@ -33,7 +34,8 @@ export class ContactComponent implements OnInit {
public contactForm: FormGroup; public contactForm: FormGroup;
@ViewChild('modal') modal; @ViewChild('modal') modal;
private subscriptions = []; private subscriptions = [];
@ViewChild('contactUs') contactUsComponent : ContactUsComponent;
ngOnDestroy() { ngOnDestroy() {
this.subscriptions.forEach(subscription => { this.subscriptions.forEach(subscription => {
if (subscription instanceof Subscriber) { if (subscription instanceof Subscriber) {
@ -94,6 +96,9 @@ export class ContactComponent implements OnInit {
message: this.fb.control('', Validators.required), message: this.fb.control('', Validators.required),
recaptcha: this.fb.control('', Validators.required), recaptcha: this.fb.control('', Validators.required),
}); });
if(this.contactUsComponent) {
this.contactUsComponent.resetRecaptcha();
}
} }
private sendMail(admins: any) { private sendMail(admins: any) {

2
services/utils-service/properties.file
View File

@ -1,4 +1,4 @@
userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo userInfoUrl = http://mpagasas.di.uoa.gr:19080/login-service/userInfo
ssl = false ssl = false
localPath = true localPath = true
# photo size in KB # photo size in KB