MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

styling changes 

*close navbar dialogs on screen resize
This commit is contained in:
Sofia Papacharalampous 2024-04-01 16:05:57 +03:00
parent 34fe15eb2f
commit 91ab347f40
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dmp-frontend/src/app/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.ts
View File

@ -1,5 +1,6 @@
import { fromEvent, Observable, Subscription } from "rxjs";
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
import { Component, Inject, OnInit } from '@angular/core'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthService } from '@app/core/services/auth/auth.service'; import { AuthService } from '@app/core/services/auth/auth.service';
@ -19,10 +20,13 @@ import { IsActive } from '@app/core/common/enum/is-active.enum';
templateUrl: './mine-inapp-notification-listing-dialog.component.html', templateUrl: './mine-inapp-notification-listing-dialog.component.html',
styleUrls: ['./mine-inapp-notification-listing-dialog.component.scss'] styleUrls: ['./mine-inapp-notification-listing-dialog.component.scss']
}) })
export class MineInAppNotificationListingDialogComponent extends BaseComponent implements OnInit { export class MineInAppNotificationListingDialogComponent extends BaseComponent implements OnInit, OnDestroy {
public inappNotifications = new Array<InAppNotification>(); public inappNotifications = new Array<InAppNotification>();
public notificationInAppTrackingEnum = NotificationInAppTracking; public notificationInAppTrackingEnum = NotificationInAppTracking;
resizeObservable: Observable<Event>;
resizeSubscription: Subscription;
constructor( constructor(
public dialogRef: MatDialogRef<MineInAppNotificationListingDialogComponent>, public dialogRef: MatDialogRef<MineInAppNotificationListingDialogComponent>,
@Inject(MAT_DIALOG_DATA) public dialogData: any, @Inject(MAT_DIALOG_DATA) public dialogData: any,
@ -56,6 +60,17 @@ export class MineInAppNotificationListingDialogComponent extends BaseComponent i
}, },
error => this.onCallbackError(error), error => this.onCallbackError(error),
); );
this.resizeObservable = fromEvent(window, 'resize');
this.resizeSubscription = this.resizeObservable
.subscribe(evt =>{
this.dialogRef.close();
});
}
ngOnDestroy(): void {
this.resizeSubscription.unsubscribe();
} }
private onCallbackError(errorResponse: HttpErrorResponse) { private onCallbackError(errorResponse: HttpErrorResponse) {

2
dmp-frontend/src/app/ui/navbar/navbar.component.html
View File

@ -29,7 +29,7 @@
<mat-icon>arrow_drop_down</mat-icon> <mat-icon>arrow_drop_down</mat-icon>
</button> </button>
<mat-menu #languageMenu="matMenu" class="lang-parent"> <mat-menu #languageMenu="matMenu" class="lang-parent">
<app-language (languageChange)="getLanguage($event)"></app-language> <app-language (languageChange)="getLanguage($event)" class="d-lg-block d-none"></app-language>
</mat-menu> </mat-menu>
</div> </div>
<div class="col-auto" *ngIf="isAuthenticated() && authentication.hasPermission(authentication.permissionEnum.ViewMineInAppNotificationPage)"> <div class="col-auto" *ngIf="isAuthenticated() && authentication.hasPermission(authentication.permissionEnum.ViewMineInAppNotificationPage)">

17
dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.ts
View File

@ -1,18 +1,22 @@
import { Component, Inject, OnInit } from '@angular/core'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms'; import { UntypedFormGroup } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthService } from '../../../core/services/auth/auth.service'; import { AuthService } from '../../../core/services/auth/auth.service';
import { Observable, Subscription, fromEvent } from 'rxjs';
@Component({ @Component({
selector: 'app-user-dialog-component', selector: 'app-user-dialog-component',
templateUrl: 'user-dialog.component.html', templateUrl: 'user-dialog.component.html',
styleUrls: ['user-dialog.component.scss'] styleUrls: ['user-dialog.component.scss']
}) })
export class UserDialogComponent implements OnInit { export class UserDialogComponent implements OnInit, OnDestroy {
public formGroup: UntypedFormGroup; public formGroup: UntypedFormGroup;
resizeObservable: Observable<Event>;
resizeSubscription: Subscription;
constructor( constructor(
private authentication: AuthService, private authentication: AuthService,
private router: Router, private router: Router,
@ -21,6 +25,15 @@ export class UserDialogComponent implements OnInit {
) { } ) { }
ngOnInit(): void { ngOnInit(): void {
this.resizeObservable = fromEvent(window, 'resize');
this.resizeSubscription = this.resizeObservable
.subscribe(evt =>{
this.dialogRef.close();
});
}
ngOnDestroy(): void {
this.resizeSubscription.unsubscribe();
} }
public logout(): void { public logout(): void {