From 4c1222530aad5de7ea6998a8dd83ae519a0a8cd8 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 11 Sep 2020 11:27:29 +0300 Subject: [PATCH 1/2] Fixes path on support/feedback. Adds animation on filters of DMP listing --- .../app/ui/dmp/listing/dmp-listing.component.html | 2 +- .../app/ui/dmp/listing/dmp-listing.component.scss | 2 ++ .../app/ui/dmp/listing/dmp-listing.component.ts | 12 ++++++++++-- .../src/app/ui/dmp/overview/dmp-overview.module.ts | 4 ++++ .../src/app/ui/sidebar/sidebar.component.html | 14 +++++++++++--- .../src/app/ui/sidebar/sidebar.component.ts | 8 ++------ 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html index 4bdf661be..3ecdfea2d 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html @@ -8,7 +8,7 @@

{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} {{'DMP-LISTING.LINK-ZENODO' | translate}} {{'DMP-LISTING.GET-IDEA' | translate}}

-
+
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss index ba7fc9fc9..efbc38c53 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss @@ -190,6 +190,8 @@ right: 0px; z-index: 100; width: 37px; + transition: right .3s; + transition-timing-function: ease-in-out; } .filter-btn button { diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts index 7e9f51848..d113f23db 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts @@ -28,6 +28,7 @@ import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.compo import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order'; import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'; import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; +import { NgDialogAnimationService } from "ng-dialog-animation"; @Component({ selector: 'app-dmp-listing-component', @@ -71,6 +72,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread private dmpService: DmpService, private router: Router, private route: ActivatedRoute, + public dialogAnimation: NgDialogAnimationService, public dialog: MatDialog, public enumUtils: EnumUtils, private language: TranslateService, @@ -346,7 +348,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread } openFiltersDialog(): void { - const dialogRef = this.dialog.open(DmpCriteriaDialogComponent, { + const dialogRef = this.dialogAnimation.open(DmpCriteriaDialogComponent, { width: '456px', height: '100%', id: 'filters', @@ -359,7 +361,13 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread // criteria: this.grantId ? this.criteria : this.getDefaultCriteria(), updateDataFn: this.updateDataFn.bind(this) }, - position: { right: '0px;' } + position: { right: '0px;' }, + animation: { + to: "left", + incomingOptions: { + keyframeAnimationOptions: { duration: 300, easing: "ease-in-out" } + } + } }); dialogRef.afterClosed().subscribe(result => { diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts index 685a8bee6..dc73b4f76 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts @@ -9,6 +9,7 @@ import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; import { RouterModule } from '@angular/router'; import { CloneDialogModule } from '../clone/clone-dialog/clone-dialog.module'; +import { NgDialogAnimationService } from 'ng-dialog-animation'; @NgModule({ imports: [ @@ -24,6 +25,9 @@ import { CloneDialogModule } from '../clone/clone-dialog/clone-dialog.module'; ], declarations: [ DmpOverviewComponent + ], + providers: [ + NgDialogAnimationService ] }) export class DmpOverviewModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html index 321396716..d043ed575 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html @@ -4,16 +4,24 @@
- + {{ groupMenuRoute.icon }} person {{groupMenuRoute.title | translate}} - + {{ groupMenuRoute.icon }} {{groupMenuRoute.title | translate}} - + + {{ groupMenuRoute.icon }} + {{groupMenuRoute.title | translate}} + + + {{ groupMenuRoute.icon }} + {{groupMenuRoute.title | translate}} + + {{ groupMenuRoute.icon }} {{groupMenuRoute.title | translate}} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index b726b6997..2120bfdca 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -253,12 +253,8 @@ export class SidebarComponent implements OnInit { } } - public openContactSupport(groupMenuRoute: RouteInfo) { - if (this.isAuthenticated()) { - window.open(groupMenuRoute.url, '_blank'); - } else { - window.open('/splash/contact.html', '_self'); - } + public openFeedback(groupMenuRoute: RouteInfo) { + window.open(groupMenuRoute.url, '_blank'); } } From 05fc18404aa5497972eb149a511a8a57d430ce13 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 11 Sep 2020 11:31:09 +0300 Subject: [PATCH 2/2] Adds library from: npmjs.com/package/ng-dialog-animation --- dmp-frontend/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index 07983c8b1..6d73f251f 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -30,6 +30,7 @@ "file-saver": "^2.0.2", "moment": "^2.24.0", "moment-timezone": "^0.5.26", + "ng-dialog-animation": "^9.0.3", "ngx-cookie-service": "^2.2.0", "ngx-cookieconsent": "^2.2.3", "ngx-guided-tour": "^1.1.10",