Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Notification updates + import fix + paligo fonts

Browse Source
This commit is contained in:
Adina Țeudan 2021-10-15 00:17:24 +03:00
parent 3828c0bee3
commit b8b67ec8f2
8 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/components/notifications/notifications.component.html
View File

@ -16,7 +16,7 @@
class="notification"
mat-menu-item
>
<redaction-initials-avatar></redaction-initials-avatar>
<redaction-initials-avatar [user]="notification.userId"></redaction-initials-avatar>
<div class="notification-content">
<div [innerHTML]="getNotificationMessage(notification)"></div>
<div class="small-label mt-2">{{ getTime(notification.creationDate) }}</div>

1
apps/red-ui/src/app/components/notifications/notifications.component.ts
View File

@ -93,7 +93,6 @@ export class NotificationsComponent {
for (const key of Object.keys(res)) {
this.groupedNotifications.push({ dateString: key, notifications: res[key] });
}
this.groupedNotifications = this.groupedNotifications.reverse();
}
private _getDossierName(dossierId: string | undefined) {

3
apps/red-ui/src/app/modules/dossier/shared/services/file-management.service.ts
View File

@ -1,6 +1,5 @@
import { GenericService, List, QueryParam, RequiredParam, Validate } from '@iqser/common-ui';
import { GenericService, HeadersConfiguration, List, QueryParam, RequiredParam, Validate } from '@iqser/common-ui';
import { Injectable, Injector } from '@angular/core';
import { HeadersConfiguration } from '../../../../../../../../libs/common-ui/src/lib/utils/headers-configuration';
import { HttpHeaders, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs';

3
apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
View File

@ -8,9 +8,8 @@ import { TranslateService } from '@ngx-translate/core';
import { UploadDownloadDialogService } from './upload-download-dialog.service';
import { FileUploadResult } from '@redaction/red-ui-http';
import { isCsv } from '@utils/file-drop-utils';
import { ErrorMessageService, GenericService, RequiredParam, Validate } from '@iqser/common-ui';
import { ErrorMessageService, GenericService, HeadersConfiguration, RequiredParam, Validate } from '@iqser/common-ui';
import { DossiersService } from '@services/entity-services/dossiers.service';
import { HeadersConfiguration } from '../../../../../../../libs/common-ui/src/lib/utils/headers-configuration';
export interface ActiveUpload {
subscription: Subscription;

3
apps/red-ui/src/app/services/report-template.service.ts
View File

@ -1,9 +1,8 @@
import { Injectable, Injector } from '@angular/core';
import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
import { GenericService, HeadersConfiguration, RequiredParam, Validate } from '@iqser/common-ui';
import { PlaceholdersResponse, ReportTemplate } from '@redaction/red-ui-http';
import { Observable } from 'rxjs';
import { HttpResponse } from '@angular/common/http';
import { HeadersConfiguration } from '../../../../../libs/common-ui/src/lib/utils/headers-configuration';
@Injectable({
providedIn: 'root',

2
libs/common-ui

@ -1 +1 @@
Subproject commit f7d8b556d3eb926f8f5fbdfd6663518afc298c9e
Subproject commit e864fac7cee9bf73120de987ad15cb5d536950eb

25
paligo-styles/fonts.scss
View File

@ -1,34 +1,29 @@
@font-face {
font-family: 'OpenSans Extrabold';
src: url('../../fonts/OpenSans-ExtraBold.ttf') format('truetype');
}
@font-face {
font-family: 'Inter';
font-family: 'OpenSans';
font-weight: 300;
src: url('../../fonts/Inter-VariableFont.ttf') format('truetype');
src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype');
}
@font-face {
font-family: 'Inter';
font-family: 'OpenSans';
font-weight: 400;
src: url('../../fonts/Inter-VariableFont.ttf') format('truetype');
src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype');
}
@font-face {
font-family: 'Inter';
font-family: 'OpenSans';
font-weight: 500;
src: url('../../fonts/Inter-VariableFont.ttf') format('truetype');
src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype');
}
@font-face {
font-family: 'Inter';
font-family: 'OpenSans';
font-weight: 600;
src: url('../../fonts/Inter-VariableFont.ttf') format('truetype');
src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype');
}
@font-face {
font-family: 'Inter';
font-family: 'OpenSans';
font-weight: 700;
src: url('../../font/Inter-VariableFont.ttf') format('truetype');
src: url('../font/OpenSans-VariableFont.ttf') format('truetype');
}

4
paligo-styles/style.scss
View File

@ -11,7 +11,7 @@
body {
color: variables.$accent;
background-color: variables.$grey-9;
font-family: 'Inter', sans-serif;
font-family: 'OpenSans', sans-serif;
h1,
h2,
@ -22,7 +22,7 @@ body {
p,
pre {
margin: 0;
font-family: 'Inter', sans-serif;
font-family: 'OpenSans', sans-serif;
}
@include common-mixins.scroll-bar;