This commit is contained in:
Sofia Papacharalampous 2024-07-04 14:10:12 +03:00
parent 9e69821561
commit 216fc43d3a
5 changed files with 28 additions and 14 deletions

View File

@ -8,22 +8,19 @@ import { filter, map, switchMap } from 'rxjs/operators';
import { AuthService, LoginStatus } from './core/services/auth/auth.service'; import { AuthService, LoginStatus } from './core/services/auth/auth.service';
import { CultureService } from './core/services/culture/culture-service'; import { CultureService } from './core/services/culture/culture-service';
// import { BreadCrumbResolverService } from './ui/misc/breadcrumb/service/breadcrumb.service'; // import { BreadCrumbResolverService } from './ui/misc/breadcrumb/service/breadcrumb.service';
import { Title } from '@angular/platform-browser'; import { DomSanitizer, Title } from '@angular/platform-browser';
import { CookieService } from "ngx-cookie-service"; import { CookieService } from "ngx-cookie-service";
import { NgcCookieConsentService, NgcStatusChangeEvent } from "ngx-cookieconsent"; import { NgcCookieConsentService, NgcStatusChangeEvent } from "ngx-cookieconsent";
import { ConfigurationService } from './core/services/configuration/configuration.service'; import { ConfigurationService } from './core/services/configuration/configuration.service';
import { LanguageService } from './core/services/language/language.service'; import { LanguageService } from './core/services/language/language.service';
import { MatSidenav } from '@angular/material/sidenav'; import { MatSidenav } from '@angular/material/sidenav';
import { nameof } from 'ts-simple-nameof';
import { TenantConfigurationType } from './core/common/enum/tenant-configuration-type';
import { CssColorsTenantConfiguration, TenantConfiguration } from './core/model/tenant-configuaration/tenant-configuration';
import { MatomoService } from './core/services/matomo/matomo-service'; import { MatomoService } from './core/services/matomo/matomo-service';
import { SideNavService } from './core/services/sidenav/side-nav.sevice'; import { SideNavService } from './core/services/sidenav/side-nav.sevice';
import { TenantConfigurationService } from './core/services/tenant-configuration/tenant-configuration.service';
import { TimezoneService } from './core/services/timezone/timezone-service'; import { TimezoneService } from './core/services/timezone/timezone-service';
import { BreadcrumbService } from './ui/misc/breadcrumb/breadcrumb.service'; import { BreadcrumbService } from './ui/misc/breadcrumb/breadcrumb.service';
import { TenantHandlingService } from './core/services/tenant/tenant-handling.service'; import { TenantHandlingService } from './core/services/tenant/tenant-handling.service';
import { MatIconRegistry } from '@angular/material/icon';
declare const gapi: any; declare const gapi: any;
@ -62,11 +59,16 @@ export class AppComponent implements OnInit, AfterViewInit {
private matomoService: MatomoService, private matomoService: MatomoService,
private tenantHandlingService: TenantHandlingService, private tenantHandlingService: TenantHandlingService,
private sidenavService: SideNavService, private sidenavService: SideNavService,
private breadcrumbService: BreadcrumbService private breadcrumbService: BreadcrumbService,
private sanitizer: DomSanitizer,
public iconRegistry: MatIconRegistry,
) { ) {
this.initializeServices(); this.initializeServices();
this.matomoService.init(); this.matomoService.init();
this.helpContentEnabled = configurationService.helpService.enabled; this.helpContentEnabled = configurationService.helpService.enabled;
const paperPlaneIconSrc = this.sanitizer.bypassSecurityTrustResourceUrl('/assets/images/annotations/paper-plane.svg');
iconRegistry.addSvgIcon('paperPlane', paperPlaneIconSrc);
} }
ngAfterViewInit(): void { ngAfterViewInit(): void {
setTimeout(() => { setTimeout(() => {

View File

@ -15,7 +15,6 @@
</div> </div>
<mat-dialog-content> <mat-dialog-content>
<div class="row"> <div class="row">
<!-- Create New Thread --> <!-- Create New Thread -->
<div class="col-12"> <div class="col-12">
<form [formGroup]="threadFormGroup"> <form [formGroup]="threadFormGroup">
@ -77,7 +76,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row mt-2 mb-2"> <div class="row mt-2 mb-2">
<!-- Parent Thread --> <!-- Parent Thread -->
<div class="col-12"> <div class="col-12">
<div class="container"> <div class="container">
@ -90,7 +89,7 @@
<mat-icon class="account-icon">account_circle</mat-icon> <mat-icon class="account-icon">account_circle</mat-icon>
</div> </div>
<div class="col"> <div class="col">
<div class="row pt-1"> <div class="row pt-1 pb-2">
<div class="col"> <div class="col">
<div class="row h-100"> <div class="row h-100">
<span class="col user">{{getParentAnnotation(thread).author.name}}</span> <span class="col user">{{getParentAnnotation(thread).author.name}}</span>
@ -182,8 +181,8 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="col-auto p-0 send-msg"> <div class="col-auto p-0 send-msg">
<button class="form-field-margin" mat-icon-button color="black" (click)="replyThread(thread)" matTooltip="{{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}}"> <button mat-icon-button (click)="replyThread(thread)" matTooltip="{{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}}">
<img class="paper-plane" src="/assets/images/annotations/paper-plane.png" alt="paper-plane"> <mat-icon svgIcon="paperPlane"></mat-icon>
</button> </button>
</div> </div>
</div> </div>

View File

@ -22,7 +22,6 @@ import { takeUntil } from 'rxjs/operators';
import { nameof } from 'ts-simple-nameof'; import { nameof } from 'ts-simple-nameof';
import { AnnotationStatusArrayEditorModel } from './annotation-status-editor.model'; import { AnnotationStatusArrayEditorModel } from './annotation-status-editor.model';
import { StatusService } from '@annotation-service/services/http/status.service'; import { StatusService } from '@annotation-service/services/http/status.service';
import { InternalStatus } from '@annotation-service/core/enum/internal-status.enum';
import { ConfigurationService } from '@app/core/services/configuration/configuration.service'; import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
import { MatSelectionList } from '@angular/material/list'; import { MatSelectionList } from '@angular/material/list';
@ -55,7 +54,7 @@ export class AnnotationDialogComponent extends BaseComponent {
public annotationStatusFormGroup: UntypedFormGroup; public annotationStatusFormGroup: UntypedFormGroup;
public listingStatuses: Status[] = []; public listingStatuses: Status[] = [];
public dmpUsersMentionNames: string[] = []; public dmpUsersMentionNames: string[] = [];
@ViewChild('annotationStatus') annotationStatus: MatSelectionList; @ViewChild('annotationStatus') annotationStatus: MatSelectionList;

View File

@ -341,7 +341,7 @@ export class TableOfContentsComponent extends BaseComponent implements OnInit, O
this.pauseIntersectionObserver = true; this.pauseIntersectionObserver = true;
this.tocentrySelected = entry; this.tocentrySelected = entry;
this.entrySelected.emit({ entry: entry, execute: execute }); this.entrySelected.emit({ entry: entry, execute: execute });
setTimeout(() => this.pauseIntersectionObserver = false, 1000); setTimeout(() => this.pauseIntersectionObserver = false, 2000);
} }
/** /**

View File

@ -0,0 +1,14 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="21.000000pt" height="21.000000pt" viewBox="0 0 21.000000 21.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,21.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M103 150 c-100 -55 -102 -57 -78 -70 22 -12 28 -9 76 31 55 45 56 40
7 -22 -15 -20 -28 -47 -28 -59 0 -22 1 -22 19 -6 15 14 23 15 45 5 14 -7 28
-10 31 -7 6 5 36 181 32 184 -1 1 -48 -24 -104 -56z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 637 B