diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index fe7d42b..bb0e9a0 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -49,6 +49,7 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit { ngOnInit() { super.ngOnInit(); + this.layoutService.setHasHelpPopUp(false); this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.subscriptions.push(this.params.subscribe(params => { @@ -109,6 +110,7 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit { ngOnDestroy() { super.ngOnDestroy(); + this.layoutService.setHasHelpPopUp(true); this.layoutService.setRootClass(null); this.setProperties(Irish.irishAdminToolsCommunity, Irish.irishAdminToolsPortalType); } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 593726d..ad6ecea 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -31,11 +31,6 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
- - - - @@ -88,6 +83,7 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper"; + ` }) export class AppComponent extends ResearcherBaseComponent implements OnInit, AfterViewInit { @@ -110,6 +106,7 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft stakeholderUtils: StakeholderUtils = new StakeholderUtils(); windowWidth: number; compactMenuItems: boolean = false; + hasHelpPopUp: boolean = true; constructor(protected _route: ActivatedRoute, protected _router: Router, @@ -147,6 +144,9 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft ngOnInit() { this.isClient = typeof document !== 'undefined'; + this.subscriptions.push(this.layoutService.hasHelpPopUp.subscribe(value => { + this.hasHelpPopUp = value; + })); if(this.isClient) { this.getWindowWidth(); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d1fd8f8..86d0fb3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -17,8 +17,7 @@ import {CookieLawModule} from "./openaireLibrary/sharedComponents/cookie-law/coo import {SearchResearchResultsServiceModule} from "./openaireLibrary/services/searchResearchResultsService.module"; import {SearchOrcidService} from "./openaireLibrary/claims/claim-utils/service/searchOrcid.service"; import {SearchOrcidServiceModule} from "./openaireLibrary/claims/claim-utils/service/searchOrcidService.module"; -import {ContactModule} from "./contact/contact.module"; -import {IconsModule} from "./openaireLibrary/utils/icons/icons.module"; +import {HelpPopUpModule} from './shared/help-pop-up/help-pop-up.module'; @NgModule({ declarations: [ @@ -37,8 +36,7 @@ import {IconsModule} from "./openaireLibrary/utils/icons/icons.module"; CookieLawModule, SearchResearchResultsServiceModule, SearchOrcidServiceModule, - ContactModule, - IconsModule + HelpPopUpModule ], providers: [ SearchOrcidService, diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 6668e93..339bbb6 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -21,8 +21,14 @@ - - + +
+ +
+

Give us your feedback

+ Give general feedback of this platform. +
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c33af18..b0c69be 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c33af181bb46f6c054cc1e115f721cd204a619e1 +Subproject commit b0c69be6ef3e55089d7032f0d1457c874652974f diff --git a/src/app/shared/help-pop-up/help-pop-up.component.html b/src/app/shared/help-pop-up/help-pop-up.component.html new file mode 100644 index 0000000..e9dad9b --- /dev/null +++ b/src/app/shared/help-pop-up/help-pop-up.component.html @@ -0,0 +1,36 @@ +
+ + +
+ + +
+ Basic interactive functions +
+ \ No newline at end of file diff --git a/src/app/shared/help-pop-up/help-pop-up.component.less b/src/app/shared/help-pop-up/help-pop-up.component.less new file mode 100644 index 0000000..c58c70f --- /dev/null +++ b/src/app/shared/help-pop-up/help-pop-up.component.less @@ -0,0 +1,15 @@ +@import (reference) "~src/assets/openaire-theme/less/_import-variables"; + +#help-pop-up { + position: fixed; + bottom: 5vh; + right: 5vw; + z-index: @global-z-index - 20; + + .uk-drop { + max-height: 550px; + height: 385px; + max-width: 80vw; + width: 400px; + } +} \ No newline at end of file diff --git a/src/app/shared/help-pop-up/help-pop-up.component.ts b/src/app/shared/help-pop-up/help-pop-up.component.ts new file mode 100644 index 0000000..f486c5e --- /dev/null +++ b/src/app/shared/help-pop-up/help-pop-up.component.ts @@ -0,0 +1,39 @@ +import {Component, ElementRef, OnInit, ViewChild} from "@angular/core"; +import {AlertModal} from "../../openaireLibrary/utils/modal/alert"; + +declare var UIkit; + +@Component({ + selector: 'help-pop-up', + templateUrl: 'help-pop-up.component.html', + styleUrls: ['help-pop-up.component.less'] +}) +export class HelpPopUpComponent implements OnInit { + private subscriptions: any[] = []; + isClient: boolean = false; + helpPopUpClicked: boolean = false; + showDrop: boolean = false; + @ViewChild('drop') drop: ElementRef; + @ViewChild('guideModal', { static: true }) guideModal: AlertModal; + + ngOnInit() { + this.isClient = typeof document !== 'undefined'; + if(this.isClient) { + this.subscriptions.push(UIkit.util.on(document, 'show', '#pop-up', (event) => { + this.showDrop = true; + })); + this.subscriptions.push(UIkit.util.on(document, 'hide', '#pop-up', (event) => { + this.showDrop = false; + })); + } + } + + openGuideModal() { + this.guideModal.alertMessage = false; + this.guideModal.alertHeader = false; + this.guideModal.alertFooter = false; + this.guideModal.cancelButton = false; + this.guideModal.okButton = false; + this.guideModal.open(); + } +} \ No newline at end of file diff --git a/src/app/shared/help-pop-up/help-pop-up.module.ts b/src/app/shared/help-pop-up/help-pop-up.module.ts new file mode 100644 index 0000000..525d5ed --- /dev/null +++ b/src/app/shared/help-pop-up/help-pop-up.module.ts @@ -0,0 +1,24 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {AppRoutingModule} from '../../app-routing.module'; +import {IconsModule} from '../../openaireLibrary/utils/icons/icons.module'; +import {HelpPopUpComponent} from './help-pop-up.component'; +import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; +import {ContactModule} from '../../contact/contact.module'; + + +@NgModule({ + imports: [ + CommonModule, FormsModule, AppRoutingModule, IconsModule, ContactModule, AlertModalModule + ], + declarations: [ + HelpPopUpComponent + ], + providers:[], + exports: [ + HelpPopUpComponent + ] +}) +export class HelpPopUpModule { +} diff --git a/src/assets/irish-assets/interactive_functions.gif b/src/assets/irish-assets/interactive_functions.gif new file mode 100644 index 0000000..5bffd00 Binary files /dev/null and b/src/assets/irish-assets/interactive_functions.gif differ diff --git a/src/assets/irish-assets/interactive_functions_preview.png b/src/assets/irish-assets/interactive_functions_preview.png new file mode 100644 index 0000000..bfa0d67 Binary files /dev/null and b/src/assets/irish-assets/interactive_functions_preview.png differ