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

DM-315 add documine logo

Browse Source
This commit is contained in:
Dan Percic 2023-07-18 16:44:24 +03:00
parent 3e23306712
commit 199d2ec0a2
12 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/red-ui/src/app/app.component.ts
View File

@ -1,13 +1,10 @@
import { Component, inject, Renderer2, ViewContainerRef } from '@angular/core';
import { Component, Renderer2, ViewContainerRef } from '@angular/core';
import { RouterHistoryService } from '@services/router-history.service';
import { DOCUMENT } from '@angular/common';
import { UserPreferenceService } from '@users/user-preference.service';
import { getConfig, IqserPermissionsService } from '@iqser/common-ui';
import { getConfig } from '@iqser/common-ui';
import { AppConfig } from '@red/domain';
import { NavigationEnd, Router } from '@angular/router';
import { filter, map, switchMap, take, tap } from 'rxjs/operators';
import { Roles } from '@users/roles';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { filter, map, switchMap, take } from 'rxjs/operators';
function loadCustomTheme() {
const cssFileName = getConfig<AppConfig>().THEME;
@ -37,9 +34,8 @@ export class AppComponent {
userPreferenceService: UserPreferenceService,
renderer: Renderer2,
private readonly _router: Router,
iqserPermissionsService: IqserPermissionsService,
) {
renderer.addClass(inject(DOCUMENT).body, userPreferenceService.getTheme());
renderer.addClass(document.body, userPreferenceService.getTheme());
loadCustomTheme();
const removeQueryParams = _router.events.pipe(
@ -51,13 +47,9 @@ export class AppComponent {
);
removeQueryParams.subscribe();
const changeFavicon = iqserPermissionsService.has$(Roles.getRss).pipe(
tap(hasRss => {
const faviconUrl = hasRss ? 'assets/icons/documine-logo.ico' : 'favicon.ico';
document.getElementById('favicon').setAttribute('href', faviconUrl);
}),
);
changeFavicon.pipe(takeUntilDestroyed()).subscribe();
if (getConfig().IS_DOCUMINE) {
document.getElementById('favicon').setAttribute('href', 'assets/icons/documine-logo.ico');
}
}
#removeKeycloakQueryParams() {

5
apps/red-ui/src/app/components/base-screen/base-screen.component.html
View File

@ -11,7 +11,10 @@
<a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/'] | tenant" class="logo">
<div [attr.help-mode-key]="'home'" class="actions">
<iqser-logo (iqserHiddenAction)="userPreferenceService.toggleDevFeatures()" icon="red:logo"></iqser-logo>
<iqser-logo
(iqserHiddenAction)="userPreferenceService.toggleDevFeatures()"
[icon]="config.IS_DOCUMINE ? 'red:documine-logo' : 'red:logo'"
></iqser-logo>
<div class="app-name">{{ titleService.getTitle() }}</div>
</div>
</a>

3
apps/red-ui/src/app/components/base-screen/base-screen.component.ts
View File

@ -6,7 +6,7 @@ import { Title } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-search-action';
import { filter, map, startWith } from 'rxjs/operators';
import { IqserPermissionsService } from '@iqser/common-ui';
import { getConfig, IqserPermissionsService } from '@iqser/common-ui';
import { BreadcrumbsService } from '@services/breadcrumbs.service';
import { FeaturesService } from '@services/features.service';
import { ARCHIVE_ROUTE, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE } from '@red/domain';
@ -33,6 +33,7 @@ export class BaseScreenComponent {
readonly roles = Roles;
readonly documentViewer = inject(REDDocumentViewer);
readonly currentUser = this.userService.currentUser;
readonly config = getConfig();
readonly searchActions: List<SpotlightSearchAction> = [
{
text: this._translateService.instant('search.this-dossier'),

2
apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.html
View File

@ -4,7 +4,7 @@
</div>
<a class="logo">
<div class="actions">
<iqser-logo icon="red:logo"></iqser-logo>
<iqser-logo [icon]="config.IS_DOCUMINE ? 'red:documine-logo' : 'red:logo'"></iqser-logo>
<div class="app-name">{{ titleService.getTitle() }}</div>
</div>
</a>

3
apps/red-ui/src/app/components/skeleton/skeleton-top-bar/skeleton-top-bar.component.ts
View File

@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { getConfig } from '@iqser/common-ui';
@Component({
selector: 'redaction-skeleton-top-bar',
@ -8,5 +9,7 @@ import { Title } from '@angular/platform-browser';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class SkeletonTopBarComponent {
readonly config = getConfig();
constructor(readonly titleService: Title) {}
}

1
apps/red-ui/src/app/modules/icons/icons.module.ts
View File

@ -36,6 +36,7 @@ export class IconsModule {
'dictionary',
'denied',
'disable-analysis',
'documine-logo',
'double-chevron-right',
'enable-analysis',
'enter',

1
apps/red-ui/src/assets/config/config.json
View File

@ -3,6 +3,7 @@
"ADMIN_CONTACT_URL": null,
"API_URL": "https://dan.iqser.cloud",
"APP_NAME": "RedactManager very very very very long",
"IS_DOCUMINE": false,
"AUTO_READ_TIME": 3,
"BACKEND_APP_VERSION": "4.4.40",
"EULA_URL": "EULA_URL",

BIN
apps/red-ui/src/assets/icons/documine-logo.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

19
apps/red-ui/src/assets/icons/general/documine-logo.svg Normal file
View File

@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" id="Layer_1" version="1.1" x="0px" xml:space="preserve" y="0px" viewBox="398.3 453.2 132.2 117.1">
<style type="text/css">
.st0 {
opacity: 0.5;
fill: #504FDC;
}
.st1 {
fill: #504FDC;
}
</style>
<g>
<polygon class="st0" points="441.3,453.2 441.3,496.8 398.3,496.8 "/>
<path class="st1" d="M530.5,475.7c0,1.2-0.5,2.4-1.3,3.2c-0.8,0.8-1.9,1.3-3.2,1.3h-5.8c-2.5,0-4.5-2-4.5-4.5 c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3h5.8C528.5,471.2,530.5,473.3,530.5,475.7z"/>
<path class="st1" d="M512.1,489.2h-32.2c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3h22.4 c1.2,0,2.4-0.5,3.2-1.3c0.8-0.8,1.3-1.9,1.3-3.2c0-2.5-2-4.5-4.5-4.5h-14.4c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2 c0.8-0.8,1.9-1.3,3.2-1.3h9.4c1.2,0,2.4-0.5,3.2-1.3c0.8-0.8,1.3-1.9,1.3-3.2c0-2.5-2-4.5-4.5-4.5h-56v43.6h-43v73.5h90 c1.2,0,2.4-0.5,3.2-1.3c0.8-0.8,1.3-1.9,1.3-3.2c0-2.5-2-4.5-4.5-4.5h-14.8l0,0h-0.6c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2 c0.8-0.8,1.9-1.3,3.2-1.3h14.4c1.2,0,2.4-0.5,3.2-1.3c0.8-0.8,1.3-1.9,1.3-3.2c0-2.5-2-4.5-4.5-4.5h-30.4c-2.5,0-4.5-2-4.5-4.5 c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3h46.4c1.2,0,2.4-0.5,3.2-1.3c0.8-0.8,1.3-1.9,1.3-3.2c0-2.5-2-4.5-4.5-4.5h-38.4 c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3h22.4c1.2,0,2.4-0.5,3.2-1.3c0.8-0.8,1.3-1.9,1.3-3.2 c0-2.5-2-4.5-4.5-4.5h-14.4c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3h39.2c1.2,0,2.4-0.5,3.2-1.3 c0.8-0.8,1.3-1.9,1.3-3.2C516.6,491.3,514.5,489.2,512.1,489.2z M455.3,552.2c2.5,0,4.5,2,4.5,4.5c0,1.2-0.5,2.4-1.3,3.2 c-0.8,0.8-1.9,1.3-3.2,1.3h-5.8c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3H455.3z"/>
<path class="st1" d="M516.6,565.8c0,1.2-0.5,2.4-1.3,3.2c-0.8,0.8-1.9,1.3-3.2,1.3h-5.8c-2.5,0-4.5-2-4.5-4.5 c0-1.2,0.5-2.4,1.3-3.2c0.8-0.8,1.9-1.3,3.2-1.3h5.8C514.5,561.3,516.6,563.3,516.6,565.8z"/>
<path class="st1" d="M514.2,514.9c-0.8,0.8-1.9,1.3-3.2,1.3h-5.8c-2.5,0-4.5-2-4.5-4.5c0-1.2,0.5-2.4,1.3-3.2 c0.8-0.8,1.9-1.3,3.2-1.3h5.8c2.5,0,4.5,2,4.5,4.5C515.6,513,515.1,514.1,514.2,514.9z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

6
docker/red-ui/docker-entrypoint.sh
View File

@ -4,6 +4,7 @@ ADMIN_CONTACT_NAME="${ADMIN_CONTACT_NAME:-}"
ADMIN_CONTACT_URL="${ADMIN_CONTACT_URL:-}"
API_URL="${API_URL:-}"
APP_NAME="${APP_NAME:-}"
IS_DOCUMINE="${IS_DOCUMINE:-}"
AUTO_READ_TIME="${AUTO_READ_TIME:-1.5}"
BACKEND_APP_VERSION="${BACKEND_APP_VERSION:-4.7.0}"
EULA_URL="${EULA_URL:-}"
@ -25,13 +26,12 @@ BASE_TRANSLATIONS_DIRECTORY="${BASE_TRANSLATIONS_DIRECTORY:-/assets/i18n/redact/
THEME="${THEME:-theme-template}"
WATERMARK_PREVIEW_PAPER_FORMAT="${WATERMARK_PREVIEW_PAPER_FORMAT:-a4}"
echo '{
"ADMIN_CONTACT_NAME":"'"$ADMIN_CONTACT_NAME"'",
"ADMIN_CONTACT_URL":"'"$ADMIN_CONTACT_URL"'",
"API_URL":"'"$API_URL"'",
"APP_NAME":"'"$APP_NAME"'",
"IS_DOCUMINE":"'"$IS_DOCUMINE"'",
"AUTO_READ_TIME":"'"$AUTO_READ_TIME"'",
"BACKEND_APP_VERSION":"'"$BACKEND_APP_VERSION"'",
"EULA_URL":"'"$EULA_URL:"'",
@ -51,7 +51,7 @@ echo '{
"AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'",
"NOTIFICATIONS_THRESHOLD":"'"$NOTIFICATIONS_THRESHOLD"'",
"WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'"
}' > /usr/share/nginx/html/ui/assets/config/config.json
}' >/usr/share/nginx/html/ui/assets/config/config.json
echo 'Env variables: '
cat /usr/share/nginx/html/ui/assets/config/config.json

2
libs/common-ui

@ -1 +1 @@
Subproject commit 699e74a867e53485844e8e5bcfc91ed1d2ff2d4f
Subproject commit e69f8b3f0df8701bbc3dbc79e2239aaad3acc889

2
libs/red-domain/src/lib/shared/app-config.ts
View File

@ -1,4 +1,4 @@
import { IqserAppConfig } from '@iqser/common-ui/lib/utils';
import { IqserAppConfig } from '@common-ui/utils';
export interface AppConfig extends IqserAppConfig {
readonly ADMIN_CONTACT_NAME: string;