[fullscreen-modal-for-contact-us | WIP] wip for contact-us modal moved to another branch

src/app/app-routing.module.ts

@@ -41,11 +41,11 @@ const routes: Routes = [
     loadChildren: () => import('./upload-dois/upload-dois.module').then(m => m.UploadDoisModule),
     data: {title: Irish.METADATA_PREFIX}, canActivate: [HasConsentGuard]
   },
-  {
-    path: 'contact-us',
-    loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule),
-    data: {title: Irish.METADATA_PREFIX}
-  },
+  // {
+  //   path: 'contact-us',
+  //   loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule),
+  //   data: {title: Irish.METADATA_PREFIX}
+  // },
   {
     path: 'admin',
     loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule),

src/app/contact/contact-routing.module.ts

@@ -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 { }

src/app/contact/contact.component.html

@@ -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 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">
     <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"
                   [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>
         </h1>
 				<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>
-        </h1>
+        </h1> -->
       </contact-us>
     </div>
   </div>

src/app/contact/contact.component.ts

@@ -14,9 +14,10 @@ import {BaseComponent} from '../openaireLibrary/sharedComponents/base/base.compo
     templateUrl: './contact.component.html'
 })
 export class ContactComponent extends BaseComponent implements OnInit {
-    public url: string = null;
+    // public url: string = null;
     public sending = false;
     public contactForm: UntypedFormGroup;
+    // @ViewChild('fsModal') fsModal;
     @ViewChild('modal') modal;
     
     constructor(protected _route: ActivatedRoute,
@@ -31,10 +32,10 @@ export class ContactComponent extends BaseComponent implements OnInit {
     }
     
     ngOnInit() {
-      this.title = 'Contact us';
-      this.description = 'Contact us';
-      this.url = this.properties.domain + this.properties.baseLink + this._router.url;
-      this.setMetadata();
+      // this.title = 'Contact us';
+      // this.description = 'Contact us';
+      // this.url = this.properties.domain + this.properties.baseLink + this._router.url;
+      // this.setMetadata();
       this.reset();
     }
 

src/app/contact/contact.module.ts

@@ -1,9 +1,9 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {RouterModule} from '@angular/router';
+// import {RouterModule} from '@angular/router';
 
 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 {RecaptchaModule} from "ng-recaptcha";
 import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
@@ -14,7 +14,7 @@ import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module";
 
 @NgModule({
   imports: [
-    ContactRoutingModule, CommonModule, RouterModule,
+    CommonModule,
     AlertModalModule, RecaptchaModule,
     Schema2jsonldModule, ContactUsModule
   ],

src/app/shared/monitor/monitor.component.html

@@ -196,7 +196,7 @@
     {{countSelectedFilters()}}
   </span>
 </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">
     <icon name="email" ratio="1.5" [flex]="true" customClass="uk-text-background" visuallyHidden="feedback"></icon>
 </a>
@@ -273,3 +273,6 @@
         </div>
     </div>
 </ng-template>
+<fs-modal #fsModal classTitle="uk-tile-default uk-border-bottom">
+  <contact></contact>
+</fs-modal>

src/app/shared/monitor/monitor.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component} from "@angular/core";
+import {ChangeDetectorRef, Component, ViewChild} from "@angular/core";
 import {
   MonitorIndicatorStakeholderBaseComponent
 } 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 {StringUtils} from "../../openaireLibrary/utils/string-utils.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({
   selector: 'monitor',
   templateUrl: 'monitor.component.html'
 })
 export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
+  @ViewChild('fsModal') fsModal: FullScreenModalComponent;
 
   constructor(protected _route: ActivatedRoute,
               protected _router: Router,
@@ -112,4 +114,16 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
     }
     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');
+  // }
+}

src/app/shared/monitor/monitor.module.ts

@@ -12,6 +12,8 @@ import {SearchFilterModule} from "../../openaireLibrary/searchPages/searchUtils/
 import {IconsService} from "../../openaireLibrary/utils/icons/icons.service";
 import {filters} from "../../openaireLibrary/utils/icons/icons";
 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({
   imports: [CommonModule, RouterModule.forChild([
@@ -19,7 +21,7 @@ import {SliderUtilsModule} from "../../openaireLibrary/sharedComponents/slider-u
     {path: ':topic/', component: MonitorComponent},
     {path: ':topic/:category', 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],
   exports: [MonitorComponent]
 })