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

explore/src/app/contact/contact.component.html

@@ -7,7 +7,7 @@
   <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">
     <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)">
         <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>

explore/src/app/contact/contact.component.ts

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

services/utils-service/properties.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
 localPath = true
 # photo size in KB