From 392f16ca6a2556d8d7b4e8b1031f185b808d0224 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 1 Apr 2025 14:34:14 +0200
Subject: [PATCH 01/36] OZG-7707 Add icons showcase to demo app
---
alfa-client/apps/demo/project.json | 29 ++++----
.../apps/demo/src/app/app.component.html | 14 +++-
.../apps/demo/src/app/app.component.ts | 2 +
alfa-client/apps/demo/src/app/app.config.ts | 11 +++-
.../src/assets/accessibility.svg | 9 +++
.../src/assets/account-circle.svg | 4 ++
alfa-client/libs/design-system/src/index.ts | 1 +
.../src/lib/icon/icon.component.spec.ts | 44 +++++++++++++
.../src/lib/icon/icon.component.ts | 66 +++++++++++++++++++
.../src/lib/icon/icon.stories.ts | 45 +++++++++++++
alfa-client/package.json | 1 +
alfa-client/pnpm-lock.yaml | 17 +++++
12 files changed, 221 insertions(+), 22 deletions(-)
create mode 100644 alfa-client/libs/design-system/src/assets/accessibility.svg
create mode 100644 alfa-client/libs/design-system/src/assets/account-circle.svg
create mode 100644 alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts
create mode 100644 alfa-client/libs/design-system/src/lib/icon/icon.component.ts
create mode 100644 alfa-client/libs/design-system/src/lib/icon/icon.stories.ts
diff --git a/alfa-client/apps/demo/project.json b/alfa-client/apps/demo/project.json
index e0876536a2..33b6d437bf 100644
--- a/alfa-client/apps/demo/project.json
+++ b/alfa-client/apps/demo/project.json
@@ -8,24 +8,23 @@
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
- "outputs": [
- "{options.outputPath}"
- ],
+ "outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/apps/demo",
"index": "apps/demo/src/index.html",
"main": "apps/demo/src/main.ts",
- "polyfills": [
- "zone.js"
- ],
+ "polyfills": ["zone.js"],
"tsConfig": "apps/demo/tsconfig.app.json",
"assets": [
"apps/demo/src/favicon.ico",
- "apps/demo/src/assets"
- ],
- "styles": [
- "apps/demo/src/styles.scss"
+ "apps/demo/src/assets",
+ {
+ "input": "libs/design-system/src/assets",
+ "glob": "**/*",
+ "output": "assets/icons"
+ }
],
+ "styles": ["apps/demo/src/styles.scss"],
"scripts": []
},
"configurations": {
@@ -75,15 +74,11 @@
},
"lint": {
"executor": "@nx/eslint:lint",
- "outputs": [
- "{options.outputFile}"
- ]
+ "outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
- "outputs": [
- "{workspaceRoot}/coverage/{projectRoot}"
- ],
+ "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/demo/jest.config.ts"
}
@@ -95,4 +90,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 22a2f09c8b..9dce1e1daf 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -57,6 +57,14 @@
</div>
<div class="my-12">
+ <h2 class="heading-2">Icons</h2>
+ <div class="mb-6 flex">
+ <ods-icon name="account-circle" size="xxl" />
+ <ods-icon name="accessibility" size="extra-large" color="text" />
+ <ods-icon name="accessibility" size="large" color="error" />
+ <ods-icon name="accessibility" class="fill-red-500" />
+ <ods-icon name="accessibility" size="small" />
+ </div>
<h1 class="mb-6 text-2xl font-semibold text-text">Auswertungen</h1>
<ods-button text="Auswertung hinzufügen" />
<ul class="mt-6 divide-y divide-gray-300 rounded-md bg-background-50 text-text shadow-sm ring-1 ring-gray-300">
@@ -582,21 +590,21 @@
</div>
<div class="mt-4">
- <ods-file-upload-button class="w-72" [isLoading]="false" id="upload117">
+ <ods-file-upload-button class="w-72" [isLoading]="false" id="upload117" dataTestId="demo-upload-1">
<ods-bescheid-upload-icon icon />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
<div class="mt-4">
- <ods-file-upload-button class="w-72" [isLoading]="true" id="upload117">
+ <ods-file-upload-button class="w-72" [isLoading]="true" id="upload117" dataTestId="demo-upload-2">
<ods-bescheid-upload-icon icon />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
<div class="mt-4">
- <ods-file-upload-button class="w-72" [isLoading]="true" id="upload130">
+ <ods-file-upload-button class="w-72" [isLoading]="true" id="upload130" dataTestId="demo-upload-3">
<ods-attachment-icon icon />
<ods-spinner-icon spinner size="medium" />
<div text class="text-center">Anhang hochladen</div></ods-file-upload-button
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 044bdfb401..1e18d64a6b 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -39,6 +39,7 @@ import {
ErrorMessageComponent,
FieldsetComponent,
FileUploadButtonComponent,
+ IconComponent,
InstantSearchComponent,
RadioButtonCardComponent,
SaveIconComponent,
@@ -90,6 +91,7 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
TextareaComponent,
ErrorMessageComponent,
TooltipDirective,
+ IconComponent,
],
selector: 'app-root',
templateUrl: './app.component.html',
diff --git a/alfa-client/apps/demo/src/app/app.config.ts b/alfa-client/apps/demo/src/app/app.config.ts
index 9c33c34037..a0ecda43e8 100644
--- a/alfa-client/apps/demo/src/app/app.config.ts
+++ b/alfa-client/apps/demo/src/app/app.config.ts
@@ -21,10 +21,17 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ApplicationConfig } from '@angular/core';
+import { provideHttpClient } from '@angular/common/http';
+import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
import { provideRouter, withEnabledBlockingInitialNavigation } from '@angular/router';
+import { provideAngularSvgIcon } from 'angular-svg-icon';
import { appRoutes } from './app.routes';
export const appConfig: ApplicationConfig = {
- providers: [provideRouter(appRoutes, withEnabledBlockingInitialNavigation())],
+ providers: [
+ provideRouter(appRoutes, withEnabledBlockingInitialNavigation()),
+ provideZoneChangeDetection({ eventCoalescing: true }),
+ provideHttpClient(),
+ provideAngularSvgIcon(),
+ ],
};
diff --git a/alfa-client/libs/design-system/src/assets/accessibility.svg b/alfa-client/libs/design-system/src/assets/accessibility.svg
new file mode 100644
index 0000000000..5f0c8a9197
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/accessibility.svg
@@ -0,0 +1,9 @@
+<svg viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <rect x="2" y="2" width="22" height="22" rx="11" />
+ <path
+ d="M13 8.87508C12.6828 8.87508 12.3726 8.781 12.1088 8.60473C11.845 8.42846 11.6394 8.17793 11.518 7.8848C11.3966 7.59168 11.3648 7.26914 11.4267 6.95796C11.4886 6.64678 11.6414 6.36095 11.8657 6.1366C12.0901 5.91225 12.3759 5.75947 12.6871 5.69757C12.9983 5.63568 13.3208 5.66744 13.6139 5.78886C13.907 5.91027 14.1576 6.11588 14.3339 6.37969C14.5101 6.64349 14.6042 6.95364 14.6042 7.27092C14.6038 7.69623 14.4346 8.10399 14.1339 8.40473C13.8331 8.70547 13.4253 8.87463 13 8.87508Z"
+ class="fill-whitetext" />
+ <path
+ d="M18.0417 8.898L18.0288 8.90144L18.0168 8.90516C17.9881 8.91318 17.9595 8.92178 17.9308 8.93066C17.3977 9.08706 14.8105 9.81638 12.9877 9.81638C11.2939 9.81638 8.94064 9.18618 8.18783 8.97219C8.1129 8.94322 8.03639 8.91855 7.95866 8.89829C7.41439 8.75506 7.04199 9.30792 7.04199 9.81323C7.04199 10.3137 7.49173 10.552 7.94577 10.723V10.731L10.6734 11.583C10.9521 11.6898 11.0266 11.799 11.063 11.8935C11.1813 12.1969 11.0868 12.7976 11.0533 13.0072L10.8871 14.2963L9.96501 19.3434C9.96215 19.3572 9.95957 19.3712 9.95728 19.3855L9.95069 19.4219C9.88423 19.8845 10.224 20.3334 10.8674 20.3334C11.4288 20.3334 11.6766 19.9458 11.784 19.4185C11.784 19.4185 12.5861 14.9047 12.9871 14.9047C13.3882 14.9047 14.2143 19.4185 14.2143 19.4185C14.3218 19.9458 14.5695 20.3334 15.131 20.3334C15.7761 20.3334 16.1158 19.8825 16.0477 19.4185C16.0417 19.3789 16.0345 19.34 16.0259 19.3022L15.0912 14.2969L14.9253 13.0078C14.8053 12.257 14.9018 12.0089 14.9345 11.9508L14.9368 11.9465C14.9677 11.8892 15.1087 11.7609 15.4375 11.6374L17.995 10.7434C18.0107 10.7392 18.0262 10.7342 18.0414 10.7285C18.4998 10.5566 18.9581 10.3188 18.9581 9.81381C18.9581 9.30878 18.586 8.75506 18.0417 8.898Z"
+ class="fill-whitetext" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/account-circle.svg b/alfa-client/libs/design-system/src/assets/account-circle.svg
new file mode 100644
index 0000000000..e6e1d1517a
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/account-circle.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M12.75 2C7.23 2 2.75 6.48 2.75 12C2.75 17.52 7.23 22 12.75 22C18.27 22 22.75 17.52 22.75 12C22.75 6.48 18.27 2 12.75 2ZM7.82 18.28C8.25 17.38 10.87 16.5 12.75 16.5C14.63 16.5 17.26 17.38 17.68 18.28C16.32 19.36 14.61 20 12.75 20C10.89 20 9.18 19.36 7.82 18.28ZM19.11 16.83C17.68 15.09 14.21 14.5 12.75 14.5C11.29 14.5 7.82 15.09 6.39 16.83C5.37 15.49 4.75 13.82 4.75 12C4.75 7.59 8.34 4 12.75 4C17.16 4 20.75 7.59 20.75 12C20.75 13.82 20.13 15.49 19.11 16.83ZM12.75 6C10.81 6 9.25 7.56 9.25 9.5C9.25 11.44 10.81 13 12.75 13C14.69 13 16.25 11.44 16.25 9.5C16.25 7.56 14.69 6 12.75 6ZM12.75 11C11.92 11 11.25 10.33 11.25 9.5C11.25 8.67 11.92 8 12.75 8C13.58 8 14.25 8.67 14.25 9.5C14.25 10.33 13.58 11 12.75 11Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index c17fdb29f5..0c5d7568d8 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -44,6 +44,7 @@ export * from './lib/form/text-input/text-input.component';
export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
+export * from './lib/icon/icon.component';
export * from './lib/icons/accessibility-icon/accessibility-icon.component';
export * from './lib/icons/account-circle-icon/account-circle-icon.component';
export * from './lib/icons/admin-logo-icon/admin-logo-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts
new file mode 100644
index 0000000000..90024846fc
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
+ * Ministerpräsidenten des Landes Schleswig-Holstein
+ * Staatskanzlei
+ * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+ *
+ * Lizenziert unter der EUPL, Version 1.2 oder - sobald
+ * diese von der Europäischen Kommission genehmigt wurden -
+ * Folgeversionen der EUPL ("Lizenz");
+ * Sie dürfen dieses Werk ausschließlich gemäß
+ * dieser Lizenz nutzen.
+ * Eine Kopie der Lizenz finden Sie hier:
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Sofern nicht durch anwendbare Rechtsvorschriften
+ * gefordert oder in schriftlicher Form vereinbart, wird
+ * die unter der Lizenz verbreitete Software "so wie sie
+ * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+ * ausdrücklich oder stillschweigend - verbreitet.
+ * Die sprachspezifischen Genehmigungen und Beschränkungen
+ * unter der Lizenz sind dem Lizenztext zu entnehmen.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from './icon.component';
+
+describe('IconComponent', () => {
+ let component: IconComponent;
+ let fixture: ComponentFixture<IconComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [IconComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(IconComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
new file mode 100644
index 0000000000..1681095e65
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
+ * Ministerpräsidenten des Landes Schleswig-Holstein
+ * Staatskanzlei
+ * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+ *
+ * Lizenziert unter der EUPL, Version 1.2 oder - sobald
+ * diese von der Europäischen Kommission genehmigt wurden -
+ * Folgeversionen der EUPL ("Lizenz");
+ * Sie dürfen dieses Werk ausschließlich gemäß
+ * dieser Lizenz nutzen.
+ * Eine Kopie der Lizenz finden Sie hier:
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Sofern nicht durch anwendbare Rechtsvorschriften
+ * gefordert oder in schriftlicher Form vereinbart, wird
+ * die unter der Lizenz verbreitete Software "so wie sie
+ * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+ * ausdrücklich oder stillschweigend - verbreitet.
+ * Die sprachspezifischen Genehmigungen und Beschränkungen
+ * unter der Lizenz sind dem Lizenztext zu entnehmen.
+ */
+import { CommonModule } from '@angular/common';
+import { Component, Input } from '@angular/core';
+import { SvgIconComponent } from 'angular-svg-icon';
+import { VariantProps, cva } from 'class-variance-authority';
+import { twMerge } from 'tailwind-merge';
+
+const iconVariants = cva('', {
+ variants: {
+ size: {
+ full: 'size-full',
+ small: 'size-4',
+ medium: 'size-6',
+ large: 'size-8',
+ 'extra-large': 'size-10',
+ xxl: 'size-12',
+ },
+ color: {
+ primary: 'fill-primary',
+ text: 'fill-text',
+ whitetext: 'fill-whitetext',
+ error: 'fill-error',
+ },
+ },
+});
+
+type IconVariants = VariantProps<typeof iconVariants>;
+
+@Component({
+ selector: 'ods-icon',
+ standalone: true,
+ imports: [CommonModule, SvgIconComponent],
+ template: `<svg-icon [src]="'assets/icons/' + name + '.svg'" [svgClass]="twMerge(iconVariants({ size, color }), class)" />`,
+ styles: [':host {@apply block w-fit}'],
+})
+export class IconComponent {
+ @Input({ required: true }) name!: string;
+ @Input() class: string;
+ @Input() size: IconVariants['size'] = 'medium';
+ @Input() color: IconVariants['color'] = 'primary';
+
+ readonly iconVariants = iconVariants;
+ readonly twMerge = twMerge;
+}
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts b/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts
new file mode 100644
index 0000000000..6f92ea55f2
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
+ * Ministerpräsidenten des Landes Schleswig-Holstein
+ * Staatskanzlei
+ * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+ *
+ * Lizenziert unter der EUPL, Version 1.2 oder - sobald
+ * diese von der Europäischen Kommission genehmigt wurden -
+ * Folgeversionen der EUPL ("Lizenz");
+ * Sie dürfen dieses Werk ausschließlich gemäß
+ * dieser Lizenz nutzen.
+ * Eine Kopie der Lizenz finden Sie hier:
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Sofern nicht durch anwendbare Rechtsvorschriften
+ * gefordert oder in schriftlicher Form vereinbart, wird
+ * die unter der Lizenz verbreitete Software "so wie sie
+ * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+ * ausdrücklich oder stillschweigend - verbreitet.
+ * Die sprachspezifischen Genehmigungen und Beschränkungen
+ * unter der Lizenz sind dem Lizenztext zu entnehmen.
+ */
+import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+
+import { IconComponent } from './icon.component';
+
+const meta: Meta<IconComponent> = {
+ title: 'Icon',
+ component: IconComponent,
+ decorators: [
+ moduleMetadata({
+ imports: [IconComponent],
+ }),
+ ],
+ excludeStories: /.*Data$/,
+ tags: ['autodocs'],
+};
+
+export default meta;
+type Story = StoryObj<IconComponent>;
+
+export const Default: Story = {
+ args: {},
+};
diff --git a/alfa-client/package.json b/alfa-client/package.json
index d4e51a736a..94a5710a8b 100644
--- a/alfa-client/package.json
+++ b/alfa-client/package.json
@@ -73,6 +73,7 @@
"@nx/angular": "19.8.8",
"angular-oauth2-oidc": "17.0.2",
"angular-oauth2-oidc-jwks": "17.0.2",
+ "angular-svg-icon": "^19.1.1",
"class-variance-authority": "^0.7.0",
"date-fns": "^2.30.0",
"file-saver": "2.0.5",
diff --git a/alfa-client/pnpm-lock.yaml b/alfa-client/pnpm-lock.yaml
index c447ee766c..c01bfa47f1 100644
--- a/alfa-client/pnpm-lock.yaml
+++ b/alfa-client/pnpm-lock.yaml
@@ -71,6 +71,9 @@ importers:
angular-oauth2-oidc-jwks:
specifier: 17.0.2
version: 17.0.2
+ angular-svg-icon:
+ specifier: ^19.1.1
+ version: 19.1.1(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1)
class-variance-authority:
specifier: ^0.7.0
version: 0.7.0
@@ -4362,6 +4365,13 @@ packages:
'@angular/common': '>=14.0.0'
'@angular/core': '>=14.0.0'
+ angular-svg-icon@19.1.1:
+ resolution: {integrity: sha512-4uKVdkc68ii2nadJAqJDbRfMFaD3JZ4AK2S28PjGDvXfvtE5T28lm/CFZA3MKqUesUZlneJAaOX4cpC3pvoCZQ==}
+ peerDependencies:
+ '@angular/common': '>=19.0.0'
+ '@angular/core': '>=19.0.0'
+ rxjs: '>=6.6.3'
+
ansi-colors@4.1.3:
resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
engines: {node: '>=6'}
@@ -16432,6 +16442,13 @@ snapshots:
'@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.14.10)
tslib: 2.8.1
+ angular-svg-icon@19.1.1(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1):
+ dependencies:
+ '@angular/common': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1)
+ '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.14.10)
+ rxjs: 7.8.1
+ tslib: 2.8.1
+
ansi-colors@4.1.3: {}
ansi-escapes@4.3.2:
--
GitLab
From 513530c477a0adee25245a70f2137f3c1b16f27d Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 1 Apr 2025 15:41:50 +0200
Subject: [PATCH 02/36] OZG-7707 Replace one icon from admin client
---
alfa-client/apps/admin/project.json | 5 ++
alfa-client/apps/admin/src/main.ts | 2 +
.../apps/demo/src/app/app.component.html | 1 +
.../apps/demo/src/app/app.component.spec.ts | 6 +-
.../organisations-einheit-list.component.html | 2 +-
...ganisations-einheit-list.component.spec.ts | 3 +-
.../organisations-einheit-list.component.ts | 4 +-
.../design-system/src/assets/admin-logo.svg | 67 +++++++++++++++++++
.../libs/design-system/src/assets/delete.svg | 4 ++
.../src/lib/icon/icon.component.spec.ts | 4 ++
.../src/lib/icon/icon.component.ts | 1 +
11 files changed, 93 insertions(+), 6 deletions(-)
create mode 100644 alfa-client/libs/design-system/src/assets/admin-logo.svg
create mode 100644 alfa-client/libs/design-system/src/assets/delete.svg
diff --git a/alfa-client/apps/admin/project.json b/alfa-client/apps/admin/project.json
index 8bffa965bb..2ea9600d7c 100644
--- a/alfa-client/apps/admin/project.json
+++ b/alfa-client/apps/admin/project.json
@@ -22,6 +22,11 @@
"input": "apps/admin/src/favicon",
"glob": "**/*",
"output": ""
+ },
+ {
+ "input": "libs/design-system/src/assets",
+ "glob": "**/*",
+ "output": "assets/icons"
}
],
"styles": ["apps/admin/src/styles.scss"],
diff --git a/alfa-client/apps/admin/src/main.ts b/alfa-client/apps/admin/src/main.ts
index de7bed8ea6..666ea4989c 100644
--- a/alfa-client/apps/admin/src/main.ts
+++ b/alfa-client/apps/admin/src/main.ts
@@ -44,6 +44,7 @@ import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { OAuthModule } from 'angular-oauth2-oidc';
+import { provideAngularSvgIcon } from 'angular-svg-icon';
import { ConfigurationsProviders } from 'libs/admin/configuration-shared/src/lib/configuration.providers';
import { PostfachProviders } from 'libs/admin/postfach-shared/src/lib/postfach.providers';
import { SettingsProviders } from 'libs/admin/settings-shared/src/lib/settings.providers';
@@ -113,6 +114,7 @@ loadEnvironment(environment.environmentUrl).then((env) => {
},
}),
),
+ provideAngularSvgIcon(),
{
provide: HTTP_INTERCEPTORS,
useClass: HttpUnauthorizedInterceptor,
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 9dce1e1daf..8905cd8a7a 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -64,6 +64,7 @@
<ods-icon name="accessibility" size="large" color="error" />
<ods-icon name="accessibility" class="fill-red-500" />
<ods-icon name="accessibility" size="small" />
+ <ods-icon name="admin-logo" size="unset" />
</div>
<h1 class="mb-6 text-2xl font-semibold text-text">Auswertungen</h1>
<ods-button text="Auswertung hinzufügen" />
diff --git a/alfa-client/apps/demo/src/app/app.component.spec.ts b/alfa-client/apps/demo/src/app/app.component.spec.ts
index 95f82e3a7e..4a014cf975 100644
--- a/alfa-client/apps/demo/src/app/app.component.spec.ts
+++ b/alfa-client/apps/demo/src/app/app.component.spec.ts
@@ -22,13 +22,15 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { TestBed } from '@angular/core/testing';
-import { AppComponent } from './app.component';
import { RouterTestingModule } from '@angular/router/testing';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
+import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [AppComponent, RouterTestingModule],
+ imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent)],
}).compileComponents();
});
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
index a64e70976f..fd66640a20 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
@@ -39,7 +39,7 @@
data-test-id="delete-organisations-einheit-dialog-button"
[dialogData]="{ organisationsEinheitName: organisationsEinheit.name, organisationsEinheitId: organisationsEinheit.id }"
>
- <ods-delete-icon icon />
+ <ods-icon icon name="delete" color="error" />
</ods-open-dialog-button>
</div>
</ods-list-item>
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
index c016c3c9c8..a680943511 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
@@ -28,7 +28,7 @@ import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { OpenDialogButtonComponent } from '@ods/component';
-import { ExclamationIconComponent, ListComponent, ListItemComponent } from '@ods/system';
+import { ExclamationIconComponent, IconComponent, ListComponent, ListItemComponent } from '@ods/system';
import { getConvertedDataTestIdOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { createAdminOrganisationsEinheit } from '../../../../../organisations-einheit-shared/src/test/organisations-einheit';
@@ -56,6 +56,7 @@ describe('OrganisationsEinheitListComponent', () => {
MockComponent(ListComponent),
MockComponent(ListItemComponent),
MockComponent(ExclamationIconComponent),
+ MockComponent(IconComponent),
],
}).compileComponents();
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
index 9fabaed44e..c9a6d85f3c 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
@@ -27,7 +27,7 @@ import { DIALOG_COMPONENT } from '@alfa-client/ui';
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { OpenDialogButtonComponent } from '@ods/component';
-import { DeleteIconComponent, ListComponent, ListItemComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, ListComponent, ListItemComponent, TooltipDirective } from '@ods/system';
import { OrganisationsEinheitDeleteDialogContainerComponent } from './organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog-container.component';
@Component({
@@ -42,7 +42,7 @@ import { OrganisationsEinheitDeleteDialogContainerComponent } from './organisati
ConvertForDataTestPipe,
OpenDialogButtonComponent,
TooltipDirective,
- DeleteIconComponent,
+ IconComponent,
],
})
export class OrganisationsEinheitListComponent {
diff --git a/alfa-client/libs/design-system/src/assets/admin-logo.svg b/alfa-client/libs/design-system/src/assets/admin-logo.svg
new file mode 100644
index 0000000000..f26c24debf
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/admin-logo.svg
@@ -0,0 +1,67 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" width="143" height="38"
+ viewBox="0 0 143 38" aria-hidden="true">
+ <g clip-path="url(#a)">
+ <path fill="#003064"
+ d="M28.747 17.906h-9.604c-1.188 0-2.15-.925-2.15-2.065s.963-2.066 2.15-2.066h9.604c1.187 0 2.15.926 2.15 2.066 0 1.14-.963 2.065-2.15 2.065Z" />
+ <path fill="url(#b)"
+ d="M32.707 24.879H22.633c-1.187 0-2.15-.926-2.15-2.066 0-1.14.963-2.065 2.15-2.065h10.074c1.187 0 2.15.925 2.15 2.065s-.963 2.066-2.15 2.066Z" />
+ <mask id="c" width="19" height="19" x="7" y="20" maskUnits="userSpaceOnUse" style="mask-type:luminance">
+ <path fill="#fff"
+ d="M25.205 32.794c0 2.867-2.43 5.206-5.418 5.206s-5.24-2.149-5.402-4.876c0-4.194-3.037-7.722-7.111-8.672 1.816-.562 3.257-1.937 3.837-3.683.988 3.92 4.655 6.834 8.997 6.834 2.854.155 5.095 2.432 5.095 5.19h.002Z" />
+ </mask>
+ <g mask="url(#c)">
+ <mask id="d" width="20" height="19" x="6" y="20" maskUnits="userSpaceOnUse" style="mask-type:luminance">
+ <path fill="#fff" d="M25.915 20.095H6.564v18.581h19.35V20.095Z" />
+ </mask>
+ <g mask="url(#d)">
+ <path fill="url(#e)" d="M6.514 20.052h19.427v18.65H6.514z" />
+ </g>
+ </g>
+ <mask id="f" width="26" height="25" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance">
+ <path fill="#fff"
+ d="M25.205 5.206c0 2.76-2.237 5.036-5.074 5.192-5.031 0-9.148 3.889-9.277 8.703-.006.082-.006.16-.006.242-.156 2.66-2.418 4.757-5.192 4.87h-.021c-.07.006-.145.006-.215.006-.295 0-.585-.02-.87-.073L4.29 24.1a4.88 4.88 0 0 1-.73-.195 5.518 5.518 0 0 1-1.473-.79c-.016-.012-.033-.021-.049-.043a5.159 5.159 0 0 1-.355-.294c-.07-.067-.139-.135-.21-.206a4.407 4.407 0 0 1-.618-.76l-.129-.206a4.292 4.292 0 0 1-.334-.656 4.635 4.635 0 0 1-.237-.708c-.021-.082-.042-.16-.054-.243-.015-.082-.032-.166-.042-.248a5.414 5.414 0 0 1-.054-.506C0 19.168 0 19.09 0 19.013a5.716 5.716 0 0 1 .06-.765c.015-.119.038-.238.064-.356.005-.011.005-.02.01-.026a2.66 2.66 0 0 1 .092-.35 5.415 5.415 0 0 1 .166-.46 5.236 5.236 0 0 1 .924-1.467c.06-.068.118-.13.184-.192a3.704 3.704 0 0 1 .376-.345c.07-.062.14-.119.214-.17a4.57 4.57 0 0 1 .904-.548c.07-.042.144-.073.22-.104.054-.025.108-.046.166-.067.054-.026.112-.046.172-.062.472-.17.978-.274 1.505-.3h.07c.161 0 .322-.005.478-.015h.016c4.88-.279 8.76-4.168 8.76-8.889C14.546 2.155 16.916 0 19.786 0s5.417 2.34 5.417 5.206h.002Z" />
+ </mask>
+ <g mask="url(#f)">
+ <mask id="g" width="27" height="26" x="-1" y="-1" maskUnits="userSpaceOnUse" style="mask-type:luminance">
+ <path fill="#fff" d="M25.915-.675H-.71v25.57h26.624V-.675Z" />
+ </mask>
+ <g mask="url(#g)">
+ <path fill="url(#h)" d="M-.712-.735H25.94v25.644H-.712z" />
+ </g>
+ </g>
+ <g clip-path="url(#i)">
+ <path fill="url(#j)"
+ d="M48.801 15c-3.41 0-5.944-2.352-5.944-5.822s2.533-5.73 5.944-5.73c3.41 0 5.96 2.214 5.96 5.73 0 3.517-2.533 5.822-5.96 5.822Zm0-9.166c-1.854 0-3.12 1.425-3.12 3.344 0 1.92 1.283 3.408 3.12 3.408 1.837 0 3.134-1.425 3.134-3.408 0-1.982-1.283-3.344-3.134-3.344Z" />
+ <path fill="#001E49"
+ d="M57.928 14.706v-2.292l5.202-6.426h-5.08V3.742h8.385v2.121l-5.327 6.55h5.436v2.293h-8.616ZM76.073 14.987c-3.49 0-6.006-2.322-6.006-5.776 0-3.453 2.596-5.762 5.93-5.762 1.712 0 3.305.574 4.216 1.454l-1.67 1.904c-.507-.588-1.388-1.023-2.453-1.023-1.854 0-3.213 1.455-3.213 3.42 0 1.967 1.187 3.454 3.335 3.454.617 0 1.187-.092 1.652-.293v-2H75.78V8.229h4.509v5.806c-1.066.557-2.534.943-4.216.943v.01ZM84.198 11.655V9.643h3.921v2.012h-3.921ZM101.554 13.08c-.91 1.178-2.147 1.92-3.984 1.92-3.289 0-5.637-2.43-5.637-5.776 0-3.344 2.394-5.775 5.65-5.775 1.606 0 2.982.557 3.767 1.596l-.634.587c-.633-.804-1.774-1.395-3.12-1.395-2.92 0-4.74 2.26-4.74 4.987 0 2.728 1.82 4.988 4.74 4.988 1.283 0 2.362-.386 3.351-1.61l.604.478h.003ZM106.743 14.706h-.835V3h.835v11.706ZM115.22 14.908c-2.223 0-3.783-1.627-3.783-3.81 0-2.184 1.56-3.794 3.783-3.794s3.8 1.61 3.8 3.794c0 2.183-1.56 3.81-3.8 3.81Zm0-6.875c-1.791 0-2.919 1.346-2.919 3.065 0 1.718 1.128 3.05 2.919 3.05 1.791 0 2.936-1.315 2.936-3.05 0-1.735-1.128-3.065-2.936-3.065ZM128.965 14.706a14.953 14.953 0 0 1-.063-1.425h-.029c-.416.99-1.468 1.627-2.563 1.627-1.9 0-2.702-1.316-2.702-3.005V7.489h.848v4.087c0 1.425.432 2.616 2.038 2.616 1.237 0 2.379-1.023 2.379-3.035V7.486h.834v5.558c0 .419.03 1.178.079 1.656h-.818l-.003.006ZM140.932 13.281c-.617 1.053-1.745 1.627-2.873 1.627-2.194 0-3.675-1.656-3.675-3.81s1.485-3.793 3.675-3.793c1.128 0 2.256.557 2.873 1.655h.033V3h.848v11.706h-.848v-1.425h-.033Zm-2.794.898c1.699 0 2.919-1.346 2.919-3.081 0-1.735-1.22-3.097-2.919-3.097-1.808 0-2.873 1.408-2.873 3.097s1.065 3.08 2.873 3.08ZM47.006 25.225 44.18 33h-1.154l3.252-8.531h.744l-.017.756ZM49.373 33l-2.83-7.775-.018-.756h.744L50.533 33h-1.16Zm-.147-3.158v.926h-4.793v-.926h4.793Zm6.282 1.928V24h1.09v9H55.6l-.093-1.23Zm-4.266-1.87v-.122c0-.485.059-.924.176-1.319.12-.398.29-.74.51-1.025.222-.285.486-.504.79-.656a2.25 2.25 0 0 1 1.032-.235c.398 0 .746.07 1.043.211.3.137.554.338.761.604.211.261.377.578.498.949.122.371.206.79.252 1.26v.539a5.517 5.517 0 0 1-.252 1.254 2.957 2.957 0 0 1-.498.949c-.207.262-.46.463-.761.603-.301.137-.653.205-1.055.205-.371 0-.71-.08-1.02-.24a2.407 2.407 0 0 1-.79-.674 3.283 3.283 0 0 1-.51-1.02 4.488 4.488 0 0 1-.176-1.282Zm1.09-.122v.123c0 .316.031.613.093.89.067.278.169.522.305.733.137.21.31.377.522.498.21.117.463.175.756.175.359 0 .654-.076.884-.228.235-.152.422-.354.563-.604.14-.25.25-.521.328-.814v-1.412a3.134 3.134 0 0 0-.205-.621 1.912 1.912 0 0 0-.34-.54 1.47 1.47 0 0 0-.51-.38c-.199-.094-.435-.14-.709-.14a1.5 1.5 0 0 0-.767.187c-.211.12-.385.289-.522.504a2.33 2.33 0 0 0-.304.738 4.045 4.045 0 0 0-.094.89Zm7.031-1.858V33h-1.09v-6.34h1.031l.059 1.26Zm-.223 1.67-.504-.017a4.33 4.33 0 0 1 .17-1.202c.11-.37.272-.693.487-.966.215-.274.482-.485.803-.633.32-.153.69-.229 1.113-.229.297 0 .57.043.82.13.25.081.467.212.65.392.184.18.327.41.428.691.102.281.153.621.153 1.02V33h-1.084v-4.172c0-.332-.057-.597-.17-.796a.971.971 0 0 0-.47-.434 1.692 1.692 0 0 0-.714-.14c-.32 0-.588.056-.803.17-.215.113-.386.269-.515.468-.13.2-.223.428-.282.686a3.833 3.833 0 0 0-.082.808Zm4.108-.598-.727.223a3.19 3.19 0 0 1 .17-1.002c.113-.32.276-.605.486-.855.215-.25.479-.448.791-.592a2.47 2.47 0 0 1 1.073-.223c.34 0 .64.045.902.135.266.09.488.229.668.416.184.184.322.42.416.709.094.289.14.633.14 1.031V33h-1.09v-4.177c0-.356-.056-.631-.169-.827a.886.886 0 0 0-.469-.416 1.874 1.874 0 0 0-.715-.123c-.238 0-.449.041-.632.123a1.308 1.308 0 0 0-.463.34c-.125.14-.221.303-.287.486a1.806 1.806 0 0 0-.094.586Zm6.738-2.332V33h-1.09v-6.34h1.09Zm-1.172-1.681c0-.176.053-.325.158-.446.11-.12.27-.181.48-.181.208 0 .366.06.475.181.114.121.17.27.17.446a.613.613 0 0 1-.17.433c-.109.117-.267.176-.474.176-.211 0-.371-.059-.48-.176a.638.638 0 0 1-.159-.433Zm3.996 3.035V33h-1.084v-6.34h1.026l.058 1.354Zm-.258 1.576-.45-.017c.003-.434.068-.835.193-1.202a3 3 0 0 1 .527-.966 2.35 2.35 0 0 1 1.857-.862c.313 0 .594.043.844.13.25.081.463.214.639.398.18.183.316.421.41.714.094.29.14.643.14 1.06V33h-1.09v-4.166c0-.332-.048-.597-.146-.797a.9.9 0 0 0-.427-.44 1.536 1.536 0 0 0-.692-.14c-.27 0-.515.057-.738.17-.219.114-.408.27-.569.469-.156.2-.279.428-.369.686a2.506 2.506 0 0 0-.129.808Zm6.985-2.93V33h-1.09v-6.34h1.09Zm-1.172-1.681c0-.176.053-.325.158-.446.11-.12.27-.181.48-.181.208 0 .366.06.475.181.114.121.17.27.17.446a.613.613 0 0 1-.17.433c-.11.117-.267.176-.474.176-.211 0-.371-.059-.48-.176a.638.638 0 0 1-.159-.433Zm6.604 6.34c0-.157-.036-.301-.106-.434-.066-.137-.205-.26-.416-.37-.207-.112-.52-.21-.938-.292a7.423 7.423 0 0 1-.955-.264 2.898 2.898 0 0 1-.72-.369 1.548 1.548 0 0 1-.451-.51 1.42 1.42 0 0 1-.159-.685c0-.25.055-.487.164-.71.114-.222.272-.42.475-.591.207-.172.455-.307.744-.404.29-.098.612-.147.967-.147.508 0 .941.09 1.3.27.36.18.636.42.827.72.191.297.287.627.287.99h-1.084a.93.93 0 0 0-.158-.51 1.167 1.167 0 0 0-.451-.415 1.456 1.456 0 0 0-.721-.164c-.3 0-.545.047-.732.14a.94.94 0 0 0-.405.346.87.87 0 0 0-.064.762c.043.09.117.174.222.252.106.074.254.144.446.21.191.067.435.134.732.2.52.117.948.258 1.283.422.336.164.586.365.75.603.165.239.246.528.246.868a1.689 1.689 0 0 1-.674 1.36 2.476 2.476 0 0 1-.773.386c-.297.09-.63.134-1.002.134-.558 0-1.031-.1-1.418-.298-.386-.2-.68-.457-.879-.774a1.85 1.85 0 0 1-.298-1.002h1.09c.015.297.101.533.257.71.156.171.348.294.574.368.227.07.452.106.674.106.297 0 .545-.04.744-.117.204-.078.358-.186.463-.323a.747.747 0 0 0 .159-.468Zm5.162-4.659v.832h-3.428v-.832h3.428Zm-2.268-1.54h1.084v6.31c0 .215.033.377.1.486.066.11.152.182.257.217.106.035.22.053.34.053.09 0 .184-.008.281-.024.102-.02.178-.035.23-.047l.005.885c-.086.028-.2.053-.34.076a2.581 2.581 0 0 1-.498.041c-.266 0-.51-.052-.732-.158a1.177 1.177 0 0 1-.534-.527c-.129-.25-.193-.586-.193-1.008V25.12Zm4.623 2.537V33h-1.084v-6.34h1.055l.03.997Zm1.98-1.032-.005 1.008a1.56 1.56 0 0 0-.258-.035 2.745 2.745 0 0 0-.27-.012c-.25 0-.47.04-.662.117a1.372 1.372 0 0 0-.486.329c-.133.14-.238.308-.316.503a2.425 2.425 0 0 0-.147.633l-.305.176c0-.383.037-.742.112-1.078.078-.336.197-.633.357-.89a1.75 1.75 0 0 1 .61-.61 1.712 1.712 0 0 1 1.16-.193.801.801 0 0 1 .21.052Zm4.506 5.291v-3.263c0-.25-.05-.467-.152-.65a.998.998 0 0 0-.445-.434c-.2-.102-.446-.153-.739-.153a1.73 1.73 0 0 0-.72.14 1.254 1.254 0 0 0-.48.37.809.809 0 0 0-.17.492H95.18c0-.226.059-.451.176-.674a1.97 1.97 0 0 1 .504-.603c.223-.184.488-.328.797-.434a3.14 3.14 0 0 1 1.043-.164c.46 0 .867.078 1.219.235.355.156.632.392.832.709.203.312.304.705.304 1.177v2.953c0 .211.018.436.053.674.039.239.096.444.17.616V33h-1.13a2.022 2.022 0 0 1-.13-.498 4.01 4.01 0 0 1-.047-.586Zm.188-2.76.012.762h-1.096c-.309 0-.584.026-.826.076-.242.047-.446.12-.61.217a1.03 1.03 0 0 0-.375.37.979.979 0 0 0-.129.51c0 .198.045.38.135.544a.98.98 0 0 0 .404.393c.184.093.409.14.674.14.332 0 .625-.07.88-.21a1.83 1.83 0 0 0 .603-.516c.152-.204.234-.4.246-.592l.463.521a1.576 1.576 0 0 1-.223.545 2.607 2.607 0 0 1-1.201 1.026 2.33 2.33 0 0 1-.926.175c-.43 0-.806-.084-1.13-.252a1.934 1.934 0 0 1-.75-.673 1.784 1.784 0 0 1-.264-.955c0-.34.066-.64.199-.897.133-.262.324-.478.574-.65.25-.176.55-.309.902-.399.352-.09.745-.134 1.178-.134h1.26Zm5.256-2.496v.832h-3.428v-.832h3.428Zm-2.268-1.54h1.084v6.31c0 .215.033.377.1.486.066.11.152.182.258.217.105.035.218.053.339.053.09 0 .184-.008.282-.024.101-.02.177-.035.228-.047l.006.885a2.51 2.51 0 0 1-.34.076 2.576 2.576 0 0 1-.498.041c-.265 0-.51-.052-.732-.158a1.172 1.172 0 0 1-.533-.527c-.129-.25-.194-.586-.194-1.008V25.12Zm4.717 1.54V33h-1.09v-6.34h1.09Zm-1.172-1.681c0-.176.053-.325.158-.446.11-.12.27-.181.481-.181.207 0 .365.06.474.181.114.121.17.27.17.446a.61.61 0 0 1-.17.433c-.109.117-.267.176-.474.176-.211 0-.371-.059-.481-.176a.64.64 0 0 1-.158-.433Zm2.625 4.922v-.135c0-.457.067-.881.199-1.272.133-.394.325-.736.575-1.025.25-.293.552-.52.908-.68a2.817 2.817 0 0 1 1.195-.246c.445 0 .846.082 1.201.246.36.16.664.387.914.68.254.29.448.63.58 1.025.133.391.2.815.2 1.272v.135c0 .457-.067.88-.2 1.271-.132.39-.326.732-.58 1.025-.25.29-.552.516-.908.68-.351.16-.75.24-1.195.24-.446 0-.846-.08-1.201-.24a2.704 2.704 0 0 1-.914-.68 3.103 3.103 0 0 1-.575-1.025 3.948 3.948 0 0 1-.199-1.271Zm1.084-.135v.135c0 .316.037.615.111.896.075.277.186.524.334.738.153.215.342.385.569.51.226.121.49.182.791.182.297 0 .556-.06.779-.182a1.64 1.64 0 0 0 .563-.51c.148-.214.259-.46.334-.738a3.34 3.34 0 0 0 .117-.896v-.135c0-.313-.039-.608-.117-.885a2.302 2.302 0 0 0-.34-.744 1.617 1.617 0 0 0-.563-.516 1.575 1.575 0 0 0-.785-.187c-.297 0-.559.062-.785.187a1.69 1.69 0 0 0-.563.516 2.38 2.38 0 0 0-.334.744 3.42 3.42 0 0 0-.111.885Zm7.131-1.752V33h-1.084v-6.34h1.025l.059 1.354Zm-.258 1.576-.451-.017c.004-.434.068-.835.193-1.202.125-.37.301-.693.528-.966a2.348 2.348 0 0 1 1.857-.862c.313 0 .594.043.844.13.25.081.463.214.639.398.179.183.316.421.41.714.093.29.14.643.14 1.06V33h-1.09v-4.166c0-.332-.048-.597-.146-.797a.9.9 0 0 0-.428-.44 1.534 1.534 0 0 0-.691-.14 1.6 1.6 0 0 0-.738.17c-.219.114-.409.27-.569.469a2.37 2.37 0 0 0-.369.686 2.503 2.503 0 0 0-.129.808Z" />
+ </g>
+ </g>
+ <defs>
+ <linearGradient id="b" x1="20.483" x2="34.857" y1="22.812" y2="22.812" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#003064" />
+ <stop offset="1" stop-color="#D4004B" />
+ </linearGradient>
+ <linearGradient id="j" x1="42.857" x2="54.761" y1="9.225" y2="9.225" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#003064" />
+ <stop offset="1" stop-color="#D4004B" />
+ </linearGradient>
+ <clipPath id="a">
+ <path fill="#fff" d="M0 0h142.857v38H0z" />
+ </clipPath>
+ <clipPath id="i">
+ <rect width="100" height="36" x="42.857" y="1" fill="#fff" rx="8" />
+ </clipPath>
+ <pattern id="e" width="1" height="1" patternContentUnits="objectBoundingBox">
+ <use xlink:href="#k" transform="scale(.00352 .00348)" />
+ </pattern>
+ <pattern id="h" width="1" height="1" patternContentUnits="objectBoundingBox">
+ <use xlink:href="#l" transform="scale(.00256 .00253)" />
+ </pattern>
+ <image
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARwAAAEfCAYAAACTYHlOAAAACXBIWXMAABcRAAAXEQHKJvM/AAAgAElEQVR4nO2dabQsV3Xf9+nHh/hLbIiNEAiLQSAQGhBIegNCr69ACGvGNrPADBKaeQKC40TAvc9BUkwYZAZBMKzEyyEBm0kyIijE3Cs9PREsIQyyDchCTIm/emWZmLWyFq+yurqGffbZ+ww1dFd17/9a973uqnNOneru8+v/3udUtcmyLIM1087dfwkb517qPenpWbth84brYHrWGev28qhUvWntgLNx7mtg5+5vRJefgWf7zj/ptU8q1bposi4nOnM15peengSbeb1v5JBSqVTttTbAOXjjhxrXVeioVN1oLYCTGkZxmtVvAy2VSrUmOZxZKNWVsp8/tOzTUalGq5V3OF27EnU5KlVzrbzD6dLdlFKXo1I100o7nNnMVPcyyz4tlWq0WmngdB/+mKLdD3fcrkq1Hlpxh9NuZmoug/66bFelWj89alXPuJ278YdN/YRqKtXqa2WTxuaXjkfPss5zL7PLHfQ6K5UqTSsZUrkOpPtE712H1OWoVKlaSYczX1ncPxCyn3+/92OoVKuklXM4M9BojkWlGqZWDjiLXAms0+MqVZpWCjiLdjc6Pa5SpWmlcjiLyt1gaR5HpYrXyjicZeVuNKxSqeK1MsBZ1lXcGlapVPFaCeAsc2ZKZ8VUqnitBHCWe48ao4sAVapIjT5pPMuhbL17GcCxVy9nP//eEvqgUo1Lo3Y4s1Bm8bAx7KUSO+pyVKqgRg2cxYdSzDVZBX90tkqlCmu0IdX81zMX8dMtwoWfzObsnzSsUql8Gq3D6R82fOhU7WKkLkel8muUDqffFcWeW1lE3OVCXY5KJWt0DmfmIrqHjXsb0ZhdnDR5rFLJGpXD6TZvE0GQ5Pt2mfwugNtf+eOGfVKpVlujcTjdwSbCriQ4GlohX3msLkelYjUa4LSfAo+kSEPQYB288SNNOqhSrbxGAZz2SeJI0ETDxl9YXY5KxWvwwGkGG+NPBHNFk9oMS12OSuVq0MBJg03idBKkgiZBZjZbdV/+p1Kpag0WOGHYJLgYqWpUwUSZunF1OSqVrUECJw42DdWbqzEFbGrN8jjqclSqWoMDTm+w6cvVGHBAg6UuR6WqNSjg9HbJQtLsU2q7gd8hV5ejUlUaDHDiczYRSk7vpCabjZWrCbWtLkelmmsQwOk0jGpwOUJa8ZTyxepjnbFSqXIt/Vqq0cAmInwS2y2eZj/7m/jjqVQrqKU5nPLaqN5mo7xqEEJFhk8SbGY6eNOt7buuUo1YS3E4cRdi9uVs+gqhhFtbkCfb/+0/wvT5p6f1QaVaES3c4cxA0+nd+pYKGyEzbW2y96vLUa2zFgacuBCqVMJsVHTBRMcUBZvQZu7XHTSBrFpfLSSkSruXTR+3kEgpHpur8W3ytTHfl/3swbR+qVQroF4dTgmaUYRQzKUJfHu+8Cl0TFP9t3HeG+L7plKtiHoDzuzew+krhyNuJdFVW1bRrlxNADaoiIZWqnVU5yFV85/e7SqU6mNtTZsQCmrYMA1k//idiOOrVKuhzhxOGT719tO7vdxOYgH5GiPDZqaN894Y0QeVajXUGjg4T9P8wssuQqmu8zVCm0mwCbe5c899cPDmj0b0RaUavxqHVDO4zG5s3s3V3Z6B28stJfqEjQQapg4K6ba//EmYnnlaRL9UqvEqGTjzH6L7Rse3kWgDnK5zNiHQSG0YeRe3g/Rl+vzTYPuOTwb6plKNW1HAmcHlrkN/2V9+JmoRXWJdp1jProbd7Tsvd9/skoftOz4R0U+VapzyAmcWMm29u+8f6F+Au2kCm1h4lPtiyosOq962/eVPaGilWlmxwJkngL9RPEud+UlVU3czBNgkOBtvOGe3M3M5Ch3VKsoCznzG6VJymn0CZ+iwiVs1HG4vBVjF+pz/8y3PsVWqcaqaFp+FTy5s+tSyYSNcphB1HMNW7wo2M21ccLnn+CrVOJU7HN7ZCIOoM8XMBjXsS5MrvVslh5mNLWAzf2rysGr7Sx8X2lCpxqeJHzZD0grBxnFHLmwgXxR4P2xc8CahHZVqfJrcdegbS+h0E3cT0+yQYWOY2SxCHmcFtIGde76Z/6lUqyAD/+xpgXU4fYRUqcCJ6EMr2DRJDjMbI6a9vccksMEPt//84zA987mefqpUw9cSbqKeCrCeckhRzXYIG9McNrN/Ni68Qp2OavQKOJxlu5ue8jatwqjuk8Ni+0zb2T/cLxxLpRq+lv9DeCsJG8O0wc6jy2LbNmAeczrsHFanoxqnFgwc3+CP2kGK9QQblg095GucMMoXwtXbNy68CnYOPyAUUqmGqwUCp+PwrHPYcLNIvra6ytcAAylKPAyn+f8bF16p0FGNTssLqdq4m6Tf9451Nh0mh30NJuZsbAjaZTcuUqejGpcWBJxYQHTlgriwxte+dLX3gmBj0mFTOR2FjmpEmmy94zqht33MUHXQdEoo1Qo23KaeYMPWEcI7px8GNi6+WqGjGoXya6ns21GU6sFteJtuG0q1SBDH9IM99iLCKHocmtupH2/f9hGYPu85fP9VqgEoD6k2b5BcTg/qxTglgAhvj3U2UbBhp7ZahlH0ODJsZtq4+BrYOay3tVANVzlwpmedAdt3/mfUyR7dTdNyKYli3wxRSr+SwiiuWGIY5fykjAc2wvE2LlHoqIYr4QZcAwunGoVSAdhEuZtFhVEeECWVNdW26fNOhe0v9n17WJUqTdYs1czpZD9/CLbecW0/L2Oj3E3TvI2n/EJhY+x6nGsyXcJmrp17vwUbL1lgqKxSRch7E/X2v9ZAB0+gDLu7K3ezCNgIIZG3b8LUN9sPaZrcn9vZ/uKHYLrvVOacVKrFKul3qdJ+kyrGfawTbIR2O3U2XM5nfoztL3xQoaNauhr/8mYYPi3dTdd5m2XlbKJgAx6I0LIpsLHLTPc9B7a/8IdMX1SqxagxcLDc0KtPd+NrO2ZgC+U6zdnQp5FuqEXOpm7TD6Q8mfx5hY5qOeoEOFjz3xz/sO18UoEzSNikuhSuTgBgsc7GKcvAhquLysygM933bOacVKr+1DlwsGbg2bpRmpptCZyFhlGJMIuCjQ8gtH0JJNAINuXxZsDZ/twtzLmpVP2oV+CU2jlEXU+X7qbLvAtXd0nOhmsrqlwEbAiktj9/C0z3nsKcp0rVrRYCHKy56/kIvzM2UTwq2ITqRMImNu9D7pvjHoMDUuF2Pvt+pu8qVXdaOHBKHbzxI2641ZW7GQNsksKu5tdXhdwNhdH2596vbkfVm5YGnFIVeLpyN6G8zRDW2bD9aOlsOoBNuW8GnO3Pvo85H5WqnZZ+E/XNG66B7J++C1s3XCOU8ACCbgvCpmn7Ea7JqZ8ww1SW5frfFWwMhY18nJ2vfxvMMefAwff/SeA8Vao0Ld3hUB286SMox9N3KBXjnALtcoPf1564WC+lbAA2XF0mbyO2S/Zt/9l7Ybr3ZFCp2mpwwCk1B8+t9Ya+YNNpGLVo2ATA4ZyDP5Ri26zCrJNh8y2vUfCoWmmwwCm18eLXwc6h+yLzJGib8zQ2ZyK12yVsAsdPniaX+hYLG24/D6IZcLY/8x5QqZpo+T+EF9D2V/5T/idCIbTNcMkRzt2Q/cuCjROeeZwL023PSXkkhFnMOex8/UEwx/4GHLzlUw2Oo1p3Dd7hYB286VbYugmFWcn5FQjDweeYOocNLZ9w9bjjTGLKNHU3pCzat/WWS2H/npNguuckUKlCGhVwIF+1fF8Onp1D968wbECABC2XAhuQAWIdhynv7HPbme45GTavf5WCR+XV6IBT6uBNH4Wtm4nbwerkZ1m4fElke6lhFAsbWrbhjBTwkIhxMN4EMwOiGXA2D8zAcyKoVFSjBU6pjfPeMHc7WK1/loXW4fIiXSzq444dAxsIAMHX/7hZqfA+D6SK51sHXgWbB14BKlX1SRk7cCAPs+7PwZMruJI4csBXT3t0No1WG3tAwtWNhg23n1ssGAqzXEhtHXgl7N99Ikx3q+tZd60EcKCAzsGbPwo79xC30wo2dFtfsPE5sBjYgAsH7hi0nSjYhNoOQcqus/XmVxTweRao1k8rA5xSG+e/EYVYDQHh29d5GBUDkbblQu4nxsHgun6oxNWBHD6b170MVOujlQPOTDOXs3HeZfMnEiB87qbV7BItH+mQWjsbqVwD2PTkbqQ60z3PgukZz4L9u+f/q1ZXKwkcKKBz8OaPFSFWCmzAHfjWJh9sYgGSUjYQikXDBngQhIDi9M8zUyVCKmYWrH6+dd1L84eb174UVKullQVOqY3zL4Ode76JtqwLbGj/fUDxtNsCHOHjxSw+BNi6tgTQb4Nq3Fp54EAZYp1/+fxJo2Rtwr62sGG39wmb0P4G4GgMKa6eu28LgWfzmt8C1Xi0FsCBEjoXvAltWZCzkdqJhk0fN+ACd0BDLACYuo0glQoc/7lOz3gmTM84IX+8//RnwvT0Z4JqeFob4EAOnW/CxgWXJzgS4jKiBz/dR/Yv425/rPvh2kh1Pg3djfd4ATA2ON9pDqFnOOU2r7oEVIvTWgEHKugUTifaZcDiYRMd+oWcAu17xACnx0+8vEHuVyzgEuEntu07Z/CUZ8rNpvERnDavvJhpRxXS2gGn1Aw6O4cfQFs8H8omt5cIwibWZfmO1/BCTq4vsYPfqhuX9A06H9qflKS293zoMUgdZx+z3XnqAmt62jNgevrx+eP9s8enHe+UURWv3roCZ6aNC68oZrA6cCS+Npx2PLBpDaWYwYmfJ4Q2YvsxLsXTr0bHlI7re21oOa4sqWM9ZQuy9WbQmYVwm1deFFFnfbTWwIEKOg9EfBgDg9/aFAEbtmzC8RrDJjR4U4Ei1I296DN0zKg+B8pbD2OAE+9u4uoBbBUh2LoDaO2BAzl0roSdw98kH5iEsAY8H8qYqWrneLGwkQYZLpdQJvmqcumc0maY4tsN1af7af9pW1x5pkwT4HiK5u7ntGfA/vz/9Qq/FDiFNi66Ci0QbGrJu4ZNw3JsUpUet0ughNpJdTcp+6XzIuWksnQTt6Fj4GBNi5zPujgfBQ7SHDoPeD6wkc6m7bR3sGxMnxLbSglrkmafOjxuUwfElqNlyXbnaQxBUoFjF9q68qKVB48ChyiHTjV7lfihhq5gE+ts8HMBgF3DpjFQmP4E3U9M36U26DnQtrjyTJlod0P7FCO+YOl4VjHcUuAw2rjo6ho6jWGTYuUj2uEGTBdJYqsMB4VYGEW03bW78Zah5cB9/WKAI9b11GsJnFLTIsezSq5HgSMoh869D0TCpmloRMvGOptIeCVdW4WP1wZGof19uRtahp4HLcuVZ8pEO5xU4ERTKdeqhFsKHI/Mr+5FO7uGTQt3xA682HIJQFoWjJz9MWUawMbZLLkbYR9fsBfglBo7eAb/Q3jL1PZt6DfOU2BjysHQAjaGGyg+iJCB2BY29LhUzsyYUM4LSLpfOlxMmQaKbqOLg3WjrY/dDhuX/XvYuf/7Q+hOstThBLRz+Fuwcck1RaHAgAVp4PU0dd64XAqQBBjh+kl1U91N2yUD9Ny58kw962nX7iapoKgxJpcVOBGaQ+faumAn99TpGjaRa4da3zMnZaaoSSLZd16J586W5cpzZfoETreOaUxhlgInUjV0Wq4IhoRv51iIeAdcm8GbOEXex36uj0mvNbMtCTjDdDdUY3E7CpwEbVxyHezc+62iQgN77+wDeVCllLM2dQgbp0wTd9NnfzzlfGW5zSyo2IJyvSW4G6qhux0FTqI2XnId7Bz+q7pSo7AIPAORlo39Zvcdv+EaHREYTfY3SGQH+xx6DejrwJXnyozL3VAN2e0ocBI1czgbl7w54DTotyVTznq6YGfTqkwKLPruk68cec6WZ+qB8JqyGpa7odr+xNsHBx0FTgPl0HnJAVSxozU6IHzYvZdLRJSNgWAqILq+6DJ5kSJtN1SWtsvUcTb5ADFs2JSaAWcGnqFI1+E00HTfqfnfXJ5vYms7+rBza3RA+KBL38YxDqE32EDCful5AA7B8ek5SCQn/PvbNDIczdbrzNbtDEXqcFpo5nJ2vl7mcwLf1uw+SPiWDoQLrR2C4ExoO1abXa/5aVKGbGPPM6KOs2n87oZqCCGWOpwW2nz76233kg+uHmFjuAG9CNgIfWRF+5bSL6lM4JDBstK5SM2Mx8GkaAgrlBU4LTTd92zY/vwtRQMBeDhhCg5lTMIgZNoBso9zGdZjLgyMOGZSKEXPmVMM4Hx94yoIx4wGZ0KfR+RuSi0bOgqclppBJ8/nWAMg4CzYxwKYAA980g436JJCmpTQCOzyMecTOg9xLMbAl2kgCCvPttU0NayWCR3N4XQkc/RGeOCz24FxR7h8ShjGHDMIksirzxtdH9XkuAyE6bmKwBEAGeNu2PfFU2+E7oZqGTNY6nA60vbnbqkb8s5Cca4Gl8MhTApsmGOKYQffBL+DCY28sJEal9yIJ5Tyzl6FYCOpqbtJhcfwLdMyZrAUOB1puu+UPLwSp6bZb3hhQJomzkYq63FAyQnbmEHETbMzZaS6YplUaHIg8/U/Yd8KhV+Lho6GVB3LPP4FRYMxoQTdJ31Td3AhqNiPQAgTCnuSptEj25ReoyR3EwmcGBe4YqEUp0WFV+pwOtbW234n4GrAfm495b7VfQsLY2HjC7ek40eCgT4OlYka4Fan/MXbuBuFTaVFOR0FTsfafNtr8/BqLlP/bwL5Fy4UA2FQpIKJLWf85djBGAMkXCSCEqzLEqrxB+Gfdx1KrTBsSs2g0/fslQKnB82gY8MGH8M30EEYjAGAWNUI5Gi7MWEU25cIh0SPT7c74VhkX6JdUeSAZ92np61xcyRJfU+ZK3B60HTvKbA1g450PRVEuBo2DJJgwLUPfFkqDiRepxJ7Z0Hw1JH6lQgbyUFFnXvXFFkdKvUJHU0a9yhzzIuKxn3f4iAPWryfDZe48rG3t/C5Calcw/vvBEO91HOUYBPIkfnacwuJTXjLr5D6uPZKHU6P2nrra9JczdBhQ4/F1onI/wSn/HGVGNiwtoxp0Lc9dn/b8uPRwY/e3nlf1eH0LHPMufMDpFz5nZTnADL4Q/WFsl5w0OcSPFJXLYfapn3i+hU4llUsETZBlqwubHJlxXT5J7ubLleH07Nyl9MENobZb1JhQ7/5aY5G6JfzNNKpiOOvI9g4M33gP/+ovoW73E2DI1NhQ7qeuVKHswCZJ744DTTA7feFQUz52IHNtRsTlsWEUjGh3CKcjXNctoD3acLO8YshwszldJHPUYezAG3/6XvqgwRhw+QjpKvIpeepV6jjfSJsqCLA0QQ20vMgbDzywoZ7vb2NRRxwxBLsR1f5HAXOAjTde3L+x1/UWYY5zAcfAiFU0EGQ8iEAeOtJYVHkLFTsxZVRxbhCUigVgk3K8VccNh7lK5Hf2H4lsgJnQdp866XoQBg0IA+g4IwWHfgtYdOVS/E6rED7wVCKhl5cHc4VOgWiNnnLr5oCyZUu8jmaw1mgNl7+e7Dz9QcDOYcm11vRYoF8SNI1WIFyMTATw7SUfnHnxbTBtiO04dmUWGD8SqBA9u1PND5ddTgL1OZbXt0cNiYGNjT0YY4juSbneF3AhqppPdo3ZltTKWySYDPTwY81z+eow1mwzLEXMAds6GrAM/icQe0Jm7iytD8x9WLDNPbGWrGui9km9pvZ73kaLL+qakCAprNW6nAWrK23vKo4oKnzLqJDCV1vhbejx947DgIz+H0DUXJAnn3OphTYmHRwlNsUNulqaDeazlqpw1mCzLEX+h0NNHU1wkCU6sTmTGJCoKbra1rds1mqw+xnHgbLroNajP6tqy7Kf8M8RepwliDH5WBJN9ayHjIOxnd9Ua+wEdwU1VJgQx2jVC66wGqppdXYauByFDhL0P49JzKf/gA0QBp0nvvtGFzHoPIeoOHnUZBggCaFejHHFJ8L8sImpbk1g01HSk0ga0i1JG284gbY+Z8PCt/QBDKZJ1xKcgQxK4k9LqjpdVBJborpd2N3wzcnllsndTjqU6bJ1eEsSdM9Jwm3HcXuxPidj2HqQSJsuGODAAnxue/YoX5QtYVNShilrqYLpbgcdThLlHnyxQkDzCqQ6AYSnVDT/A4Hm1gnE+OUxHaZulJV/471UA8jPtblqMNZorauf2V9cOxoHBn058mRsPU9z2Nh433u2Sedirgt5lgrBBvp7R6hYl2OOpwlyzz5koRfN4Bmg5AFC9dWqiPxwarLtqQ2mbbETQMb2bQ7ixyFPR0rxuWow1mypntPYjog5SFiB6FZMmzo7o5gw4o5rnPsEbiaFXA6MS5HgbNkTXefiDrAgMYw2/FO3ze5OJiJE5Fgk9SmVD8RNqxoG0I/hwwaiOjOyKGzdasCZ/DaPPByATSGGTRSLgf4NoI5kcBXbaM2IqeqpeNHXQ0v1B2qUtg3VugUYVrokgcFzpBkgQaLQMYqwpRPCZmAtuVpI2VlMH4ePdiEgjGw8fZjCeK+L2LVZ/d7zhWF7pejwBmAtq5/eWCGSvrwcvkLAViLgg3XHtvXSLc1Nth0FcmNyekgiO3cp8AZvPZbeRywvx5ZN8O5Gg+wUmDT9fOosIxTINxjNw1glHbpIMYAHeZ8fWGVTosPROapvxUJA6qYxLG0PTKHwrXf2BklHAMCr8PQYIPVZXe6HKELaiv7Dj9Frg5nINrKk8fYvIS8uUmAjYmATexFnb48C5dL8vRPLBSR+xkybKDDgT1UOxBx/2NOCpyBaP/uZ0WARgq1mHqSMxB/HULY4HVaEe6LPvfmfSKPI4F0aMpaAKNNXV+bC2pHCqs0pBqQzHEvFTrj+8aX4JGYhE1JADdKKtNtATgm550GrlB3FzEKF+y6uLBKHc6AtPXml5HOhNwMA4Lo5DH4YSM9j87TxBw/hhsjA4skbpBmPTmZgYhzOQqcwYnAxJejcTZLIzpmpEshWUy91DKBOkEXM1IIZasPGSwuj6Mh1cBkjitcTkpSNHTtUXRimRZpGzZx21qETSJUVVFaQiKbhlXqcIYmgwdWRAK5NWyE0Cw5IZyyLaa/UqJYNSZRl6PAGZims9mqGMiILPI5CA42tLrQcFSeJiH57A2bViyUWmPddZ8CZ9CaA4dKSh5jSTmY2ByOtI3b3iRvE9GuCMHY9lRDE3U4j9J3aFjaf8YJRX+kpDGWz3V4Kqbe3MrrWhr0Vdkxbpn4PA69tkodzsA03X1CYAB7cjtSTgYXCP6Gt9NggzIRoVuSw1KNWdjlKHAGqOmeE4Rkr8+1QGDABn7lQMr3dJKTaSsF0ZiF8zgKnAFqaoVVIdBIN0+vCgRg45E0bS3WjcjJePM06V1UDV/Y4WgOZ5AKQCZXm9/Tlqac24z6tmRQ4oxK3Nsi5HV21OEMW/t3P9PTPzQt7ivDPHT2gQc23u1S2RgpQFZWhvkrVLocBc4AVYdUYL+DUaBpAhtfe023RR0gsZyqlZbxMhcfybsK4GhINVg1nBZndyVOn4t5lrYzXEJ9sVkF0apJHc5AlU+Pp06L4yL8E7RfasO3nducCpHGBVVtNYCrJhU4A9XUyePEJJKpc0kNdWIX/0W0E92GamFa4uu/VdyqQkOqQSvhExK1DiblN6OaSqmikqUOZ6DabyWOBVnRVcgBRcAm1d1ISelQsjq4XbWqUoczUE3P8EyNN0neNoWNr07K8ZN3awjWi/BruoScjgJnFIqZseK0SNg0BYtqaSrfkwWB5+DHblfgDFtNv+V9a3HEjRH1W2xP7oNqYVogeBQ4Q1ZTRyM8jSuzCBAkAE+1OHX9smOAFW1r0njA8uZxctG15GQzW156ylRqNcWuWnsxH00FzoDlAkcADC0i1pHKJa5ElupFh1MRUo6tpDSkGryarMVxnsRW6qhKB7TIFDqrKAXOoJWysljc4KkTcklNnI+vjq8e2a+wWUkpcMaoRjNPtFibxG0IKqrxi8yQZp73OXMeuB+M4j8FzljUBjJW8Zj1Mk3p0aQ/LeqrOlKEq4zaF/psGQXO4NVVIrYL2Ej7o7ulQBmOlrOSW4EzZLVyG4ViL4OIKqcL+carYVwqosBZWSV8wGJg4y0TckWBMlH7VclKuuYuQlxOR3rraDpHF/4NX5vXvKRZH4O3IiVl25RRTgxPJvX3x5glXtyfVD6mvULqcEYtsro4STFQiiwTVAMq6TqcRKV8yfTXhVyea7IUOKOSb2VvrGLXuXQQ82vKp3+lOJk2r7nhpsZjVrtn1n8KnFGojZMhFaPqd/lVqWTpRU1Cpkb7w5+9am7DZotdqQitFDiDV9uVt6mwijxe61mtJuVUyYoGTfx7IL719KPDAEiBM3QNDTQQm2iOOaaqkUKvf9J3Qdx72VX0rsBZKRk329ppCJVi5ZU4C1XKyx0Dm9D3j+94mjRedeF3f8nOJqWcKl30tU3if9zyBraUs1FqKxN3TZ97vK7DGbqmZzyD6aGwyIHu8srUXnmpsFE4NVZs6GSM+8VCPkLOx8aguiZQAVc03I753/7nPl2BM3RNTy9vwhUgSSw4gPnwhcp3DRtlTDPh19eXuLU+KvYsESCGYKaIGwxXwXNsrg+ovIZUoxDzDicP2gZWPAkgmkheqnx5GcopX3jUJkXnuwl7UV6BMyY1HrAN8jqxdr0VaJRA0QpeXhL+UrKLRbjcrqLjbJa/eXr+UEOqgWv/LIcTHS6VYvxsSsjVO2wiOzOAH98fpKLfn/phncYJ5O7YsInmb5g/X7xlAPY/9/j8oTqcgWt6Opc05tQ27OoYNGKxhE6pAZorxd34XA2bAzLuNQvlPmaFhXSJW+YACrWBpMAZtTwJ5GilXvTXcQiFP9zJfV9DJYRApny/DFfGEOgwTdBjzapkhFFCUWmHhlQj0NY1lzCdZL7KkkIvg6Y8w0WDsPEen9lBNyWHjWsk+tqWMVIZypDXzhiT/1nvryH1YiIjLlJy2ov727zsgryaOpzRqG3IRColuRpPBW87XfV5jfKui/wAABnGSURBVGWFQZ7QiboZx50Y7mH61eYpebXMLawOZwTaT/M4jd1AykI/kmSUyngbSCk/cvW9upo6C2xWODdjF7Ce2rYm0qVMIso7fZ7X2bzswmqTOpwRqEoct4FMZFHhSXAz28F1cjM45GS+2bs7hpCbAQIa+lC6JCIUKjtVjW1y8LlKzaDtCpyxKGnwdhw2BduSrX7ccUc+BT5B3/z5eZgeoIPfUyl0MgRK6AELJxP3feT7HjEmeKrvesP51WMNqUairau5xDEVn0QMFQ+GTWJbNFsZ+Vo6x2XsetTxB6AJyrZa59DgvsKRL50dXrnhkaHHp+WLPruXSTFZ5AmzjR5v4ilCXgJ1OKNXopuJKRv7ldfqmGzQL+/On2fDckITBu7VCEPz/G3cjpgfAed9MPj4FNrUzeAHEaGQt0CG3h+szHY3oA5nPNq8+mLUVybpFyNDPmicQwm6mY6PmaR+XEN6N0wNGzDVNHQ9HQ3k/WnY78g680N4HI3jZsjnB8hbY8BxNtX5Ycg6f2QD038Fzog0Tx4n3n7NGuPCgA8yQAh3QsczdEdH6ilciRKFyMQ953xQVtvJ4/YdYB9Wu3B4hF0NhSAuP3Gh4luf4wIWfT7I6/Gu16vDGa2m5XVVsXKcBSOfo6EfUKm+CBgPpdoYnaqNBYKHm0ae+xv22150O5Mmffa4Sgc6CDQYNsCApijkmBOhC9JUuiEQ8jlvBc6ItHnVxeHOso7GU07aGQsZZ4PHQXG7RXvOf2Pyg65j8NCkaRlGTOxBVzkZC8442VoOROJwKufjya5yslIkpuoqlP2YOZMJFA4F9R3thwlyMZPyHIq/XbSOIUlxCh58Pi6A3vW6852T0KTxKigldPGCJLWux96nyncO1dOMv3owQwOhTVJZdBAEwMWAmj/2AH1SJIyzuYvI8ttvFn2clP1GiXDc/zLRjAYxDueq5xP63NivCe0ik1SunBijrCorvbC4ol1m/7Of5pRWhzMybeHkMesyBHntsucb1hsuJYZG1jehJ0nglLVDAD4XgXIqnCsKuacJ06cytzEBkt9AI9k3Y2xBonYeZY6kOiZ2OqUTedTEyq1UyduJsVxJlcgtn5d/u1BZ4zodY7WF+lG+fhP6cnN5G5rDsl8EDjjqcEam/afN8ji3oU4HIOPbKQIo0GCKmzHOg7TopyxbfGOzP7LGHQfX87UruJq6Of8xTOBkTO5rigYzdIPxwvW4fWE8QHm4SU0y1uGgmTP6EhjnOLzbsVyW8xrWrstU2+zzz4oy73rtefzrkWV9rcNW9SVz8htagEYY8SHIyA+FulJYlHhMkD/4VdTBQK0qA84mVAcNOOn2GEJIVf03Cb3YAHCkPnBW/GP1Ofh+oXIl5EzpVJDTmliktM+HhqIlpEhxB9BZ5jKbhn1Mvf/33z/InoqGVCPU1lXCqmNveCMkJ8U6pvpQChM0dX2rISEsco7JxDjCLIjT16KuY++tcIlM9aIQogozcFjFhWJVOIIOMUHHxbBhwzY0M5X/Teb1Z+HSruLvUUX44/xN8nLV9kcVf7vs0AmHUm7ohF7aXeQ1YPuK6qLXoK5D1+K44eds+/5T3FCqlAJnhNq86qK609KgLnfSfAetZ23CAzRgQKr65SeaZ45YJ1Se1on+c2eKWBBMSO7EydsYCzBOezTngw4wf/0KuEzQ/7tgDhKSZ7FmiUoQ7Zo/z+E0wXUmOXiAgqcEEwPXWR12Fsp6HaCetXJmuNzzr8ENzmtylgc4msMZqaanHw87939f6HzAprNRUmpOJ6U8e8BAKOFpHy+l9+VQSrjQmIBEG/MnkX0keQ+DZ52q7abufvlPVm8XO8tBGtBd9nDuBvetSGxz52C48+Lu2mfq/01GOlLMpuURlPV6ZvX5I73z0hdLJ6nAGatma3J23vge0vvYfED5XwPIcPt8gAmWl/uAx0eortsEmcXKnAQOfzA8mDPSPWego3wKzsxSJ+fpvleGFMIQwW6N9kXo7xw+mXtpV5lYYt+LItGdFbDj4INe33e+WoYNKHDGq+lpx9t9D33TO0+FgZ7iZiLB4ZY3cnEPC9gNsefNQgYNVkADvBxYu0hjePxW4RtyHjgxy4axBs1U8SdabcXXfrLHBLTKmVgXuh/3J8MzTOTg1TGzmkFVB2w7VL+VJcDmW846+Tiu8UoKnBFr66qLYetjt8sn4IBGtAPC9pagYesapzpfN0SviGM5+z2AASCDF+zwhR7H2DNE5XOLJxRguL2EueEyTZS3jRf5OGBB729xHKuPBRjyiWnv8Q2YI6Wzmf+fZajtmkb1p8oAnHXiU+Gsk/zA0Wnxkcs8+zL+BDjYpDgabp+J3e8cOVA2Pudkbw9Qhr4GNJ+B4QH2QAX03J0+LjZYsz1M+MSEZ07IFiEzqStkpYkxtrupwJJldl9KEJaHyZg7EuIlAQVMsiOoXIbLZTZvUJl3vOJceMcrz/WekDqckWvryotsl8N9IUetuzH8Ps6OMPuNrw1pm+QeOFFqlZND7PoZ4XzxAMXFyAC19uOpbbruB10vxYUu1b58XBYJVsf5SL/0RM7TeoUzFGZRh2XsOqb+r6aOqdYGMayZh12zcPIIMHAx6KdiMsgKms3cTQg2oA5nNZS7HHasR4ZEzrY4B1LzIsahyLMwTIOedshg8pTDGywnYpXBA5RxKngGCDsVsFf+AoCbzK1cDdiwwn0IOZ2JEU8TX4LF9RtKd4TX50mL9kwNm8pJzf45AtU1bJKzmenO378KznrWUz0nMpc6nBXQ1lVzl7MQ0Fib6Iecey1JjqTabLXiB5a13z8L5FTDg7GoY7h+kBCk2kYTw7izEyC3p2AcD3Yy1owS038KHjrVLZjP8qLQOqwC+zWCGg5V/cy1NxVk0IxUhkBUu6T5jvLhWSc8JQo2oA5ndTQ59bKEb/102BjPPrYtDjSGuX7Iei503hllxJWA6z6s8uwtIuoKNkgoGJgkbQUUZpvVP8/rRHMvwKyLCTjIelN5+YGpHY3Tru1I6mFvKgeD8zs1fIrQKcOwAautr2xeAWedEAccdTgros0rL4aD/4GZsYoBDfg/3GLo5AwmWrHezoJGWmwn9R8ndy2nUwiHD9SROLAotzMOBxBQJqge2AO5SuZa7kZyRSUIcDtgOy6D7n88AfdF4d5Li01ZNZNdtVtxxr63crW4r8jLYHczZ27hYkp3k5Gyxfmc9cynRMMG1OGslibPubw+H5/jIJutB/g/CQ4J+4wzoN1jsc6KJIOtQVlup+GG4IQch1PCp/iNJetcLXgwxyq355cBTMRkMAse2jfhdaF5F7+b9Fgfa2rKDdksFwP144zdRvI2hdv5v5/6A/f4HqnDWSFt/9G/hI3L35voanyOht8vuiEvaJh+oHbcAckch7odoS3LrTigsbdVMy5VVWPnTiqzg+rvwm2VjgCVsY5dXOdkuRyur8x5USsguUD0mlTlioSvxRzSbl58Vqa6CVgBywzldAx2OHhbBje85JxAh5guqsNZLZ39pvfCzje/HwEaSIdNCDTSoj7G5TiLEAWnVT12pqul/hM4CaCxHAw9juNuivrohlxQupzih+CcWS6rDprRwjNCTEiZb5oUDZS3tQiBhivD5V7wPgDbzWAnA2Qb2Pmcsv7P/vjmiI7ZUoezYtq84kLYedND85PyWXHvLJEnV8MOEnebVZaCRoCV1IbhyhHHQxfCWX2zHA6zDR9uYurjGLQN33tmUraBHlcup379cjBNJvUxS1CVq3iFULTqA0TcMrU8ZmbDLCtnmzLkXrI6vZyrcC7ZkXI6CoryBoVRxTZTbpvngv7NxS8IdEzorjqc1dPBj/95/lfJ+YZEgwnofmEam9kuggZoeDH/x9B2A3khP2iE6WsMGdSPasDTbYyTsqasJ/b9X/CaHOu+OkCOPaH3jSHuKwMWeADkRlpZDQO3IHqMZp2qIV06lCP0Ugb0/Ejhgo5kNZCsGSo0o4W2/+Mnb+T7FJACZ0V19hXvm4dWAjTiXQ0zPR5yNHi7lDDloOaETVyf+Nkn6zgEdtTR0AV6fL36fr/YzVi5GbyPHs+qS+p54OxefV4uviPvh0GhUlYv87HDHxRWHXFDqiqcyqGT1WWsUAuHVvP/v/y2N8Lzj38yNJGGVCuqzTddCDtXlvfLMe5/AlB8ADF4my90qsq7LscBDTdlLrkZZj97uQB1Lz7QVOVqB1QCw3IzxtiXMnBOpzzcBN9xsIQT7QOZpt6FTpACqRz81gtVQsDUi/IMDonK/E0RVpmaT1UrWZk0Lu+5U1/YaTJADqde+Pevzz+7MWxAHc5q6+AfzUKrL7VzNVZdMiBYR1P+R9pwoEQgUm1mZnpw5/G49OVnOPiwLockiSloUNhkh1aoPnUy3M3OjXsP4uqUufsiW+ES3ojvZ8Nc9W0li4nTOUIKW+EUumCTJpOLds887klwx/Wvd/uaIAXOimtyxhX5CXpdDZABbW0LwAaHEvQbWnA14pR5uY27vADvw9sF0DgD2+dyLOdimH0ChDBoypwNgFOehmFW26LsHJYFGSz81IEFB58aUvX1UjV4qnwPygOVDueO614HZz7tSa0GjAJnxXXXAw/B2Ve+Lw02NHzC5RgwOQCR2oyAFnA5Gly/fF5CAmyAsI4GbDC4QCrW1pShDQUFAyRjwaOAT1kX3Lqs29lV0oR7P4p+FWGek/il8REugxO+9LIFnAQ+AnXuJkOPj4CTeP7SNb+TO5y2UuCsgX7/E1/Kw6vYEMqBjcexBKe5MUTAhkD9nIDDcUX1wHPCG7yNczSknDXoMRRQuFP+MkJ1jgHQVGHULmOHRzSpjJxPBacJ2Elh8lpWt7f4BU76ukMWh0YUKvX1UdLslBxazf5/3lOeBF+6+rXOMZtIgbMmOvvq9+dup1IybIQQygjlAMHCgo19TDbpW5VlboxFcikiaJxZJSHEwUCZ1I+rX1MA4NfdlC6l3DYh9TKwj4WBtWt+WYR1XlZSmDjCKkziL1HAwGBnl/C2Wdd+cQTNTiG44Ofo8T+8552dDRIFzhoph863EHS6gg0QYGCYSO3QEItzRHS7EQY+YHgQsDhw4h0OBkz90y0kaUxBg0Kjqo5xFw869XYR92XcBX74Ln9VaHSEgQ2QZO8vqljKTf6aIow6ktlwIm6nmpk6ksHtl18KZz7l2M4GiQJnjZTnc655PxtaWbCx9tnb+IsxiQMJ5mqEtTTSYj4MODq9XELCgpNxp6ZRiOQ4HPyDcoABhBfwcfCAOowiP0ZX3ybChuP8N6Ko86nBUr4emPsZCoNo7sZatEfzMU6SuIBWlRx2wyfc3u9unAn/6uzndzpAFDhrphw6136gPulU2MS4mhhnRMMk6nbY9uwwpsqjEHix09cTDDOSU6natAFkJna4RNt3fvmShmTUfU1w7ob+Hji6qBLlgazZKZI4dnIwdGWxA5sCNEfwYr8SNLbbed6xT4TbX//qzgeHAmcNNQurzr7mA25oZP1PQhmuHDBgoIMauPoCpHygYXMzQriEBn5dxz6+lSA2nJNB23DIVEEH8l/IZEGDE8kZ2NCi4Rh2OTMYFHcRrFYMl8LJXhDyLni9Db41aMYA5hdZXZa4mxlsbnvtq3oZGAqcNdULrv0A3PVXf1effBJsBJhwORfcFtihDetqfC5IWoRH8zLV1dz2Sl82eUxdDS4/ARsSKNdjhVNC4pgN2wgAcf18Ne/EuIlfQFPcANa+OiSy4WK5Hmv6u6iDwqpq/8zZPPGJ8MVLX9HboFDgrLFecN0t8ySyBBvOaTBOh7tSW7ow0gEKEPfC5Hac65HYFb9MQpmbyp6YKrVS1efCKgIRCyRC6FW354ZYLPwodHBoVV2/RBbtgXFCKPH5EW5RX+Ymjgto7TvmifDFV7281wGhwFlzveDNJXTcHI4IG+pcfLCR4AFhVyM6Fwc+BBKOg3CBAgCuO8EAApTfwdApcjAOMCiQ8AwXd2sLxuFUa24kh4OA44CG5mKqXA7K3Vjb7Mf7jjkGvvDyl/U+GBQ4qjl0ZuFVCmyY/Ipbj4RezD4LKhRMqH127c2E7AcSutDBTKetdzGL9yQ44OlvGiYx63cMM8PFhnsTNxeVC4MDL9gDGkoh0Bxh3A43I1WGUL+Y19v3hGPgC7/90oUMhElEGdWK6y8+eD3sP/Vp85PEgx2YMKraRpyN/ZCETB7YgD0YjbGTquJ9Zcqbm6NB7ayf8T3eZedlLHeyi8BjF1lrY4VRAdhY0+tcSIXPtT6f2fR5ueIZH99Q+FVto/LU2eXbJ+5rUrT79r17F/YBV4ejqvTC6//QdjpcgtgKvXAYRHMzXF6GgQ29x4yV66mdBs3zGDJYnQStFCrRyxmq/dyFmuVgpe0Q8DlJZey0TL2ITwr3fPfKYVYK22ttyFT4EXRVuHQ1ONr+uYt+M3c4i5ICR2XphW/B0LFhwS7o8+ZgArDBeRAKG5q/QY7ASRyjEAiAAMXK3/BwsJO9JBSSYIMdBIFalefBM1CAHQ6T4DZoBo9KWFNDczUYOgA4McxD57MX/Cbse/wTFjoAFDgqRzl0vv1wHGyEvI3jWIAJrUTY2PBynACth0FE69CFghgyuwgocL4GA0gI1wxgsJWwmdj5HZwz4vqC+2w44KBVxeVFnhmTAM4oXNCaHAKavUc9Ad526umw9+jFwgYUOCpJL3zrB+Gub/8dE0YFAMLMLolgmvhgQ/M1wj1lmFkg7CYcF4MhtIvbT1zOLtfBWFPjJH8j5mqAmTHjzrOUNCrpJQwMdKww7IjtfPYc9Xj47LkXL+1zr8BRiZoB55y3fcgNi0BOBNvbuW001+JxNobPq1QOigmxuCu5HdiUZfPrmkjOZmLnd7xT3VU7xumnnTMi4aOUu+EcDr60AeopcfY+NhhANK+TZfDWE0+Dt5582lI/8AoclVd3f/theOHbPzgvwsHGShAHnA0uGwMbDCY61S2FWFX4QtwHgRC7oA8DiYGNr6zljJzEcOQ5T+z7HFPZi/1Q0rhyN8x1UQV0/nTjAtj72Mcv/cOuwFFF6Zy3fwju+k6d16mTxJHOhiaT0e9yc6Cyk7yMA6G3/aTORkwW0yQxl0CGYhqZA1BxLxtu7Y6Q98Ghn3i+QJLG3KiU7lVM72FDksaf2X8B7P21owfxQVfgqKJ1zu9+CO568GEZNgDyN7gAFy9sOKhg58CBh7oInNQ1EOdk8B38DIIIghBdS0Onw+llEDFOLm/LGo10wZ99j+F6FTL5bakirNrzmKPhM88/b1AfcAWOKkl3f+dhOOf3PmzDBuxBVIEF6GAT4MI9p7dvEHI60myUFzaGQsEPICf8EpyWkzjmrs9CyW3nGjFjOxv71jecq2GgU4RWex7zOPj0vt8Y3IdbgaNK1t0PPgz/9lN3wt1//bA7kEDI8XhnpIS8jTUwS2hgpyOAB09D42QzvhHWxLg3z/LlbaiLIbNQzrS593IMzxXuYF8/BRQ84gWb9bZP734x7PkXjxvkB1uBo2qsd/+XO+Hdn75zXp1zMsDMHoEbKvEDkHElOKwKXQTJzQgRKNWXAjBrbGhIxGyzZ6xoEhlkd1O+RtxsFRYmTW1kGOjMH+959OPgv55x7qA/0AocVWu96IZb4e6/+cG8GWlwhUIn7tuey88AkzTmbn7ug43B62vkq73d5DIGHllvQ90NDe+C4RQCMqcSPpkLnd2PfhwceMrJOXCGLgWOqhPd/dc/gBe981Z3VooJucRvd8sZMHkbbgqcAsPYYZD7q5jF//QCTc7JWDNPUghFtnHJax9gqNuTREKqEjoHnnwKHHjyyaP5ECtwVJ3q3Hd9dO52YmZliEux9zMrdung5cDCgodxTruQS2HyNLa74SDD1Q9M0zPwscKrGJWu5pePggNPOhl2/8pRo/oAK3BUnWsGnBv/7Ktw6G9/YMGFBxADG/aH5lwQca4E51bEK8CFWSlnZkucvSIzUI6DEcIpb/gI4Lc4tQ78+knw5mNPGuUHV4Gj6k2H/vYRuPGzX4W7v/sIm0y24MMt8BNnrEJXdNvtc4lcZ1aJXSTIwYWZLmdn2PjnFnDIOYd4k4Pm18cJmlIKHFXvysHz+a/Coe/+MDwQnVs5SNdUedyI426Y6WzuKnApJPNdykDaozmrKPjgKXFGqwCaUgoc1cJ06LuPwI1f+B9w6Hs/9K9JcZLDwkyTeGGmABw6w8TlbkLuBieSmWSx5cii3Q04t6aY5WhmkNn9y49dqQ+oAke1cB363iM5dG667S/8A5Eu8uNmqSYkZ0NcCntxJQ3FUpwRBxwplyNe4e4CqJzy3/3PVxM0pRQ4qqXqptu+Bvc89EM49NAPnTBDnmauy7m/HUVmmIy7n00Se6bWvZcxcDkm6bYU1MWhsgdyyBy1sqAppcBRDUIz4Nzz/R/BzXd8TZ4KD4VZvtkpbn0NN2NFoSRdpGl8wGH6ybi4A086BXb/ymNz0KyLFDiqwenmO7bzwfnvvrwtJ4vJALeTzDQfw19dLl62IIROycCxwqf5/tlCvT2PPmp062e6kgJHNWjd8/CP4J6Hfwz3/OBHcM8jPxbunscs2IvJ31A40LU2XD7IU9dZA1Tkb64/7pT8soPdj15PyGApcFSj0j0/+DEcfuTHOXwO/+gnafkW35XmoRXHAlgofPb+6tGw51ePzh9ff9yz9cNFpMBRjV5/8LVDlfM5/OOfwuGf/MQNp8gskzvF7gnRBMc0u2Xnnl87Oq9z/TNO1Q9ShBQ4qpXV4Z/8FO79yU/thXdQP7737/833Pv3/6sC0r4nPGH+o3DFZQZWohcA9j7u8YO4L/BoBQD/Hy3uo+xbYzpDAAAAAElFTkSuQmCC"
+ id="k" width="284" height="287" />
+ <image
+ xlink:href="data:image/png;base64,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"
+ id="l" width="391" height="395" />
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/delete.svg b/alfa-client/libs/design-system/src/assets/delete.svg
new file mode 100644
index 0000000000..a19f68607f
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/delete.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M7 21C6.45 21 5.97917 20.8042 5.5875 20.4125C5.19583 20.0208 5 19.55 5 19V6H4V4H9V3H15V4H20V6H19V19C19 19.55 18.8042 20.0208 18.4125 20.4125C18.0208 20.8042 17.55 21 17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts
index 90024846fc..eef4c5ff9e 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.spec.ts
@@ -21,7 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { provideHttpClient } from '@angular/common/http';
+import { provideZoneChangeDetection } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideAngularSvgIcon } from 'angular-svg-icon';
import { IconComponent } from './icon.component';
describe('IconComponent', () => {
@@ -31,6 +34,7 @@ describe('IconComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [IconComponent],
+ providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideHttpClient(), provideAngularSvgIcon()],
}).compileComponents();
fixture = TestBed.createComponent(IconComponent);
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index 1681095e65..62f64bd9c2 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -36,6 +36,7 @@ const iconVariants = cva('', {
large: 'size-8',
'extra-large': 'size-10',
xxl: 'size-12',
+ unset: '',
},
color: {
primary: 'fill-primary',
--
GitLab
From 0ff5fca755e670472ccf7138f7f40250d13380d5 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 09:25:29 +0200
Subject: [PATCH 03/36] OZG-7707 Add svg icons to assets
---
.../libs/design-system/src/assets/archive.svg | 14 +++
.../design-system/src/assets/arrow-back.svg | 3 +
.../design-system/src/assets/attachment.svg | 4 +
.../src/assets/bescheid-generate.svg | 9 ++
.../src/assets/bescheid-upload.svg | 6 +
.../design-system/src/assets/check-circle.svg | 4 +
.../libs/design-system/src/assets/check.svg | 3 +
.../libs/design-system/src/assets/close.svg | 4 +
.../src/assets/delete-vorgang-finally.svg | 28 +++++
.../src/assets/discard-vorgang.svg | 6 +
.../libs/design-system/src/assets/edit.svg | 4 +
.../libs/design-system/src/assets/error.svg | 4 +
.../design-system/src/assets/exclamation.svg | 4 +
.../src/assets/forward-vorgang.svg | 6 +
.../libs/design-system/src/assets/help.svg | 4 +
.../libs/design-system/src/assets/info.svg | 4 +
.../libs/design-system/src/assets/logout.svg | 4 +
.../libs/design-system/src/assets/mailbox.svg | 7 ++
.../libs/design-system/src/assets/more.svg | 4 +
.../libs/design-system/src/assets/office.svg | 4 +
.../design-system/src/assets/open-link.svg | 4 +
.../design-system/src/assets/orga-unit.svg | 5 +
.../design-system/src/assets/ozg-logo.svg | 118 ++++++++++++++++++
.../libs/design-system/src/assets/plus.svg | 3 +
.../src/assets/request-vorgang-deletion.svg | 5 +
.../libs/design-system/src/assets/save.svg | 4 +
.../libs/design-system/src/assets/search.svg | 4 +
.../libs/design-system/src/assets/send.svg | 4 +
.../design-system/src/assets/settings.svg | 4 +
.../libs/design-system/src/assets/stamp.svg | 5 +
.../design-system/src/assets/statistic.svg | 3 +
.../assets/undo-request-vorgang-deletion.svg | 4 +
.../libs/design-system/src/assets/undo.svg | 4 +
.../libs/design-system/src/assets/update.svg | 4 +
.../libs/design-system/src/assets/user.svg | 4 +
35 files changed, 301 insertions(+)
create mode 100644 alfa-client/libs/design-system/src/assets/archive.svg
create mode 100644 alfa-client/libs/design-system/src/assets/arrow-back.svg
create mode 100644 alfa-client/libs/design-system/src/assets/attachment.svg
create mode 100644 alfa-client/libs/design-system/src/assets/bescheid-generate.svg
create mode 100644 alfa-client/libs/design-system/src/assets/bescheid-upload.svg
create mode 100644 alfa-client/libs/design-system/src/assets/check-circle.svg
create mode 100644 alfa-client/libs/design-system/src/assets/check.svg
create mode 100644 alfa-client/libs/design-system/src/assets/close.svg
create mode 100644 alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg
create mode 100644 alfa-client/libs/design-system/src/assets/discard-vorgang.svg
create mode 100644 alfa-client/libs/design-system/src/assets/edit.svg
create mode 100644 alfa-client/libs/design-system/src/assets/error.svg
create mode 100644 alfa-client/libs/design-system/src/assets/exclamation.svg
create mode 100644 alfa-client/libs/design-system/src/assets/forward-vorgang.svg
create mode 100644 alfa-client/libs/design-system/src/assets/help.svg
create mode 100644 alfa-client/libs/design-system/src/assets/info.svg
create mode 100644 alfa-client/libs/design-system/src/assets/logout.svg
create mode 100644 alfa-client/libs/design-system/src/assets/mailbox.svg
create mode 100644 alfa-client/libs/design-system/src/assets/more.svg
create mode 100644 alfa-client/libs/design-system/src/assets/office.svg
create mode 100644 alfa-client/libs/design-system/src/assets/open-link.svg
create mode 100644 alfa-client/libs/design-system/src/assets/orga-unit.svg
create mode 100644 alfa-client/libs/design-system/src/assets/ozg-logo.svg
create mode 100644 alfa-client/libs/design-system/src/assets/plus.svg
create mode 100644 alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg
create mode 100644 alfa-client/libs/design-system/src/assets/save.svg
create mode 100644 alfa-client/libs/design-system/src/assets/search.svg
create mode 100644 alfa-client/libs/design-system/src/assets/send.svg
create mode 100644 alfa-client/libs/design-system/src/assets/settings.svg
create mode 100644 alfa-client/libs/design-system/src/assets/stamp.svg
create mode 100644 alfa-client/libs/design-system/src/assets/statistic.svg
create mode 100644 alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg
create mode 100644 alfa-client/libs/design-system/src/assets/undo.svg
create mode 100644 alfa-client/libs/design-system/src/assets/update.svg
create mode 100644 alfa-client/libs/design-system/src/assets/user.svg
diff --git a/alfa-client/libs/design-system/src/assets/archive.svg b/alfa-client/libs/design-system/src/assets/archive.svg
new file mode 100644
index 0000000000..cca0b02d27
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/archive.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M4.96804 21L2.85693 9H21.8569L19.7458 21H4.96804ZM6.7361 19H17.9778L19.3236 11H5.39027L6.7361 19ZM10.2458 15H14.468C14.7671 15 15.0178 14.9042 15.2201 14.7125C15.4224 14.5208 15.5236 14.2833 15.5236 14C15.5236 13.7167 15.4224 13.4792 15.2201 13.2875C15.0178 13.0958 14.7671 13 14.468 13H10.2458C9.94675 13 9.69605 13.0958 9.49374 13.2875C9.29142 13.4792 9.19027 13.7167 9.19027 14C9.19027 14.2833 9.29142 14.5208 9.49374 14.7125C9.69605 14.9042 9.94675 15 10.2458 15ZM6.0236 8C5.72453 8 5.47383 7.90417 5.27152 7.7125C5.0692 7.52083 4.96804 7.28333 4.96804 7C4.96804 6.71667 5.0692 6.47917 5.27152 6.2875C5.47383 6.09583 5.72453 6 6.0236 6H18.6903C18.9893 6 19.24 6.09583 19.4424 6.2875C19.6447 6.47917 19.7458 6.71667 19.7458 7C19.7458 7.28333 19.6447 7.52083 19.4424 7.7125C19.24 7.90417 18.9893 8 18.6903 8H6.0236ZM8.13471 5C7.83564 5 7.58494 4.90417 7.38263 4.7125C7.18031 4.52083 7.07916 4.28333 7.07916 4C7.07916 3.71667 7.18031 3.47917 7.38263 3.2875C7.58494 3.09583 7.83564 3 8.13471 3H16.5792C16.8782 3 17.1289 3.09583 17.3312 3.2875C17.5336 3.47917 17.6347 3.71667 17.6347 4C17.6347 4.28333 17.5336 4.52083 17.3312 4.7125C17.1289 4.90417 16.8782 5 16.5792 5H8.13471Z" />
+ <path
+ d="M5 21C1.68629 21 -1 18.3137 -1 15C-1 11.6863 1.68629 9 5 9C8.31371 9 11 11.6863 11 15C11 18.3137 8.31371 21 5 21Z"
+ class="fill-whitetext" />
+ <path
+ d="M5.00078 19.9999C2.23936 19.9999 0.00078249 17.7613 0.000782609 14.9999C0.000782728 12.2385 2.23936 9.99991 5.00078 9.99991C7.76221 9.99991 10.0008 12.2385 10.0008 14.9999C10.0008 17.7613 7.76221 19.9999 5.00078 19.9999Z" />
+ <path
+ d="M5.00078 19.9999C2.23936 19.9999 0.00078249 17.7613 0.000782609 14.9999C0.000782728 12.2385 2.23936 9.99991 5.00078 9.99991C7.76221 9.99991 10.0008 12.2385 10.0008 14.9999C10.0008 17.7613 7.76221 19.9999 5.00078 19.9999Z" />
+ <path
+ d="M7.99997 14.9999L4.99997 11.9999L3.94997 13.0499L5.14997 14.2499H1.99997V15.7499H5.14997L3.94997 16.9499L4.99997 17.9999L7.99997 14.9999Z"
+ class="fill-whitetext" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/arrow-back.svg b/alfa-client/libs/design-system/src/assets/arrow-back.svg
new file mode 100644
index 0000000000..61a866594a
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/arrow-back.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path d="M20.75 11H8.58L14.17 5.41L12.75 4L4.75 12L12.75 20L14.16 18.59L8.58 13H20.75V11Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/attachment.svg b/alfa-client/libs/design-system/src/assets/attachment.svg
new file mode 100644
index 0000000000..aaeff270ef
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/attachment.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 16 25">
+ <path
+ d="M15.874 17c0 2.08-.73 3.85-2.19 5.31-1.46 1.46-3.23 2.19-5.31 2.19-2.08 0-3.85-.73-5.31-2.19C1.604 20.85.874 19.08.874 17V5.9c0-1.5.525-2.775 1.575-3.825C3.499 1.025 4.774.5 6.274.5s2.775.525 3.825 1.575c1.05 1.05 1.575 2.325 1.575 3.825v10.5c0 .92-.32 1.7-.96 2.34-.64.64-1.42.96-2.34.96-.92 0-1.7-.32-2.34-.96-.64-.64-.96-1.42-.96-2.34V5.3h2.4v11.1c0 .26.085.475.255.645.17.17.385.255.645.255s.475-.085.645-.255a.874.874 0 0 0 .255-.645V5.9c-.02-.84-.315-1.55-.885-2.13-.57-.58-1.275-.87-2.115-.87-.84 0-1.55.29-2.13.87-.58.58-.87 1.29-.87 2.13V17c-.02 1.42.47 2.625 1.47 3.615 1 .99 2.21 1.485 3.63 1.485 1.4 0 2.59-.495 3.57-1.485.98-.99 1.49-2.195 1.53-3.615V5.3h2.4V17Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/bescheid-generate.svg b/alfa-client/libs/design-system/src/assets/bescheid-generate.svg
new file mode 100644
index 0000000000..ed128fff26
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/bescheid-generate.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 32 40">
+ <path d="M32 12 20 0H4C1.8 0 .02 1.8.02 4L0 36c0 2.2 1.78 4 3.98 4H28c2.2 0 4-1.8 4-4V12Zm-4 24H4V4h14v10h10v22Z" />
+ <path d="M18.273 2.86H2.856v34.285h26.429V13.574H18.273V2.86Z" />
+ <circle cx="16" cy="20" r="11.5" stroke="#fff" stroke-opacity=".3" stroke-width="3" />
+ <path stroke="#fff" stroke-linecap="round" stroke-width="3" d="M25.94 25.782a11.5 11.5 0 0 1-15.811 4.106" />
+ <path fill="#fff"
+ d="M5.478 17.517 3.351 24H1.638l2.905-7.82h1.09l-.155 1.337ZM7.245 24l-2.132-6.483-.172-1.337h1.101L8.964 24H7.245Zm-.097-2.911v1.262h-4.13V21.09h4.13Zm6.763-4.91h1.606v5.168c0 .601-.13 1.108-.387 1.52a2.386 2.386 0 0 1-1.058.929c-.448.208-.963.311-1.547.311s-1.103-.103-1.558-.311a2.419 2.419 0 0 1-1.063-.93c-.254-.411-.382-.918-.382-1.52V16.18h1.612v5.167c0 .35.055.637.166.86.111.221.27.384.478.488.212.104.46.156.747.156.293 0 .542-.052.746-.156.208-.104.366-.267.473-.489.111-.222.167-.508.167-.86V16.18Zm6.429 0V24h-1.606v-7.82h1.606Zm2.406 0v1.263h-6.38V16.18h6.38Zm7.192 3.728v.37c0 .595-.08 1.129-.242 1.601a3.519 3.519 0 0 1-.682 1.209c-.293.33-.644.582-1.053.757a3.353 3.353 0 0 1-1.348.263c-.49 0-.94-.087-1.348-.263a3.021 3.021 0 0 1-1.053-.757 3.539 3.539 0 0 1-.692-1.209 4.945 4.945 0 0 1-.242-1.6v-.37c0-.599.08-1.132.242-1.601.16-.473.388-.876.682-1.209a2.992 2.992 0 0 1 1.052-.763 3.38 3.38 0 0 1 1.348-.263c.495 0 .944.088 1.349.263.408.176.759.43 1.052.763.298.333.527.736.688 1.209.165.469.247 1.002.247 1.6Zm-1.627.37v-.38c0-.416-.038-.781-.113-1.096a2.373 2.373 0 0 0-.333-.795 1.437 1.437 0 0 0-.537-.483 1.535 1.535 0 0 0-.726-.167c-.272 0-.513.055-.725.166a1.45 1.45 0 0 0-.531.484c-.143.215-.253.48-.328.795-.075.315-.113.68-.113 1.096v.38c0 .413.038.778.113 1.096.075.316.186.582.333.8.147.216.326.379.537.49.211.11.453.166.725.166.272 0 .514-.055.725-.166.212-.111.389-.274.532-.49.143-.218.253-.484.328-.8a4.8 4.8 0 0 0 .113-1.095Z" />
+ <path stroke="#FEFEFE" stroke-linecap="round" stroke-width="3" d="m10 30.022 1.287 4.773" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/bescheid-upload.svg b/alfa-client/libs/design-system/src/assets/bescheid-upload.svg
new file mode 100644
index 0000000000..11e83845c1
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/bescheid-upload.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="none" viewBox="0 0 32 40">
+ <path d="M32 12 20 0H4C1.8 0 .02 1.8.02 4L0 36c0 2.2 1.78 4 3.98 4H28c2.2 0 4-1.8 4-4V12Zm-4 24H4V4h14v10h10v22Z" />
+ <path d="M18.273 2.86H2.856v34.285h26.429V13.574H18.273V2.86Z" />
+ <path fill="#FEFEFE"
+ d="M15 24v-8.15l-2.6 2.6L11 17l5-5 5 5-1.4 1.45-2.6-2.6V24h-2Zm-5 4c-.55 0-1.02-.196-1.412-.587A1.926 1.926 0 0 1 8 26v-3h2v3h12v-3h2v3c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 22 28H10Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/check-circle.svg b/alfa-client/libs/design-system/src/assets/check-circle.svg
new file mode 100644
index 0000000000..39e7d50a3a
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/check-circle.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M22 5.18L10.59 16.6L6.35 12.36L7.76 10.95L10.59 13.78L20.59 3.78L22 5.18ZM19.79 10.22C19.92 10.79 20 11.39 20 12C20 16.42 16.42 20 12 20C7.58 20 4 16.42 4 12C4 7.58 7.58 4 12 4C13.58 4 15.04 4.46 16.28 5.25L17.72 3.81C16.1 2.67 14.13 2 12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 10.81 21.78 9.67 21.4 8.61L19.79 10.22Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/check.svg b/alfa-client/libs/design-system/src/assets/check.svg
new file mode 100644
index 0000000000..c046b477f5
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/check.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+ <path d="M9.55 18L3.85 12.3L5.275 10.875L9.55 15.15L18.725 5.975L20.15 7.4L9.55 18Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/close.svg b/alfa-client/libs/design-system/src/assets/close.svg
new file mode 100644
index 0000000000..08970d6eb3
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/close.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24">
+ <path
+ d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg b/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg
new file mode 100644
index 0000000000..955bcaad76
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg
@@ -0,0 +1,28 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M17.7366 13V3.11101H12.4405L7.74777 8.05811L7.74777 13H5.75V8.05811C5.75 7.49738 5.96112 6.95968 6.3368 6.56365L11.0296 1.61654C11.4041 1.22173 11.9115 1 12.4405 1H17.7366C18.8399 1 19.7344 1.94513 19.7344 3.11101V13H17.7366Z" />
+ <path
+ d="M7.75 20C7.75 19.4477 8.19772 19 8.75 19C9.30228 19 9.75 19.4477 9.75 20C9.75 20.5523 9.30228 21 8.75 21C8.19772 21 7.75 20.5523 7.75 20Z" />
+ <path
+ d="M7.75 20C7.75 19.4477 8.19772 19 8.75 19C9.30228 19 9.75 19.4477 9.75 20C9.75 20.5523 9.30228 21 8.75 21C8.19772 21 7.75 20.5523 7.75 20Z" />
+ <path
+ d="M11.75 21C11.75 20.4477 12.1977 20 12.75 20C13.3023 20 13.75 20.4477 13.75 21V22C13.75 22.5523 13.3023 23 12.75 23C12.1977 23 11.75 22.5523 11.75 22V21Z" />
+ <path
+ d="M11.75 21C11.75 20.4477 12.1977 20 12.75 20C13.3023 20 13.75 20.4477 13.75 21V22C13.75 22.5523 13.3023 23 12.75 23C12.1977 23 11.75 22.5523 11.75 22V21Z" />
+ <path
+ d="M11.75 13C11.75 12.4477 12.1977 12 12.75 12C13.3023 12 13.75 12.4477 13.75 13V17C13.75 17.5523 13.3023 18 12.75 18C12.1977 18 11.75 17.5523 11.75 17V13Z" />
+ <path
+ d="M11.75 13C11.75 12.4477 12.1977 12 12.75 12C13.3023 12 13.75 12.4477 13.75 13V17C13.75 17.5523 13.3023 18 12.75 18C12.1977 18 11.75 17.5523 11.75 17V13Z" />
+ <path
+ d="M7.75 15C7.75 14.4477 8.19772 14 8.75 14C9.30228 14 9.75 14.4477 9.75 15V16C9.75 16.5523 9.30228 17 8.75 17C8.19772 17 7.75 16.5523 7.75 16V15Z" />
+ <path
+ d="M7.75 15C7.75 14.4477 8.19772 14 8.75 14C9.30228 14 9.75 14.4477 9.75 15V16C9.75 16.5523 9.30228 17 8.75 17C8.19772 17 7.75 16.5523 7.75 16V15Z" />
+ <path
+ d="M15.75 20C15.75 19.4477 16.1977 19 16.75 19C17.3023 19 17.75 19.4477 17.75 20V21C17.75 21.5523 17.3023 22 16.75 22C16.1977 22 15.75 21.5523 15.75 21V20Z" />
+ <path
+ d="M15.75 20C15.75 19.4477 16.1977 19 16.75 19C17.3023 19 17.75 19.4477 17.75 20V21C17.75 21.5523 17.3023 22 16.75 22C16.1977 22 15.75 21.5523 15.75 21V20Z" />
+ <path
+ d="M15.75 15C15.75 14.4477 16.1977 14 16.75 14C17.3023 14 17.75 14.4477 17.75 15V16C17.75 16.5523 17.3023 17 16.75 17C16.1977 17 15.75 16.5523 15.75 16V15Z" />
+ <path
+ d="M15.75 15C15.75 14.4477 16.1977 14 16.75 14C17.3023 14 17.75 14.4477 17.75 15V16C17.75 16.5523 17.3023 17 16.75 17C16.1977 17 15.75 16.5523 15.75 16V15Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/discard-vorgang.svg b/alfa-client/libs/design-system/src/assets/discard-vorgang.svg
new file mode 100644
index 0000000000..71bb09f3d5
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/discard-vorgang.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M12.75 19.4L14.35 21L16.75 18.6286L19.15 21L20.75 19.4L18.3786 17L20.75 14.6L19.15 13L16.75 15.4L14.35 13L12.75 14.6L15.15 17L12.75 19.4Z" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M17 11V3.77384H12.0294L7.625 7.93078L7.625 18.408H10.75V20.1818H7.625C6.58947 20.1818 5.75 19.3876 5.75 18.408V7.93078C5.75 7.4596 5.94815 7.00779 6.30074 6.67501L10.7051 2.51807C11.0566 2.18631 11.5329 2 12.0294 2H17C18.0355 2 18.875 2.79417 18.875 3.77384V11H17Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/edit.svg b/alfa-client/libs/design-system/src/assets/edit.svg
new file mode 100644
index 0000000000..8aa1db91fd
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/edit.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M5 19H6.425L16.2 9.225L14.775 7.8L5 17.575V19ZM3 21V16.75L16.2 3.575C16.4 3.39167 16.6208 3.25 16.8625 3.15C17.1042 3.05 17.3583 3 17.625 3C17.8917 3 18.15 3.05 18.4 3.15C18.65 3.25 18.8667 3.4 19.05 3.6L20.425 5C20.625 5.18333 20.7708 5.4 20.8625 5.65C20.9542 5.9 21 6.15 21 6.4C21 6.66667 20.9542 6.92083 20.8625 7.1625C20.7708 7.40417 20.625 7.625 20.425 7.825L7.25 21H3ZM15.475 8.525L14.775 7.8L16.2 9.225L15.475 8.525Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/error.svg b/alfa-client/libs/design-system/src/assets/error.svg
new file mode 100644
index 0000000000..a6b6a8ad0d
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/error.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M12 17C12.2833 17 12.5208 16.9042 12.7125 16.7125C12.9042 16.5208 13 16.2833 13 16C13 15.7167 12.9042 15.4792 12.7125 15.2875C12.5208 15.0958 12.2833 15 12 15C11.7167 15 11.4792 15.0958 11.2875 15.2875C11.0958 15.4792 11 15.7167 11 16C11 16.2833 11.0958 16.5208 11.2875 16.7125C11.4792 16.9042 11.7167 17 12 17ZM11 13H13V7H11V13ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/exclamation.svg b/alfa-client/libs/design-system/src/assets/exclamation.svg
new file mode 100644
index 0000000000..330adc7d46
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/exclamation.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 20 20">
+ <path
+ d="M10.3069 14.7308C10.5416 14.7308 10.7383 14.6533 10.8971 14.4985C11.0559 14.3437 11.1353 14.1518 11.1353 13.923C11.1353 13.6942 11.0559 13.5023 10.8971 13.3475C10.7383 13.1928 10.5416 13.1155 10.3069 13.1155C10.0722 13.1155 9.87548 13.1928 9.71668 13.3475C9.55789 13.5023 9.47849 13.6942 9.47849 13.923C9.47849 14.1518 9.55789 14.3437 9.71668 14.4985C9.87548 14.6533 10.0722 14.7308 10.3069 14.7308ZM10.3072 11.077C10.5253 11.077 10.7079 11.0051 10.8551 10.8613C11.0024 10.7176 11.0761 10.5395 11.0761 10.327V5.827C11.0761 5.6145 11.0023 5.43633 10.8548 5.2925C10.7073 5.14883 10.5246 5.077 10.3066 5.077C10.0885 5.077 9.9059 5.14883 9.75873 5.2925C9.61139 5.43633 9.53772 5.6145 9.53772 5.827V10.327C9.53772 10.5395 9.61148 10.7176 9.75899 10.8613C9.9065 11.0051 10.0892 11.077 10.3072 11.077ZM10.3087 19.5C8.96109 19.5 7.69442 19.2507 6.50868 18.752C5.32295 18.2533 4.29156 17.5766 3.41452 16.7218C2.53748 15.8669 1.84308 14.8617 1.33132 13.706C0.81973 12.5503 0.563934 11.3156 0.563934 10.0017C0.563934 8.68775 0.819644 7.45267 1.33106 6.2965C1.84248 5.14033 2.53654 4.13467 3.41324 3.2795C4.28994 2.42433 5.3209 1.74725 6.50612 1.24825C7.69134 0.749417 8.95767 0.5 10.3051 0.5C11.6527 0.5 12.9194 0.749333 14.1051 1.248C15.2909 1.74667 16.3222 2.42342 17.1993 3.27825C18.0763 4.13308 18.7707 5.13833 19.2825 6.294C19.7941 7.44967 20.0499 8.68442 20.0499 9.99825C20.0499 11.3123 19.7942 12.5473 19.2827 13.7035C18.7713 14.8597 18.0773 15.8653 17.2006 16.7205C16.3239 17.5757 15.2929 18.2528 14.1077 18.7518C12.9225 19.2506 11.6561 19.5 10.3087 19.5Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/forward-vorgang.svg b/alfa-client/libs/design-system/src/assets/forward-vorgang.svg
new file mode 100644
index 0000000000..7f5ccf6422
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/forward-vorgang.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M17.7222 16.4V14L22 18.2L17.7222 22.4V19.94C14.6667 19.94 12.5278 20.9 11 23C11.6111 20 13.4444 17 17.7222 16.4Z" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M16.25 11V3.77384H11.2794L6.875 7.93078L6.875 18.408H9V20.1818H6.875C5.83947 20.1818 5 19.3876 5 18.408V7.93078C5 7.4596 5.19815 7.00779 5.55074 6.67501L9.95513 2.51807C10.3066 2.18631 10.7829 2 11.2794 2H16.25C17.2855 2 18.125 2.79417 18.125 3.77384V11H16.25Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/help.svg b/alfa-client/libs/design-system/src/assets/help.svg
new file mode 100644
index 0000000000..03b7bf7b89
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/help.svg
@@ -0,0 +1,4 @@
+<svg aria-hidden="true" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M11.95 18C12.3 18 12.5958 17.8792 12.8375 17.6375C13.0792 17.3958 13.2 17.1 13.2 16.75C13.2 16.4 13.0792 16.1042 12.8375 15.8625C12.5958 15.6208 12.3 15.5 11.95 15.5C11.6 15.5 11.3042 15.6208 11.0625 15.8625C10.8208 16.1042 10.7 16.4 10.7 16.75C10.7 17.1 10.8208 17.3958 11.0625 17.6375C11.3042 17.8792 11.6 18 11.95 18ZM11.05 14.15H12.9C12.9 13.6 12.9625 13.1667 13.0875 12.85C13.2125 12.5333 13.5667 12.1 14.15 11.55C14.5833 11.1167 14.925 10.7042 15.175 10.3125C15.425 9.92083 15.55 9.45 15.55 8.9C15.55 7.96667 15.2083 7.25 14.525 6.75C13.8417 6.25 13.0333 6 12.1 6C11.15 6 10.3792 6.25 9.7875 6.75C9.19583 7.25 8.78333 7.85 8.55 8.55L10.2 9.2C10.2833 8.9 10.4708 8.575 10.7625 8.225C11.0542 7.875 11.5 7.7 12.1 7.7C12.6333 7.7 13.0333 7.84583 13.3 8.1375C13.5667 8.42917 13.7 8.75 13.7 9.1C13.7 9.43333 13.6 9.74583 13.4 10.0375C13.2 10.3292 12.95 10.6 12.65 10.85C11.9167 11.5 11.4667 11.9917 11.3 12.325C11.1333 12.6583 11.05 13.2667 11.05 14.15ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/info.svg b/alfa-client/libs/design-system/src/assets/info.svg
new file mode 100644
index 0000000000..84304b828d
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/info.svg
@@ -0,0 +1,4 @@
+<svg aria-hidden="true" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M11.25 16.75H12.75V11H11.25V16.75ZM12 9.2885C12.2288 9.2885 12.4207 9.21108 12.5755 9.05625C12.7303 8.90142 12.8077 8.70958 12.8077 8.48075C12.8077 8.25192 12.7303 8.06008 12.5755 7.90525C12.4207 7.75058 12.2288 7.67325 12 7.67325C11.7712 7.67325 11.5793 7.75058 11.4245 7.90525C11.2697 8.06008 11.1923 8.25192 11.1923 8.48075C11.1923 8.70958 11.2697 8.90142 11.4245 9.05625C11.5793 9.21108 11.7712 9.2885 12 9.2885ZM12.0017 21.5C10.6877 21.5 9.45267 21.2507 8.2965 20.752C7.14033 20.2533 6.13467 19.5766 5.2795 18.7218C4.42433 17.8669 3.74725 16.8617 3.24825 15.706C2.74942 14.5503 2.5 13.3156 2.5 12.0017C2.5 10.6877 2.74933 9.45267 3.248 8.2965C3.74667 7.14033 4.42342 6.13467 5.27825 5.2795C6.13308 4.42433 7.13833 3.74725 8.294 3.24825C9.44967 2.74942 10.6844 2.5 11.9983 2.5C13.3123 2.5 14.5473 2.74933 15.7035 3.248C16.8597 3.74667 17.8653 4.42342 18.7205 5.27825C19.5757 6.13308 20.2528 7.13833 20.7518 8.294C21.2506 9.44967 21.5 10.6844 21.5 11.9983C21.5 13.3123 21.2507 14.5473 20.752 15.7035C20.2533 16.8597 19.5766 17.8653 18.7218 18.7205C17.8669 19.5757 16.8617 20.2528 15.706 20.7518C14.5503 21.2506 13.3156 21.5 12.0017 21.5ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/logout.svg b/alfa-client/libs/design-system/src/assets/logout.svg
new file mode 100644
index 0000000000..5294c26bd3
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/logout.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M5 21C4.45 21 3.97917 20.8042 3.5875 20.4125C3.19583 20.0208 3 19.55 3 19V5C3 4.45 3.19583 3.97917 3.5875 3.5875C3.97917 3.19583 4.45 3 5 3H12V5H5V19H12V21H5ZM16 17L14.625 15.55L17.175 13H9V11H17.175L14.625 8.45L16 7L21 12L16 17Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/mailbox.svg b/alfa-client/libs/design-system/src/assets/mailbox.svg
new file mode 100644
index 0000000000..db574eb95f
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/mailbox.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z"
+ stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+ <path d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7"
+ stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/more.svg b/alfa-client/libs/design-system/src/assets/more.svg
new file mode 100644
index 0000000000..f7830ecca8
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/more.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M6 14C5.45 14 4.97917 13.8042 4.5875 13.4125C4.19583 13.0208 4 12.55 4 12C4 11.45 4.19583 10.9792 4.5875 10.5875C4.97917 10.1958 5.45 10 6 10C6.55 10 7.02083 10.1958 7.4125 10.5875C7.80417 10.9792 8 11.45 8 12C8 12.55 7.80417 13.0208 7.4125 13.4125C7.02083 13.8042 6.55 14 6 14ZM12 14C11.45 14 10.9792 13.8042 10.5875 13.4125C10.1958 13.0208 10 12.55 10 12C10 11.45 10.1958 10.9792 10.5875 10.5875C10.9792 10.1958 11.45 10 12 10C12.55 10 13.0208 10.1958 13.4125 10.5875C13.8042 10.9792 14 11.45 14 12C14 12.55 13.8042 13.0208 13.4125 13.4125C13.0208 13.8042 12.55 14 12 14ZM18 14C17.45 14 16.9792 13.8042 16.5875 13.4125C16.1958 13.0208 16 12.55 16 12C16 11.45 16.1958 10.9792 16.5875 10.5875C16.9792 10.1958 17.45 10 18 10C18.55 10 19.0208 10.1958 19.4125 10.5875C19.8042 10.9792 20 11.45 20 12C20 12.55 19.8042 13.0208 19.4125 13.4125C19.0208 13.8042 18.55 14 18 14Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/office.svg b/alfa-client/libs/design-system/src/assets/office.svg
new file mode 100644
index 0000000000..b106ec7355
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/office.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M2 21V4.75L7 1L12 4.75V7H22V21H2ZM4 19H6V17H4V19ZM4 15H6V13H4V15ZM4 11H6V9H4V11ZM4 7H6V5H4V7ZM8 7H10V5H8V7ZM8 19H20V9H8V19ZM14 13V11H18V13H14ZM14 17V15H18V17H14ZM10 13V11H12V13H10ZM10 17V15H12V17H10Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/open-link.svg b/alfa-client/libs/design-system/src/assets/open-link.svg
new file mode 100644
index 0000000000..3ee831d0bf
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/open-link.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
+ <path
+ d="M5 21c-.55 0-1.02-.196-1.413-.587A1.926 1.926 0 0 1 3 19V5c0-.55.196-1.02.587-1.413A1.926 1.926 0 0 1 5 3h7v2H5v14h14v-7h2v7c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 19 21H5Zm4.7-5.3-1.4-1.4L17.6 5H14V3h7v7h-2V6.4l-9.3 9.3Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/orga-unit.svg b/alfa-client/libs/design-system/src/assets/orga-unit.svg
new file mode 100644
index 0000000000..b74d1307d8
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/orga-unit.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
+ <path fill-rule="evenodd"
+ d="M3 2.25a.75.75 0 0 0 0 1.5v16.5h-.75a.75.75 0 0 0 0 1.5H15v-18a.75.75 0 0 0 0-1.5H3ZM6.75 19.5v-2.25a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75v2.25a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75ZM6 6.75A.75.75 0 0 1 6.75 6h.75a.75.75 0 0 1 0 1.5h-.75A.75.75 0 0 1 6 6.75ZM6.75 9a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM6 12.75a.75.75 0 0 1 .75-.75h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 6a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75Zm-.75 3.75A.75.75 0 0 1 10.5 9h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 12a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM16.5 6.75v15h5.25a.75.75 0 0 0 0-1.5H21v-12a.75.75 0 0 0 0-1.5h-4.5Zm1.5 4.5a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Zm.75 2.25a.75.75 0 0 0-.75.75v.008c0 .414.336.75.75.75h.008a.75.75 0 0 0 .75-.75v-.008a.75.75 0 0 0-.75-.75h-.008ZM18 17.25a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Z"
+ clip-rule="evenodd" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/ozg-logo.svg b/alfa-client/libs/design-system/src/assets/ozg-logo.svg
new file mode 100644
index 0000000000..2e03b4ec57
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/ozg-logo.svg
@@ -0,0 +1,118 @@
+<svg data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ viewBox="0 0 300 233.91">
+ <defs>
+ <style>
+ .cls-1 {
+ fill: #001e49;
+ }
+
+ .cls-2 {
+ clip-path: url(#clippath-4);
+ }
+
+ .cls-3 {
+ fill: none;
+ }
+
+ .cls-4 {
+ clip-path: url(#clippath-1);
+ }
+
+ .cls-5 {
+ clip-path: url(#clippath-5);
+ }
+
+ .cls-6 {
+ clip-path: url(#clippath-3);
+ }
+
+ .cls-7 {
+ fill: url(#Unbenannter_Verlauf_11);
+ }
+
+ .cls-8 {
+ fill: url(#Unbenannter_Verlauf_11-2);
+ }
+
+ .cls-9 {
+ clip-path: url(#clippath-2);
+ }
+
+ .cls-10 {
+ clip-path: url(#clippath);
+ }
+
+ .cls-11 {
+ fill: #003064;
+ }
+ </style>
+ <linearGradient id="Unbenannter_Verlauf_11" data-name="Unbenannter Verlauf 11" x1="0" y1="216.4" x2="36.09"
+ y2="216.4" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#003064" />
+ <stop offset="1" stop-color="#d4004b" />
+ </linearGradient>
+ <linearGradient id="Unbenannter_Verlauf_11-2" data-name="Unbenannter Verlauf 11" x1="168.58" y1="105.58" x2="229.31"
+ y2="105.58" xlink:href="#Unbenannter_Verlauf_11" />
+ <clipPath id="clippath">
+ <path class="cls-3"
+ d="M188.53,149.59c0,12.64-10.26,22.96-22.89,22.96s-22.14-9.47-22.82-21.5c0-18.49-12.83-34.05-30.05-38.24,7.68-2.48,13.76-8.54,16.21-16.24,4.18,17.28,19.67,30.13,38.02,30.13,12.06.68,21.53,10.73,21.53,22.89Z" />
+ </clipPath>
+ <clipPath id="clippath-1">
+ <rect class="cls-3" x="107.77" y="91.57" width="85.76" height="85.97" />
+ </clipPath>
+ <clipPath id="clippath-2">
+ <rect class="cls-3" x="107.77" y="91.57" width="85.76" height="85.97" />
+ </clipPath>
+ <clipPath id="clippath-3">
+ <path class="cls-3"
+ d="M188.53,27.96c0,12.16-9.45,22.2-21.44,22.89-21.26,0-38.65,17.15-39.2,38.37-.02.36-.02.71-.02,1.07-.66,11.73-10.22,20.97-21.94,21.48h-.09c-.29.02-.61.02-.91.02-1.25,0-2.47-.09-3.68-.32-.36-.07-.73-.14-1.09-.21-1.07-.21-2.09-.5-3.09-.87-1.27-.48-2.48-1.05-3.63-1.73-.36-.2-.7-.41-1.02-.64-.09-.05-.18-.11-.27-.18-.45-.3-.89-.61-1.29-.93-.07-.05-.14-.09-.2-.18-.52-.41-1.02-.84-1.5-1.3-.3-.3-.59-.59-.89-.91-1-1.02-1.86-2.14-2.61-3.35-.18-.3-.36-.61-.55-.91-.55-.91-1.02-1.89-1.41-2.89-.41-1-.75-2.05-1-3.12-.09-.36-.18-.71-.23-1.07-.07-.36-.14-.73-.18-1.09-.11-.73-.18-1.48-.23-2.23-.02-.34-.02-.68-.02-1.02,0-.48.02-.93.05-1.39.05-.66.11-1.32.2-1.98.07-.52.16-1.05.27-1.57.02-.05.02-.09.05-.11.09-.52.23-1.05.39-1.55.09-.32.2-.66.32-.98.11-.34.25-.71.39-1.05.23-.57.48-1.14.75-1.69.2-.43.43-.84.66-1.23.39-.68.82-1.34,1.27-1.98.36-.52.75-1.02,1.16-1.5.02-.02.05-.05.07-.07.25-.3.5-.57.77-.84.2-.23.41-.43.61-.64.32-.32.64-.61.98-.89.29-.27.59-.52.91-.75.73-.59,1.5-1.12,2.29-1.59.5-.3,1-.57,1.52-.82.3-.18.61-.32.93-.46.23-.11.45-.21.7-.3.23-.11.48-.21.73-.27,2-.75,4.13-1.21,6.36-1.32h.29c.68,0,1.36-.02,2.02-.07h.07c20.62-1.23,37.02-18.38,37.02-39.19.68-12.09,10.7-21.59,22.82-21.59s22.89,10.32,22.89,22.96Z" />
+ </clipPath>
+ <clipPath id="clippath-4">
+ <rect class="cls-3" x="77.04" y="0" width="116.49" height="116.78" />
+ </clipPath>
+ <clipPath id="clippath-5">
+ <rect class="cls-3" x="77.04" y="0" width="116.49" height="116.78" />
+ </clipPath>
+ </defs>
+ <g>
+ <path class="cls-7"
+ d="M18.02,233.91c-10.35,0-18.02-7.14-18.02-17.65s7.68-17.37,18.02-17.37,18.07,6.71,18.07,17.37-7.68,17.65-18.07,17.65ZM18.02,206.12c-5.62,0-9.46,4.32-9.46,10.14s3.89,10.33,9.46,10.33,9.5-4.32,9.5-10.33-3.89-10.14-9.5-10.14Z" />
+ <path class="cls-1" d="M45.69,233.02v-6.95l15.77-19.48h-15.4v-6.81h25.42v6.43l-16.15,19.86h16.48v6.95h-26.12Z" />
+ <path class="cls-1"
+ d="M100.7,233.86c-10.58,0-18.21-7.04-18.21-17.51s7.86-17.46,17.98-17.46c5.19,0,10.02,1.74,12.78,4.41l-5.06,5.77c-1.54-1.78-4.21-3.1-7.44-3.1-5.62,0-9.74,4.41-9.74,10.37s3.6,10.47,10.11,10.47c1.87,0,3.6-.28,5.01-.89v-6.06h-6.32v-6.48h13.67v17.6c-3.23,1.69-7.68,2.86-12.78,2.86Z" />
+ <path class="cls-1" d="M125.33,223.77v-6.1h11.89v6.1h-11.89Z" />
+ <path class="cls-1"
+ d="M177.95,228.09c-2.76,3.57-6.51,5.82-12.08,5.82-9.97,0-17.09-7.37-17.09-17.51s7.26-17.51,17.13-17.51c4.87,0,9.04,1.69,11.42,4.84l-1.92,1.78c-1.92-2.44-5.38-4.23-9.46-4.23-8.85,0-14.37,6.85-14.37,15.12s5.52,15.12,14.37,15.12c3.89,0,7.16-1.17,10.16-4.88l1.83,1.45Z" />
+ <path class="cls-1" d="M193.68,233.02h-2.53v-35.49h2.53v35.49Z" />
+ <path class="cls-1"
+ d="M219.38,233.63c-6.74,0-11.47-4.93-11.47-11.55s4.73-11.5,11.47-11.5,11.52,4.88,11.52,11.5-4.73,11.55-11.52,11.55ZM219.38,212.78c-5.43,0-8.85,4.08-8.85,9.29s3.42,9.25,8.85,9.25,8.9-3.99,8.9-9.25-3.42-9.29-8.9-9.29Z" />
+ <path class="cls-1"
+ d="M261.05,233.02c-.14-1.17-.19-3.19-.19-4.32h-.09c-1.26,3-4.45,4.93-7.77,4.93-5.76,0-8.19-3.99-8.19-9.11v-13.38h2.57v12.39c0,4.32,1.31,7.93,6.18,7.93,3.75,0,7.21-3.1,7.21-9.2v-11.13h2.53v16.85c0,1.27.09,3.57.24,5.02h-2.48Z" />
+ <path class="cls-1"
+ d="M297.33,228.7c-1.87,3.19-5.29,4.93-8.71,4.93-6.65,0-11.14-5.02-11.14-11.55s4.5-11.5,11.14-11.5c3.42,0,6.84,1.69,8.71,5.02h.1v-18.07h2.57v35.49h-2.57v-4.32h-.1ZM288.86,231.42c5.15,0,8.85-4.08,8.85-9.34s-3.7-9.39-8.85-9.39c-5.48,0-8.71,4.27-8.71,9.39s3.23,9.34,8.71,9.34Z" />
+ </g>
+ <g>
+ <g>
+ <path class="cls-11"
+ d="M203.5,83.95h-40.58c-5.02,0-9.08-4.08-9.08-9.11s4.07-9.11,9.08-9.11h40.58c5.02,0,9.08,4.08,9.08,9.11s-4.07,9.11-9.08,9.11Z" />
+ <path class="cls-8"
+ d="M220.23,114.69h-42.57c-5.02,0-9.08-4.08-9.08-9.11s4.07-9.11,9.08-9.11h42.57c5.02,0,9.08,4.08,9.08,9.11s-4.07,9.11-9.08,9.11Z" />
+ </g>
+ <g class="cls-10">
+ <g class="cls-4">
+ <g class="cls-9">
+ <image width="180" height="180" transform="translate(107.58 91.49) scale(.48)"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALMAAAC0CAYAAADfER1LAAAACXBIWXMAABcRAAAXEQHKJvM/AAAgAElEQVR4nO2de7AlRX3Hvz3nYkUraoy6sDyMWoZdgQWFfYPsuYhgCAJK0CiCDxB5LQ+JqFHr3luVBcVHVJaHRTCVRyUVLQkgMWVpvGdfEJfHSojyRkz+T/5INFXJ3jP5Y7p7fv3rX/f0nHPuPa/5Vd09Mz3dPXPmfOY73/71nLMqz/McIxid3fuxa89+zP/Jrd629qkbMffZ7WifunEIR9bEKIZSSqlRg7mzez8WdtyKzu79SfUXf/BXDdRNjB7Mnd37MXvmRbXbzX9uO+Y+e/UyHFET4xIjBXOvIJton7oJiz/4ywEeURPjFEoplQ37IID+QQaAzp79ydakicmMkVDm2TMv6g9Epexi/uunBnBETYxbjJQy9xwEZABY2LGzz6NpYlxj6DD3BR8DGSjsRhPTGUO3Geqla3ps6INsorEa0xdDtxk9qbJSUZB77reJsY+hwtzZ/RO3wIDK/+j2lH4bqzGVMTSbYdNxiYDWjcZqTFcM1WYs7Ng5IJCV/nOjUefpi6HA3Nm9f0CwKbZcgr2rmUCZuhiKzZg98+IBwFyh6grIf/Vkn/toYlxiKDZjMKpcDTLQWI1pixWHufe0mWsjotXsvm7rcV9NjGOsqM2YfefFPUxd1xgkKm8B+a9+XnN/TYxjrKjNqP9UW4IKO9Vl5V64qVHnaYkVU2b1srWpNWt2XF2/UefJjxVT5tl3XpxYs6YSJ88IPpzebxNjG8sOc7pPTgS5BsSmbmM1piOWFeZlATmlDgO+s+fhRp2nIJYN5rQBX41BXhXIFYq9cNPtaftpYmxjWWDu7NmP2TOrfHLdTEWvUVwwjTpPfgwc5oUdO1ce5GAdnqZr1HmSY6CpuTSPvAIgR+Be/P630H7bhvRjaGIsYqC/mzFQkIWZvGAlr4oKNCOzgv/1RNpxNDE2MZA8c2fPfqiXrR3Mb1Y440GJSDbLp4RtEtzcbtx8R58H2sQoRl/KXP9Zi4DSViipWEGC3oObtynLFr//LbRPWS8fTxNjFz0r88KOnVAvravGdUBO7U8CWUj3CWm7Rp0nL2opc/G9PZKpqAVir6osrKve1JiXL/7D3Y06T0gkDwAXduwsHqrnSrwsMPcCcr2MBn1pgJ6MiMLs/9h3zLcm7S6huAbI0nq0nF8ExXr7beux+MCfyf00MTYhwlyo8E8EP9wrzJFKQWVNUNqk/HLomF2w26dswOIDd4WPs4mRDwfm6l+s7wXmhOcpkvZTYS1S+qmAf/GBuxq7McZhYa7+feS6mYhep6A5gKxMsiS8TgrEpp5y6y1+7y60TzkpdMRNjHAopZRa3PWTvPqHvkOzbRX1w3uusZ+IKtcGOXBh2K9cAfl/Pho4tiZGOZRSSuE3jq5OzdV6am0ZQJYyHqLfjlmPiOrbugrtU07C4ve+GTjGJkY1Vv53M6pu+UkWepAgKwdkAOjsewyz51weOM4mRjlWDuZYGi00cRIFmZWL+xGuECVdNQzovY9h9pwr5ONtYmRjwDAzT2r/aiWkva5sQTQnzfcT225UmdZz1zv7Hm2AHrMYLMwU4KT6kkIqWV2DICvhgqkA2R6jDLJZ7uw7gNlzr0x8M00MOwYIcw/q67StyGTwema9arfOQ0YBvy2AbOoWQF+V8B6aGHYMCOYYURGvzKspcYWpKCn0wOTtJFuBQB0EoAY6Dx7A7HnN/wA76lENc9Tv1vEUoT6rMg+BARtVUN5OUuMoyNxmKLasFfq87ZE31cSwow9lToFYqiP5WWGb+NMB0sBNaEfLg2pPDL4idU174QLoPHgAatUp6Dx4QHhfTQw74jAnfus5rU5AYaXlEMS2mtBOGgR66g1ykQQGgs7+uQUpts2++1p0HvwpmhitiM8A1oVZUli+Lvnf6BNxVZBLfVb5Y2G7CoHMLgqi4u2tb8XiPV9HE8OP+Axgz6rMQazwxKlqHdqPeHEI7UV/zPx0TJHpvvRr56HHMXv+deg81Kj0KETWPnWjXzoQkKXNdUCvUGvPIpguJU8ugQwGtWA1nHbysXUefByz51+Pha/8hb/fJlY05KfmeoG58nmImPWoaUNEm8DbMXB5GwfqkGfmZdRm+OXtLW/B3A0fQnvLCWhiZUN+nrkyFRcqrgNzZJuntr2AjBIyp03oAgrBzOvIEJflxfr8Jz6EuU9UPVbbxCDD+9rU7JkXJfy4oORPewRZsglRkIW+ONixwZ2kvFUgSxaFg2zrubAvfvvLaG853n8PTQw8gl9oXdixM/KTtBw+ViaptweI1FcVuHxdUuUKayH1oWLt6LoENytzgC5e21uOx9z1H0R7cwP1ckbSTw3IYFNI9Lq4jAQlleoJ65X2oo7qCv1FZwPNugQ/V2zTxlXw9uYTMHf9hWhvXocmBh+1fzjRgu1YkZoWQ7IlQcgi7YKDtJQ2fYJst1VbDQ57e/PxaG9Zh7lrP8DfZBN9RF+/Arpw0236f1sNgO1BK6kpKkAOtHHa9QqysI0/B8LhFH10zGrQPnUZKZ+/9gOYu/YP0UT/MZCftO3sebj4sZgdtyEIo1n2bEIIdr5eochOeQXIvM8aDxuFVbzKavB1rtbHob1pHeaueR+a6C0G+vvMQPHL9PP2f3biXoHDQusMAuSqNhUg8/XQ9LZnL4SLwLsQZIi9+gpobzoO7U3HYW77e9FEegwcZhMF1PS/XEhQZb7dqRMAldcZNMh1fDLtQ7InDNqgarOy+e0XAFDYtvEYtDcegybkWDaYTVioq6AMTlKgLK+CvVafEpC8nO0zqNqhi4FDG4OYLgfqGktCoJ676nw0UcSyw2xi9qyP6oGiBHOCanttgN5ArqHQKYNBD3wJ4ICqpwBe+yIC5q98DysvY+6K87yySYkVgxkoBoqzZ10SAU+X96LSMThtWQ2QQ8rtZCbgL0vtKweEpJ7k06P7TjhmvkzOS3vDWrTXF/+n+bYNa9FevwbjGisKs4mFm+/A/M13miOgh0PKKj4I+wEjULcK1oq6HhSBMnG7pNJ0Ww3Aq/oPtQm+V1bHWS7qtdevQXvDWmxbv2as4B4KzADQ2fsIFm6+A5295nfdegA5uFxTdWPbkm7xoeOqUGFvu1BPLOP9VL0nthyCWbAlACzcc5efI24flRgazCZmf//SEugqGHmZLWbLVX31BLJ5FeCusiRVQEeVXGi3HDDztoFor1+DuSvOHUnFHjrMQKHSs2dfZg5Jv6wAyFH7IrWRIDJ1A+1FOyKtxy4IyO1i742/vxjM/PwlxCiq9UjADACdvY9i4QvfLFS6NsiBes46qx8qF/eVCJFoM+i2VMXm/cWOLwXmiPoGIU+P+SvOHQmoRwZmE7NnfxydfcRHx5Q0GWThwwxeHH0AFPS9AtTOthRVFvoK1qHlYNtJHa9ebzCbGDbUIwczAMy+6+Po7H0sAWRpu1C/tn9OAaYCZKlM3JYJdSPHGLo72JfA+eLbnffL6vUZi3ffOBRPPZIwA8DsOZcXQAPsQwiBHIA3Bn1M2ZPUl2/nCkyWg32T/kIXYArMfYMsbO8j2uvXYPHuGwfWX0qs/I+NJ8bi/Xdi/lMf8z8kCo4po6A7y3CXJS9uq5i2Smgaas/2K4Ls7MRdttVCkEUgrQPyEKLzyNNQJ1yChTvvX9H9jqQymyh+xf4K4ZYqABVUYaF+KBvB+xFVN3AcoUxGiio79Wn/wv6lNt77lPpgsYzKTGOl0nkjazNodPY9Rn4jOaDI3gcmKV9AvULA0P0EQWJ9BMti2wJlwYsmcLwhVfagDZUvr5Ivt5ceWZtBo33yiZi/8VLYDzqa1aAfMlkXFZ2AJvUjqhy7MFJBpsG78FQ/VFG6aM2mAMgjFLOX3ILOI08v6z5GXplNzJ53FTr7zK9vKhks+yJA7QCOgNoJ6yKkoXqJqlupyqF98vc2HqpMY7kGh2OhzCYW770N7ZNPRBxkrrSA+8GnKDLvD25/3p0AiCqjpKZedam9J+Fkf6iOUJ0Q4H1Fep+dR57G7CW3LMMxrOT/NjWAWLx3pwYa8AAUARWA8G7lEYV22ijIH5oEvNSHAL6YaiPtpAtIzC9L7YRjFUHuB+7AOa6I5QJ6bGwGDbXqbXqBnkgOI+AAZtdDKkzbBrZJGRJvkEjtAu2D1XPqB95DcDJFqOOU8fPA67H6PYXUtj5KgxoYjpXNoLF47zcqQNZAOYoaA5kpJAXPG8Qpf9+gfdFVDqNXIXxBiQCTY6BdBcvMppUAubc+BzkwHEuY21vfivlPfgQltBxGU1NQ0pD6ecuB9qICh1RaemXH4u4wEpGLwOsita+6wS/sPiMv/hbuuG8g3Y2lzTAx+57r9H/HwCxADBwR5AjgdF3yuLFcdNQ2VNwdeHtPwSPHK77/wPZakdouASlWpb2hvyzHWEyaVIU6bDYNZFFpY4DTdqyPumk1Wi7W4xecBHtgWTpmGgNLw9VpF0EqsqkfoMfWM9NYvOdrZI1aDQMrXYa/LtkG2hcEsGw/vExqGysX9hecaEkBmbUZCsiB+tpSxKKz/2l0Hu7dP489zO2tJ6C99S0Qb9HOui4Tb+1MgUO2gC/bJlVWIQJDkmdPVeRAvWFHyr1f15n96C09Az32NsOEOvx0uubD4MAKAXpaH/DtACKwmteKC0q6kCQrEvTKMUUW3iNC63Wi17a581JVzSt+4u5ae5sIm2Fi/oaLEbYVKLcBFSAr9mf6GDTIgTLpQnS2s2WzXoc5/haNLRP/avTLo0eQgUKh68bEwDx3w8Vobz2BwSQptABqCBxHHeFui/le8aJJKWP9xOyJdzz8GHhf7i5rRU/tKhok+OeF2+s9Dz0xMAMF0EWwW7lZlhTYuzVLIFPF5/2DARVSWrYP8bMOABC1F5H25j33o668+9S+Yu41UbHnb7+vln+eKJjbW47X6gwXNEeNFfuQQ8DHVFZYl/w2BzlqH2IXCO9XWo9ti0UPpPdzgdS0Hgu3p0+oTBTMAPR/WUaVVIA46okJgCFgK8t5BKyKOBPI1kNwDwTkEQsB9M7D6em6iclm0Jh976fQeehfELYSbNnxyGTBsxrwAYxlIKR2KRM5nprTdmy5L5D7hD5GTl2bUUFh/q/x7MZEZTNozF3/QbhKDIggWwtCy5kFkayBZC3A6jsg8yMMgQwsD8gq8NdnhLoYtD7meZLdmEhlBoDZ930anYee0GsMAA6ox4fyl4PtGGi9qHJQ3dlyEGT2HsQ6yxSiylbJbGIZ6yv/2beCXU6sMgPA3PUXwlUgo9S8DO52B7AqkElU+eh+QXb6jahzZfmAQ9pNXc+eADJQPRicWGUGAPW6swNqFrhtewoYUGivXQDMlKyGOBMotOH7BD/uFYJXiqDShqb3qtbDSIbUeaKVGQDmP3GhXmJe0S5yIJkaO21JmehhI6pdVk4HmbaR+vGOexQj4bhqgIwcWLgtrM4TDfPcde+HA4793DncITgUqw+hLqsn2YIqZXcipL4Vd5VhRsX1lhwJGZBYmm6iYQaA9pZ1DISQheDbOIRg8EoKjkBZCGBJqXkfgX2MCsiVwY4zDy2nud3O/qeCQE8+zPY/Xhfg4LdorsrBQZfUDysTIaf7CfRllvkdYWSthI7o4fV57IzzXfufkvcyyQNAE+r15r8Mk2wALw/Ui/na4ECPwe5YEX4h8LZSHb6/EYvKlFtertdRZWFz/nN3IDjxA0AT7c3HlZ45aCf4OvXJkJeBgN2oUHLpVbzIxiyqDn1QOWnI3nk6YN6yDkHb4AEOYTlmS8C28y4itoNfGFXlfB+jFlUpNylibyfSXrIaU2EzAEC94T1miRRWDMicxSrrEbItpM/Qq9dX5DjHBeaqlFtOFuo+q6H7yp/8c1s0NTYDYFZDQYBvECALtsXpM6LSoRhlePsOAeSqL75GtHe6YPb8rOSZQWCvsiYIwCZ45kp+QzaHFo8w2L0+QZfah9APn0CZSdvLpEXEt0p+1fPCAWvhlUn7lLyzdDcY40jKVNR0twkXxNR4ZgBQb7yArNh/SFnIQwe2R5/hYPWDDxwF6sWWRzFEvxzww4ALp5SuC9Xlm7RvVkqp6VJmL8NAt8VADlmJSFmV2kb7HsNQKGFUGJy1qKHgU+OZAaC9yfhmGtzfch9NiumKInX5dunCiL6KOxnTYCM46S2F+Ozh7VPfPF0wbz4G7iCQgyitc4WWPC9bpzHq9mCgsUyONfEUTpfNqLQOEHyxVD82gAxlJQS1Dx4b62ccLwhqO+pUcIorLg52WqZKmeeu+QOIaTMbIQsipOfE9YrunMKEVNw4RS+zf3UicNo7D5czgVOmzCZCqswWuE+u6qNSlVP89YRHMuSBiux0dfZPM8wUHvF8VWUpyHoQyirVrQlwno8J9Noj9KvKCkAuiQVd8XcyVTYDANqbjilXnLEgswySVw4O9KpOfELE6o86yNHZv4oNMcdXNcZgFaYYZiGrAbKJLkgnNjiQrKPQgRh1eGORpMqsUtUwhg9ZPBEqYvpsBoB4JiN3t0ezH7HUXiAbMe5ZCh61LUWkAT0dvFrCqZpSmFnU/Qq/WN4HmBPA9MCjMrUH77xNL8xJqpg6eIuAXVd9x+UrUr0Gfz+xaW9T1U6Tx8/FFMKsqgGJPfnmcVsDvkmzGDx6eWZNOg89WAxgKmGWQsorB+o4Rb1eFDX2Me6RYhekNj3EFMMsDfJ4QWQwKLqNHrIX0QHmBAZ/m3lCeeLFMHWpuW2b3ozwII/niCQvnAhyzI5MosWIhWKvfFtVufnBy9CfjqlT5vbGNxcLXkYi0TL0pMhV8KbYnHGJUNoTSE7LSYWBZ5JoTB3MANKVMaWe+NUpuGUTAWkgqA0w50JiVkpn5jmUcI5zbu9Y09DpnE6YpehlsMahJS9hhUrIY497cJ8r2YwcBciCk1OQLoqQqS6jgRlIyEqAjAUj0FaVTSC3AORBWmjM4JyGXLi4I/0660Xl9vo1dvPUDQAB4psBIU8s/Nl60tmmi6q6LNR+3CP6NlU5dnbObVmOjJaRv0z/0XXSx7aph3mTGQSGfZlbKNWLgC2V9cTtGMLOhxDESpRfTKdQuvDaxcwFX2V0m3L6NTG9NqMSZAGkkB8W+4rdPmN9k5UxZBkAsQMEOCWs6/NQbJI/D+UV5sSduEBPpTJvozYDYJCSq16yGxxS7vnoSRadSYxQ0mBcQTbh2AFVDOocsAGlVDEIZNahsByKvZZ9ldYDmLvsXXaXU6nM7Y1ri4Ukm8E2RhU0AmJ0X6nk6g991H+3RwPn3qAEu5Ep/V5CdzHzflUpu/Q//mHndCphBuArql8hUuT7tVqwVoEcsjzjoNaZKj2tCXO66MSTYBPoil+sf/mTbJ279Gx31/0e+7jG/NXvLgcekqeI2Qx6ptmUqqnirYh2JcVyqOqq9DiGOVVubv/6T7X0ny2Dhb34A1Qrc9czkPoKaJn3X7w3Rdo3A8CUCPFQ9XxFsj8WlD3USQrEpp6Czocr8vttfVoSA435oaJQfwZgRV75zY+qsSIb+JdX9Td+lHkvxo1QiwFg24lHu82m6YcTeahjPkxWqioHQE7xx069CODmJfQkmQn6bW0LBYEnF/7vkF4+ZgNopmwfOYXavGYZkKEE2agwlD/b7x13eZyKrptjp+dD79sge3Dv7WXX0/Rj41K0N66N38KlWzf9ELhloHUdi1JhXwyImdR34LicffB+VTnRwCcjUkIBaGWFBWhlgLELh7SKshny95IW1CFlPWMlCktA3namirZKWwmdyVDGOpj2bMLEWg7zXrQN4aoMTLnNaG9c6/wiDoA0VaXrnrWIbIvtI7QvG+yr+cIFpgjk5Q3XlGklzTKgS6ROmobOCh+LlquyUEDWUsi7eWENjHIKamvywEqn10rbQdqBtKd2g95ZVHHoJuth7gxtAeapthkAoI79cAVckqUIQcxhZ8vSdr+TyqIClkBdctumt2QKOnIA3dy1oAYDrZQW5BaxGQa8rgub9N6UAvHQhZqiW27PGdDKsRN5eZ2Z42JW439/fKv71qfu95mFaG98s6DOZMFjhpWFLAivLz3VyID0RJL4YIcdbz+EYKfPHCrLykMm2/KuHmAZarR62v0YkM2tnx5PywUTtI1V2by8MLStyLvlhVVU0XszOWnryVXxeKh54/rcmcP9/EW/BykamDdoqyEBSNfJC8CUTkfurHPoWTtal07rUuqpctGRUDAVWJYrRcBix6OAcsIiL8pNqqusrpfoAFCZAZ0CWvRc6P7omEC/DaX0RQH49oFbjlxBWSXWhd28gD4vq217y+9Ciqm3GQCg1n0ELqlkQbqbh0bkZQXWl9yP9LBMUPWl/fDjoX1qoOwmKfthlJI+9GMpJOsZmY5WZGavpYSLk+2f9k1h5u+HbuvmpDgv7gJatU9d9yb88ItXS+egsRkAMH/leZi/g/7PRXUgDgHJlVkG0/O+gpo7fUh92uISJJUp+fcWKcwt3coAlykfNpWVVsN8M0T3r1pZ8AKDZtfx21AFmNxQ6VuaUWB7EeWAyhWgcuRdQOXAthPeFNhho8w21PEfdT55987NIKblEnySCtJqgkVx+hAVW9/ivXx3qaSlYmZWCFkX/vHr9Jmy6TTtbU1qjUNrLhA9c+cGGazR/rtkn0R1XYuBEuZu7pZ1c6vc/3PfV4WT1iizE+0Na7HrEf3/MbskB9UQTjVSrtfLW7z+J8VCKLhpLOqTKeS2nnsgiuR5C1vsph1Mytvmb418mwslAzIoQAOslIKaycrtQKHQkipTiM1TFEoV3+njky2sTZ7nhQp3C1tjB4tdsx343HvPQCwaZdbReeRpnHbJLenWIQSmgUxs49YLthGU2X8gXasxhcz0Y3K7BAq6zT52mWl4dB9KATjEzX6omcz1vYodE8k20GvPWgyboSAbqApDA28UuOsqdKnMwK+/8yWEolFmEu31a7BtwxrseuQZBiy3DKEyvcihpG14Pd4+U/42uCD5VqOso1Q5SWEf6mkpPRCD+0Sb/uZGTnwwMlXM5lH70DKemd0xLLha2R1J1Gk/fbGY3vJuXloIlqsuFFghz7RC5znyJdjnM/74/NNRFY0ys8jeemmxEALQrrDXooKvwg5srA5Tem+wZFapDWB92AGZeTW3f/tXPmFWgkzU2b5xIDskc79zhxzZTFYeiz4uxz51/fw4fWs5YMHNqV+mqqszK3m3VGS7rsv++6+/IO2FnPpGmb2Yu/wcLNx5P/h9PpyOox80PIgVgcAFkjZXzpSxW663mXwwVWatrubJNqW0EoPsx+R4jRrbh4fKdsiB7CVZub2lbGbDVeXynJj9lJMvOvJyIc+1smYmM1GAayBWOZB3u6VNIbYnzwDVVciXuvjHT38s/qGZY2qU2Y/sRH3yCKDuYE4v0DKmuDGIy5xt2T9dpxMenle2IBcqrEj78qEckIyDPoYMTsbCWhANkWqFYCdZFAM1mWDJcwBLOVNnvbZE/LJ5VUDeBVFiosBd2DKjyKe86fX4/o2XVn5mjTIHYvGuP8LsZV8uVrxUGHx15mkzD1JhuwgwKUcJpwWIZh7MQ+p8Hzon7MDJ+6OvZuLDwE4eplczOi1H3pN7cSko5MiXmDorWFjVUu4M9iyoXQV0i1SFWir6yFVevIeungDsAp859+3Jn1sDsxDbTlqD9vo16Dz6TCnA0oANcKZ6LYwo6wW3G5U2gzWi1tRelEpY3ubtFDGH1dSl2/RrjtxX5kPI4K5FthmgZ5Tbxhw/fe5CK26+lJd2QWcrFAcasH4YOaC6WtmV9iPdroa8qPOZs9t425o3JH9ujc2IRLbhMgBENQEXHLMeA1VQXDpgc27fdJ3CQ54+M9ArYyHIsxMUcs86AO4D9DMZ1AxRZnoBODBnzkWpZjJrHcwso7UKhiQyeKODOF5mFXupWyjzUm5BPvmNv4MHrv5w8mellFINzJHY9egzOO2KrxQr1hIY+ODbBrM5kH1wLoqMlfF6GVumgz2Ufpeqr31CLct8qM2xWZAz5zFPqAJURUFuZf5FNkO+z2FANjnhJeqB4fph6PWDblm+1LVt84OlX/6PWz5f67NqPHNFbDvpaGw76WjseuwZT3Wpb6SgO+k3veyUGYUTJiJKcIk9oZ5Zt3e9NFxFNcrLn0du6YtAK7Jq6W3mmyRA+Y0SA7s9TvKQ/UwG89xE3s2Rd/WTbpkqshbdHCrP7SDPemTo9SwHDmpTnOsEeFfbDNUFloD7L7uop8+rUeaEOO3Kr2qg4Ssvylc7YWEgBohV0CsZfLWj4PKcMLUaGcpvgSgXNDVDUmtMnS24WpUNxCXQRN2NjzZ3AvMMhhlUKthZv7zbRb4E5yGQ/KBWWq3MhZ1A0aBbWgn72s2LrEc3R77UxclHHYX7PnJh7c+osRk14rSrvopdB54tLQZLuVG74HpsArednZPV2UmLmQEW4KqygRBlHQ9K6oFbys7ilQ/cE79MoSY2w2YxaD/m4s1hn7cw1oJmK6yVICk2A6sDsPbKBu6TjzoK9170/p4+nwbmGrHrwDM47eo/rQBZlbDzFBuzGk6Ww8sBl2AXVYz9YMCq0ufSbdYbU5Bbbj3VyrQv5vXcukaR7QUE5cBsMxkmjBIf7JZ5ZD3Is964mxeDvoMl2FuPOBJ///739fz5NDDXjF0HnsHbt3+tGmSaZguBTEG1qkv8KU27cR9MPDO1EPbVADhDVDdj0LcY1Obb1tp3qxly0dj0HgmqxDyTYR6o73bLzMWSnu2jFuP/usiXuti6+kjcc8EFfX02Dcw9xK4Dz+Lt136tBBlwZsSsP+YDP2YlSu8sqLFjOTT0LQJxlvkA018PoordYtbBbJvRv3WhPXR2SMbqKv+ComHyzUCpzFImY4n6467jlfODXWApx3fPPR9bjziyr8+lgbnH2PXTZ3H6dV+PWAuSRjM/hkL8sv36Pp2MoFkKo8zKhbx45RYAjkVwbARZpqquZrIy9WZUWj8tZx75LDMg7njAfhPEsB6QnP0AAARtSURBVE0th1FlYyWMCvN1AvN3z3o3thx+RN+fSQNzH7Hrp8/i9Ou/XiowUTBlPngDHIXePNVmVY+oNAWZg93KnHKnjmAfMpPdCHhm2BRdVg7+mCLb7IU5dvPmaZoy11PPOVxoqQofZJMluvw7Z5yDLYf1D3JxSA3MfcWux5/FO264tVQt7qOJusKk5SjAJP3Gp58dRaa3fO1/nQeF7ERHVkBMbIWTtcgIvDaf7FqRUs2NBQLs1UmdBnMd7uweyLIe6BFF3vKa1bj+uJOw5dDDB/ZZNDAPIHY//hxO/+Q3xAGhk4oz26hflvwxsxXe02wtZjXMthlVgkwHfDNEmfX0tMpgy2lKzplJpP7bXHQ8dJHNKUtT1sYba0Xe/OrD8O1tZ/t99RkNzAOMd9x4K3Y/8bwPMrcRxH74frgCZGfAV/6EFjINMvfBXlYjK9fJoNFNy5GLRrnH6/LsfrfP5pUloLUqb3rVofi7k89alvPfwDzgeMend1qgnYGdk+Egy9xGUC9tnlemADs2ILN1PIgdf0xA1WqtDiE2RZgN9Aeo9OLUb9ZAbJfpRAkBOs+Bgzn+dsOZ2Pzqw5bt3DcwL0PsfuI5nPHZ212QJagp7NSvBgZ8vm/2VVVe9iH3JloEZebT5TYTo9+npSbXD+Ybn8xm/dDN8TcnnoHNrzp0Wc97A/Myxhmfux17fva8BwadrhYnPhRKG+D5V6aegqrCA9bNHRdpOSmV51oXm4GhFglwBn45VGkt+Leruzmued06XPv641fkfDcwL3Ps/tnzOHPuDnGw5830eQptIBYmSKhSz1QpcwkphVyRwaK1IxmsB7cXFn2WxNDsAA03x9zNsenlq3DNUeuw6ZWrVuxcNzCvULxz4U7sfvIFJ5vheGZvsAcRYpVl5bc/iKLSJ+HoNLVjL0w/FGZ6AXkXipvFkECmYZ5p3n74sbjmyONW6MyW0cC8grHn5y9gxz0/wp6nXnAmTCg4Kars2IFM2WeTOcjesxdEnaUZQ/FVK7IzdS+l6ABs/M3XYvvqY7Hp5a9doTPqRgPzEGLPky/gpnv/CXue+YWF2U3PMaWkOWPB37p+OaDCQdAFe2MGgK1y8OqArOD8UMb21cdi++pjhnIuaTQwDzH2PP0L3HT/j7H3uRddu0EtCE2xkbywYyHIQNB7GN9MlFCAMxdmX/3hTsbwB6Z0bF99LLYfNnyITTQwj0jc/MAi9j73IvY+/8tyskK45YcGdo7SWqDZMxeSR+Z+md8l6ESPhnnUIDbRwDxisfe5F7H3uV/iiz/cBfv1KJ1hsM9aSBBzdQ55Z0+5lfucB70DKACZwqZXrMKmV6zC9tXHDvv0RKOBecTjiz/ajX0v/hv2/fLf3Zk/T10zX529Wb1MhF/KZGz6rUOx+ZWrsP2Ilc9K9BoNzGMUJdTFgOxLDz7EZvVIvrjFVVuYJMkyoAVsfvVqbP7tw6AUcM0KTXAsRzQwT0h8ef8/+1Pkwjdetqxajc2vWT3ko12eUEqp/wcWkI2OAeYvXAAAAABJRU5ErkJggg==" />
+ </g>
+ </g>
+ </g>
+ <g class="cls-6">
+ <g class="cls-2">
+ <g class="cls-5">
+ <image width="244" height="244" transform="translate(76.86 -.19) scale(.48)"
+ xlink:href="data:image/png;base64,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" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/plus.svg b/alfa-client/libs/design-system/src/assets/plus.svg
new file mode 100644
index 0000000000..673de9ce3a
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/plus.svg
@@ -0,0 +1,3 @@
+<svg aria-hidden="true" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M11 13H5V11H11V5H13V11H19V13H13V19H11V13Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg b/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg
new file mode 100644
index 0000000000..1b1a479253
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path d="M11.75 8H13.75V12.15L15.35 10.6L16.75 12L12.75 16L8.75 12L10.15 10.6L11.75 12.15V8Z" />
+ <path
+ d="M7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/save.svg b/alfa-client/libs/design-system/src/assets/save.svg
new file mode 100644
index 0000000000..c97a1ea3dd
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/save.svg
@@ -0,0 +1,4 @@
+<svg aria-hidden="true" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M25.3333 16V25.3333H6.66667V16H4V25.3333C4 26.8 5.2 28 6.66667 28H25.3333C26.8 28 28 26.8 28 25.3333V16H25.3333ZM17.3333 16.8933L20.7867 13.4533L22.6667 15.3333L16 22L9.33333 15.3333L11.2133 13.4533L14.6667 16.8933V4H17.3333V16.8933Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/search.svg b/alfa-client/libs/design-system/src/assets/search.svg
new file mode 100644
index 0000000000..9e138b8a79
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/search.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M15.5 14H14.71L14.43 13.73C15.41 12.59 16 11.11 16 9.5C16 5.91 13.09 3 9.5 3C5.91 3 3 5.91 3 9.5C3 13.09 5.91 16 9.5 16C11.11 16 12.59 15.41 13.73 14.43L14 14.71V15.5L19 20.49L20.49 19L15.5 14ZM9.5 14C7.01 14 5 11.99 5 9.5C5 7.01 7.01 5 9.5 5C11.99 5 14 7.01 14 9.5C14 11.99 11.99 14 9.5 14Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/send.svg b/alfa-client/libs/design-system/src/assets/send.svg
new file mode 100644
index 0000000000..2a1e1a931e
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/send.svg
@@ -0,0 +1,4 @@
+<svg aria-hidden="true" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M4 26.6688V5.33545L29.3333 16.0021L4 26.6688ZM6.66667 22.6688L22.4667 16.0021L6.66667 9.33545V14.0021L14.6667 16.0021L6.66667 18.0021V22.6688Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/settings.svg b/alfa-client/libs/design-system/src/assets/settings.svg
new file mode 100644
index 0000000000..40651bfee5
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/settings.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M 10.490234 2 C 10.011234 2 9.6017656 2.3385938 9.5097656 2.8085938 L 9.1757812 4.5234375 C 8.3550224 4.8338012 7.5961042 5.2674041 6.9296875 5.8144531 L 5.2851562 5.2480469 C 4.8321563 5.0920469 4.33375 5.2793594 4.09375 5.6933594 L 2.5859375 8.3066406 C 2.3469375 8.7216406 2.4339219 9.2485 2.7949219 9.5625 L 4.1132812 10.708984 C 4.0447181 11.130337 4 11.559284 4 12 C 4 12.440716 4.0447181 12.869663 4.1132812 13.291016 L 2.7949219 14.4375 C 2.4339219 14.7515 2.3469375 15.278359 2.5859375 15.693359 L 4.09375 18.306641 C 4.33275 18.721641 4.8321562 18.908906 5.2851562 18.753906 L 6.9296875 18.1875 C 7.5958842 18.734206 8.3553934 19.166339 9.1757812 19.476562 L 9.5097656 21.191406 C 9.6017656 21.661406 10.011234 22 10.490234 22 L 13.509766 22 C 13.988766 22 14.398234 21.661406 14.490234 21.191406 L 14.824219 19.476562 C 15.644978 19.166199 16.403896 18.732596 17.070312 18.185547 L 18.714844 18.751953 C 19.167844 18.907953 19.66625 18.721641 19.90625 18.306641 L 21.414062 15.691406 C 21.653063 15.276406 21.566078 14.7515 21.205078 14.4375 L 19.886719 13.291016 C 19.955282 12.869663 20 12.440716 20 12 C 20 11.559284 19.955282 11.130337 19.886719 10.708984 L 21.205078 9.5625 C 21.566078 9.2485 21.653063 8.7216406 21.414062 8.3066406 L 19.90625 5.6933594 C 19.66725 5.2783594 19.167844 5.0910937 18.714844 5.2460938 L 17.070312 5.8125 C 16.404116 5.2657937 15.644607 4.8336609 14.824219 4.5234375 L 14.490234 2.8085938 C 14.398234 2.3385937 13.988766 2 13.509766 2 L 10.490234 2 z M 12 8 C 14.209 8 16 9.791 16 12 C 16 14.209 14.209 16 12 16 C 9.791 16 8 14.209 8 12 C 8 9.791 9.791 8 12 8 z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/stamp.svg b/alfa-client/libs/design-system/src/assets/stamp.svg
new file mode 100644
index 0000000000..77bb27f812
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/stamp.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24">
+ <path fill-rule="evenodd"
+ d="M2.742 21.213h-.409a.872.872 0 0 1-.63-.252.873.873 0 0 1-.253-.631v-3.333A2.557 2.557 0 0 1 4 14.447h4.667a.786.786 0 0 0 .783-.784v-.366c0-1.823-.434-3.522-1.315-4.907a4.388 4.388 0 0 1-.685-2.393c0-1.291.571-2.544 1.511-3.372a4.534 4.534 0 0 1 3.568-1.141c2.01.227 3.678 1.823 3.982 3.802a4.755 4.755 0 0 1-.527 2.973l-.012.02c-.945 1.575-1.422 3.212-1.422 4.818v.566c0 .43.353.784.783.784H20a2.557 2.557 0 0 1 2.55 2.55v3.333a.873.873 0 0 1-.253.63.873.873 0 0 1-.63.253h-.066a2.666 2.666 0 0 1-2.3 1.334H5.032a2.642 2.642 0 0 1-2.29-1.334Zm18.041-1.766v-2.45a.787.787 0 0 0-.783-.784h-4.667a2.557 2.557 0 0 1-2.55-2.55v-.566c0-1.925.555-3.817 1.635-5.7.307-.557.452-1.198.34-1.845-.195-1.196-1.196-2.17-2.415-2.308a2.8 2.8 0 0 0-1.949.51l-.246.202c-.606.496-.93 1.269-.93 2.04 0 .53.137 1.03.417 1.479 1.017 1.648 1.582 3.647 1.582 5.822v.366a2.557 2.557 0 0 1-2.55 2.55H4a.786.786 0 0 0-.783.784v2.45h17.566Z"
+ clip-rule="evenodd" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/statistic.svg b/alfa-client/libs/design-system/src/assets/statistic.svg
new file mode 100644
index 0000000000..cdd6483e88
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/statistic.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path d="M2 21V19H22V21H2ZM3 18V11H6V18H3ZM8 18V6H11V18H8ZM13 18V9H16V18H13ZM18 18V3H21V18H18Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg b/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg
new file mode 100644
index 0000000000..a3ee32d8a2
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M11.75 16H13.75V11.85L15.35 13.4L16.75 12L12.75 8L8.75 12L10.15 13.4L11.75 11.85V16ZM7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/undo.svg b/alfa-client/libs/design-system/src/assets/undo.svg
new file mode 100644
index 0000000000..2bdb826365
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/undo.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M13.25 8C10.6 8 8.2 8.99 6.35 10.6L2.75 7V16H11.75L8.13 12.38C9.52 11.22 11.29 10.5 13.25 10.5C16.79 10.5 19.8 12.81 20.85 16L23.22 15.22C21.83 11.03 17.9 8 13.25 8Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/update.svg b/alfa-client/libs/design-system/src/assets/update.svg
new file mode 100644
index 0000000000..ef6280b2fe
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/update.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M21.75 10.12H14.97L17.71 7.3C14.98 4.6 10.56 4.5 7.83 7.2C5.1 9.91 5.1 14.28 7.83 16.99C10.56 19.7 14.98 19.7 17.71 16.99C19.07 15.65 19.75 14.08 19.75 12.1H21.75C21.75 14.08 20.87 16.65 19.11 18.39C15.6 21.87 9.9 21.87 6.39 18.39C2.89 14.92 2.86 9.28 6.37 5.81C9.88 2.34 15.51 2.34 19.02 5.81L21.75 3V10.12ZM13.25 8V12.25L16.75 14.33L16.03 15.54L11.75 13V8H13.25Z" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/user.svg b/alfa-client/libs/design-system/src/assets/user.svg
new file mode 100644
index 0000000000..4e0d58f849
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/user.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 112 112" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+ <path
+ d="M56 0.970734C25.6239 0.970734 0.970886 25.6239 0.970886 56C0.970886 86.3761 25.6239 111.029 56 111.029C86.3761 111.029 111.029 86.3761 111.029 56C111.029 25.6239 86.3761 0.970734 56 0.970734ZM56 17.4795C65.135 17.4795 72.5087 24.8534 72.5087 33.9881C72.5087 43.1232 65.135 50.4969 56 50.4969C46.8652 50.4969 39.4912 43.1232 39.4912 33.9881C39.4912 24.8534 46.8652 17.4795 56 17.4795ZM56 95.621C42.2428 95.621 30.0814 88.5772 22.9825 77.9014C23.1477 66.9506 44.9943 60.9526 56 60.9526C66.9508 60.9526 88.8525 66.9506 89.0175 77.9014C81.9189 88.5772 69.7575 95.621 56 95.621Z" />
+</svg>
\ No newline at end of file
--
GitLab
From e090300b2b2b4c8d84ca20a26c870699e2996a80 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 10:46:18 +0200
Subject: [PATCH 04/36] OZG-7707 Replace some icons in alfa
---
alfa-client/apps/alfa/project.json | 35 +++++++------------
alfa-client/apps/alfa/src/app/app.module.ts | 2 ++
.../accessibility-button.component.spec.ts | 9 +++--
.../accessibility-button.component.ts | 7 ++--
alfa-client/libs/design-system/src/index.ts | 2 --
.../accessibility-icon.component.spec.ts | 21 -----------
.../accessibility-icon.component.ts | 33 -----------------
.../accessibility-icon.stories.ts | 27 --------------
.../account-circle-icon.component.spec.ts | 21 -----------
.../account-circle-icon.component.ts | 27 --------------
.../account-circle-icon.stories.ts | 27 --------------
...er-profile-button-container.component.html | 2 +-
...profile-button-container.component.spec.ts | 4 +--
.../src/lib/user-profile.module.ts | 4 +--
14 files changed, 31 insertions(+), 190 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.stories.ts
diff --git a/alfa-client/apps/alfa/project.json b/alfa-client/apps/alfa/project.json
index 971b4de26c..3827d3099a 100644
--- a/alfa-client/apps/alfa/project.json
+++ b/alfa-client/apps/alfa/project.json
@@ -14,9 +14,7 @@
"build": {
"executor": "@angular-devkit/build-angular:browser",
"options": {
- "allowedCommonJsDependencies": [
- "file-saver"
- ],
+ "allowedCommonJsDependencies": ["file-saver"],
"outputPath": "dist/apps/alfa",
"index": "apps/alfa/src/index.html",
"main": "apps/alfa/src/main.ts",
@@ -34,11 +32,14 @@
"input": "libs/ui/src/lib/assets",
"glob": "**/*",
"output": "assets/icons"
+ },
+ {
+ "input": "libs/design-system/src/assets",
+ "glob": "**/*",
+ "output": "assets/icons"
}
],
- "styles": [
- "apps/alfa/src/styles/main.scss"
- ],
+ "styles": ["apps/alfa/src/styles/main.scss"],
"scripts": [],
"stylePreprocessorOptions": {
"includePaths": [
@@ -85,9 +86,7 @@
]
}
},
- "outputs": [
- "{options.outputPath}"
- ]
+ "outputs": ["{options.outputPath}"]
},
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
@@ -109,9 +108,7 @@
},
"lint": {
"executor": "@nx/eslint:lint",
- "outputs": [
- "{options.outputFile}"
- ]
+ "outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
@@ -119,9 +116,7 @@
"tsConfig": "apps/alfa/tsconfig.spec.json",
"jestConfig": "apps/alfa/jest.config.ts"
},
- "outputs": [
- "{workspaceRoot}/coverage/apps/alfa"
- ]
+ "outputs": ["{workspaceRoot}/coverage/apps/alfa"]
},
"container": {
"executor": "@nx-tools/nx-container:build",
@@ -129,15 +124,11 @@
"engine": "docker",
"push": false,
"metadata": {
- "images": [
- "docker.ozg-sh.de/alfa-client"
- ],
+ "images": ["docker.ozg-sh.de/alfa-client"],
"load": true,
- "tags": [
- "build-latest"
- ]
+ "tags": ["build-latest"]
}
}
}
}
-}
\ No newline at end of file
+}
diff --git a/alfa-client/apps/alfa/src/app/app.module.ts b/alfa-client/apps/alfa/src/app/app.module.ts
index 566ebc0b3f..9d8f546ca3 100644
--- a/alfa-client/apps/alfa/src/app/app.module.ts
+++ b/alfa-client/apps/alfa/src/app/app.module.ts
@@ -45,6 +45,7 @@ import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { OAuthModule } from 'angular-oauth2-oidc';
+import { provideAngularSvgIcon } from 'angular-svg-icon';
import { de } from 'date-fns/locale';
import { HttpBinaryFileInterceptor } from '../../../../libs/tech-shared/src/lib/interceptor/http-binary-file.interceptor';
import { HttpXsrfInterceptor } from '../../../../libs/tech-shared/src/lib/interceptor/http-xsrf.interceptor';
@@ -159,6 +160,7 @@ const routes: Routes = [
deps: [MAT_DATE_LOCALE],
},
provideHttpClient(withInterceptorsFromDi()),
+ provideAngularSvgIcon(),
],
bootstrap: [AppComponent],
})
diff --git a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.spec.ts b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.spec.ts
index 8b150294c1..646056eb5e 100644
--- a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.spec.ts
+++ b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.spec.ts
@@ -1,5 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { LinkComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, LinkComponent, TooltipDirective } from '@ods/system';
import { MockComponent, MockDirective } from 'ng-mocks';
import { AccessibilityButtonComponent } from './accessibility-button.component';
@@ -9,7 +9,12 @@ describe('AccessibilityButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [AccessibilityButtonComponent, MockComponent(LinkComponent), MockDirective(TooltipDirective)],
+ imports: [
+ AccessibilityButtonComponent,
+ MockComponent(LinkComponent),
+ MockComponent(IconComponent),
+ MockDirective(TooltipDirective),
+ ],
}).compileComponents();
fixture = TestBed.createComponent(AccessibilityButtonComponent);
diff --git a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
index edc5070fab..90593eb3ce 100644
--- a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
+++ b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
@@ -1,13 +1,14 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { AccessibilityIconComponent, LinkComponent, TooltipDirective } from '@ods/system';
+import { LinkComponent, TooltipDirective } from '@ods/system';
+import { IconComponent } from '../../../../design-system/src/lib/icon/icon.component';
@Component({
selector: 'common-accessibility-button',
standalone: true,
- imports: [CommonModule, AccessibilityIconComponent, LinkComponent, TooltipDirective],
+ imports: [CommonModule, LinkComponent, TooltipDirective, IconComponent],
template: `<ods-link [url]="url" [linkTestId]="linkTestId" tooltip="Barrierefreiheit" [openInNewTab]="true">
- <ods-accessibility-icon size="large" />
+ <ods-icon name="accessibility" size="large" class="fill-neutral-500 dark:fill-neutral-400" />
</ods-link>`,
})
export class AccessibilityButtonComponent {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 0c5d7568d8..05d5fe525f 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/accessibility-icon/accessibility-icon.component';
-export * from './lib/icons/account-circle-icon/account-circle-icon.component';
export * from './lib/icons/admin-logo-icon/admin-logo-icon.component';
export * from './lib/icons/archive-icon/archive-icon.component';
export * from './lib/icons/arrow-back-icon/arrow-back-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.spec.ts
deleted file mode 100644
index 8a1735897e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AccessibilityIconComponent } from './accessibility-icon.component';
-
-describe('AccessibilityIconComponent', () => {
- let component: AccessibilityIconComponent;
- let fixture: ComponentFixture<AccessibilityIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [AccessibilityIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(AccessibilityIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.ts
deleted file mode 100644
index a8c309a368..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-accessibility-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 26 26"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-neutral-500 dark:fill-neutral-400', class)]"
- xmlns="http://www.w3.org/2000/svg"
- aria-hidden="true"
- >
- <rect x="2" y="2" width="22" height="22" rx="11" />
- <path
- d="M13 8.87508C12.6828 8.87508 12.3726 8.781 12.1088 8.60473C11.845 8.42846 11.6394 8.17793 11.518 7.8848C11.3966 7.59168 11.3648 7.26914 11.4267 6.95796C11.4886 6.64678 11.6414 6.36095 11.8657 6.1366C12.0901 5.91225 12.3759 5.75947 12.6871 5.69757C12.9983 5.63568 13.3208 5.66744 13.6139 5.78886C13.907 5.91027 14.1576 6.11588 14.3339 6.37969C14.5101 6.64349 14.6042 6.95364 14.6042 7.27092C14.6038 7.69623 14.4346 8.10399 14.1339 8.40473C13.8331 8.70547 13.4253 8.87463 13 8.87508Z"
- class="fill-whitetext"
- />
- <path
- d="M18.0417 8.898L18.0288 8.90144L18.0168 8.90516C17.9881 8.91318 17.9595 8.92178 17.9308 8.93066C17.3977 9.08706 14.8105 9.81638 12.9877 9.81638C11.2939 9.81638 8.94064 9.18618 8.18783 8.97219C8.1129 8.94322 8.03639 8.91855 7.95866 8.89829C7.41439 8.75506 7.04199 9.30792 7.04199 9.81323C7.04199 10.3137 7.49173 10.552 7.94577 10.723V10.731L10.6734 11.583C10.9521 11.6898 11.0266 11.799 11.063 11.8935C11.1813 12.1969 11.0868 12.7976 11.0533 13.0072L10.8871 14.2963L9.96501 19.3434C9.96215 19.3572 9.95957 19.3712 9.95728 19.3855L9.95069 19.4219C9.88423 19.8845 10.224 20.3334 10.8674 20.3334C11.4288 20.3334 11.6766 19.9458 11.784 19.4185C11.784 19.4185 12.5861 14.9047 12.9871 14.9047C13.3882 14.9047 14.2143 19.4185 14.2143 19.4185C14.3218 19.9458 14.5695 20.3334 15.131 20.3334C15.7761 20.3334 16.1158 19.8825 16.0477 19.4185C16.0417 19.3789 16.0345 19.34 16.0259 19.3022L15.0912 14.2969L14.9253 13.0078C14.8053 12.257 14.9018 12.0089 14.9345 11.9508L14.9368 11.9465C14.9677 11.8892 15.1087 11.7609 15.4375 11.6374L17.995 10.7434C18.0107 10.7392 18.0262 10.7342 18.0414 10.7285C18.4998 10.5566 18.9581 10.3188 18.9581 9.81381C18.9581 9.30878 18.586 8.75506 18.0417 8.898Z"
- class="fill-whitetext"
- />
- </svg>`,
-})
-export class AccessibilityIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.stories.ts
deleted file mode 100644
index 58485f4983..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/accessibility-icon/accessibility-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { AccessibilityIconComponent } from './accessibility-icon.component';
-
-const meta: Meta<AccessibilityIconComponent> = {
- title: 'Icons/Accessibility icon',
- component: AccessibilityIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<AccessibilityIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.spec.ts
deleted file mode 100644
index e50bb31c69..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AccountCircleIconComponent } from './account-circle-icon.component';
-
-describe('AccountCircleIconComponent', () => {
- let component: AccountCircleIconComponent;
- let fixture: ComponentFixture<AccountCircleIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [AccountCircleIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(AccountCircleIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.ts
deleted file mode 100644
index b762c6cbe3..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-account-circle-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M12.75 2C7.23 2 2.75 6.48 2.75 12C2.75 17.52 7.23 22 12.75 22C18.27 22 22.75 17.52 22.75 12C22.75 6.48 18.27 2 12.75 2ZM7.82 18.28C8.25 17.38 10.87 16.5 12.75 16.5C14.63 16.5 17.26 17.38 17.68 18.28C16.32 19.36 14.61 20 12.75 20C10.89 20 9.18 19.36 7.82 18.28ZM19.11 16.83C17.68 15.09 14.21 14.5 12.75 14.5C11.29 14.5 7.82 15.09 6.39 16.83C5.37 15.49 4.75 13.82 4.75 12C4.75 7.59 8.34 4 12.75 4C17.16 4 20.75 7.59 20.75 12C20.75 13.82 20.13 15.49 19.11 16.83ZM12.75 6C10.81 6 9.25 7.56 9.25 9.5C9.25 11.44 10.81 13 12.75 13C14.69 13 16.25 11.44 16.25 9.5C16.25 7.56 14.69 6 12.75 6ZM12.75 11C11.92 11 11.25 10.33 11.25 9.5C11.25 8.67 11.92 8 12.75 8C13.58 8 14.25 8.67 14.25 9.5C14.25 10.33 13.58 11 12.75 11Z"
- />
- </svg>`,
-})
-export class AccountCircleIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.stories.ts
deleted file mode 100644
index 46eae30d49..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/account-circle-icon/account-circle-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { AccountCircleIconComponent } from './account-circle-icon.component';
-
-const meta: Meta<AccountCircleIconComponent> = {
- title: 'Icons/Account circle icon',
- component: AccountCircleIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<AccountCircleIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
index e1e8b8b763..e116c9cf44 100644
--- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
+++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="showUserProfileSearch()"
>
- <ods-account-circle-icon icon class="fill-text" />
+ <ods-icon icon name="account-circle" color="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts
index a99b9f0846..61a631a8c6 100644
--- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts
+++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts
@@ -27,7 +27,7 @@ import { UserProfileService } from '@alfa-client/user-profile-shared';
import { VorgangHeaderLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { AccountCircleIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent, MockDirective } from 'ng-mocks';
import { AssignUserProfileButtonContainerComponent } from './assign-user-profile-button-container.component';
@@ -46,7 +46,7 @@ describe('AssignUserProfileButtonContainerComponent', () => {
AssignUserProfileButtonContainerComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(AccountCircleIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
index 0f595e41c3..1f8af984ac 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
@@ -38,11 +38,11 @@ import { MatTooltip } from '@angular/material/tooltip';
import { RouterModule } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
import {
- AccountCircleIconComponent,
DropdownMenuButtonItemComponent,
DropdownMenuComponent,
DropdownMenuItemComponent,
ErrorIconComponent,
+ IconComponent,
LogoutIconComponent,
UserIconComponent as OdsUserIconComponent,
TooltipDirective,
@@ -88,7 +88,7 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
DropdownMenuItemComponent,
DropdownMenuButtonItemComponent,
ButtonWithSpinnerComponent,
- AccountCircleIconComponent,
+ IconComponent,
TooltipDirective,
],
declarations: [
--
GitLab
From 5658fcf4e7f244d29f1ade1888456e9fcda0117c Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 13:34:36 +0200
Subject: [PATCH 05/36] OZG-7707 replace more icons - archive - arrow-back -
attachment
---
.../apps/demo/src/app/app.component.html | 2 +-
.../apps/demo/src/app/app.component.ts | 2 -
.../multi-file-upload-editor.component.html | 2 +-
...multi-file-upload-editor.component.spec.ts | 3 +-
.../multi-file-upload-editor.component.ts | 4 +-
.../file-upload-editor.component.html | 2 +-
.../file-upload-editor.component.spec.ts | 9 +++-
.../file-upload-editor.component.ts | 11 +---
alfa-client/libs/design-system/src/index.ts | 3 --
.../file-upload-button.stories.ts | 8 +--
.../archive-icon.component.spec.ts | 21 --------
.../archive-icon/archive-icon.component.ts | 41 ---------------
.../archive-icon/archive-icon.stories.ts | 27 ----------
.../arrow-back-icon.component.spec.ts | 21 --------
.../arrow-back-icon.component.ts | 25 ---------
.../arrow-back-icon.stories.ts | 27 ----------
.../attachment-icon.component.spec.ts | 44 ----------------
.../attachment-icon.component.ts | 51 -------------------
.../attachment-icon.stories.ts | 50 ------------------
.../ui/back-button/back-button.component.html | 2 +-
.../back-button/back-button.component.spec.ts | 4 +-
.../ui/back-button/back-button.component.ts | 4 +-
.../vorgang-archive-container.component.html | 4 +-
...organg-archive-container.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 28 ++++++++--
.../vorgang-archive-status.component.html | 2 +-
.../vorgang-archive-status.component.spec.ts | 5 +-
.../libs/vorgang/src/lib/vorgang.module.ts | 4 +-
28 files changed, 57 insertions(+), 353 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 8905cd8a7a..ab6e5ddc28 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -606,7 +606,7 @@
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="true" id="upload130" dataTestId="demo-upload-3">
- <ods-attachment-icon icon />
+ <ods-icon name="attachment" icon />
<ods-spinner-icon spinner size="medium" />
<div text class="text-center">Anhang hochladen</div></ods-file-upload-button
>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 1e18d64a6b..58107f931a 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -28,7 +28,6 @@ import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import {
AttachmentComponent,
- AttachmentIconComponent,
AttachmentWrapperComponent,
BescheidGenerateIconComponent,
BescheidUploadIconComponent,
@@ -82,7 +81,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
SendIconComponent,
StampIconComponent,
CloseIconComponent,
- AttachmentIconComponent,
BescheidGenerateIconComponent,
BescheidUploadIconComponent,
SpinnerIconComponent,
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
index 538932cf34..a433402016 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
@@ -9,7 +9,7 @@
dataTestId="multi-file-upload-button"
>
<ods-spinner-icon spinner size="medium" />
- <ods-attachment-icon icon size="medium" />
+ <ods-icon icon name="attachment" />
@if (label) {
<p text data-test-id="upload-button-label" class="text-center">{{ label }}</p>
}
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
index 38303a464c..642ff50001 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
@@ -11,7 +11,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker/.';
import { expect } from '@jest/globals';
import { getUrl, Resource } from '@ngxp/rest';
-import { FileUploadButtonComponent, SpinnerIconComponent, UploadButtonVariants } from '@ods/system';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent, UploadButtonVariants } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -44,6 +44,7 @@ describe('MultiFileUploadEditorComponent', () => {
ConvertForDataTestPipe,
MockComponent(SpinnerIconComponent),
MockComponent(FileUploadButtonComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
index 2a96236120..3b117daa14 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
@@ -5,7 +5,7 @@ import { AsyncPipe } from '@angular/common';
import { Component, HostListener, inject, Input, OnInit } from '@angular/core';
import { ControlContainer, FormGroupDirective, ReactiveFormsModule } from '@angular/forms';
import { getUrl, Resource } from '@ngxp/rest';
-import { AttachmentIconComponent, FileUploadButtonComponent, SpinnerIconComponent, UploadButtonVariants } from '@ods/system';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent, UploadButtonVariants } from '@ods/system';
import { uniqueId } from 'lodash-es';
import { Observable } from 'rxjs';
@@ -17,7 +17,7 @@ import { Observable } from 'rxjs';
imports: [
AsyncPipe,
FileUploadButtonComponent,
- AttachmentIconComponent,
+ IconComponent,
SpinnerIconComponent,
ReactiveFormsModule,
BinaryFileModule,
diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
index e3807c40af..35380942bf 100644
--- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
@@ -38,6 +38,6 @@
dataTestId="file-upload-editor"
>
<ods-spinner-icon spinner size="medium" />
- <ods-attachment-icon icon size="medium" />
+ <ods-icon icon name="attachment" />
<p text class="text-center">{{ label }}</p>
</ods-file-upload-button>
diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts
index 9bb05063e4..5dbc2060ed 100644
--- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts
@@ -25,7 +25,7 @@ import { ConvertForDataTestPipe, createEmptyStateResource } from '@alfa-client/t
import { getElementFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AbstractControl, FormGroupDirective, ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
-import { FileUploadButtonComponent, SpinnerIconComponent } from '@ods/system';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { FileUploadEditorComponent } from './file-upload-editor.component';
@@ -43,7 +43,12 @@ describe('FileUploadEditorComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [FileUploadEditorComponent, MockComponent(SpinnerIconComponent), MockComponent(FileUploadButtonComponent)],
+ declarations: [
+ FileUploadEditorComponent,
+ MockComponent(SpinnerIconComponent),
+ MockComponent(FileUploadButtonComponent),
+ MockComponent(IconComponent),
+ ],
imports: [ReactiveFormsModule, ConvertForDataTestPipe],
providers: [
{
diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts
index 2a412d827f..ffc77123a0 100644
--- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts
@@ -26,7 +26,7 @@ import { NgForOf } from '@angular/common';
import { Component, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core';
import { ControlContainer, FormGroupDirective, ReactiveFormsModule, UntypedFormArray, UntypedFormControl } from '@angular/forms';
import { Resource } from '@ngxp/rest';
-import { AttachmentIconComponent, FileUploadButtonComponent, SpinnerIconComponent } from '@ods/system';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from '@ods/system';
import { uniqueId } from 'lodash-es';
import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
@@ -35,14 +35,7 @@ import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstra
templateUrl: './file-upload-editor.component.html',
viewProviders: [{ provide: ControlContainer, useExisting: FormGroupDirective }],
standalone: true,
- imports: [
- FileUploadButtonComponent,
- AttachmentIconComponent,
- SpinnerIconComponent,
- ReactiveFormsModule,
- NgForOf,
- ConvertForDataTestPipe,
- ],
+ imports: [FileUploadButtonComponent, IconComponent, SpinnerIconComponent, ReactiveFormsModule, NgForOf, ConvertForDataTestPipe],
})
export class FileUploadEditorComponent extends FormControlEditorAbstractComponent implements OnInit {
@Input() label: string = '';
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 05d5fe525f..4bbe3d52ed 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -46,9 +46,6 @@ export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.c
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
export * from './lib/icons/admin-logo-icon/admin-logo-icon.component';
-export * from './lib/icons/archive-icon/archive-icon.component';
-export * from './lib/icons/arrow-back-icon/arrow-back-icon.component';
-export * from './lib/icons/attachment-icon/attachment-icon.component';
export * from './lib/icons/bescheid-generate-icon/bescheid-generate-icon.component';
export * from './lib/icons/bescheid-upload-icon/bescheid-upload-icon.component';
export * from './lib/icons/check-circle-icon/check-circle-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
index 694af4683c..5dd83fb819 100644
--- a/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
@@ -33,12 +33,7 @@ const meta: Meta<FileUploadButtonComponent> = {
component: FileUploadButtonComponent,
decorators: [
moduleMetadata({
- imports: [
- CommonModule,
- FileUploadButtonComponent,
- AttachmentIconComponent,
- SpinnerIconComponent,
- ],
+ imports: [CommonModule, FileUploadButtonComponent, AttachmentIconComponent, SpinnerIconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -56,6 +51,7 @@ export const Upload: Story = {
render: (args: FileUploadButtonComponent) => ({
props: args,
template: `<ods-file-upload-button ${argsToTemplate(args)}>
+ // TODO OZG-7707
<ods-attachment-icon icon></ods-attachment-icon>
<ods-spinner-icon spinner size="medium"></ods-spinner-icon>
<p text>Anhang hochladen</p>
diff --git a/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.spec.ts
deleted file mode 100644
index 4d5d18cdcc..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ArchiveIconComponent } from './archive-icon.component';
-
-describe('ArchiveIconComponent', () => {
- let component: ArchiveIconComponent;
- let fixture: ComponentFixture<ArchiveIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ArchiveIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(ArchiveIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.ts
deleted file mode 100644
index 28d9287daa..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-archive-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)"
- aria-hidden="true"
- >
- <path
- d="M4.96804 21L2.85693 9H21.8569L19.7458 21H4.96804ZM6.7361 19H17.9778L19.3236 11H5.39027L6.7361 19ZM10.2458 15H14.468C14.7671 15 15.0178 14.9042 15.2201 14.7125C15.4224 14.5208 15.5236 14.2833 15.5236 14C15.5236 13.7167 15.4224 13.4792 15.2201 13.2875C15.0178 13.0958 14.7671 13 14.468 13H10.2458C9.94675 13 9.69605 13.0958 9.49374 13.2875C9.29142 13.4792 9.19027 13.7167 9.19027 14C9.19027 14.2833 9.29142 14.5208 9.49374 14.7125C9.69605 14.9042 9.94675 15 10.2458 15ZM6.0236 8C5.72453 8 5.47383 7.90417 5.27152 7.7125C5.0692 7.52083 4.96804 7.28333 4.96804 7C4.96804 6.71667 5.0692 6.47917 5.27152 6.2875C5.47383 6.09583 5.72453 6 6.0236 6H18.6903C18.9893 6 19.24 6.09583 19.4424 6.2875C19.6447 6.47917 19.7458 6.71667 19.7458 7C19.7458 7.28333 19.6447 7.52083 19.4424 7.7125C19.24 7.90417 18.9893 8 18.6903 8H6.0236ZM8.13471 5C7.83564 5 7.58494 4.90417 7.38263 4.7125C7.18031 4.52083 7.07916 4.28333 7.07916 4C7.07916 3.71667 7.18031 3.47917 7.38263 3.2875C7.58494 3.09583 7.83564 3 8.13471 3H16.5792C16.8782 3 17.1289 3.09583 17.3312 3.2875C17.5336 3.47917 17.6347 3.71667 17.6347 4C17.6347 4.28333 17.5336 4.52083 17.3312 4.7125C17.1289 4.90417 16.8782 5 16.5792 5H8.13471Z"
- />
- <path
- d="M5 21C1.68629 21 -1 18.3137 -1 15C-1 11.6863 1.68629 9 5 9C8.31371 9 11 11.6863 11 15C11 18.3137 8.31371 21 5 21Z"
- class="fill-whitetext"
- />
- <path
- d="M5.00078 19.9999C2.23936 19.9999 0.00078249 17.7613 0.000782609 14.9999C0.000782728 12.2385 2.23936 9.99991 5.00078 9.99991C7.76221 9.99991 10.0008 12.2385 10.0008 14.9999C10.0008 17.7613 7.76221 19.9999 5.00078 19.9999Z"
- />
- <path
- d="M5.00078 19.9999C2.23936 19.9999 0.00078249 17.7613 0.000782609 14.9999C0.000782728 12.2385 2.23936 9.99991 5.00078 9.99991C7.76221 9.99991 10.0008 12.2385 10.0008 14.9999C10.0008 17.7613 7.76221 19.9999 5.00078 19.9999Z"
- />
- <path
- d="M7.99997 14.9999L4.99997 11.9999L3.94997 13.0499L5.14997 14.2499H1.99997V15.7499H5.14997L3.94997 16.9499L4.99997 17.9999L7.99997 14.9999Z"
- class="fill-whitetext"
- />
- </svg> `,
-})
-export class ArchiveIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.stories.ts
deleted file mode 100644
index 33f6a6847a..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/archive-icon/archive-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ArchiveIconComponent } from './archive-icon.component';
-
-const meta: Meta<ArchiveIconComponent> = {
- title: 'Icons/Archive icon',
- component: ArchiveIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ArchiveIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.spec.ts
deleted file mode 100644
index 744a885c40..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ArrowBackIconComponent } from './arrow-back-icon.component';
-
-describe('ArrowBackIconComponent', () => {
- let component: ArrowBackIconComponent;
- let fixture: ComponentFixture<ArrowBackIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ArrowBackIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(ArrowBackIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.ts
deleted file mode 100644
index d0ab0a9d8e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-arrow-back-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path d="M20.75 11H8.58L14.17 5.41L12.75 4L4.75 12L12.75 20L14.16 18.59L8.58 13H20.75V11Z" />
- </svg>`,
-})
-export class ArrowBackIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.stories.ts
deleted file mode 100644
index 1305d80008..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/arrow-back-icon/arrow-back-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ArrowBackIconComponent } from './arrow-back-icon.component';
-
-const meta: Meta<ArrowBackIconComponent> = {
- title: 'Icons/Arrow back icon',
- component: ArrowBackIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ArrowBackIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.spec.ts
deleted file mode 100644
index 06f863c574..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AttachmentIconComponent } from './attachment-icon.component';
-
-describe('AttachmentIconComponent', () => {
- let component: AttachmentIconComponent;
- let fixture: ComponentFixture<AttachmentIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [AttachmentIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(AttachmentIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts
deleted file mode 100644
index 07ef4c9a18..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-attachment-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- viewBox="0 0 16 25"
- >
- <path
- d="M15.874 17c0 2.08-.73 3.85-2.19 5.31-1.46 1.46-3.23 2.19-5.31 2.19-2.08 0-3.85-.73-5.31-2.19C1.604 20.85.874 19.08.874 17V5.9c0-1.5.525-2.775 1.575-3.825C3.499 1.025 4.774.5 6.274.5s2.775.525 3.825 1.575c1.05 1.05 1.575 2.325 1.575 3.825v10.5c0 .92-.32 1.7-.96 2.34-.64.64-1.42.96-2.34.96-.92 0-1.7-.32-2.34-.96-.64-.64-.96-1.42-.96-2.34V5.3h2.4v11.1c0 .26.085.475.255.645.17.17.385.255.645.255s.475-.085.645-.255a.874.874 0 0 0 .255-.645V5.9c-.02-.84-.315-1.55-.885-2.13-.57-.58-1.275-.87-2.115-.87-.84 0-1.55.29-2.13.87-.58.58-.87 1.29-.87 2.13V17c-.02 1.42.47 2.625 1.47 3.615 1 .99 2.21 1.485 3.63 1.485 1.4 0 2.59-.495 3.57-1.485.98-.99 1.49-2.195 1.53-3.615V5.3h2.4V17Z"
- />
- </svg>`,
-})
-export class AttachmentIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.stories.ts
deleted file mode 100644
index 02ce615b45..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { AttachmentIconComponent } from './attachment-icon.component';
-
-const meta: Meta<AttachmentIconComponent> = {
- title: 'Icons/Attachment icon',
- component: AttachmentIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<AttachmentIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
index 81e091ce81..ff29f8519d 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
@@ -25,6 +25,6 @@
-->
<a [routerLink]="linkTo" data-test-id="back-button" tabindex="-1">
<ods-button variant="ghost" size="fit" [tooltip]="label" tooltipAriaType="aria-labelledby">
- <ods-arrow-back-icon icon class="fill-text" />
+ <ods-icon name="arrow-back" icon color="text" />
</ods-button>
</a>
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts
index 1e440ea225..5e3b514238 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts
@@ -25,7 +25,7 @@ import { getElementFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { faker } from '@faker-js/faker';
-import { ArrowBackIconComponent, ButtonComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { BackButtonComponent } from './back-button.component';
@@ -43,7 +43,7 @@ describe('BackButtonComponent', () => {
declarations: [
BackButtonComponent,
MockComponent(ButtonComponent),
- MockComponent(ArrowBackIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
imports: [RouterTestingModule],
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.ts b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.ts
index db593f08cb..c40492dcca 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.ts
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.ts
@@ -23,14 +23,14 @@
*/
import { Component, Input } from '@angular/core';
import { RouterLink } from '@angular/router';
-import { ArrowBackIconComponent, ButtonComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
@Component({
selector: 'ozgcloud-back-button',
templateUrl: './back-button.component.html',
styleUrls: ['./back-button.component.scss'],
standalone: true,
- imports: [RouterLink, TooltipDirective, ButtonComponent, ArrowBackIconComponent],
+ imports: [RouterLink, TooltipDirective, ButtonComponent, IconComponent],
})
export class BackButtonComponent {
@Input() label: string;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.html
index aabaa1db52..fafd6189a0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.html
@@ -5,5 +5,5 @@
size="medium"
text="Archivierung starten"
>
- <ods-archive-icon icon />
-</ods-button>
\ No newline at end of file
+ <ods-icon icon name="archive" />
+</ods-button>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.spec.ts
index a8fa62ffcf..4cc24536e1 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-archive-container/vorgang-archive-container.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { mock } from '@alfa-client/test-utils';
import { OzgcloudDialogService } from '@alfa-client/ui';
-import { ArchiveIconComponent, ButtonComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { VorgangArchiveConfirmationDialogContainerComponent } from './vorgang-archive-confirmation-dialog-container/vorgang-archive-confirmation-dialog-container.component';
@@ -22,7 +22,7 @@ describe('VorgangArchiveContainerComponent', () => {
VorgangArchiveContainerComponent,
MockComponent(ButtonComponent),
MockComponent(VorgangArchiveConfirmationDialogContainerComponent),
- MockComponent(ArchiveIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 1d749edd60..57a34430ca 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -32,7 +32,21 @@ import { LoeschAnforderungSharedModule } from '@alfa-client/loesch-anforderung-s
import { PostfachModule } from '@alfa-client/postfach';
import { PostfachSharedModule } from '@alfa-client/postfach-shared';
import { ConvertForDataTestPipe, ConvertProblemDetailToErrorMessagesPipe, HasLinkPipe } from '@alfa-client/tech-shared';
-import { BackButtonComponent, DateEditorComponent, ExpansionPanelComponent, IconButtonWithSpinnerComponent, OzgcloudIconButtonPrimaryComponent, OzgcloudIconComponent, OzgcloudMenuComponent, OzgcloudPasteTextButtonComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, SpinnerTransparencyComponent, SubnavigationComponent, } from '@alfa-client/ui';
+import {
+ BackButtonComponent,
+ DateEditorComponent,
+ ExpansionPanelComponent,
+ IconButtonWithSpinnerComponent,
+ OzgcloudIconButtonPrimaryComponent,
+ OzgcloudIconComponent,
+ OzgcloudMenuComponent,
+ OzgcloudPasteTextButtonComponent,
+ OzgcloudStrokedButtonWithSpinnerComponent,
+ OzgcloudTextEditorComponent,
+ SpinnerComponent,
+ SpinnerTransparencyComponent,
+ SubnavigationComponent,
+} from '@alfa-client/ui';
import { UserProfileModule } from '@alfa-client/user-profile';
import { UserProfileSharedModule } from '@alfa-client/user-profile-shared';
import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
@@ -46,9 +60,14 @@ import { MatIcon } from '@angular/material/icon';
import { MatMenuTrigger } from '@angular/material/menu';
import { MatTab, MatTabContent, MatTabGroup } from '@angular/material/tabs';
import { RouterModule, Routes } from '@angular/router';
-import { ButtonWithSpinnerComponent, FileUploadEditorComponent, SingleFileUploadEditorComponent, TextareaEditorComponent, TextEditorComponent, } from '@ods/component';
import {
- ArchiveIconComponent,
+ ButtonWithSpinnerComponent,
+ FileUploadEditorComponent,
+ SingleFileUploadEditorComponent,
+ TextareaEditorComponent,
+ TextEditorComponent,
+} from '@ods/component';
+import {
AttachmentComponent,
AttachmentWrapperComponent,
BescheidGenerateIconComponent,
@@ -66,6 +85,7 @@ import {
ErrorMessageComponent,
ExclamationIconComponent,
FileIconComponent,
+ IconComponent,
MoreIconComponent,
RadioButtonCardComponent,
SaveIconComponent,
@@ -155,7 +175,6 @@ const routes: Routes = [
BescheidStatusTextComponent,
ErrorMessageComponent,
CollaborationModule,
- ArchiveIconComponent,
CheckCircleIconComponent,
CheckIconComponent,
MatDialogContent,
@@ -192,6 +211,7 @@ const routes: Routes = [
EditIconComponent,
DiscardVorgangIconComponent,
MatTabContent,
+ IconComponent,
],
declarations: [
VorgangDetailPageComponent,
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
index 4f42642589..123e10b9d3 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
@@ -1,4 +1,4 @@
<div class="flex items-center gap-1">
- <ods-archive-icon class="fill-text" />
+ <ods-icon name="archive" color="text" />
<span>in Archivierung</span>
</div>
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.spec.ts b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.spec.ts
index 69aab5616d..1716960bbe 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.spec.ts
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.spec.ts
@@ -1,7 +1,8 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Vorgang } from '@alfa-client/vorgang-shared';
-import { ArchiveIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
import { createVorgang } from '../../../../../../../vorgang-shared/test/vorgang';
import { VorgangArchiveStatusComponent } from './vorgang-archive-status.component';
@@ -13,7 +14,7 @@ describe('VorgangArchiveStatusComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [ArchiveIconComponent],
+ imports: [MockComponent(IconComponent)],
declarations: [VorgangArchiveStatusComponent],
}).compileComponents();
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang.module.ts b/alfa-client/libs/vorgang/src/lib/vorgang.module.ts
index d1668cea27..97c8c6dcc1 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang.module.ts
+++ b/alfa-client/libs/vorgang/src/lib/vorgang.module.ts
@@ -44,8 +44,8 @@ import { MatIcon, MatIconModule } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { RouterModule, Routes } from '@angular/router';
import { ButtonToggleGroupComponent } from '@ods/component';
+import { ButtonToggleComponent, IconComponent, TooltipDirective } from '@ods/system';
import { HasAnyLinkPipe } from '../../../tech-shared/src/lib/pipe/has-any-link.pipe';
-import { ArchiveIconComponent, ButtonToggleComponent, TooltipDirective } from '@ods/system';
import { vorgangFilterViewGuard } from './vorgang-filter-view.guard';
import { VorgangListContainerComponent } from './vorgang-list-container/vorgang-list-container.component';
import { EmptyListComponent } from './vorgang-list-container/vorgang-list/empty-list/empty-list.component';
@@ -190,7 +190,7 @@ const routes: Routes = [
HintModule,
ButtonToggleComponent,
ButtonToggleGroupComponent,
- ArchiveIconComponent,
+ IconComponent,
FormatDateWithTimePipe,
FormatDateWithoutYearWithTimePipe,
MatIcon,
--
GitLab
From 5a94724c40449edcb219210d1f689671bbc6ec99 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 14:05:49 +0200
Subject: [PATCH 06/36] OZG-7707 replace icons in admin app component
---
.../apps/admin/src/app/app.component.html | 6 ++--
.../apps/admin/src/app/app.component.spec.ts | 4 +--
.../apps/admin/src/app/app.component.ts | 6 ++--
.../libs/design-system/src/assets/users.svg | 34 +++++++++++++++++++
4 files changed, 41 insertions(+), 9 deletions(-)
create mode 100644 alfa-client/libs/design-system/src/assets/users.svg
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index 55e1c88245..e6cf848872 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -34,7 +34,7 @@
routerLink="/"
data-test-id="logo-link"
>
- <ods-admin-logo-icon />
+ <ods-icon name="admin-logo" size="unset" />
</a>
<user-profile-button-container
[apiRootStateResource]="apiRootStateResource$ | async"
@@ -45,7 +45,7 @@
<ods-navbar data-test-id="navigation">
@if (apiRoot | hasLink: apiRootLinkRel.USERS) {
<ods-nav-item data-test-id="users-roles-navigation" caption="Benutzer & Rollen" [path]="routes.BENUTZER">
- <ods-users-icon class="stroke-text" icon />
+ <ods-icon icon name="users" class="fill-none stroke-text" />
</ods-nav-item>
}
@if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
@@ -54,7 +54,7 @@
caption="Organisationseinheiten"
[path]="routes.ORGANISATIONSEINHEITEN"
>
- <ods-orga-unit-icon icon />
+ <ods-icon icon name="orga-unit" color="text" />
</ods-nav-item>
<hr />
}
diff --git a/alfa-client/apps/admin/src/app/app.component.spec.ts b/alfa-client/apps/admin/src/app/app.component.spec.ts
index fb01cab1df..8f149b9d4a 100644
--- a/alfa-client/apps/admin/src/app/app.component.spec.ts
+++ b/alfa-client/apps/admin/src/app/app.component.spec.ts
@@ -38,7 +38,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
import { AuthenticationService } from '@authentication';
import {
- AdminLogoIconComponent,
+ IconComponent,
MailboxIconComponent,
NavbarComponent,
NavItemComponent,
@@ -100,7 +100,7 @@ describe('AppComponent', () => {
imports: [HasLinkPipe],
declarations: [
AppComponent,
- MockComponent(AdminLogoIconComponent),
+ MockComponent(IconComponent),
MockComponent(OrgaUnitIconComponent),
MockComponent(UsersIconComponent),
MockComponent(MailboxIconComponent),
diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index 989a4ad4b3..8cc01f4def 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -33,7 +33,7 @@ import { Component, inject, OnInit } from '@angular/core';
import { Router, RouterLink, RouterOutlet } from '@angular/router';
import { AuthenticationService } from '@authentication';
import { hasLink } from '@ngxp/rest';
-import { AdminLogoIconComponent, NavbarComponent, NavItemComponent, OrgaUnitIconComponent, UsersIconComponent, } from '@ods/system';
+import { IconComponent, NavbarComponent, NavItemComponent } from '@ods/system';
import { filter, Observable, Subscription } from 'rxjs';
import { UserProfileButtonContainerComponent } from '../../../../libs/admin/user-profile/src/lib/user-menu/user-profile.button-container.component';
import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
@@ -47,10 +47,8 @@ import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/
CommonModule,
NavbarComponent,
NavItemComponent,
- UsersIconComponent,
UserProfileButtonContainerComponent,
- AdminLogoIconComponent,
- OrgaUnitIconComponent,
+ IconComponent,
RouterOutlet,
UnavailablePageComponent,
BuildInfoComponent,
diff --git a/alfa-client/libs/design-system/src/assets/users.svg b/alfa-client/libs/design-system/src/assets/users.svg
new file mode 100644
index 0000000000..bd2e8130ce
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/users.svg
@@ -0,0 +1,34 @@
+<svg
+ viewBox="0 0 24 24"
+ aria-hidden="true"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path
+ d="M16 21V19C16 17.9391 15.5786 16.9217 14.8284 16.1716C14.0783 15.4214 13.0609 15 12 15H6C4.93913 15 3.92172 15.4214 3.17157 16.1716C2.42143 16.9217 2 17.9391 2 19V21"
+ stroke-width="2"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ fill="none"
+ />
+ <path
+ d="M9 11C11.2091 11 13 9.20914 13 7C13 4.79086 11.2091 3 9 3C6.79086 3 5 4.79086 5 7C5 9.20914 6.79086 11 9 11Z"
+ stroke-width="2"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ fill="none"
+ />
+ <path
+ d="M22 20.9999V18.9999C21.9993 18.1136 21.7044 17.2527 21.1614 16.5522C20.6184 15.8517 19.8581 15.3515 19 15.1299"
+ stroke-width="2"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ fill="none"
+ />
+ <path
+ d="M16 3.12988C16.8604 3.35018 17.623 3.85058 18.1676 4.55219C18.7122 5.2538 19.0078 6.11671 19.0078 7.00488C19.0078 7.89305 18.7122 8.75596 18.1676 9.45757C17.623 10.1592 16.8604 10.6596 16 10.8799"
+ stroke-width="2"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ fill="none"
+ />
+ </svg>
\ No newline at end of file
--
GitLab
From 79a0e6a0b2cf19c7f036cf6b7781030267ae040a Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 14:54:55 +0200
Subject: [PATCH 07/36] OZG-7707 replace bescheid generate icon
---
.../apps/admin/src/app/app.component.spec.ts | 12 +-
.../apps/demo/src/app/app.component.html | 10 +-
.../apps/demo/src/app/app.component.ts | 2 -
...zard-create-document-button.component.html | 2 +-
...d-create-document-button.component.spec.ts | 4 +-
.../libs/bescheid/src/lib/bescheid.module.ts | 43 +++-
.../accessibility-button.component.ts | 2 +-
alfa-client/libs/design-system/src/index.ts | 2 -
.../lib/button-card/button-card.stories.ts | 4 +-
.../src/lib/icon/icon.component.ts | 2 +
.../admin-logo-icon.component.html | 200 ------------------
.../admin-logo-icon.component.spec.ts | 44 ----
.../admin-logo-icon.component.ts | 33 ---
.../admin-logo-icon.stories.ts | 38 ----
.../bescheid-generate-icon.component.spec.ts | 44 ----
.../bescheid-generate-icon.component.ts | 65 ------
.../bescheid-generate-icon.stories.ts | 50 -----
.../src/lib/vorgang-detail.module.ts | 2 -
18 files changed, 52 insertions(+), 507 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.html
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.stories.ts
diff --git a/alfa-client/apps/admin/src/app/app.component.spec.ts b/alfa-client/apps/admin/src/app/app.component.spec.ts
index 8f149b9d4a..6be45ca955 100644
--- a/alfa-client/apps/admin/src/app/app.component.spec.ts
+++ b/alfa-client/apps/admin/src/app/app.component.spec.ts
@@ -37,14 +37,7 @@ import {
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
import { AuthenticationService } from '@authentication';
-import {
- IconComponent,
- MailboxIconComponent,
- NavbarComponent,
- NavItemComponent,
- OrgaUnitIconComponent,
- UsersIconComponent,
-} from '@ods/system';
+import { IconComponent, NavbarComponent, NavItemComponent } from '@ods/system';
import { createConfigurationResource } from 'libs/admin/configuration-shared/test/configuration';
import { MenuContainerComponent } from 'libs/admin/configuration/src/lib/menu-container/menu-container.component';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
@@ -101,9 +94,6 @@ describe('AppComponent', () => {
declarations: [
AppComponent,
MockComponent(IconComponent),
- MockComponent(OrgaUnitIconComponent),
- MockComponent(UsersIconComponent),
- MockComponent(MailboxIconComponent),
MockComponent(UserProfileButtonContainerComponent),
MockComponent(UnavailablePageComponent),
MockComponent(NavbarComponent),
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index ab6e5ddc28..7d4bba4498 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -557,19 +557,19 @@
<div class="flex flex-col gap-4 bg-background-200 p-6">
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="false" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-bescheid-generate-icon icon />
+ <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-bescheid-generate-icon icon />
+ <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-bescheid-generate-icon icon />
+ <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
</ods-button-card>
</div>
@@ -580,13 +580,13 @@
text="Bescheiddokument und noch mehr"
subText="Subtext in der 2ten Reihe"
>
- <ods-bescheid-generate-icon icon />
+ <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument">
- <ods-bescheid-generate-icon icon />
+ <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
</ods-button-card>
</div>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 58107f931a..d671283d32 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -29,7 +29,6 @@ import { RouterModule } from '@angular/router';
import {
AttachmentComponent,
AttachmentWrapperComponent,
- BescheidGenerateIconComponent,
BescheidUploadIconComponent,
ButtonCardComponent,
ButtonComponent,
@@ -81,7 +80,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
SendIconComponent,
StampIconComponent,
CloseIconComponent,
- BescheidGenerateIconComponent,
BescheidUploadIconComponent,
SpinnerIconComponent,
TextareaComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
index 4b6a5edec7..f283d60473 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
@@ -6,5 +6,5 @@
subText="automatisch erstellen"
data-test-id="create-bescheid-document-button"
>
- <ods-bescheid-generate-icon icon />
+ <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
</ods-button-card>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.spec.ts
index 9473e81b5c..279a510fb1 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.spec.ts
@@ -2,7 +2,7 @@ import { BescheidDocument, BescheidLinkRel, createEmptyBescheidDocument } from '
import { HasLinkPipe } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, getElementComponentFromFixtureByCss, mock, Mock, triggerEvent } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { BescheidGenerateIconComponent, ButtonCardComponent } from '@ods/system';
+import { ButtonCardComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { createBescheidDocument, createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
@@ -28,7 +28,7 @@ describe('BescheidWizardAutomatischErstellenButtonComponent', () => {
declarations: [
BescheidWizardCreateDocumentButtonComponent,
MockComponent(ButtonCardComponent),
- MockComponent(BescheidGenerateIconComponent),
+ MockComponent(IconComponent),
HasLinkPipe,
],
providers: [{ provide: BescheidFormService, useValue: formService }],
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index bff2453ae3..f790bef19c 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -24,20 +24,53 @@
import { BescheidSharedModule } from '@alfa-client/bescheid-shared';
import { BinaryFileModule, FileUploadListContainerComponent, MultiFileUploadEditorComponent } from '@alfa-client/binary-file';
import { CommandSharedModule } from '@alfa-client/command-shared';
-import { ConvertForDataTestPipe, ConvertProblemDetailToErrorMessagesPipe, GetUrlPipe, HasLinkPipe, ToEmbeddedResourcesPipe, } from '@alfa-client/tech-shared';
+import {
+ ConvertForDataTestPipe,
+ ConvertProblemDetailToErrorMessagesPipe,
+ GetUrlPipe,
+ HasLinkPipe,
+ ToEmbeddedResourcesPipe,
+} from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { ButtonWithSpinnerComponent, FileUploadEditorComponent, SingleFileUploadEditorComponent, TextareaEditorComponent, TextEditorComponent, } from '@ods/component';
+import {
+ ButtonWithSpinnerComponent,
+ FileUploadEditorComponent,
+ SingleFileUploadEditorComponent,
+ TextareaEditorComponent,
+ TextEditorComponent,
+} from '@ods/component';
import { BescheidListInVorgangContainerComponent } from './bescheid-list-in-vorgang-container/bescheid-list-in-vorgang-container.component';
import { BescheidListInVorgangComponent } from './bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component';
import { DocumentInBescheidContainerComponent } from './bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/document-in-bescheid-container/document-in-bescheid-container.component';
import { BeschiedenDateContainerComponent } from './beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component';
import { BeschiedenDateInVorgangContainerComponent } from './beschieden-date-in-vorgang-container/beschieden-date-in-vorgang-container.component';
-import { DateEditorComponent, ExpansionPanelComponent, OzgcloudStrokedButtonWithSpinnerComponent, SpinnerComponent, } from '@alfa-client/ui';
+import {
+ DateEditorComponent,
+ ExpansionPanelComponent,
+ OzgcloudStrokedButtonWithSpinnerComponent,
+ SpinnerComponent,
+} from '@alfa-client/ui';
import { ReactiveFormsModule } from '@angular/forms';
import { MatIcon } from '@angular/material/icon';
-import { AttachmentComponent, AttachmentWrapperComponent, BescheidGenerateIconComponent, BescheidStatusTextComponent, BescheidUploadIconComponent, BescheidWrapperComponent, ButtonCardComponent, ButtonComponent, CheckIconComponent, CloseIconComponent, RadioButtonCardComponent, SaveIconComponent, SendIconComponent, SpinnerIconComponent, StampIconComponent, } from '@ods/system';
+import {
+ AttachmentComponent,
+ AttachmentWrapperComponent,
+ BescheidStatusTextComponent,
+ BescheidUploadIconComponent,
+ BescheidWrapperComponent,
+ ButtonCardComponent,
+ ButtonComponent,
+ CheckIconComponent,
+ CloseIconComponent,
+ IconComponent,
+ RadioButtonCardComponent,
+ SaveIconComponent,
+ SendIconComponent,
+ SpinnerIconComponent,
+ StampIconComponent,
+} from '@ods/system';
import { FormatFullDatePipe } from '../../../tech-shared/src/lib/pipe/format-full-date.pipe';
import { BescheidWizardContainerComponent } from './bescheid-wizard-container/bescheid-wizard-container.component';
import { BescheidWizardAbschliessenButtonComponent } from './bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component';
@@ -94,7 +127,7 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
OzgcloudStrokedButtonWithSpinnerComponent,
ReactiveFormsModule,
ButtonCardComponent,
- BescheidGenerateIconComponent,
+ IconComponent,
SingleFileUploadEditorComponent,
BescheidUploadIconComponent,
SpinnerIconComponent,
diff --git a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
index 90593eb3ce..c8151a459a 100644
--- a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
+++ b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
@@ -8,7 +8,7 @@ import { IconComponent } from '../../../../design-system/src/lib/icon/icon.compo
standalone: true,
imports: [CommonModule, LinkComponent, TooltipDirective, IconComponent],
template: `<ods-link [url]="url" [linkTestId]="linkTestId" tooltip="Barrierefreiheit" [openInNewTab]="true">
- <ods-icon name="accessibility" size="large" class="fill-neutral-500 dark:fill-neutral-400" />
+ <ods-icon name="accessibility" size="large" color="neutral" />
</ods-link>`,
})
export class AccessibilityButtonComponent {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 4bbe3d52ed..c768768d8c 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/admin-logo-icon/admin-logo-icon.component';
-export * from './lib/icons/bescheid-generate-icon/bescheid-generate-icon.component';
export * from './lib/icons/bescheid-upload-icon/bescheid-upload-icon.component';
export * from './lib/icons/check-circle-icon/check-circle-icon.component';
export * from './lib/icons/check-icon/check-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts b/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts
index 8c893b3869..86908c6adc 100644
--- a/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts
@@ -23,7 +23,6 @@
*/
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { BescheidGenerateIconComponent } from '../icons/bescheid-generate-icon/bescheid-generate-icon.component';
import { ButtonCardComponent } from './button-card.component';
const meta: Meta<ButtonCardComponent> = {
@@ -38,7 +37,7 @@ const meta: Meta<ButtonCardComponent> = {
},
decorators: [
moduleMetadata({
- imports: [ButtonCardComponent, BescheidGenerateIconComponent],
+ imports: [ButtonCardComponent],
}),
],
excludeStories: /.*Data$/,
@@ -61,6 +60,7 @@ export const Default: Story = {
render: (args: ButtonCardComponent) => ({
props: args,
template: `<ods-button-card ${argsToTemplate(args)} class="w-72">
+ //TODO OZG-7707
<ods-bescheid-generate-icon icon fileType="auto"></ods-bescheid-generate-icon>
</ods-button-card>`,
}),
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index 62f64bd9c2..1e5fbb384c 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -43,6 +43,8 @@ const iconVariants = cva('', {
text: 'fill-text',
whitetext: 'fill-whitetext',
error: 'fill-error',
+ pdf: 'fill-pdf',
+ neutral: 'fill-neutral-500 dark:fill-neutral-400',
},
},
});
diff --git a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.html b/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.html
deleted file mode 100644
index b5e9d23867..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!--
-
- Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- Ministerpräsidenten des Landes Schleswig-Holstein
- Staatskanzlei
- Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-
- Lizenziert unter der EUPL, Version 1.2 oder - sobald
- diese von der Europäischen Kommission genehmigt wurden -
- Folgeversionen der EUPL ("Lizenz");
- Sie dürfen dieses Werk ausschließlich gemäß
- dieser Lizenz nutzen.
- Eine Kopie der Lizenz finden Sie hier:
-
- https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-
- Sofern nicht durch anwendbare Rechtsvorschriften
- gefordert oder in schriftlicher Form vereinbart, wird
- die unter der Lizenz verbreitete Software "so wie sie
- ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- ausdrücklich oder stillschweigend - verbreitet.
- Die sprachspezifischen Genehmigungen und Beschränkungen
- unter der Lizenz sind dem Lizenztext zu entnehmen.
-
--->
-<svg
- width="143"
- height="38"
- viewBox="0 0 143 38"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
->
- <g clip-path="url(#clip0_299_6811)">
- <path
- d="M28.7467 17.9064H19.1427C17.9555 17.9064 16.9927 16.981 16.9927 15.841C16.9927 14.701 17.9555 13.7755 19.1427 13.7755H28.7467C29.9339 13.7755 30.8967 14.701 30.8967 15.841C30.8967 16.981 29.9339 17.9064 28.7467 17.9064Z"
- fill="#003064"
- />
- <path
- d="M32.707 24.8786H22.633C21.4458 24.8786 20.483 23.9531 20.483 22.8131C20.483 21.6732 21.4458 20.7477 22.633 20.7477H32.707C33.8942 20.7477 34.857 21.6732 34.857 22.8131C34.857 23.9531 33.8942 24.8786 32.707 24.8786Z"
- fill="url(#paint0_linear_299_6811)"
- />
- <mask
- id="mask0_299_6811"
- style="mask-type: luminance"
- maskUnits="userSpaceOnUse"
- x="7"
- y="20"
- width="19"
- height="19"
- >
- <path
- d="M25.2048 32.7939C25.2048 35.6607 22.7751 38.0001 19.7873 38.0001C16.7994 38.0001 14.5472 35.851 14.3853 33.1244C14.3853 28.9301 11.3478 25.4022 7.27356 24.4524C9.08983 23.8899 10.5312 22.5151 11.1106 20.7694C12.099 24.6899 15.7656 27.6026 20.1082 27.6026C22.9625 27.7577 25.2034 30.035 25.2034 32.7939H25.2048Z"
- fill="white"
- />
- </mask>
- <g mask="url(#mask0_299_6811)">
- <mask
- id="mask1_299_6811"
- style="mask-type: luminance"
- maskUnits="userSpaceOnUse"
- x="6"
- y="20"
- width="20"
- height="19"
- >
- <path d="M25.9149 20.0948H6.5636V38.676H25.9149V20.0948Z" fill="white" />
- </mask>
- <g mask="url(#mask1_299_6811)">
- <rect
- x="6.51373"
- y="20.0515"
- width="19.4266"
- height="18.6499"
- fill="url(#pattern0_299_6811)"
- />
- </g>
- </g>
- <mask
- id="mask2_299_6811"
- style="mask-type: luminance"
- maskUnits="userSpaceOnUse"
- x="0"
- y="0"
- width="26"
- height="25"
- >
- <path
- d="M25.2049 5.20616C25.2049 7.96506 22.9683 10.2423 20.131 10.3975C15.0996 10.3975 10.9829 14.2869 10.8536 19.1005C10.8479 19.1828 10.8479 19.261 10.8479 19.3433C10.6917 22.0038 8.42956 24.1003 5.65615 24.2136H5.63485C5.56527 24.219 5.49001 24.219 5.42042 24.219C5.12505 24.219 4.83535 24.1987 4.54992 24.1461C4.46329 24.1313 4.37809 24.1151 4.29146 24.1003C4.03869 24.0544 3.79728 23.9869 3.56013 23.9046C3.25907 23.7967 2.97364 23.6672 2.69956 23.5121C2.61294 23.4662 2.53341 23.419 2.45815 23.3677C2.43685 23.3569 2.41555 23.3421 2.39425 23.3259C2.28632 23.2584 2.18407 23.1869 2.08751 23.1141C2.07189 23.1033 2.05485 23.0938 2.03923 23.0722C1.91568 22.9792 1.79781 22.8807 1.68421 22.7781C1.61462 22.7107 1.54504 22.6432 1.47404 22.5717C1.23688 22.3397 1.03381 22.0861 0.856305 21.8122C0.813702 21.7447 0.76968 21.6732 0.727078 21.6058C0.597851 21.3994 0.485665 21.1768 0.393361 20.9501C0.296795 20.7235 0.215851 20.4847 0.156208 20.2418C0.134907 20.1595 0.113606 20.0813 0.102245 19.999C0.0866245 19.9167 0.0695836 19.8331 0.0596431 19.7508C0.0326617 19.5848 0.0170409 19.4148 0.0056803 19.2449C0 19.168 0 19.0897 0 19.0128C0 18.9049 0.0056803 18.801 0.0113606 18.6971C0.0227212 18.5474 0.038342 18.3976 0.0596431 18.2479C0.0752639 18.1292 0.0979851 18.0104 0.123546 17.8917C0.129227 17.8809 0.129227 17.8715 0.134907 17.8661C0.156208 17.7474 0.18887 17.6286 0.225792 17.5153C0.247093 17.4425 0.274074 17.3656 0.301056 17.2927C0.328037 17.2158 0.360699 17.1322 0.39194 17.0553C0.445903 16.9258 0.505546 16.7976 0.56945 16.6735C0.617732 16.575 0.671695 16.4819 0.725658 16.3942C0.816543 16.2391 0.918788 16.0893 1.02671 15.945C1.11334 15.8262 1.20422 15.7129 1.30079 15.6036C1.30647 15.5983 1.31215 15.5929 1.31641 15.5888C1.37605 15.5214 1.43427 15.4593 1.4996 15.3972C1.54788 15.346 1.59616 15.2988 1.64445 15.2529C1.71971 15.18 1.79497 15.1139 1.87592 15.0519C1.9455 14.9898 2.01509 14.9331 2.09035 14.8819C2.26218 14.747 2.44537 14.6283 2.63282 14.5203C2.75068 14.4529 2.86997 14.3908 2.99352 14.3341C3.0631 14.2923 3.13836 14.2613 3.21363 14.2303C3.26759 14.2046 3.32155 14.1844 3.37978 14.1628C3.43374 14.1372 3.49196 14.1169 3.55161 14.1008C4.02449 13.9308 4.53004 13.8269 5.05688 13.8013H5.12647C5.28836 13.8013 5.44882 13.7959 5.60503 13.7864H5.62065C10.5014 13.5072 14.3811 9.61771 14.3811 4.89722C14.5458 2.15451 16.9159 0 19.7859 0C22.6559 0 25.2035 2.33933 25.2035 5.20616H25.2049Z"
- fill="white"
- />
- </mask>
- <g mask="url(#mask2_299_6811)">
- <mask
- id="mask3_299_6811"
- style="mask-type: luminance"
- maskUnits="userSpaceOnUse"
- x="-1"
- y="-1"
- width="27"
- height="26"
- >
- <path d="M25.9148 -0.674683H-0.708801V24.8947H25.9148V-0.674683Z" fill="white" />
- </mask>
- <g mask="url(#mask3_299_6811)">
- <rect
- x="-0.711609"
- y="-0.735229"
- width="26.652"
- height="25.6436"
- fill="url(#pattern1_299_6811)"
- />
- </g>
- </g>
- <g clip-path="url(#clip1_299_6811)">
- <path
- d="M48.8011 15.0003C45.3904 15.0003 42.8572 12.6484 42.8572 9.17837C42.8572 5.70834 45.3904 3.44885 48.8011 3.44885C52.2118 3.44885 54.7615 5.66216 54.7615 9.17837C54.7615 12.6946 52.2283 15.0003 48.8011 15.0003ZM48.8011 5.83368C46.9473 5.83368 45.6807 7.25864 45.6807 9.17837C45.6807 11.0981 46.9638 12.5857 48.8011 12.5857C50.6384 12.5857 51.9347 11.1608 51.9347 9.17837C51.9347 7.19597 50.6516 5.83368 48.8011 5.83368Z"
- fill="url(#paint1_linear_299_6811)"
- />
- <path
- d="M57.928 14.7063V12.4139L63.1298 5.98835H58.0501V3.74207H66.4349V5.86301L61.1078 12.4139H66.5438V14.7063H57.928Z"
- fill="#001E49"
- />
- <path
- d="M76.0732 14.9869C72.5834 14.9869 70.0666 12.6648 70.0666 9.21124C70.0666 5.75769 72.6626 3.44873 75.9974 3.44873C77.7093 3.44873 79.3025 4.02267 80.2129 4.90338L78.5438 6.80662C78.0358 6.21948 77.1551 5.78408 76.0897 5.78408C74.2359 5.78408 72.877 7.23872 72.877 9.20464C72.877 11.1706 74.0644 12.6582 76.2118 12.6582C76.8286 12.6582 77.3992 12.5658 77.8643 12.3646V10.3657H75.7796V8.22828H80.2887V14.0337C79.2233 14.5911 77.7555 14.977 76.0732 14.977V14.9869Z"
- fill="#001E49"
- />
- <path d="M84.1975 11.6554V9.64331H88.1194V11.6554H84.1975Z" fill="#001E49" />
- <path
- d="M101.554 13.0804C100.644 14.258 99.4069 15.0001 97.5697 15.0001C94.281 15.0001 91.9325 12.5691 91.9325 9.22443C91.9325 5.87974 94.3272 3.44873 97.5829 3.44873C99.1892 3.44873 100.565 4.00618 101.35 5.04521L100.716 5.63235C100.083 4.82751 98.9418 4.23708 97.596 4.23708C94.6769 4.23708 92.8561 6.49656 92.8561 9.22443C92.8561 11.9523 94.6769 14.2118 97.596 14.2118C98.8792 14.2118 99.9578 13.8259 100.947 12.6021L101.551 13.0804H101.554Z"
- fill="#001E49"
- />
- <path d="M106.743 14.7064H105.908V3H106.743V14.7064Z" fill="#001E49" />
- <path
- d="M115.22 14.9075C112.997 14.9075 111.437 13.2814 111.437 11.0977C111.437 8.91412 112.997 7.30444 115.22 7.30444C117.443 7.30444 119.02 8.91412 119.02 11.0977C119.02 13.2814 117.46 14.9075 115.22 14.9075ZM115.22 8.03342C113.429 8.03342 112.301 9.37921 112.301 11.0977C112.301 12.8163 113.429 14.1489 115.22 14.1489C117.011 14.1489 118.156 12.8328 118.156 11.0977C118.156 9.36272 117.028 8.03342 115.22 8.03342Z"
- fill="#001E49"
- />
- <path
- d="M128.965 14.7064C128.919 14.3205 128.902 13.6542 128.902 13.2815H128.873C128.457 14.271 127.405 14.9076 126.31 14.9076C124.41 14.9076 123.608 13.5915 123.608 11.9027V7.48926H124.456V11.5761C124.456 13.0011 124.888 14.1918 126.494 14.1918C127.731 14.1918 128.873 13.1693 128.873 11.1572V7.48596H129.707V13.044C129.707 13.4629 129.737 14.2215 129.786 14.6998H128.968L128.965 14.7064Z"
- fill="#001E49"
- />
- <path
- d="M140.932 13.2815C140.315 14.3337 139.187 14.9076 138.059 14.9076C135.865 14.9076 134.384 13.2518 134.384 11.0979C134.384 8.94392 135.869 7.30456 138.059 7.30456C139.187 7.30456 140.315 7.86201 140.932 8.96042H140.965V3H141.813V14.7064H140.965V13.2815H140.932ZM138.138 14.1787C139.837 14.1787 141.057 12.8329 141.057 11.0979C141.057 9.36284 139.837 8.00055 138.138 8.00055C136.33 8.00055 135.265 9.40902 135.265 11.0979C135.265 12.7867 136.33 14.1787 138.138 14.1787Z"
- fill="#001E49"
- />
- <path
- d="M47.0056 25.2249L44.1814 33.0002H43.0271L46.2791 24.469H47.0232L47.0056 25.2249ZM49.3728 33.0002L46.5427 25.2249L46.5251 24.469H47.2693L50.533 33.0002H49.3728ZM49.2263 29.842V30.7678H44.4333V29.842H49.2263ZM55.5076 31.7698V24.0002H56.5974V33.0002H55.6013L55.5076 31.7698ZM51.2419 29.9006V29.7776C51.2419 29.2932 51.3005 28.8538 51.4177 28.4592C51.5388 28.0608 51.7087 27.719 51.9275 27.4338C52.1501 27.1487 52.4138 26.9299 52.7185 26.7776C53.0271 26.6213 53.3708 26.5432 53.7498 26.5432C54.1482 26.5432 54.4958 26.6135 54.7927 26.7542C55.0935 26.8909 55.3474 27.092 55.5544 27.3577C55.7654 27.6194 55.9314 27.9358 56.0525 28.3069C56.1736 28.678 56.2576 29.0979 56.3044 29.5667V30.1057C56.2615 30.5706 56.1775 30.9885 56.0525 31.3596C55.9314 31.7307 55.7654 32.0471 55.5544 32.3088C55.3474 32.5706 55.0935 32.7717 54.7927 32.9124C54.4919 33.0491 54.1404 33.1174 53.738 33.1174C53.3669 33.1174 53.0271 33.0374 52.7185 32.8772C52.4138 32.717 52.1501 32.4924 51.9275 32.2034C51.7087 31.9143 51.5388 31.5745 51.4177 31.1838C51.3005 30.7893 51.2419 30.3616 51.2419 29.9006ZM52.3318 29.7776V29.9006C52.3318 30.217 52.363 30.5139 52.4255 30.7913C52.4919 31.0686 52.5935 31.3127 52.7302 31.5237C52.8669 31.7346 53.0408 31.9006 53.2517 32.0217C53.4626 32.1389 53.7146 32.1975 54.0076 32.1975C54.3669 32.1975 54.6619 32.1213 54.8923 31.969C55.1267 31.8167 55.3142 31.6155 55.4548 31.3655C55.5955 31.1155 55.7048 30.844 55.783 30.551V29.1389C55.7361 28.9241 55.6677 28.717 55.5779 28.5178C55.4919 28.3147 55.3787 28.135 55.238 27.9788C55.1013 27.8186 54.9314 27.6917 54.7283 27.5979C54.5291 27.5042 54.2927 27.4573 54.0193 27.4573C53.7224 27.4573 53.4666 27.5198 53.2517 27.6448C53.0408 27.7659 52.8669 27.9338 52.7302 28.1487C52.5935 28.3596 52.4919 28.6057 52.4255 28.887C52.363 29.1643 52.3318 29.4612 52.3318 29.7776ZM59.363 27.9202V33.0002H58.2732V26.6604H59.3044L59.363 27.9202ZM59.1404 29.5901L58.6365 29.5725C58.6404 29.1389 58.697 28.7385 58.8064 28.3713C58.9158 28.0002 59.0779 27.678 59.2927 27.4045C59.5076 27.1311 59.7751 26.9202 60.0955 26.7717C60.4158 26.6194 60.7869 26.5432 61.2087 26.5432C61.5056 26.5432 61.7791 26.5862 62.0291 26.6721C62.2791 26.7542 62.4958 26.885 62.6794 27.0647C62.863 27.2444 63.0056 27.4749 63.1072 27.7561C63.2087 28.0374 63.2595 28.3772 63.2595 28.7756V33.0002H62.1755V28.8284C62.1755 28.4963 62.1189 28.2307 62.0056 28.0315C61.8962 27.8323 61.74 27.6877 61.5369 27.5979C61.3337 27.5042 61.0955 27.4573 60.822 27.4573C60.5017 27.4573 60.2341 27.5139 60.0193 27.6272C59.8044 27.7405 59.6326 27.8967 59.5037 28.0959C59.3748 28.2952 59.281 28.5237 59.2224 28.7815C59.1677 29.0354 59.1404 29.3049 59.1404 29.5901ZM63.2478 28.9924L62.5212 29.2151C62.5251 28.8674 62.5818 28.5334 62.6912 28.2131C62.8044 27.8928 62.9666 27.6077 63.1775 27.3577C63.3923 27.1077 63.656 26.9104 63.9685 26.7659C64.281 26.6174 64.6384 26.5432 65.0408 26.5432C65.3806 26.5432 65.6814 26.5881 65.9431 26.678C66.2087 26.7678 66.4314 26.9065 66.6111 27.094C66.7947 27.2776 66.9333 27.5139 67.0271 27.803C67.1208 28.092 67.1677 28.4358 67.1677 28.8342V33.0002H66.0779V28.8225C66.0779 28.467 66.0212 28.1917 65.908 27.9963C65.7986 27.7971 65.6423 27.6584 65.4392 27.5803C65.24 27.4983 65.0017 27.4573 64.7244 27.4573C64.4861 27.4573 64.2751 27.4983 64.0916 27.5803C63.908 27.6624 63.7537 27.7756 63.6287 27.9202C63.5037 28.0608 63.408 28.2229 63.3416 28.4065C63.2791 28.5901 63.2478 28.7854 63.2478 28.9924ZM69.9861 26.6604V33.0002H68.8962V26.6604H69.9861ZM68.8142 24.9788C68.8142 24.803 68.8669 24.6545 68.9724 24.5334C69.0818 24.4124 69.2419 24.3518 69.4529 24.3518C69.6599 24.3518 69.8181 24.4124 69.9275 24.5334C70.0408 24.6545 70.0974 24.803 70.0974 24.9788C70.0974 25.1467 70.0408 25.2913 69.9275 25.4124C69.8181 25.5295 69.6599 25.5881 69.4529 25.5881C69.2419 25.5881 69.0818 25.5295 68.9724 25.4124C68.8669 25.2913 68.8142 25.1467 68.8142 24.9788ZM72.8103 28.0139V33.0002H71.7263V26.6604H72.7517L72.8103 28.0139ZM72.5525 29.5901L72.1013 29.5725C72.1052 29.1389 72.1697 28.7385 72.2947 28.3713C72.4197 28.0002 72.5955 27.678 72.822 27.4045C73.0486 27.1311 73.3181 26.9202 73.6306 26.7717C73.947 26.6194 74.2966 26.5432 74.6794 26.5432C74.9919 26.5432 75.2732 26.5862 75.5232 26.6721C75.7732 26.7542 75.9861 26.887 76.1619 27.0706C76.3416 27.2542 76.4783 27.4924 76.572 27.7854C76.6658 28.0745 76.7126 28.428 76.7126 28.8459V33.0002H75.6228V28.8342C75.6228 28.5022 75.574 28.2366 75.4763 28.0374C75.3787 27.8342 75.2361 27.6877 75.0486 27.5979C74.8611 27.5042 74.6306 27.4573 74.3572 27.4573C74.0876 27.4573 73.8416 27.5139 73.6189 27.6272C73.4001 27.7405 73.2107 27.8967 73.0505 28.0959C72.8943 28.2952 72.7712 28.5237 72.6814 28.7815C72.5955 29.0354 72.5525 29.3049 72.5525 29.5901ZM79.5369 26.6604V33.0002H78.447V26.6604H79.5369ZM78.365 24.9788C78.365 24.803 78.4177 24.6545 78.5232 24.5334C78.6326 24.4124 78.7927 24.3518 79.0037 24.3518C79.2107 24.3518 79.3689 24.4124 79.4783 24.5334C79.5916 24.6545 79.6482 24.803 79.6482 24.9788C79.6482 25.1467 79.5916 25.2913 79.4783 25.4124C79.3689 25.5295 79.2107 25.5881 79.0037 25.5881C78.7927 25.5881 78.6326 25.5295 78.5232 25.4124C78.4177 25.2913 78.365 25.1467 78.365 24.9788ZM84.9685 31.3186C84.9685 31.1624 84.9333 31.0178 84.863 30.885C84.7966 30.7483 84.658 30.6252 84.447 30.5159C84.24 30.4026 83.9275 30.3049 83.5095 30.2229C83.158 30.1487 82.8396 30.0608 82.5544 29.9592C82.2732 29.8577 82.033 29.7346 81.8337 29.5901C81.6384 29.4456 81.488 29.2756 81.3826 29.0803C81.2771 28.885 81.2244 28.6565 81.2244 28.3948C81.2244 28.1448 81.2791 27.9084 81.3884 27.6858C81.5017 27.4631 81.6599 27.2659 81.863 27.094C82.0701 26.9221 82.3181 26.7874 82.6072 26.6897C82.8962 26.592 83.2185 26.5432 83.574 26.5432C84.0818 26.5432 84.5154 26.6331 84.8748 26.8127C85.2341 26.9924 85.5095 27.2327 85.7009 27.5334C85.8923 27.8303 85.988 28.1604 85.988 28.5237H84.9041C84.9041 28.3479 84.8513 28.178 84.7458 28.0139C84.6443 27.8459 84.4939 27.7073 84.2947 27.5979C84.0994 27.4885 83.8591 27.4338 83.574 27.4338C83.2732 27.4338 83.0291 27.4807 82.8416 27.5745C82.658 27.6643 82.5232 27.7795 82.4373 27.9202C82.3552 28.0608 82.3142 28.2092 82.3142 28.3655C82.3142 28.4827 82.3337 28.5881 82.3728 28.6819C82.4158 28.7717 82.49 28.8557 82.5955 28.9338C82.7009 29.0081 82.8494 29.0784 83.0408 29.1448C83.2322 29.2112 83.4763 29.2776 83.7732 29.344C84.2927 29.4612 84.7205 29.6018 85.0564 29.7659C85.3923 29.9299 85.6423 30.1311 85.8064 30.3694C85.9705 30.6077 86.0525 30.8967 86.0525 31.2366C86.0525 31.5139 85.9939 31.7678 85.8767 31.9983C85.7634 32.2288 85.5974 32.428 85.3787 32.5959C85.1638 32.76 84.906 32.8889 84.6052 32.9827C84.3083 33.0725 83.9744 33.1174 83.6033 33.1174C83.0447 33.1174 82.572 33.0178 82.1853 32.8186C81.7986 32.6194 81.5056 32.3616 81.3064 32.0452C81.1072 31.7288 81.0076 31.3948 81.0076 31.0432H82.0974C82.113 31.3401 82.199 31.5764 82.3552 31.7522C82.5115 31.9241 82.7029 32.0471 82.9294 32.1213C83.156 32.1917 83.3806 32.2268 83.6033 32.2268C83.9001 32.2268 84.1482 32.1877 84.3474 32.1096C84.5505 32.0315 84.7048 31.9241 84.8103 31.7874C84.9158 31.6506 84.9685 31.4944 84.9685 31.3186ZM90.1306 26.6604V27.4924H86.7029V26.6604H90.1306ZM87.863 25.1194H88.947V31.4299C88.947 31.6448 88.9802 31.8069 89.0466 31.9163C89.113 32.0256 89.199 32.0979 89.3044 32.1331C89.4099 32.1682 89.5232 32.1858 89.6443 32.1858C89.7341 32.1858 89.8279 32.178 89.9255 32.1624C90.0271 32.1428 90.1033 32.1272 90.1541 32.1155L90.1599 33.0002C90.074 33.0276 89.9607 33.053 89.8201 33.0764C89.6833 33.1038 89.5173 33.1174 89.322 33.1174C89.0564 33.1174 88.8123 33.0647 88.5896 32.9592C88.3669 32.8538 88.1892 32.678 88.0564 32.4319C87.9275 32.1819 87.863 31.8459 87.863 31.4241V25.1194ZM92.4861 27.6565V33.0002H91.4021V26.6604H92.4568L92.4861 27.6565ZM94.4666 26.6252L94.4607 27.6331C94.3708 27.6135 94.2849 27.6018 94.2029 27.5979C94.1248 27.5901 94.0349 27.5862 93.9333 27.5862C93.6833 27.5862 93.4626 27.6252 93.2712 27.7034C93.0798 27.7815 92.9177 27.8909 92.7849 28.0315C92.6521 28.1721 92.5466 28.3401 92.4685 28.5354C92.3943 28.7268 92.3455 28.9377 92.322 29.1682L92.0173 29.344C92.0173 28.9612 92.0544 28.6018 92.1287 28.2659C92.2068 27.9299 92.3259 27.6331 92.4861 27.3752C92.6462 27.1135 92.8494 26.9104 93.0955 26.7659C93.3455 26.6174 93.6423 26.5432 93.9861 26.5432C94.0642 26.5432 94.1541 26.553 94.2556 26.5725C94.3572 26.5881 94.4275 26.6057 94.4666 26.6252ZM98.9724 31.9163V28.6526C98.9724 28.4026 98.9216 28.1858 98.8201 28.0022C98.7224 27.8147 98.574 27.6702 98.3748 27.5686C98.1755 27.467 97.9294 27.4163 97.6365 27.4163C97.363 27.4163 97.1228 27.4631 96.9158 27.5569C96.7126 27.6506 96.5525 27.7737 96.4353 27.926C96.322 28.0784 96.2654 28.2424 96.2654 28.4182H95.1814C95.1814 28.1917 95.24 27.967 95.3572 27.7444C95.4744 27.5217 95.6423 27.3206 95.8611 27.1409C96.0837 26.9573 96.3494 26.8127 96.658 26.7073C96.9705 26.5979 97.3181 26.5432 97.7009 26.5432C98.1619 26.5432 98.5681 26.6213 98.9197 26.7776C99.2751 26.9338 99.5525 27.1702 99.7517 27.4866C99.9548 27.7991 100.056 28.1917 100.056 28.6643V31.6174C100.056 31.8284 100.074 32.053 100.109 32.2913C100.148 32.5295 100.205 32.7346 100.279 32.9065V33.0002H99.1482C99.0935 32.8752 99.0505 32.7092 99.0193 32.5022C98.988 32.2913 98.9724 32.0959 98.9724 31.9163ZM99.1599 29.1565L99.1716 29.9182H98.0759C97.7673 29.9182 97.4919 29.9436 97.2498 29.9944C97.0076 30.0413 96.8044 30.1135 96.6404 30.2112C96.4763 30.3088 96.3513 30.4319 96.2654 30.5803C96.1794 30.7249 96.1365 30.8948 96.1365 31.0901C96.1365 31.2893 96.1814 31.4709 96.2712 31.635C96.3611 31.7991 96.4958 31.9299 96.6755 32.0276C96.8591 32.1213 97.0837 32.1682 97.3494 32.1682C97.6814 32.1682 97.9744 32.0979 98.2283 31.9573C98.4822 31.8167 98.6833 31.6448 98.8318 31.4417C98.9841 31.2385 99.0662 31.0413 99.0779 30.8499L99.5408 31.3713C99.5134 31.5354 99.4392 31.717 99.3181 31.9163C99.197 32.1155 99.0349 32.3069 98.8318 32.4905C98.6326 32.6702 98.3943 32.8206 98.1169 32.9417C97.8435 33.0588 97.5349 33.1174 97.1912 33.1174C96.7615 33.1174 96.3845 33.0334 96.0603 32.8655C95.74 32.6975 95.49 32.4729 95.3103 32.1917C95.1345 31.9065 95.0466 31.5881 95.0466 31.2366C95.0466 30.8967 95.113 30.5979 95.2458 30.3401C95.3787 30.0784 95.5701 29.8616 95.8201 29.6897C96.0701 29.5139 96.3708 29.3811 96.7224 29.2913C97.074 29.2014 97.4666 29.1565 97.9001 29.1565H99.1599ZM104.416 26.6604V27.4924H100.988V26.6604H104.416ZM102.148 25.1194H103.232V31.4299C103.232 31.6448 103.265 31.8069 103.332 31.9163C103.398 32.0256 103.484 32.0979 103.59 32.1331C103.695 32.1682 103.808 32.1858 103.929 32.1858C104.019 32.1858 104.113 32.178 104.211 32.1624C104.312 32.1428 104.388 32.1272 104.439 32.1155L104.445 33.0002C104.359 33.0276 104.246 33.053 104.105 33.0764C103.969 33.1038 103.802 33.1174 103.607 33.1174C103.342 33.1174 103.097 33.0647 102.875 32.9592C102.652 32.8538 102.474 32.678 102.342 32.4319C102.213 32.1819 102.148 31.8459 102.148 31.4241V25.1194ZM106.865 26.6604V33.0002H105.775V26.6604H106.865ZM105.693 24.9788C105.693 24.803 105.746 24.6545 105.851 24.5334C105.961 24.4124 106.121 24.3518 106.332 24.3518C106.539 24.3518 106.697 24.4124 106.806 24.5334C106.92 24.6545 106.976 24.803 106.976 24.9788C106.976 25.1467 106.92 25.2913 106.806 25.4124C106.697 25.5295 106.539 25.5881 106.332 25.5881C106.121 25.5881 105.961 25.5295 105.851 25.4124C105.746 25.2913 105.693 25.1467 105.693 24.9788ZM108.318 29.9006V29.7659C108.318 29.3088 108.385 28.885 108.517 28.4944C108.65 28.0999 108.842 27.7581 109.092 27.469C109.342 27.176 109.644 26.9495 110 26.7893C110.355 26.6252 110.754 26.5432 111.195 26.5432C111.64 26.5432 112.041 26.6252 112.396 26.7893C112.756 26.9495 113.06 27.176 113.31 27.469C113.564 27.7581 113.758 28.0999 113.89 28.4944C114.023 28.885 114.09 29.3088 114.09 29.7659V29.9006C114.09 30.3577 114.023 30.7815 113.89 31.1721C113.758 31.5627 113.564 31.9045 113.31 32.1975C113.06 32.4866 112.758 32.7131 112.402 32.8772C112.051 33.0374 111.652 33.1174 111.207 33.1174C110.761 33.1174 110.361 33.0374 110.006 32.8772C109.65 32.7131 109.345 32.4866 109.092 32.1975C108.842 31.9045 108.65 31.5627 108.517 31.1721C108.385 30.7815 108.318 30.3577 108.318 29.9006ZM109.402 29.7659V29.9006C109.402 30.217 109.439 30.5159 109.513 30.7971C109.588 31.0745 109.699 31.3206 109.847 31.5354C110 31.7502 110.189 31.9202 110.416 32.0452C110.642 32.1663 110.906 32.2268 111.207 32.2268C111.504 32.2268 111.763 32.1663 111.986 32.0452C112.213 31.9202 112.4 31.7502 112.549 31.5354C112.697 31.3206 112.808 31.0745 112.883 30.7971C112.961 30.5159 113 30.217 113 29.9006V29.7659C113 29.4534 112.961 29.1584 112.883 28.8811C112.808 28.5999 112.695 28.3518 112.543 28.137C112.394 27.9182 112.207 27.7463 111.98 27.6213C111.758 27.4963 111.496 27.4338 111.195 27.4338C110.898 27.4338 110.636 27.4963 110.41 27.6213C110.187 27.7463 110 27.9182 109.847 28.137C109.699 28.3518 109.588 28.5999 109.513 28.8811C109.439 29.1584 109.402 29.4534 109.402 29.7659ZM116.533 28.0139V33.0002H115.449V26.6604H116.474L116.533 28.0139ZM116.275 29.5901L115.824 29.5725C115.828 29.1389 115.892 28.7385 116.017 28.3713C116.142 28.0002 116.318 27.678 116.545 27.4045C116.771 27.1311 117.041 26.9202 117.353 26.7717C117.67 26.6194 118.019 26.5432 118.402 26.5432C118.715 26.5432 118.996 26.5862 119.246 26.6721C119.496 26.7542 119.709 26.887 119.885 27.0706C120.064 27.2542 120.201 27.4924 120.295 27.7854C120.388 28.0745 120.435 28.428 120.435 28.8459V33.0002H119.345V28.8342C119.345 28.5022 119.297 28.2366 119.199 28.0374C119.101 27.8342 118.959 27.6877 118.771 27.5979C118.584 27.5042 118.353 27.4573 118.08 27.4573C117.81 27.4573 117.564 27.5139 117.342 27.6272C117.123 27.7405 116.933 27.8967 116.773 28.0959C116.617 28.2952 116.494 28.5237 116.404 28.7815C116.318 29.0354 116.275 29.3049 116.275 29.5901Z"
- fill="#001E49"
- />
- </g>
- </g>
- <defs>
- <pattern id="pattern0_299_6811" patternContentUnits="objectBoundingBox" width="1" height="1">
- <use xlink:href="#image0_299_6811" transform="scale(0.00352113 0.00348432)" />
- </pattern>
- <pattern id="pattern1_299_6811" patternContentUnits="objectBoundingBox" width="1" height="1">
- <use xlink:href="#image1_299_6811" transform="scale(0.00255754 0.00253165)" />
- </pattern>
- <linearGradient
- id="paint0_linear_299_6811"
- x1="20.483"
- y1="22.8118"
- x2="34.857"
- y2="22.8118"
- gradientUnits="userSpaceOnUse"
- >
- <stop stop-color="#003064" />
- <stop offset="1" stop-color="#D4004B" />
- </linearGradient>
- <linearGradient
- id="paint1_linear_299_6811"
- x1="42.8572"
- y1="9.22455"
- x2="54.7615"
- y2="9.22455"
- gradientUnits="userSpaceOnUse"
- >
- <stop stop-color="#003064" />
- <stop offset="1" stop-color="#D4004B" />
- </linearGradient>
- <clipPath id="clip0_299_6811">
- <rect width="142.857" height="38" fill="white" />
- </clipPath>
- <clipPath id="clip1_299_6811">
- <rect x="42.8572" y="1" width="100" height="36" rx="8" fill="white" />
- </clipPath>
- <image
- id="image0_299_6811"
- width="284"
- height="287"
- xlink:href="data:image/png;base64,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"
- />
- <image
- id="image1_299_6811"
- width="391"
- height="395"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYcAAAGLCAYAAAAs3F4FAAAACXBIWXMAABcRAAAXEQHKJvM/AAAgAElEQVR4nO2defQsSVXnb9bhHOeIozN/oEfZBRGhFxCUXhDecx88CIosDS2CKIIjDIyD3az9nqye44jsAmI3SwONMq4gi/hes3XTG9Dd0DTdQNMsioyzOM78R8WczMqIuPfGjcjMqqyqrKrvp/v3fpWZkZFb/e437r0RkZVzzhEAAGyQN37gRqqoovr/+p83ffAmoqqiqqoWv+u14XP7uy1b+XLUrlNlTr/zv6P73OW7FhdTVXT6nb6TTr/zd+LxDqCqgTgAANbF1Tf/d7r65m82hvyN7/9cFABl/MPnxtjPDHEgJgjpektAvMjwslEoKjr3gd+H554B4gAAGJWrbvomXX3TN+mqm7/ZCEPaso/CkBh707i3AkC8jPIaBohD2BbEh+jcs2/fbHrc2d+LL0MLxAEAsDKve8/1dNVN/9SIAinjnbb2KW/ktQBkvAZLQITnQbm6Ka7TIsGO87izvpdOu+N30Kl3/I6D/XJAHAAAS/Hav7mWrvr8PzWikBhoIiUSsfXPvQSxzRKHrHCQ4V2UcxJEJNcxcbA8DL+tFopT73DbgxMKiAMAoDev/etP0xU3foOu+vw3ZDhnxgx0LleQCEhhW1dOwvQatJciQ1G0pDjw8o8983uan0MA4gAA6OQ1f/Upes1ffTpt/SdhINsgJ+XJCi1F478oN7PDUqY4WJ6KYfCVhyHWmWVVubbMaXe4LZ1z5vc0HsW+AnEAAJhc8bl/oFf/5afoyhv/MdNTyDbwpdCSF5A09JNLLhvHSrblxKFg+HmOoYc4BDEJZSh8fuwZ303nnPHde/clgjgAAAS1KLzqL66hK278x365A9YaD+VmM9sg6/La0GfzDrkeS5Td1zT8fp92/XKeg/Qi2lV0zhnfQ+eccbu9+TJBHAAADZ/43NfpVX9+TSMO2vCGzwXvIJ87YMKhjT/bPy8OmX27xEHs19WddXVx8J9rL+KcB+y+SEAcADhwPnHD1+mVf34VXXHDP3SGj3T3VG6oUy9A5x/69EwqC4OVdyh6MEVxoGKZfFgpIw6h/IJdFwmIAwAHzGNf9JeNx6Bj8VmDWUr65nIPSljy3kVH3kEJQFEccjmLJcUh7zkQxSUpDn79ix9xFzrlDt++c18yiAMAB8gr3n0FveLdV5pJ2sQzoJzBpsTI2wZdhY5MD0GFnjKJZ8vrKCWlteFPRGFQWImYAMikNKnQUtjUljrljrelF//inXfqiwZxAOCAuPyzX6NXvPsTdPlnv95hHK2kbs57qNfN0rBOIXTURxwsz4CHpWzPoZwbCdebeA5pYlqEk7LeQlkcQsl2dR1mesyOhJogDgAcCI85/m66/IavScNJZLeaufE3k765XIAlAEaYJ5t8zu+XFZy+noPhIQ0TB2J5h4w4JKElLSpEp9RjJB5wOzrl9tMONUEcANhzLv/sV+nRx/4sicsnxt8I2/ht+eR0PidgGfPoIczKoaeiCGhB6QhHBeO9gjgEDejKO3R7D56pexEQBwD2mEcd+1O6/DNfTYx/r4RsrpwWmU4vIM0TdHsdvt5ZEnrqEo90nU6Cs+sp5Bx6i0PYL35O8fXLDbUXMdVcRK0NswmcBwBgZB51wbvosuu/0lS6aP61bUDfFAyLring2oKLZb/dUdJ0dO0+vD5HYf+mDufamp3c7qtw6enElY59XNQV6+PnwOtzYv9FHX5d3MnFEyVVQ+Hmu+RfffyuGnJbr//q/6WHvfKzdP3X/l9x720BzwGAPeKyz3yF/uCSj9NlwWPQIR6SLf9CK1q05Is9k9KeSzLslPEejNCUP4+4bibOv7/3kMmLlO6BGVaiHqGlct6BSHkalHoRUwszIawEwB5Rewq/9IJ3qtBIl0AYvXh69v7p6jWUFwBlvHOGfuj6zsT0wNAau4+0cmgpbGT/ytWn3P629OJHTCPMBHEAYE/4r+/8GP3BJR+TXS91S5yksRfljKSsNMCU8R4yLXTLe7ASyj09inyugjIikB47OW9LIAvegxYHKxFdUZc4WEi/YgoD5yAOAOwBj3jeO+iy6281ul/28Q4y4SWVUC56CLqHEFHZ2AvvYpYa5w7vIRveSkJSOjlue0R5YaREFPj9zYoDLSMQfG9HL2kEYntTgiMhDcAO8/Hrb6VHPPft9PHrvhySziH57BPHIaFLMrErtlNM4rblHEvgOpYJ9olevs2pJHCutRmT30aiWKeIWX7ZTP6KbTLBnNST7s0z4SxJX0pSu+KicbFLEK/jOe++pUlYbxN4DgDsIB+/7lb6xede3Jy4bzXHuLfyIHgr2co/WNt1S95IQJvhpWyOodTq70gyJ6GkmeH9WGGnNPcxKPcQvIFS7oF3U+XhITsx3ZtWAV/yS3fdigcBzwGAHaT2FH7hOW8LLd3QvnOxDc49iNgtlbXQReuftfytcqG1770D1XVV1xO8jlhnWM+6u4Y6STSas3DfgPfOTbuvSu9EOgS6H60TnpEoLLr7xhXyNLUnoupy/hnwz5lr5eXaAs/+sy/ROy7/p618SeE5ALBDNMLw7LctTthIPJPlSWTzC7kcBSUt7UXxWSYBXGjFZ5PM1NHq9+tnSV1WTiSbyM55PJ3XHD0nf7NzuYfYpZWsTquDyBnj+pWktRexKeA5ALBDfOy6L9PDz38L8xRiHJ+YB+HEoDbuJej8AmvBWzkIliNYNGjn0hPgOQbmCYhWvPYeWAtaeCbWwDiS55EOirNb4tETST2e9gaVB8Epz4nd7Og96NwOyfNf9kedSPBArvvKv9Jz/vSLG/2ywnMAYEe43UNeyELZsi++5UHIHESpB1PH2IZMnqIUy8/nC3LjJmbCMyh5C9leTct6D0bPJe0VUbiPpD6Xu7YOx8jAM+r8w0sf+f1r/8LCcwBgR3jYeW8Orci0R5L0IPjvkIMg2Rp2ytsIrWmWO0jKqfyC8EKcEednPYqc5UWQE+cochMkz4f3oEra/PF05XrxgaThNXIPfLv2inxBcYzEa2DnZ0zpYf/wfERZGOqar/vqv9LbL/vGRr60EAcAJs7Dfuci+ti1t0RDzk29IRDBGBMPLekEspGAFgIR069mIpu4QDBxUvVyIxs0ja9X4acQ/gnl5qocEwt2PcnxjW3iXPn5JPEsI+XMtykx4fdNhrP6xJbyahCLyPtSi0MtEusG4gDAhPn537mIPnrtLXbPpA4PQnsFTpQj0RKOAkGiKS62a6HhIiM7Rol6hOFmRpOPu9DmOKmTGcr02KzFL2qJHxwZC9zqW/dEuCP8GKqHk75v7Pryoz4kUjPkPZNXtNh2/iVfaPIQ6wTiAMBE+flnXUgf+/SXkvCG8CBMgUjLCq9AGH5jkJzVfVUYyygSegCc9kxE11X+OSS5mUdj/CTeAOsSy4+dOxY/n9R7SK/DVpdolrnixCQ3E19el6+beU7pj0zkB6Fz+sj8fi22nP+um9cqEBAHACbIQ5/1J/TRT3+JtbRTgYjGnFLDr8rq8IcQiFwOIgn/kBACnn+IBtLyEOL91SGtrIiINrQVMtJ122WT0BM3wOEece9BCaJqvUuBsLwIHpZL/B75w4XAEAQyBEEXPv+Sm9f25YU4ADAxalH46Ke+JA05pQIRP6pBb0ZZnidg7kUsl3gQpESAdTkNNpULBD8XHUaS+QRRnwqmmIY9yR10ewqW9yKdA51L4feovUaS90HcSy4wiRE3RCIrBLEO7SEkoqME19+X8y+5aS1fYIgDABOiFoaH/pc32R4BRaPPQ0v+dzRdzDgmrW4ePlIehCUQxA2nbPW7cD6+vrnYlvRQUvkJcsyAStsXYE6EtMdcUPha5gmJengIx8yl6HvDz53rQBRUKRLSuFsiYSiCeHbSQ2D7y0Mn13ztrf9K571zfIGAOAAwIV72lg/JUElGICxDLryFYPjJFAvnrHWU1mu04NNwkxSe5mc+T8qHXAE3sE1vpLmZb8jmK1TPJseOS9w4G16F9mYCiTqp+xE8EmLPIEpC4kkY4SZ/nsSOH7wxLiba81D7kay2Oda1X/k/zc+YQBwAmAi1MNSeQzRIxIwYM75EapsSCC0ozIikhpeUQDhxTOklMC9C5SmksWYGcK6OyQ0zS9Tq9dmwk/CEKC3vYlmxrzLEUoC5l8QNuxYIkiIhQk0ZkRD23N8vERk0jb70ELQgpKG2+ue8d3x+VIGAOAAwAWpReOmbP8REgYi3PqOx4Mac4sZgpCm2UhMvwddKoXw0YCq0YnkH3MgaQhMMuIqZJ7mEeUYIuHgwIcjnH+aslZ6WlfV6dN3yHIPRFwJJbJkZaGL3n4XLdLiJ5xFkDE17CFoQeTF+7STOg9hde9tHvz7alxnTZwAwAb7rx5+9OInMG8Xk9Bhkv/GN75+Z8iE72VzxZUADXhZkTr0dy5de6COn5O4/fYaetE/XY5VfrJvZ90BNm5FO7R3utpzKO9xm9dzExh4oERcwcx1kQRU894HfR+ee/X0rfakxfQYAE+DnnvkGO5adeBEsdi3CRrrVy/d1sRGr9kmSrrz+YqipEIpScX0eWhHextzwBlTeouhVqO3cc+HmU4eXYjgquGOhrN8jvZfxPlLYTXoRIkQmwk0ZL8vJfTu9gySElZ6/P85bP/I1uvbW1cNLEAcAtshL3/x39JFPfTE1Li0ifBQDQsHwB2NKMdThuGEK5exchJU/EOEcvq8hBCLJTNIA6vW5EFUSkjHCSUl4iRt+bju5keVGVaQDuJDo/AUPq1khJifuu8gJcJFmy/rHi4uVUUn202WSbTqpvbi+Z739hpW/1BAHALZELQovufCDIpcgWq3CyHPDRaKFH4wpOWnMhMGO+yQCoQ03T3rz3kGqBcyT0NxYWjmAdB/pQSy6wbY/8/x+qfgk5jPNcbBrNEWH2L3WXpR/FsqzCjITRIfFdqxzLhl5/SNSDVLg4iFSQYgPYlH8rR/92kpf7NvAMACwHV560QcXx63/mCsX49P1H76Pe9d/5W0MuzYqlauashRXk3N1HLypZFGPqxal6zrC/i5U1RiVOrTe2ptmHbXLbYFmj6q1N7ysX1VVjYGqSNisBh+Gb44XLqE5+7R8vWK+aKaGbVXdvXWWlI2v34/n1ZSdzUQZRzwlEGtxxNfFuip//8PNWNwofn0+q9BcRcXueaiokgIhUg0VO2kSx+6PU1U4UVFScy0OH/4qnXanf0un3+k7Bx3JA88BgC3wkU99gT78yS+IHjCib4gOT/iPqpVregRGmEm0iINHEPcVrXIrDBRCP4aX0bb4RfiG12nE3HXLPfEIaC5mZPU/8+BhpMe3Qlr2erVOh9j8A4kmObm/8b5xteKtd34vbE+CPezE80lzFUoYEociDQfW/9UCsSzwHADYAnU4iYcmfA8Y1za3q7bpvWgFtx5A+9kb/qpt0vtWLCvSeiOL36HnjW8Rtx4I3zd6HcpDCJ6C0Kj2QG39wbPx55W2+HldXYjWf6gvuArt3vPWB5iFwtzgRi9DHpV7APpaKnUPqD1C6i20XoX33IgfgndLcnGN7q2UtPZLWF6C8hWcLOO3f+rL/5s+/eV/odPvPNx7gOcAwIZ5yYUfoI988guiJchzBLH1H3MRYUnlInj+IdZFzIpwLyJNCPtjS4+A2D7+FNi5md6D9gJ4q38uWszpfj7XIFv01OkV8LrnSVnLq7DK6tyDvK/5HETwInKxf+4NiPyHf9Qy15DPsejchszzcG+Qf1f8tf32W69f6gsOcQBgw7z4wg+InjZBA0Syk4cwKPzx85CR30cbMh4qkoaPGfximCkN9+TCQlwo4rbUmFv18oRxPL3yMbmIWuEqbjD5Om18LWMc7kE4R35f7ZAVF/L8uXOtUOE0nkTv88PPL1lWokPxnr7lw18Z/CWHOACwQWph4D1PUpFgsWyKBjzpDUNaIFhZJjBcJISHUPAiiFIjmhh5nqvgAjGfJ/WaRlj12NGfQz1kl80fI81TSO/B8k7YT/baSdxDPneU3EfZeDuTEJ553lvI/FA8F9uj5N+D+L1486VfHvwlxwhpADbIt//YbzcH42NodTy6CusqFq+uWHH/WY3kTerjo6P9cmZfPaLab2cv3rdHUxsjpn39RllzZLMejd3W4T/P6rG61j58ZPRspkZAz5JjxVHRspyuV56zv0dyZHQcpV4l6QRWQD3rfJlOgpmOGZgGZb6lOXeiyH3u/F30B79yaq/D1SOkkZAGYEO8+E/e3/6lVotkcZsaDdnXkOB0baLXOxOs26TzCdI2Yc2S1TGJSyxZ7Y8Tl3nCOlTLNch3haWY6K6YUWK5bZWMJZInrtZT2j01LVO1SeAoeHOat8efhXXCVDbXoVPM8yZZnR5r3u41Y8uy3tBNt01Cy7S2a8+PxD4WouutIL/FvCWUGnxRJGnfs7wRW/7kLf+r+3gMhJUA2AAf/uTNC3Fo4HFn1vvEib/oGKYIYQsSYYP2Awtv2KEmv8xDJCKs4ethyWkdXtLdR3X4R/zMY+4hhqNkqCP9HMvOrTpVSEgfLxdO0tOBJ7F/FfbR4TMzDMfPZ67rD5liuV7gxHeg+BOyEenzcexc5bNiz1+FEy862T+8BM8BgA3w4je9PxoJHorwBiqEhqQn4UK3U2oNgOxOSaHrqhr4RnFAG7FQVfBKmKchu25GLyKsY904pZ2LrWjma8TBcyQr4p6GGJrmqtBFtwqORzyQbGezLqyhpe8vs+QtpJ7CYnHehKTCPuF+MI+hPsDcJQ4RHygYzjHrSjh2JaoSyu1j1cGetfbYKOas47JYootO3kJPOHLnPgeD5wDAJqg9h4DVmvQ9bQxPIrZaSSaZedKZGYMkSWnWIVu4IRTBPBrRo4n13hGtYlGHTH7HhGs66MxMdouyua6psdU+z2xLeyaRbEVnutYm98q3xufzRlSkRxK9FvtlRaybrJGYD096nr7zIv/D7yf/jqTPI64jdX2OLjpxS69vPDwHANbMi970vjZIT6L16Ni6MIwsNA6VJ9EOXiNWjWub/mEQW7sxTp9BoeletWXD1BthIFg6gM6fVmgVixh8e/K+hS0axLp1HHMI3BewB7XJ/WUDXOcJ2nqay54vTno2K5SVeQV/8jFKl8b0eaYhGdRnDQhkJ82vIHoSLFMh9i+4Drr9kHxyaoOdqNbXeeGJL9ETjt7FuAB1OeitBMB6+TdnPSPUn/Q+YhvMfi+lnkiqLv2eAVGfEKFCLyXeK4f3PGL7iP1Cz6JZPGZXTyW/X+H9EWnPpK53M8gy+nOzfWZt0z2b/Lsk2G0r9R5j15h0PEt6LFVpNl2V6CMSPPDnRBnvvWXqYbmqJ/74XemJR+9qliH0VgJg/Xz4mpuFNQgx90pZCB8a0l0jRU4iegC+5VuxLkfO6NUUjJzyJvyEfE5MwxHzC+SnkVA5CeK9eVimIbbY81ShrO0txM/+h/du8q1/l8kr0OLNcMGL4CXmYZoNGYGnYGSjaPpxBGmnq3j+7MmFnlvee5NIk89vZBWOQczMWxMFymuM16T9Kx4KJPIhRruSCz/0xaI4EMJKAKyXF77pb5k2MJEIYRwtEi50cxUt/YxI8DBR7LrahjBCbIjskJPj7c+KhZp4YpqHq9pT0cnYKoTWWeOYJ6uZKAQtiInocH2VnrVVnos3/nUoyXsL1Hosix+3EJA6R9BEkVhoqWIhOWF8WTa5tfT8lPyFhyQ1q6cUcgndhbMldAjOry0HckTYqFLhIzMIxEKVav0nv/Q/6b53/ff5a0BYCYD18W1nPr2tm4ckxIdkoJqJ9igy4aaKquQYlblcyXp4fcVBX/wY9kA6PjhtESlioaXMa0aTQXAhxENhXxn20a8QXYS26tCRDzHNZkZoiYeVZmmIqTnWLH6Ot1uG0WT4Lt6zeA+t8FH6bMWzWJJowp31S26j6KXWwvCqX7t/5uuGsBIAa+NFf/y3oqUcwkBkexELXGLMF6sXrX3+zgeKuc6sJ0GsBey9CcfchugN+G6osfWsk9Rk2DzpgWQwktbRM+Ghmrag895AGyYStnPenqn3RBbnvDDec6J53LcJRLXehZvxgXRtSKYp670RJhBz75EYrXs+ilC9n8L7SXPf/ThBJtypdM+GkISPdCZbbW8XPvnF/1E8CDwHANbEt53xtLbiJFPJ/s0lJtslq1Ahea09CTK8iS5PQngD3EswvIfcVB5EymNQ3oEvK5K5fioMa4oM0brXyWnKeBTeQ5jF5Zy3YB5rpjwkdR+Yl5Q+OX5Ps0+euRn9sUJv/KMz1pl7OKIn/eTd6Fd/4m7pmcNzAGA9fPiam2SLkrckfYveLzvei0ilQNlfcghthOQ1EXGZ8C1E5kmQGPhm5yW0J6E9A9+AFlNvhBrYfsyL8Nenu8aG+kV/UDklhabSNq7yyVjvPXgnIhr4RVLaewgUl7W30AqDU2JULy/y2vwGsJPh9px5cSIc1T7LyrLV4ikPw84s6MSC/o7ZR7/mC/9sigMhIQ3AenjhG98brCn/M63CR96q5F0SS0LhRAvW/8FHHYghp3AI1u8+SV6T7zHDjV9UAj/aOr46NDM2Qoea/Pk4QyBCmbY+oRy+FS5/Fr2wrO0zplhq5LMIiLg2SR0Fg9fJw1R+ff0z98beXwT581S/wyOSwSI2ekWRqIt4zt04465TL0HQgaJrCqEliAMAa+DSa25aVCpGjen4NDMuLCZfEopg0Jnn0G5Iu8KyHk7BexFTcvichOFF+P1ZyCTNL7i2W2u8hM4YtS/k2Huzua30oqR7IoW7wwS28SCaxAK5ptsrGwA39/mKGdGMeRBeDDLeQsXEpx657GeEXQwCbGWNvT1PTmbIBSwa4jiWhBMFpJgvKOI697HHPMiJ+d70wZvoST/1A8m+EAcARuZSEVLyqEn1WCvT9iaICUVFUQu6RIKJi/cmfOu/1AWWmPXnDWUnk7DCe7A8BrUcfosX9jNhDN7RjKRKUDNNhO9VJBLPPCTUGv1qNm8EYoGaS2keRSJ4DGL2Vx6ikkIx972tuJfAvAk50tkxL4TiPeKZ/cRnSL8p/dAGPyPNeqQ0X2pXXP3Ff6YnEcQBgLXz4atvYnFoY+Qs6T/aOLFeIhSkchTemzBEIkY/lDcRSlahr36pd1M8vVYQKm/g+howo2zb8p6H0JhPXvhrn7PPXJB87yHbiFPlw0sk2uDOmJrbzavQIysknWezeBoVhXBbFUSijkZ5cXJCbMV7vV2cRj2elx32EV+IxJ7nxaIciCqIgFrphMgTXXPzPyfHIogDAONz6TWfZ3UyFz7bqyXOxBp1gY3FVclsWyTa/VkYwRKKaJNtTyIchqqkK2ycH8rIM4QVcS4inWtwQjSEXyHvhYolecObCzV576Ax3mKajTb5PIv5Ce9xBE/E192IhBcOLhK1zMzM3EPMrVTsYv3vGRthzXM68nlzL9EiJwhkrc8IjtMrVaOhPt0//sDn6dd++h5iP4gDACNz6dU32RWKsQmWUPBWXsU0QQlFa2AcKxtajzFJEYQiakRMAMdZNrhI+F3jJH+UCIU26o4JRwy7+Jfv6DBSxRLhSTco7x0II9rmB8LJzc3wT+x66qfQ8KMOKqrmFTs1GZbqJRJzP15C5h7i82AekN+XviVHgCehuEo+76R7cmLSu9Haa3y3HOntfn16JIgDACNSC0PSq8hCTIdR9iZIOA98Gghv8awkdhSKYIyDWbKnxAgtWcfESHkV9gyrpOqKVsp54dHJXGKGlZjRZSKR694aDfRM2UKekCY2iI610CuZu0jCVfX02XWrnwtH9S2as3EUoidUVYXr4O/aiGLhpECwe8FOXHaZ7SQTelJdkY0PJDax63jj+2+kX//pHxRlIA4AjIgPKXlbnCSMNX1Egpg6VHytz1HwbYZQWF1ifSuXnV980RD3brhX0QoFv0AXcyrJHE3cMIpBEtH7KRpF7l0EY70Y8OavoRnUxkdMN5PyzeW6Nl+w8GjS3knp8iIsxIWjDS6Fc/BGvgr5BykUCy+jYnkI/vBy94WFrTLfhiA4/LvBmgpaBnIztPYZ+4wR0gCMyG1+5KlZIej0JnwpqQOd5WTZ3M68WyxbZ52PNQK7So5gjIbmdcZzrMQ56RHY7DMfpaxGSodj+HCQLy9GPPP5k4yR1tmR0KVt6chrcU/FufkQnLoedv1mE4Dfl/Z+5L5BOvwjnkruC8PDmf6TYfV//WfvSU/+mXv6c8cIaQBGJbR2yc4oCG8iLUO69Z4VCzn9swg7hVPo9ij4uIYY/WBGyBsu3rvKGz82hoMnOLOegZVnIB16sXLUbP7sioSnsZiodR5a/F4gpFcwiz2NKqNLLDPiLvEsYjK8DjfNmAgKr6a91uY4LEHtuKDw+yIeZSW/MyFxrnHprQlfARmGVAdQ3ykzY52shjgAMBK/+4b3LCoKf+dlkfBLZY8iM+WyMB7qPQGVNAJZoZBzyLVC0Z6TPx/HyvtjJol1ngchWbcO0esWrNiLj3iuQpdSx3sEtYn20CJnXVp9EjmMjQiG29tuO6zUTyQWQjGf+TfKsYsLIST+AgyWnwhvqXPh3GPeJJwcEw5+l5R7WJwGPO6f3mf9BUpl4vXv+yw9+WfvGZYhDgCMhhrSxBOCwu7nxKJHIjvs5JhxpqWFIkSV2SjpRfXao6jk3E08fs6vgyVbG0PIxgLEBLPlSVBMILNrJB+mUeMPZKu8YtsW62f1zK4z1vqnKCKhPDEBcaqbbGqTF8z5OWpxq8S6MJ5g/i0RXor3XCertceljtE7AaCFxZGdPChXCHEAYFR0i6yKf+NhlUwQc7hQkAjrZ8Si2D1WhRqYUCzOqRLugyMyktisSyzzJkIiW9mhStmbcF7h5fe+1d+Oh7AS0sLw84Q0hVY59yaEB9Aa/Wba7PlMtv5dmoRehJz8rVMT+pEXEtYryvnQFe++ysc38N+qmyvx7f5eDhEI2xMNES5938PnkrshN1x98zfpfne/XfMZ4gDASBx//eQC4lsAACAASURBVN8sKhJ/u04IBSUGtMOr4N6HIhGOrFDwsILlTThh3WNupBLn572J4NhwDyUcQuUq5EW09URvQre4Q8iIG34mFjJ8kz63cFqtJ7KYXTWGq/QrRn3PpiAETuYqFqv9LK6LnlKt9LQt8jaUFabiUM9WeBMsxia8Jt6byckrcdIb498FFVg06Odq8D5JV90EcQBgfei/yfA3nHoVNFAsREmet9ChqJJQmK17YufiBYSHnOKJOiYG/LrYoYJXkpgnFpJKwiutSLnKpTkFVk7kHFRoyIn3MCzObe7n55vNEjFYzAwbw0mVuLS5qHuhAnOac88jiBoPXZHMOVTaQ+DPysoRkLnsn0u8MiuXsCStonKhgDgAMBrONuYll76K7UCPjDrldrY8DJUjkBuFUCS1BMO8KMnHNpjeRPaKuNGzvBvpXfgxEbyzTZXoF5/8KAqWCAmJPIGflnvR0vezss7n8ygcwuZHEZC5iFnbwJfTbvDpOEQvqvZcE++GjcL2N0W+AY9dJ6lcjBAK+/tlNh/0YD3zWZWBOAAwAsff0IaU8m6DTYgixP2EWGhHQpVKNxbmVyIjxMP35LaXYrybJ7FdVqzUZYhIlxQUOWC4FaVwYG5wrdh9FepPQkLEDDhv2c9jrmIxDx8rn/R24rmIeZi6g4+orifwm/l6xPnqc9WDBPUjtAbAWQIgQ026k6vlnTV1W4+qrO30uvdcT095yL2bzxAHAEbC/lvsKRZJDEGLRWb/JAoljUsqFPlzCPMmVSRHS0vVKF4J6w0bSlVKyKQ+cWvVto/9fEq+22c7AtknlWN8Xod8vFfgWBKZz8XkxDsaooDMKMXvR9E1YWGr+g3VYoAbfyDGOhdmvu0XQuKeQkxJdIwoTx5GYV2HSBDEAYCRcLZdSKWh9BcZvQVrtb2RZHiCT12tvIZ+yW2WlqjshHJai9y5EuudIRgU4uxB3dRModH4S48hvqhIpRwa5m3x2SJUNOOGP4Zs5rVHMJux85zLcBLr1RSnxlDH8e+I0GMadA8r4RXoa6MkvFSFXIK+aXHZJ8FNWM+lYlQpRrhCyFADcQBgBC69+sZFJTlXnvKbY7HMzp16YoWK9MuAsjsv9mHCkYxrSHazwx7+VMKSnNWPHVGLhjeiTB6cE72T4kt6SHRZlSEiWkyVTe2Lf5rK5obxXkywR2o0NbGQEj+HZGyEU++oDhfJxcyHjUh6QEl5fR/jdu9zacGoWoFIui5X/P4Xvmz5KGOzz5Wf/0bzEeIAwAicvOpGoxLDEyhEA4a0z7NeBknBSHsW8b3tvIUcAGeccJcn4ccxuNQEOiYa8sX73qrFgEpuvIB+p7R4rWiQpvrlPjHMJKfPbutuNCANKTW5DB5OMsJXbj4XXWRJhL34uRIz6m3ortLhJRc8qSACfCwJj8cpDyQE7awwUe571xFOugriAMC6MeJDPVpzOXKp5EQ0hFHoITlJyz4apWXm5dQBES4acuZX1sIOg/DiXs4baMv4UhVfLepHN894r6P4TmkxlTYz8q7pvUSm0CwOPZOaEPR4kQifz7l3kw5+8x5DMPpaoLiXoT97QXG+E4AVhvI5IuN7lUajeuMfAcQBgI1RSCZ0/fH29jhYiCcsFnauMpLjqo78SL5arSdx4jlnCoUQIBHKitt9HY731nHfavMLpN4VTTG0FK6qEh9D7oL1XgrC4rvAmuMcVPhpRukx+HQVYnR2DAnpcRJpw9+y7taUI6noRA+EWA+B8mPTRyOIAwDbZIAi9AxNWcVTL6OPKDnLrsgTsKNS8XWk3g9hxt/OZziZLA/OhQtxe9mNlbXyGwPOQ0O1SLThpJmRbxCD69hcSWHMhG/9z4UnkeQdaMYESb3wJ1y6juVUythr8XLh3mSn1DBzFo7lX0RgzsxtdOepF/9CHABYA/plYcsxMEHdWzQKYpEWNjbLDenpRGMvbaQcgyHqc+rceO+lsE9FsdaKGdd5styYy7nsTbRoaEuRCNNlzHyES4qB2c21qci/jnSmWvDxlUfsqoP5diI0tDhvv+ui7mjU9USF2rvgy8kA7OyXJPtQYwmElQAYj1JoPg2zrHLYcUNTWizSXQwxkjGrwim6+Na01pQxnViU4GLRfnbEBcGP52JTXIdW/lyFd6IXUbW5ATKMtHnC89aAi9zDLBwjeWucf9fcnMSYjHCtbABfeB+1zjvwEJFu4YttxLYX8hTJO6tzzykNYsnnAs8BgBHpn/HjPVgShq0ecNyMx9EhVL71XpVEyEx62lNuyDEPcYqH1EvQwtHO+zObSZEJryT1yyrMxLuvGpP1ccHgM05IcWE/Se6B2vEU/B0NOpTj1PG5Idfl/PEL05sXwkvUjoEY5Fzy8i6eBsQBgK1QanWnf8JW/H+YAzIwRKUOYL+eUuYe0lIqPFR5sYgLdhdWv6NxcvPFTKt6iguRJG5nY63YrK4kxhn4Cfd076HClEQ6ZRBPaJHjIJ0bUQLQ9jqqtEgJ8UpiQ+Z5JVrsx4SweyxL6kelLlAtfuLGf2h+QxwAWJHjr//rkW+hYZ30H3yHXbcwJKdcWge4kz1d2OTSjelCa70Wv6Io6DBS14RxMZk9T6bg9p5DGt9X5yla4jOxjU/tFIrmRhI3Rn+u5rByBQFgx9Uzzvrjh7viz9sPegtnI/IQ1L5Zrk2aiO+I9Ri6GhVX3PD15jfEAYCdgodfdBuy/GevnZIepXvt7PIf1LY2ZuHnShoiCMnpcYGoWLdVEl1Q+VQTceoNOVq5amZKmsn7oSNDSlx4KqWZtbXZ34WXEC3eJe2FxU/pnZHj3Pu0DY+gaqc0544KMV3gaQ9y6SR9lDsHA4gDADuL0Yztghn5fFfVBXmzYrktzl6ymtvesC8xwC6pp/6ZxQFvQRRqYy28Azvn4OERfjLzD4X1jSDMVY8kNrCbt/X9CO8gJOqFfCF3ET8Tm+7bGSJh3Xfmc/S6ldZIeIgDAAcH9z400Ujk8xy2wSl5EGnhFYWBE/IQ/KU98+AdBH1qhCL2ZpJnmIbIsgKR+VwkjWmxe0GiZ5Kus7Tsn0ccbe5/yb1S2y9XWCPhIQ4AAIbOEZAUjHbRDGebQXlecERBMOp2yXgHHduvkt5M0YQ6ZVzb7VlPQbXilSEWY/dM70HmFrTHEUao8+P7PDc/B3UbLCEhfusrq1RaB2UmMgcADME5+2ed5I7pMr18VsLJH38Yb3TCMTPHXcs52cdpwkxuTvM6zDN3zfxHzneDZdsXP479zNuxDrps5jPFa/Z1kVX33IllMuoM28W5yvOT5dNlfz7i3NR2f23O/L7En6f9wv2a2wnPAYB14VQbbljfU8kSCdtOlh6NVwpLDTj+OvDGL8x8KpPVMZwUW89hXeVIjZsrXL9sV+susKaXYHbrsmZnrZLWv71sh6LM3qzi3FgYitLt3guCOACwEVQMoMswd4VoxsAy4KsM396WIGTwb7ar+CtYXUzVUmKrXTmMRH59as4dE5pcqCcNHdlGPb5Hgh2Xl6/kvTbDYL43q/FItLCQ1sN2H4gDACty7I/+angF1uRLUzCuuXMoicbERIHTGG3RkUnmJaLX4LuklvMMVJBsmUvoiOw7bZFZPZn9wzI3/gWhKZ0rZcvFWiAOAGybCRvXwC6cY5aYLg7jz5yaZqMZ6LwYVEdmmMaFN8SJbX7ks8u+x08lpfWgvNhV1SlZiG+/cyrUpMNRA3pNUewyK2fGpaCAmHgPALD/iEFlekyBky3tRi9cKgohDyDb11QKIVUxrGW7CN35An98P7Gf38+/WEiGvOIIOH7epI+emx6E9YaC5wAAOByCreTTgxvJWz+SOcT1K2ZkZds9jihgI6KNLqY619AVnkpIQlC2sOhlIWCFOFPs7sqHWEMcAFgJ+93RYEo43gpXXXSc0wbWsd9VCN7YHoJL8gxpGYuM18Dn3kuEpj13NsJajoGwvIlUFKp0RdKB6gH3un3zEeIAwApcCnGYPo4nG/wsGk7MuxTDKS6IiItxlnQwWbNunrwfIptMNsI51qSAZojJz9fE/RWWic56DyxR7XFkFYyLNWdAHAAAh0Gha5AiTiGepoAX3WJjeT/lhMwzLLrO+ohUnHzWte+lTg10eaQzy3YkXWrb82BGvji1tz5A23ErlqtE31eIAwBg74nOgw/4R6voJ7pr/AX/7gc1i+qiaCa8ZEyREVr7IRfRvpfah6rC+6Zj91lqyzU9l8J7KOz5ndozD2+bSyYOLOY02lld2/xCkLjK0Zn3ukMoBXEAYAWQc9gl2oCRCC0ZM5K2IiLys+0/5oAzjhpzYIeZXPBCwjFahRFJ7bYA63naHli8DiOGzIzxDhR3ibmLtsLg+bBJm86AOAAwDhCHPcK32NmIhDr0Us3aRHCSf+AGvYqD6Hw2QRh/iuMZmKpYo6uTvAMPG/lj++3Brvtke1tfrleUFyIyRIdkUgXiAADYc3iioBRaYglrlqbwA+assE6UkrS7qiMKYxSqyouPMtps3EXOi+DCIJcr0qMyYmUkJMaxCkIISiW1dVoG4gDAkhxfZtoMsGV0aIkJQ4M09f7tcY5SgahYf6OYkI5XZ62vVMveCYGx52gK3Wm5ca/8uUX3IYTInBOCEOSrFQz/no6Kzbux2FTRMx91Zjh/iAMA4ICJLkL0HnxCONpULyJkJXuNLqE8XxDsN/FxDBUTBie8gmS8Q+ZQaRdW7kk4JitsB7I9F907iyAOACwP8g07Sia0RFwq2JxJPEsseg6J8BGxcRNxpT9UyEbwOvgMqqpHkvUCIdbLtjBbKwkvKCbco8rE6bpbz6Ot5IxT7iieJ8QBgCWBOOwuOni0QDXZjfCSFxVr9tUYPooiYHkEcXs7nbjj3oNPWltjF3z5gjAk3gRfVuKlxjacCXEAYCxkL3iwY4iks5ifTz5RtWJRNrbKuXeQEwhRjTHlRtwvHszqmeSYKvhSwcMhJ7u/6gR20vU2ik3NWfe+k3h+eE0oAEuAZPS+wFrRLnwIv/3YAGpT2SSKsFd2xqZ46DXkWL2O1eecb/07Vk+sX76ONJ6PeMUn2zfsQ+r1oL6M8apTf7LxVaPwHABYA0lbE+wAoScS79HTEnMPVnLaG2sVPiI2MlqMc/BJbpXqcNKLIB2e6pguQ/SCYl1gycXz8NkOGYLi4ywWO5+lhIHgOQCwHCev+pzaz+FO7jKG9yCfKBuS7OTqsJ/xsn/eOvct/MSLEF6J8ghIno/2JPxJxH1c3Nd7D77u4CXMo/fR1nPmKTKkRPAcAFgOOxkND2I3kaMNeJdW4l1bjeR0sl/wIHTr3J6Om3jvpLbVb3ZXFV5HO++SmY+IVGznMLaCYjdaYt/WswxxgOcAwEDKvZTgQewcwiOIrXESnoTcbLb0w3qn9svkFoRX4EQugpLyTnkddj7C1yHzCTEf4ZhHwT2ds06F5wDAynS/wwEexC7CnxrvvdSuie14V7H8Q7qZ/FQZpGL9JAfAcXg+Ic7mGsdYLPb1ye/Ym4l3YV2srIK4VNFVkF1hyYvWov5nnfMg82nBcwBgICev/BwchL1BJRCK3gPrvaS8jaRXky+vvAHZkud7Si9CexzBi1A9lHxvJO9JhN5IzBtJvQkS13H2qXc2HybEAYCBhLBSUSCgHrtAeEq6JyrJGD4vlwiBCC9Zj94OF+n1OmwUu6xy0WKhJnJCTGQ3ViYUREEooqjFczgL4gDA6iTjGyAQO4BM3jILb6C8gOyYh9zjtTwB6hYIfRw9xoFYHiPsI/cXoSqesHb8ymU9z3qsHVIiiAMAw2hCShoIxPQpPAY5gI2SJDMfFCd+JwY/Ndh+ZRQIZwuEJURq0Jwvk4aa0gRzOBntRagE9lmn3iV7XyAOAAwg21MJAjEd9JvdcnQ9Fq0ZZniJr/eGl7IG3w4b5ctzz4EcFxU5WjrnSYQ6jOWzT7sLnX2aHVIiiAMA/Tn+R39ZLguB2D5ZYXDKoDu11VACtiKZWoPYb6d+Fww+CYFQg+f4oDnhZTAPgJQHYCSt/WefhxDXxkQql4j2QBwAGIQrG3oIxPbo6zH0JNp3KQi53ktxLiPqFAj+uZiHUInqNOHs9+NjKXTSmsxw0++ce6R4IyAOAPTk2Ou45wCB2D2Me599HOmGzt5L3jhTt0BEu14QCOHRxKkwusJNJASGgkfCcxJ1SKkLiAMAPchPl5EBArFZBuQZcqGl8nMpeQ3p+Ad+DOks8HAU9wi858HCQ8xTiGEilY/Q4SYj1MQOEeo575ePdt4qiAMAPbg0mWjPs6xAgNFYNZyk0w3sg4gqhdVaINIQEyUhJiYXahIklolg9Tth5J0RGkrCTSyHkXgRzJNYJKK7PYfK6TMFAKR/KKf/atef0sBNmF5jNAaLQxUnoWPLFN66zB9PFSbOE3vw5aqKE1qEqqqwD9+f7xde51mxl/sYn+N+fF9+fHHmrA51Xe3nv/79J9EDT79r+Q5VVQXPAYAO1vM6ULTJRmGsJHTwHrQbYSWmZf4hTUyT9CBk0WyS2vYCKPFCQjGjF5KsLx0hffZpd+0UBg/EAYAOjr/uL3rYcpc3+IVNYAWWFoZyt9b04fGPaW8j/7mUg9CG3RSIrIH3n9Kuqs6xL5c5tkEkHOj8x/9477sEcQCgQP1Sn8WoaKeaizmG5CCgGCuxtoh4mqiW+YgkS2BWIb2JskDo6TYcWQJBLP9AQSRsL0LnJhY79fUaCOIAQJlLr1Qhpd4CUfAiwATQBp5NUZF5Vtajc6b3QKr+1Asgkl1WSRh4FWbi++r9mWcSB9JRXGbndv7jf2LQbUdCGoAC1WlPtDf2DmkY5ZJVSE6vxNLhpXximjLJaYr530xyuErqkwlqShLMOrlcsbrioXitqi51PuKYbNu//P1L+98ZJKQByNPkGnL0blMZ5dAcmy7i2RRciSRE5NcXvAcVGpLJZp1HMPIGcW9ZF5GRi5Dn/96X//rgWw7PAYAM1WlPaDeUuqkOabVW5sfOY4Aet3aZ+6db2qRa25b3QGZrPWnds26oqQNS5euxurqS8khKXoTycupfD7rP3eg9L39yz3sSzh+eAwAW8m1vpRzCkm0rNMkminwwuQn5HCnvgYzt/pNTZVSrv5yo9kVVTybHaigkq+v/z/+Vn1zqVkMcADAIISUrzKBZJcTUaxvovrWr3b9yRzI7vJTuk0tOqySzERbKJ6ozPZlICoT1tria5zzhJ+nH7vP9A+5EBOIAgKL2Gk5eeUNc2Vcghton6MGWsb0Cvd4Z68yWvq5sKYHgRTM9mZLpu1ktrM4Hnv799Own/NTStxjiAIAizqOkEpBWYlLQRyCgCGtjKe+h8CxzS/p7kAkL+RWJQCSjqHvUxRPVcSOrx3+KgvGcJy4vDISENAAp1am/otZVhcVMIrSYIF2iPtCPZRPTVt45SU6n63rNvUS6i6ua/0hUKxPMdl1iJiUzWf2g+96N/vYVT+17AxKQkAZAcfy1f27cEisbmdkWVi8RZgKrs6z3kIswyVLGQppUpr4eRNg7Hxqy62JhJla3o/i9W0UYPBAHAFrqXMOxWhxMA7OEQAxeX9oHbJ6O70EhqUy9BIL/0gnmQpKabIHwJd73ytWFgSAOAESE15AViIF5iD4tWejBBCh4epYe5IrpNkRRILTHMiBJTbZAPPeJP00/dt+7jXI7IQ4ANF7DDXTyys/KW5E17Dkvwtnmw6wGirC75D2K4SGmvgLBPAgxE2tMVD/ovnen5/7qz4x2VyEOANRew2u812A0/bLGva8XUarD2gXCsU3k3e94FsXnNkQg8r2YrOkyUgFy9L5X/eaodw3iAA6ehddwAzPwlnEveRF2HDotl9sfTIMlQ0uWI2k5kMlXQuUguPehzsWIKAnBef+r/+PodxBdWcHBU9373PYWWHMfWbOq5rpL2rN4du+bm3MJ3VqXYqW3w+mZWsl4rqpbqyqWm72VrG6pVOrmGs8n1px2df3Aa36rCSmNCbqygoPn+Gv+G7sFfTyAHrmIwfvCqxiVldq7+i1xZDzXkAFIdk0KqmX78fcYSR1OQYaYHvTDdx9dGDzwHMBBU93rcUnrbEEPL4CsVmof78M6HpktVHgPS7IB7yFusTyILu/BqEx7EKTeByF+VY0wfOA1Txt4bf2A5wAOmqNPeFF7+VZOoYcXQGYg2fjYN//QbzPYDF3eQ/aBWQkC5T0kCWoq5yCswXLrEgYPxAEcJE0S+oqurqvMIOSyjKX9SnSFl7pECayRjt5lZjTJfp6lnk+mQGQOqdd98DVPX/sXAOIADpLjr353e9lG11W5Qn3MCURmxSj5BwjE5OgSCKvrqfH96dWDSXyVHH3wtU9vQkrrBuIADo7aY2i8hpzhNgWC/4U6w2AXDHjJtpcEApqwddJHkO/Tmvcg9FdNC4T6PhUEYlPCQEhIg0Ok+qFz2qvuSDp3Jpv7dFVdsXtrV0Ic2KyUkGb3PJuHtrsfJ11cs91b01orfc4qQf13r/tP9KAf/oHhl7EESEiDg+Po43+XXXJH6CcZHd3Dg1gmsd3Le0AbbitknbiSh5DPHTljXVjS3wPmQWxSGDwQB3AwHH/1n7XhJP5H2GWE+/Rk6slggQDbpeczMcNL1opugdDLD/7hu9MHtyAMhLASOBRqUTj6+OPJC1jYgvGxZ5jJKt9Z1qh/6DFAmVFCS9QvvNQ1/sF47rkQkx9F/eD7/QD93euesfLZLwPCSuBgOP6qP20vVSb+2ELPMFPJ61Bl5Yp82T4gvDScMdu9XeElyxksJK/T9bFAfdrbFAYPxAHsPUd/+Xi+d5KZVxgSAtI5iFy5ZerOlAH9GUUgVqkjn0/K1frg+91j68JAEAew7yy6rX4megamYS54BNnEs7HQSyA0MP5rZywPosv5M72H8oLOP9TC8KE/2r4wEHIOYN+p7vHIjjj+uvIKpXqX6d6K3MPKrJyDGN61NS52dG8log+9/pmNOEyBOudwm0mcCQBr4OgvH1tU2rR/+Exq7XLzy8k/3LqsMCK8LFsulU0+awp1ToFK3Y99IXleQ6k9zEo+OuvZ669Us2g9Y9cmnu/RCMPUQFgJ7CXHX/UuOvmJ69mllZLJKmyUGyGdy1losrmNAYZ22YkAV8UYiDVer58JsCmx6xGFrLngyT83SWEghJXAPnLyE5+ho+dekAnB6LmYS+GaAWX7ho2GhJc2HVrqIwL7Yi5GmNKbBoaXSHVv/fs3/OfJhJE0dVgJ4gD2ioUwvKC9pPStWYGljfQIeYVRBcLYZyjLGMp9MBtbEIiq6Y30g40wTBmMcwB7hRQGKvROKnVHHVK2FI7qOwaiowtMr/ESKxjqZQ3kquEmv/8+hawC+fENL/iNh05eGDxISIO94fgrL7GTz8438UrJZ290/b5mVlEumDlGXWcm8S136pnILuy2TFJ7DMNc19HHiygdq28dY7NSgrqUnKYkQX3k/vegC37joZMNI1kgrAT2gqOPe37jOQiWCgcVylrlOsNGhXKi7JLhpdI+JdbRYuemZGj92zJDq4aWyEhNse27KAqEnAPYF44+9vl08grfM2mMPACtbviXEpwhAqbrMdblmGIoZyfFgbK5hyP3/8GdFAUPxAHsPEcf+7zoMayafN6EQOhyKw3Q08cz1nXuPxGs0eWbYAxxUL9qUah/dhkMggM7zfFXvpONZSgMKsvmAVRZ307iZa0chBWr7jtITtdXHHTXNUDPuNbsujEGga2RaldnEon3+tgeiAIHngPYSWpROHrOc1eY7mJIjL+PZ7DMccfwRnLHTxaMXSYmFNvwHka4B8ee8vN7JQqEsBLYVYIweFYViL5lxxSIZUUkKVe6FmPfHFMQih0KLdU5BZ9X2EcgDmDnWAjDc3oYzIG5hV5l91wgsvVuiHVPDZJjwDXXXkKdZK6FYZ+BOICd4uTlrTD0CgVR2VAn5TchEFZCWp+XMWVH7+u1ymTWd7ENkZioOHgPYd8FgQNxADvDycuvU6Gk5EO7vmAwO1vgGaO+VD6gT25hxfyDWbbjWpZlU2IxkbzDvoeNuoA4gJ3g+CveQcf+8O3sVHsYvrHftbCsQIxShtfV51o7rmVZNiEQWxIHLwaHEDLqA8QBTJ46jFR7DSmrCgSVjToZQjI4HzBAkHqXMcolZa1zzOw3lHULxAZDS3X+oOaC9jeIQBzApDn6mGerdzJoNuVBrDt0tKKImGWtugv7DmGdAjGyOHiPwAMh6AfEAUyWRhi4x7B06MSa+GZdAsGXl6hnkEdjnHtSfsB+Q1mXQHSIw7Eexv3BShDAcCAOYJIkwsBZ1vgtneTdsED0KSNOd5lwWma/oYwkEMLgu7p1f5hJ4CkBcQCToumR9Jjzuw3X0q3j0pvdNhRiSs6vZ9fVqQqEeawUHt451B5AuwTEAUyGKAycoSLR0wCuFO+nFQRiRJFJTrd07rl9zBXLoY4Xkr0Qgp0E4gAmQSMMj2bCMMSAjS4QVDbKy5SZTP4hJxDZlb1ovIIfuSe6ge4REAewdWpRMPMLYwhEslvO0FLeaCdlhwjEOkVGn3PXeVvHK2zrIAwSQ++fvQTiALbGwls4rz18yfB3rmjL9clDGBWubWbVVQVimfDSAO8hu0v+WTTzCqEn0EEAcQBb4fgfXkzHXn6xcei+IrGEQFAfo089jTKtz4MYq6dU9rytMvntEITDBOIANkrtLRx/+cV08vJrC4dd0YtY9n0HYw1K21YIioYIRFkcjtz/nk24CIJwuEAcwMaQYaQuNhVmWsIzSMpuSSBWzj+kAnHsKQ9DDgE0QBzARlgknUvegsUQgcis7BVm6puDyJVb0vjrOvRxlp29tdd1RRov4akPg5cABBAHsFb6hZFKrEsgaIAhHXF67q78wgbzD8ee+jB68P3vCVEAJhAHsDaW8xYs1uxBrBJiWscAuN7Gf7nw0rHffDhd8JSHEQAlIA5gdPI9kVZhzR5EX8NPfY17nzKrCggNTxRvAAAADI9JREFUEohjT314Ez4CoA8QBzAawxLOy1AQCE6VXViQ8yLG9CBWCg+N4WHEMgtReHhyxQCUgDiAlVk9rzCEiQrE2gbILZ/jOPIjP0Qn/kTPVQVAPyAOYCXGyysMYdsCsWToR5RZUkB0HYZI1XMcXfDUX2h+A7AsEAewFOvJKwwhJxD+q6xj7slCu2pAMneMuZFoiEAME5DaU7jgNyEKYBwgDmAQtZcgZk+dNDqJTBsWiEw9q3Zv1ceoiE5c+JxGHAAYC4gD6EWdUzj28rfJoiO9BWz99PAi+grE4PwDL7Nq/iE9RpNXuOi5m7qR4ICAOIAstZdw6WXXpaLA2XeBsMovO3J55AT1iTc/D94CWBsQB5BQi0LT++iyAYnmnRCJQriIVkxQr5zE7r/9yI/ei05c9LzsVQIwBhAHEDBDR0OZvEgMFYiRE9SkBGJgfuHEW54PbwFsBIjDgdMrdLQMkxaJVQSij+HvKLdEeKnxFt78/O5LA2AkIA4HymLQ2nVt6Ghdj9/qLbQhnH0aYsXQ8BJtRyBOvOUFjTgAsEkgDgdCLQSXXnZtYWzCOr4CPRVhVeHoc+qjCwRfHlsgqpBbuOC3HglhAFsB4rDHdAuCZqyvwYhuglXVsqdp9jwqHKj0cpyiQFCv/EGpjiM/em868dYLytcDwBqBOOwZx1shWH708qpfhQnnGoZ6D9QnQU0ZgciEoahbII497ZGNxwDANqm14TZ4AruJ9wxoJTHQVGM1zaeHG+MU20qsuuo2VjD8vFzuwI7IybEUtbdQew0ATAF4DjvC6l7BEIZ8JabefZXR6T0kCyu+KKgrkb34feSMe9MFT3sUhAFMBoSVJsZxZfi3O7ld36/FDokDrSu8VBKUcv7hyANOoRNvO97//AHYAAgrrRlt7DmxK+lU6Qox7ZgoeApRnsX6PvEnHV7q2CdT7tjTH914DABMEXgOA+DGfrut+k2jvyI7KgyeCYSXTlz8QjryAISRwDRBWCmDF4Hpt+43iXpXwq4zSnhJ79cvvHTi4hdBGMCkQVipxff8gRiU2BNRyNIjVCR6JIWVPXomxaIn3g6PAewGB+s5yCkkwEFi2vEVPIiO8NKJt7+oSUADMHUOznNYzDx6SLkCsDSDPYhMXrotC2EAu8bei0PtHQx+PwE4DMwokGnhewgELyPLQxjALrK34gAvASyPNRK6p0CEUc+L8ife8WIIA9hJ9koc4CWA0ekSCIu2GIQB7DJ7IQ7wEsDWyISXTrz9JRAGsNPstDjAUwCTQAlE4zGcAWEAu81OigNEAYxGNlLENvQJLfleSe94CR0541Q8H7Dz7Jw4IIQEpgqEAewTOyMOEAUwZWpRgDCAfWLy4lCHkI4+6rwJnAk4PPqFlmpROPHOl+L7AfaKSU+fcfTR5yOvANZPsXdqZX7k29wtf4OHBPaKevqM2RQvqPEWIAxgErC2U9KMcvAYwN4yubASwkhgetjhpWPPeBzyDGBvmVRYCd4C2Di9ZyKXBY+cWecZXobnBfaSyYSVEEYCW2HQKypiG2qRgIYwgP1m62EldFEFW2GpdxctYkoXPPNxeGZg79mqOMBbAFthhZfanbjkZcgzgINga2ElCAPYNY49EwlocDhsXByQXwBbZUmv4cgZp9EFz0A4CRwOG+2thG6qYKusEE5yX34vnh04GDbaWwnCAHaVE5f8Hp4dODg2Ig4QBrCr1OEk5BnAIbL2sBKEAUyKgaElhJPAIbL2sBKEAUyOAU0hhJPAIbM2cYAwgMnSQyAQTgKHzlrCShAGsBMUQkwIJ4FDZm1hpeOYDgPsMMcwPQYA43sOGOAGdgrDe4DXAA6d0T2HOpwEYQA7hWoaIQkNwILRxAF5BrCztAKBJDQAkdHEAXkGsNM4wlTcADBGEQfkGcCuc+RMeA0AcFYWh9pjgDCAXQdeAwCSlcShzjPgLW5g14HXAEDKSl1Zqzs9BLcU7Dwn3vV7EAcAGCt1Za3zDADsOvAaALBZShwwngHsC8g1AGCzlDig2yrYB+A1AJBnsDigdxLYF+A1AJBncEIaSWiwD9Rew4lLXoZnCYDB4IQ0ktBgX4DXAECZ3uKAJDTYF5BrAKCb3uKAJDTYFyAMAHTTK+dQCwNGQoN9wd2K9zUAUKJ3zgHCAPYFvOUNgH50igPCSWCfePCZp+F5AtCDzrASuq6CfQIhJQC66QwrwWsA+wRCSgD0pygOyDWAfQIhJQD6kxWHelwDAPsCxjYAMIysOCCkBPYJCAMAwzAT0rXXcPRR5+FWgr0BiWgA+pNNSF+KaTLAHnEEuQYABmOKAxLRYJ9ASAmA4STigFwD2DcwAysAw0nEAb2UwD6BkBIAy5GKA/INYI9ASAmA5RDigJAS2DcQUgJgOYQ4IKQEAACAEnFASAnsEZhLCYDlCeIArwEAAIAniAMGvoF9A/kGAJYnTJ+B9zaAfQNTZgCwHL1fEwrAroF8AwCr0YgDurACAADgwHMAewle7APAajQ5B+QbwL6BfAMAy4OcA9hLMJ8SAKszQ74B7BuYTwmA1YHnAAAAIAHiAPYOJKMBWJ2K7vgfkndIA7DLIBkNwGogIQ0AAMAE4gAAACAB4gD2CkybAcA4QBwAAAAkQBwAAAAkQBzAXoFurACMA8QB7BUYHQ3AOEAcAAAAJEAcAAAAJEAcwN6A2VgBGA+IA9gbkG8AYDwgDgAAABIgDgAAABIgDgAAABIgDgAAABIgDgAAABIgDgAAABIgDmBvwLxKAIwHxAHsDRjnAMB4QBwAAAAkQBwAAAAkQBwAAAAkQBwAAAAkQBwAAAAkQBwAAAAkQBzAXoB3OQAwLhAHsBdgjAMA4wJxAAAAkABxAAAAkABxAAAAkDBDIg/sAxc883F4jgCMyAyJPAAAABqElQAAACRAHMDOcwwhJQBGZ4ZYLQAAAA08B7Dz4A1wAIxPIw5wy8Eug04VAIxPIw5oeYFdBV2xAVgPjTig5QV2FXx3AVgPIeeAFhjYReD1ArAeojigBQZ2EHxvAVgPQRzQpRXsGuhIAcD6QFdWsLMgpATA+hDigJYY2CUQUgJgfQhxQEsM7ApoyACwXoQ4oCUGAACArJwDWmRgF0AHCgDWSyIOCC2BqYMxOQCsn0QcEFoCUwdeAwDrx+zKitASmDJowACwfkxxQMsMTBU0XADYDNlBcIjrgimChgsAmyErDvgjBFMDXgMAmyPvOZxxKrwHMCnQkw6AzVGcWwneA5gKdUMFiWgANkdRHOA9gKmAhgoAm6VzVlb8UYJtA68BgM3TKQ7wHsC2QQMFgM3T630O+OME2wJeAwDboZc41H+c6EYItgEaJgBsh8o55/oeubrTQ/CYwMaoGyQQBwA2T1UzRBxOXn4dHX3UeXhUYCO4W9+LGw3AFqi1YdA7pJGcBpsCYUwAtssgcSDEgMEGqBsg+J4BsF0GiwOS02DdQBgA2D6Dcg4cJKfBOkASGoDtMzjnwDnxrt/DIwSjgnASANNhaXFAchqMDYQBgOmwtDjUnLjkZXiUYBTqcBJGQgMwHVYSB0J4CYwAwkkATI+lE9IcDI4Dq4DBbgBMi5US0hzkH8CywPMEYJqMIg7U5h8gEGAItTAgzwDANBlNHAgJajAAJKABmDajigMhTAB6gAQ0ANNndHGoW4MQCJCjFgZ4mABMn9HFgTD/EigAYQBgN1iLOFA72hUJasCBRwnA7rA2cSD0YAIM9EwCYLdYqzgQBAJAGADYSdYuDgSBOGggDADsJhsRB4JAHBz1s66nxYAwALCbbEwcqBUI9GLaf9BdFYDdZ5SJ94aCifr2FwgDALvPaBPvDQUD5fYTCAMA+8NWxIEgEHtHHS6EMACwP2wlrKQ5+ujz6eRl1+JrtaOgRxIA+8XWwkoaJKp3E/RIAmB/mYTn4KkT1cdffjG8iB2gFnPMrArAflJ7DpMSBw/CTNMGYSQA9pvJigOhu+skQW8kAA6DyeQcLOqWaRPPxqjqSYDeSAAcFpP1HDh1HuLYyy+ezgkdEMgtAHB4TDqsZIFcxObwr/JEbgGAw2PnxIHQo2kjIOEMwGGzk+LggUiMD0JIAADadXHwNAJx+XUQiRWAKAAAOHshDh54EsOBKAAALPZKHDwQiTJINAMAuthLcfDUInHpZdeiC2xL7SU8+MzTIAoAgE72Whw4h5qXONKKAUJHAIAhHIw4cPZdKCAIAIBVOUhx4BxvQ067HnpCyAgAMCYHLw4an6egiQuG9w4gCACAdQBx6ME2BeMIM/4QAgDApoA4LMnxgkj0zWfk3nwHEQAAbJuqqqr/D8JIdVur6JqXAAAAAElFTkSuQmCC"
- />
- </defs>
-</svg>
diff --git a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.spec.ts
deleted file mode 100644
index f74352690d..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdminLogoIconComponent } from './admin-logo-icon.component';
-
-describe('AdminLogoIconComponent', () => {
- let component: AdminLogoIconComponent;
- let fixture: ComponentFixture<AdminLogoIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [AdminLogoIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(AdminLogoIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.ts
deleted file mode 100644
index f720e90426..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'ods-admin-logo-icon',
- standalone: true,
- imports: [CommonModule],
- templateUrl: `./admin-logo-icon.component.html`,
-})
-export class AdminLogoIconComponent {}
diff --git a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.stories.ts
deleted file mode 100644
index a61b68feb7..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/admin-logo-icon/admin-logo-icon.stories.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { AdminLogoIconComponent } from './admin-logo-icon.component';
-
-const meta: Meta<AdminLogoIconComponent> = {
- title: 'Icons/Admin logo icon',
- component: AdminLogoIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<AdminLogoIconComponent>;
-
-export const Default: Story = {};
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.spec.ts
deleted file mode 100644
index f1fbd7020f..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { BescheidGenerateIconComponent } from './bescheid-generate-icon.component';
-
-describe('BescheidGenerateIconComponent', () => {
- let component: BescheidGenerateIconComponent;
- let fixture: ComponentFixture<BescheidGenerateIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [BescheidGenerateIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(BescheidGenerateIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts
deleted file mode 100644
index b72cf1d919..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-bescheid-generate-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-pdf', class)]"
- aria-hidden="true"
- fill="none"
- viewBox="0 0 32 40"
- >
- <path
- d="M32 12 20 0H4C1.8 0 .02 1.8.02 4L0 36c0 2.2 1.78 4 3.98 4H28c2.2 0 4-1.8 4-4V12Zm-4 24H4V4h14v10h10v22Z"
- />
- <path d="M18.273 2.86H2.856v34.285h26.429V13.574H18.273V2.86Z" />
- <circle cx="16" cy="20" r="11.5" stroke="#fff" stroke-opacity=".3" stroke-width="3" />
- <path
- stroke="#fff"
- stroke-linecap="round"
- stroke-width="3"
- d="M25.94 25.782a11.5 11.5 0 0 1-15.811 4.106"
- />
- <path
- fill="#fff"
- d="M5.478 17.517 3.351 24H1.638l2.905-7.82h1.09l-.155 1.337ZM7.245 24l-2.132-6.483-.172-1.337h1.101L8.964 24H7.245Zm-.097-2.911v1.262h-4.13V21.09h4.13Zm6.763-4.91h1.606v5.168c0 .601-.13 1.108-.387 1.52a2.386 2.386 0 0 1-1.058.929c-.448.208-.963.311-1.547.311s-1.103-.103-1.558-.311a2.419 2.419 0 0 1-1.063-.93c-.254-.411-.382-.918-.382-1.52V16.18h1.612v5.167c0 .35.055.637.166.86.111.221.27.384.478.488.212.104.46.156.747.156.293 0 .542-.052.746-.156.208-.104.366-.267.473-.489.111-.222.167-.508.167-.86V16.18Zm6.429 0V24h-1.606v-7.82h1.606Zm2.406 0v1.263h-6.38V16.18h6.38Zm7.192 3.728v.37c0 .595-.08 1.129-.242 1.601a3.519 3.519 0 0 1-.682 1.209c-.293.33-.644.582-1.053.757a3.353 3.353 0 0 1-1.348.263c-.49 0-.94-.087-1.348-.263a3.021 3.021 0 0 1-1.053-.757 3.539 3.539 0 0 1-.692-1.209 4.945 4.945 0 0 1-.242-1.6v-.37c0-.599.08-1.132.242-1.601.16-.473.388-.876.682-1.209a2.992 2.992 0 0 1 1.052-.763 3.38 3.38 0 0 1 1.348-.263c.495 0 .944.088 1.349.263.408.176.759.43 1.052.763.298.333.527.736.688 1.209.165.469.247 1.002.247 1.6Zm-1.627.37v-.38c0-.416-.038-.781-.113-1.096a2.373 2.373 0 0 0-.333-.795 1.437 1.437 0 0 0-.537-.483 1.535 1.535 0 0 0-.726-.167c-.272 0-.513.055-.725.166a1.45 1.45 0 0 0-.531.484c-.143.215-.253.48-.328.795-.075.315-.113.68-.113 1.096v.38c0 .413.038.778.113 1.096.075.316.186.582.333.8.147.216.326.379.537.49.211.11.453.166.725.166.272 0 .514-.055.725-.166.212-.111.389-.274.532-.49.143-.218.253-.484.328-.8a4.8 4.8 0 0 0 .113-1.095Z"
- />
- <path stroke="#FEFEFE" stroke-linecap="round" stroke-width="3" d="m10 30.022 1.287 4.773" />
- </svg>`,
-})
-export class BescheidGenerateIconComponent {
- @Input() size: IconVariants['size'] = 'extra-large';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.stories.ts
deleted file mode 100644
index 042e531240..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { BescheidGenerateIconComponent } from './bescheid-generate-icon.component';
-
-const meta: Meta<BescheidGenerateIconComponent> = {
- title: 'Icons/Bescheid generate icon',
- component: BescheidGenerateIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<BescheidGenerateIconComponent>;
-
-export const Default: Story = {
- args: { size: 'extra-large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'extra-large' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 57a34430ca..7f290dcfb3 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -70,7 +70,6 @@ import {
import {
AttachmentComponent,
AttachmentWrapperComponent,
- BescheidGenerateIconComponent,
BescheidStatusTextComponent,
BescheidUploadIconComponent,
ButtonCardComponent,
@@ -164,7 +163,6 @@ const routes: Routes = [
StampIconComponent,
SpinnerIconComponent,
BescheidUploadIconComponent,
- BescheidGenerateIconComponent,
AttachmentComponent,
AttachmentWrapperComponent,
ButtonWithSpinnerComponent,
--
GitLab
From e95e5fee737b19ccf6fcbdbe8848575a9d4c99ad Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 16:20:43 +0200
Subject: [PATCH 08/36] OZG-7707 replace more icons - check-circle -
bescheid-upload
---
.../apps/demo/src/app/app.component.html | 4 +-
.../apps/demo/src/app/app.component.ts | 2 -
...zard-upload-document-button.component.html | 4 +-
...d-upload-document-button.component.spec.ts | 4 +-
.../libs/bescheid/src/lib/bescheid.module.ts | 2 -
alfa-client/libs/design-system/src/index.ts | 2 -
.../bescheid-upload-icon.component.spec.ts | 44 --------------
.../bescheid-upload-icon.component.ts | 57 -------------------
.../bescheid-upload-icon.stories.ts | 50 ----------------
.../check-circle-icon.component.spec.ts | 21 -------
.../check-circle-icon.component.ts | 27 ---------
.../check-circle-icon.stories.ts | 50 ----------------
.../annehmen-button.component.html | 4 +-
.../annehmen-button.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 4 --
.../erledigen-button-container.component.html | 2 +-
...ledigen-button-container.component.spec.ts | 4 +-
...reroeffnen-button-container.component.html | 2 +-
...oeffnen-button-container.component.spec.ts | 4 +-
.../src/lib/wiedervorlage.module.ts | 26 +++++++--
20 files changed, 38 insertions(+), 279 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 7d4bba4498..565c0a88d7 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -592,14 +592,14 @@
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="false" id="upload117" dataTestId="demo-upload-1">
- <ods-bescheid-upload-icon icon />
+ <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="true" id="upload117" dataTestId="demo-upload-2">
- <ods-bescheid-upload-icon icon />
+ <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index d671283d32..26f9bee0fd 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -29,7 +29,6 @@ import { RouterModule } from '@angular/router';
import {
AttachmentComponent,
AttachmentWrapperComponent,
- BescheidUploadIconComponent,
ButtonCardComponent,
ButtonComponent,
CheckboxComponent,
@@ -80,7 +79,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
SendIconComponent,
StampIconComponent,
CloseIconComponent,
- BescheidUploadIconComponent,
SpinnerIconComponent,
TextareaComponent,
TextInputComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
index 6ddb97a03c..1633e3b160 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
@@ -6,8 +6,8 @@
class="w-72"
data-test-id="bescheid-wizard-upload-document-upload-editor"
>
- <ods-bescheid-upload-icon icon></ods-bescheid-upload-icon>
- <ods-spinner-icon spinner size="extra-large"></ods-spinner-icon>
+ <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-spinner-icon spinner size="extra-large" />
<div text class="text-center">Bescheiddokument hochladen</div>
</ods-single-file-upload-editor>
</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.spec.ts
index 083c98f7ee..4938c9de60 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.spec.ts
@@ -10,7 +10,7 @@ import {
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
import { SingleFileUploadEditorComponent } from '@ods/component';
-import { BescheidUploadIconComponent, SpinnerIconComponent } from '@ods/system';
+import { IconComponent, SpinnerIconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import {
createBescheidDocument,
@@ -41,7 +41,7 @@ describe('BescheidWizardDokumentHochladenButtonComponent', () => {
declarations: [
BescheidWizardUploadDocumentButtonComponent,
MockComponent(SingleFileUploadEditorComponent),
- MockComponent(BescheidUploadIconComponent),
+ MockComponent(IconComponent),
MockComponent(SpinnerIconComponent),
HasLinkPipe,
],
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index f790bef19c..e2d3862abc 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -58,7 +58,6 @@ import {
AttachmentComponent,
AttachmentWrapperComponent,
BescheidStatusTextComponent,
- BescheidUploadIconComponent,
BescheidWrapperComponent,
ButtonCardComponent,
ButtonComponent,
@@ -129,7 +128,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
ButtonCardComponent,
IconComponent,
SingleFileUploadEditorComponent,
- BescheidUploadIconComponent,
SpinnerIconComponent,
AttachmentComponent,
AttachmentWrapperComponent,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index c768768d8c..58278e9160 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/bescheid-upload-icon/bescheid-upload-icon.component';
-export * from './lib/icons/check-circle-icon/check-circle-icon.component';
export * from './lib/icons/check-icon/check-icon.component';
export * from './lib/icons/close-icon/close-icon.component';
export * from './lib/icons/delete-icon/delete-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.spec.ts
deleted file mode 100644
index b20106c0ae..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { BescheidUploadIconComponent } from './bescheid-upload-icon.component';
-
-describe('BescheidUploadIconComponent', () => {
- let component: BescheidUploadIconComponent;
- let fixture: ComponentFixture<BescheidUploadIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [BescheidUploadIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(BescheidUploadIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts
deleted file mode 100644
index b66c4da7ff..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-bescheid-upload-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-pdf', class)]"
- aria-hidden="true"
- fill="none"
- viewBox="0 0 32 40"
- >
- <path
- d="M32 12 20 0H4C1.8 0 .02 1.8.02 4L0 36c0 2.2 1.78 4 3.98 4H28c2.2 0 4-1.8 4-4V12Zm-4 24H4V4h14v10h10v22Z"
- />
- <path d="M18.273 2.86H2.856v34.285h26.429V13.574H18.273V2.86Z" />
- <path
- fill="#FEFEFE"
- d="M15 24v-8.15l-2.6 2.6L11 17l5-5 5 5-1.4 1.45-2.6-2.6V24h-2Zm-5 4c-.55 0-1.02-.196-1.412-.587A1.926 1.926 0 0 1 8 26v-3h2v3h12v-3h2v3c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 22 28H10Z"
- />
- </svg>`,
-})
-export class BescheidUploadIconComponent {
- @Input() size: IconVariants['size'] = 'extra-large';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.stories.ts
deleted file mode 100644
index c9a76567ff..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { BescheidUploadIconComponent } from './bescheid-upload-icon.component';
-
-const meta: Meta<BescheidUploadIconComponent> = {
- title: 'Icons/Bescheid upload icon',
- component: BescheidUploadIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<BescheidUploadIconComponent>;
-
-export const Default: Story = {
- args: { size: 'extra-large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'extra-large' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.spec.ts
deleted file mode 100644
index eda5ec6e83..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CheckCircleIconComponent } from './check-circle-icon.component';
-
-describe('CheckCircleIconComponent', () => {
- let component: CheckCircleIconComponent;
- let fixture: ComponentFixture<CheckCircleIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [CheckCircleIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(CheckCircleIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.ts
deleted file mode 100644
index 86aa983a93..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-check-circle-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M22 5.18L10.59 16.6L6.35 12.36L7.76 10.95L10.59 13.78L20.59 3.78L22 5.18ZM19.79 10.22C19.92 10.79 20 11.39 20 12C20 16.42 16.42 20 12 20C7.58 20 4 16.42 4 12C4 7.58 7.58 4 12 4C13.58 4 15.04 4.46 16.28 5.25L17.72 3.81C16.1 2.67 14.13 2 12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 10.81 21.78 9.67 21.4 8.61L19.79 10.22Z"
- />
- </svg>`,
-})
-export class CheckCircleIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.stories.ts
deleted file mode 100644
index 21d0c5a0c4..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/check-circle-icon/check-circle-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { CheckCircleIconComponent } from './check-circle-icon.component';
-
-const meta: Meta<CheckCircleIconComponent> = {
- title: 'Icons/Check circle icon',
- component: CheckCircleIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<CheckCircleIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index f643340a8a..1c8396c66a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -34,7 +34,7 @@
size="fit"
dataTestId="annehmen-icon-button"
>
- <ods-check-circle-icon icon class="fill-text" />
+ <ods-icon icon name="check-circle" color="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -44,7 +44,7 @@
variant="outline"
dataTestId="annehmen-button"
>
- <ods-check-circle-icon icon />
+ <ods-icon icon name="check-circle" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
index f9798f26d3..97d15e8b68 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
@@ -27,7 +27,7 @@ import { getElementComponentFromFixtureByCss, mock, notExistsAsHtmlElement, trig
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -53,7 +53,7 @@ describe('AnnehmenButtonComponent', () => {
AnnehmenButtonComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CheckCircleIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 7f290dcfb3..e1a8a6f374 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -71,10 +71,8 @@ import {
AttachmentComponent,
AttachmentWrapperComponent,
BescheidStatusTextComponent,
- BescheidUploadIconComponent,
ButtonCardComponent,
ButtonComponent,
- CheckCircleIconComponent,
CheckIconComponent,
CloseIconComponent,
DiscardVorgangIconComponent,
@@ -162,7 +160,6 @@ const routes: Routes = [
SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
- BescheidUploadIconComponent,
AttachmentComponent,
AttachmentWrapperComponent,
ButtonWithSpinnerComponent,
@@ -173,7 +170,6 @@ const routes: Routes = [
BescheidStatusTextComponent,
ErrorMessageComponent,
CollaborationModule,
- CheckCircleIconComponent,
CheckIconComponent,
MatDialogContent,
ReactiveFormsModule,
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index 49f1ca7b95..c0be85781e 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="erledigen()"
>
- <ods-check-circle-icon icon class="fill-text" />
+ <ods-icon icon name="check-circle" color="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
index f87fc191ba..7a33024753 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { WiedervorlageLinkRel, WiedervorlageService } from '@alfa-client/wiedervorlage-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
import { MockComponent, MockDirective } from 'ng-mocks';
@@ -46,7 +46,7 @@ describe('ErledigenButtonContainerComponent', () => {
ErledigenButtonContainerComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CheckCircleIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
index 89e6c8cfe1..be8296d701 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="wiedereroeffnen()"
>
- <ods-check-circle-icon icon class="fill-text" />
+ <ods-icon icon name="check-circle" color="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts
index c80ebee942..ead236dfd5 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { WiedervorlageLinkRel, WiedervorlageService } from '@alfa-client/wiedervorlage-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
import { MockComponent, MockDirective } from 'ng-mocks';
import { WiedereroeffnenButtonContainerComponent } from './wiedereroeffnen-button-container.component';
@@ -45,7 +45,7 @@ describe('WiedereroeffnenButtonContainerComponent', () => {
WiedereroeffnenButtonContainerComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CheckCircleIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
index 7fe2f1babb..ad7d40f128 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
@@ -22,8 +22,26 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { BinaryFileModule } from '@alfa-client/binary-file';
-import { ConvertForDataTestPipe, FormatToPrettyDatePipe, HasLinkPipe, ToEmbeddedResourcesPipe, ToResourceUriPipe, ToTrafficLightPipe, ToTrafficLightTooltipPipe, } from '@alfa-client/tech-shared';
-import { BackButtonComponent, DateEditorComponent, ExpansionPanelComponent, IconButtonWithSpinnerComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, SubnavigationComponent, TextAreaEditorComponent, } from '@alfa-client/ui';
+import {
+ ConvertForDataTestPipe,
+ FormatToPrettyDatePipe,
+ HasLinkPipe,
+ ToEmbeddedResourcesPipe,
+ ToResourceUriPipe,
+ ToTrafficLightPipe,
+ ToTrafficLightTooltipPipe,
+} from '@alfa-client/tech-shared';
+import {
+ BackButtonComponent,
+ DateEditorComponent,
+ ExpansionPanelComponent,
+ IconButtonWithSpinnerComponent,
+ OzgcloudStrokedButtonWithSpinnerComponent,
+ OzgcloudTextEditorComponent,
+ SpinnerComponent,
+ SubnavigationComponent,
+ TextAreaEditorComponent,
+} from '@alfa-client/ui';
import { UserProfileModule } from '@alfa-client/user-profile';
import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui';
@@ -34,7 +52,7 @@ import { MatIcon } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { RouterModule, Routes } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckCircleIconComponent, PlusIconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent, } from '@ods/system';
+import { IconComponent, PlusIconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
import { CreateWiedervorlageButtonContainerComponent } from './create-wiedervorlage-button-container/create-wiedervorlage-button-container.component';
import { ErledigenButtonContainerComponent } from './erledigen-button-container/erledigen-button-container.component';
@@ -95,7 +113,7 @@ const routes: Routes = [
TooltipDirective,
UpdateIconComponent,
PlusIconComponent,
- CheckCircleIconComponent,
+ IconComponent,
SaveIconComponent,
MultiFileUploadComponent,
],
--
GitLab
From 0105ba93651e6f8cb637e71cef47e6350a93405d Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 09:02:19 +0200
Subject: [PATCH 09/36] OZG-7707 replace more icons - check icon - close icon
---
.../apps/demo/src/app/app.component.html | 2 +-
.../apps/demo/src/app/app.component.ts | 2 -
.../admin-cancel-button.component.html | 2 +-
.../admin-cancel-button.component.spec.ts | 4 +-
.../admin-cancel-button.component.ts | 4 +-
...-delete-dialog-container.component.spec.ts | 3 +-
.../bescheid-wizard-container.component.html | 2 +-
...escheid-wizard-container.component.spec.ts | 21 ++++++--
...zard-antrag-bescheiden-form.component.html | 6 ++-
...d-antrag-bescheiden-form.component.spec.ts | 13 +++--
...ard-cancel-dialog-container.component.html | 4 +-
...-cancel-dialog-container.component.spec.ts | 20 +++++--
.../libs/bescheid/src/lib/bescheid.module.ts | 4 --
.../beschieden-date-container.component.html | 16 ++----
...eschieden-date-container.component.spec.ts | 4 +-
.../binary-file/src/lib/binary-file.module.ts | 11 +++-
.../binary-file2/binary-file2.component.html | 2 +-
.../binary-file2.component.spec.ts | 4 +-
.../collaboration-request-form.component.html | 2 +-
...llaboration-request-form.component.spec.ts | 4 +-
.../collaboration.request.formservice.spec.ts | 3 ++
.../src/lib/collaboration.module.ts | 4 +-
.../cancel-dialog-button.component.spec.ts | 4 +-
.../cancel-dialog-button.component.ts | 12 ++---
alfa-client/libs/design-system/src/index.ts | 2 -
.../bescheid-status-text.component.spec.ts | 4 +-
.../bescheid-status-text.component.ts | 17 +++---
.../button-toggle.component.spec.ts | 4 +-
.../button-toggle/button-toggle.component.ts | 8 +--
.../radio-button-card.stories.ts | 11 +---
.../src/lib/icon/icon.component.ts | 1 +
.../check-icon/check-icon.component.spec.ts | 44 ----------------
.../icons/check-icon/check-icon.component.ts | 48 -----------------
.../icons/check-icon/check-icon.stories.ts | 50 ------------------
.../close-icon/close-icon.component.spec.ts | 44 ----------------
.../icons/close-icon/close-icon.component.ts | 52 -------------------
.../icons/close-icon/close-icon.stories.ts | 50 ------------------
.../search-field.component.spec.ts | 4 +-
.../search-field/search-field.component.ts | 6 +--
.../src/lib/user-settings.module.ts | 3 +-
.../abschliessen-button.component.html | 4 +-
.../abschliessen-button.component.spec.ts | 4 +-
...g-process-vorgang-container.component.html | 4 +-
...rocess-vorgang-container.component.spec.ts | 8 +--
.../src/lib/vorgang-detail.module.ts | 4 --
...h-zustaendige-stelle-dialog.component.html | 2 +-
...ustaendige-stelle-dialog.component.spec.ts | 4 +-
.../src/lib/zustaendige-stelle.module.ts | 4 +-
48 files changed, 130 insertions(+), 405 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 565c0a88d7..4af108d3a3 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -504,7 +504,7 @@
<ods-stamp-icon />
</ods-radio-button-card>
<ods-radio-button-card label="abgelehnt" name="exampleName" value="abgelehnt" variant="bescheid_abgelehnt">
- <ods-close-icon class="fill-abgelehnt" size="large" />
+ <ods-icon name="close" color="abgelehnt" size="large" />
</ods-radio-button-card>
</div>
</form>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 26f9bee0fd..6c8542f5fc 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -32,7 +32,6 @@ import {
ButtonCardComponent,
ButtonComponent,
CheckboxComponent,
- CloseIconComponent,
ErrorMessageComponent,
FieldsetComponent,
FileUploadButtonComponent,
@@ -78,7 +77,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
SaveIconComponent,
SendIconComponent,
StampIconComponent,
- CloseIconComponent,
SpinnerIconComponent,
TextareaComponent,
TextInputComponent,
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html
index 3125fbdfd9..4962fe8d2b 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html
@@ -1,3 +1,3 @@
<ods-routing-button [linkPath]="linkPath" text="Abbrechen" variant="outline" dataTestId="cancel-button">
- <ods-close-icon icon class="fill-primary" />
+ <ods-icon icon name="close" />
</ods-routing-button>
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.spec.ts b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.spec.ts
index 253650b230..e7f199865e 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.spec.ts
+++ b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.spec.ts
@@ -2,7 +2,7 @@ import { AdminCancelButtonComponent } from '@admin-client/shared';
import { getMockComponent } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RoutingButtonComponent } from '@ods/component';
-import { CloseIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
describe('AdminCancelButtonComponent', () => {
@@ -12,7 +12,7 @@ describe('AdminCancelButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [AdminCancelButtonComponent],
- declarations: [MockComponent(RoutingButtonComponent), MockComponent(CloseIconComponent)],
+ declarations: [MockComponent(RoutingButtonComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(AdminCancelButtonComponent);
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.ts b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.ts
index 8c284f05c6..ab9eb2dbcd 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.ts
+++ b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.ts
@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { RoutingButtonComponent } from '@ods/component';
-import { CloseIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
@Component({
selector: 'admin-cancel-button',
templateUrl: './admin-cancel-button.component.html',
standalone: true,
- imports: [CommonModule, RoutingButtonComponent, CloseIconComponent],
+ imports: [CommonModule, RoutingButtonComponent, IconComponent],
})
export class AdminCancelButtonComponent {
@Input() linkPath: string;
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog-container.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog-container.component.spec.ts
index 474c396b29..3862816f4c 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog-container.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog-container.component.spec.ts
@@ -5,6 +5,7 @@ import { createEmptyStateResource, StateResource } from '@alfa-client/tech-share
import { dispatchEventFromFixture, getMockComponent, Mock, mock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker/locale/de';
+import { MockComponent } from 'ng-mocks';
import { Observable, of } from 'rxjs';
import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
@@ -34,7 +35,7 @@ describe('UserDeleteDialogContainerComponent', () => {
} as any;
await TestBed.configureTestingModule({
- imports: [UserDeleteDialogContainerComponent, UserDeleteDialogComponent],
+ imports: [UserDeleteDialogContainerComponent, MockComponent(UserDeleteDialogComponent)],
providers: [
{ provide: UserFormService, useValue: formService },
{ provide: UserService, useValue: userService },
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
index d63d7046e6..649d125a51 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
@@ -37,7 +37,7 @@
(clickEmitter)="cancelWizard(bescheidStateResource.resource)"
dataTestId="close-bescheid"
>
- <ods-close-icon icon />
+ <ods-icon icon name="close" color="text" />
</ods-button>
<alfa-bescheid-wizard
[vorgangWithEingangResource]="vorgangWithEingangResource"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts
index ed66740aa8..38bf00e3cb 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts
@@ -25,12 +25,21 @@ import { BescheidWizardContainerComponent } from '@alfa-client/bescheid';
import { BescheidResource, BescheidService, BescheidWizardDialogResult, BescheidWizardStep } from '@alfa-client/bescheid-shared';
import { CommandOrder, CommandResource } from '@alfa-client/command-shared';
import { createEmptyStateResource, createStateResource, ESCAPE_KEY, StateResource } from '@alfa-client/tech-shared';
-import { createDialogRefMock, DialogRefMock, existsAsHtmlElement, getElementFromFixtureByType, Mock, mock, triggerEvent, useFromMock, } from '@alfa-client/test-utils';
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ existsAsHtmlElement,
+ getElementFromFixtureByType,
+ Mock,
+ mock,
+ triggerEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
import { OzgcloudDialogService } from '@alfa-client/ui';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ButtonComponent, CloseIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { createBescheidResource, createBescheidStateResource } from '../../../../bescheid-shared/src/test/bescheid';
@@ -40,7 +49,11 @@ import { singleColdCompleted } from '../../../../tech-shared/test/marbles';
import { createKeydownKeyboardEvent } from '../../../../test-utils/src/lib/keyboard';
import { createVorgangWithEingangResource } from '../../../../vorgang-shared/test/vorgang';
import { BescheidWizardComponent } from './bescheid-wizard/bescheid-wizard.component';
-import { BescheidWizardCancelDialogContainerComponent, CancelWizardDialogData, CancelWizardDialogResult, } from './bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component';
+import {
+ BescheidWizardCancelDialogContainerComponent,
+ CancelWizardDialogData,
+ CancelWizardDialogResult,
+} from './bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component';
import { BescheidFormService } from './bescheid.formservice';
describe('BescheidWizardContainerComponent', () => {
@@ -83,7 +96,7 @@ describe('BescheidWizardContainerComponent', () => {
MockComponent(BescheidWizardComponent),
MockComponent(BescheidWizardCancelDialogContainerComponent),
MockComponent(ButtonComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
index 2843835f2a..6c90dcd130 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
@@ -31,7 +31,8 @@
value="true"
data-test-id="button-bewilligt"
variant="bescheid_bewilligt"
- ><ods-stamp-icon size="large"></ods-stamp-icon>
+ >
+ <ods-stamp-icon size="large"></ods-stamp-icon>
</ods-radio-button-card>
<ods-radio-button-card
label="abgelehnt"
@@ -39,7 +40,8 @@
value="false"
data-test-id="button-abgelehnt"
variant="bescheid_abgelehnt"
- ><ods-close-icon size="large" class="fill-abgelehnt"></ods-close-icon>
+ >
+ <ods-icon name="close" size="large" color="abgelehnt" />
</ods-radio-button-card>
</div>
<div class="flex">
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
index 17cafdfc31..84be3eb452 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
@@ -24,13 +24,20 @@
import { BescheidLinkRel, BescheidService } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
import { createEmptyStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, getElementFromFixtureByType, mock, notExistsAsHtmlElement, triggerEvent, useFromMock, } from '@alfa-client/test-utils';
+import {
+ existsAsHtmlElement,
+ getElementFromFixtureByType,
+ mock,
+ notExistsAsHtmlElement,
+ triggerEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
import { DateEditorComponent } from '@alfa-client/ui';
import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
-import { CloseIconComponent, RadioButtonCardComponent, StampIconComponent } from '@ods/system';
+import { IconComponent, RadioButtonCardComponent, StampIconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
@@ -61,7 +68,7 @@ describe('BescheidWizardAntragBescheidenFormComponent', () => {
MockComponent(BescheidWizardWeiterButtonComponent),
MockComponent(RadioButtonCardComponent),
MockComponent(StampIconComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
MockComponent(DateEditorComponent),
],
providers: [
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
index 9d885f59c0..d566e92d9e 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
@@ -38,7 +38,7 @@
dataTestId="bescheiderstellung-abbrechen-entwurf-speichern"
text="Entwurf speichern"
>
- <ods-check-icon class="fill-whitetext" icon></ods-check-icon>
+ <ods-icon icon name="check" color="whitetext" />
</ods-button-with-spinner>
<ods-button-with-spinner
[stateResource]="deleteStateResource$ | async"
@@ -47,7 +47,7 @@
dataTestId="bescheiderstellung-abbrechen-entwurf-verwerfen"
text="Verwerfen"
>
- <ods-close-icon class="fill-primary" icon></ods-close-icon>
+ <ods-icon icon name="close" />
</ods-button-with-spinner>
</div>
</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts
index 54f6e363e2..5e95bb485a 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts
@@ -24,12 +24,20 @@
import { BescheidService } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
import { createErrorStateResource, StateResource } from '@alfa-client/tech-shared';
-import { createDialogRefMock, DialogRefMock, existsAsHtmlElement, getElementComponentFromFixtureByCss, Mock, mock, triggerEvent, } from '@alfa-client/test-utils';
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ existsAsHtmlElement,
+ getElementComponentFromFixtureByCss,
+ Mock,
+ mock,
+ triggerEvent,
+} from '@alfa-client/test-utils';
import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { expect } from '@jest/globals';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckIconComponent, CloseIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
import { createCommandStateResource, createSuccessfullyDoneCommandStateResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
@@ -38,7 +46,10 @@ import { singleColdCompleted } from 'libs/tech-shared/test/marbles';
import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { BescheidFormService } from '../../bescheid.formservice';
-import { BescheidWizardCancelDialogContainerComponent, CancelWizardDialogData, } from './bescheid-wizard-cancel-dialog-container.component';
+import {
+ BescheidWizardCancelDialogContainerComponent,
+ CancelWizardDialogData,
+} from './bescheid-wizard-cancel-dialog-container.component';
describe('BescheidWizardCancelDialogContainerComponent', () => {
let component: BescheidWizardCancelDialogContainerComponent;
@@ -68,8 +79,7 @@ describe('BescheidWizardCancelDialogContainerComponent', () => {
declarations: [
BescheidWizardCancelDialogContainerComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CheckIconComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index e2d3862abc..f025ab427a 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -61,8 +61,6 @@ import {
BescheidWrapperComponent,
ButtonCardComponent,
ButtonComponent,
- CheckIconComponent,
- CloseIconComponent,
IconComponent,
RadioButtonCardComponent,
SaveIconComponent,
@@ -110,7 +108,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
BescheidStatusTextComponent,
BescheidWrapperComponent,
StampIconComponent,
- CloseIconComponent,
ButtonWithSpinnerComponent,
RadioButtonCardComponent,
ButtonComponent,
@@ -134,7 +131,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
FileUploadEditorComponent,
SendIconComponent,
SaveIconComponent,
- CheckIconComponent,
TextEditorComponent,
TextareaEditorComponent,
ConvertForDataTestPipe,
diff --git a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
index 2c2af3a725..03c6c749e0 100644
--- a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
@@ -25,17 +25,11 @@
-->
<ng-container *ngIf="bescheid$ | async as bescheid">
<div class="flex items-center gap-2 text-text">
- <ods-stamp-icon
- *ngIf="bescheid.bewilligt"
- data-test-id="bewilligt-icon"
- size="small"
- class="fill-bewilligt"
- />
- <ods-close-icon
- *ngIf="!bescheid.bewilligt"
- data-test-id="abgelehnt-icon"
- class="fill-abgelehnt"
- />
+ @if (bescheid.bewilligt) {
+ <ods-stamp-icon data-test-id="bewilligt-icon" size="small" class="fill-bewilligt" />
+ } @else {
+ <ods-icon name="close" color="abgelehnt" data-test-id="abgelehnt-icon" />
+ }
{{ bescheid.beschiedenAm | formatFullDatePipe }}
</div>
diff --git a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts
index e70aa9d868..21484521a0 100644
--- a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { BescheidService } from '@alfa-client/bescheid-shared';
-import { CloseIconComponent, StampIconComponent } from '@ods/system';
+import { IconComponent, StampIconComponent } from '@ods/system';
import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
import { FormatFullDatePipe } from 'libs/tech-shared/src/lib/pipe/format-full-date.pipe';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -52,7 +52,7 @@ describe('BeschiedenDateContainerComponent', () => {
BeschiedenDateContainerComponent,
FormatFullDatePipe,
MockComponent(StampIconComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file.module.ts b/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
index 362e1cbf5d..dc3d2acd6c 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
@@ -28,7 +28,14 @@ import { NgModule } from '@angular/core';
import { MatIcon } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { DownloadButtonComponent } from '@ods/component';
-import { AttachmentComponent, AttachmentHeaderComponent, AttachmentWrapperComponent, CloseIconComponent, SpinnerIconComponent, TooltipDirective, } from '@ods/system';
+import {
+ AttachmentComponent,
+ AttachmentHeaderComponent,
+ AttachmentWrapperComponent,
+ IconComponent,
+ SpinnerIconComponent,
+ TooltipDirective,
+} from '@ods/system';
import { FileSizePlainPipe } from '../../../tech-shared/src/lib/pipe/file-size-plain.pipe';
import { FileUploadEditorComponent } from '../../../ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component';
import { BinaryFileAttachmentContainerComponent } from './binary-file-attachment-container/binary-file-attachment-container.component';
@@ -51,7 +58,7 @@ import { VerticalBinaryFileListComponent } from './vertical-binary-file-list/ver
AttachmentHeaderComponent,
AttachmentWrapperComponent,
SpinnerIconComponent,
- CloseIconComponent,
+ IconComponent,
DownloadButtonComponent,
FileUploadEditorComponent,
HasLinkPipe,
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index 28d0e68be0..aed6ff10ce 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -42,7 +42,7 @@
aria-label="Anhang löschen Button"
data-test-class="delete-file-button"
>
- <ods-close-icon class="fill-text"></ods-close-icon>
+ <ods-icon name="close" color="text" />
</button>
</div>
</ods-attachment>
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
index 7f114ea64b..ad44bb2046 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
@@ -26,7 +26,7 @@ import { BinaryFileLinkRel, BinaryFileResource } from '@alfa-client/binary-file-
import { SpinnerComponent } from '@alfa-client/ui';
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
-import { AttachmentComponent, CloseIconComponent } from '@ods/system';
+import { AttachmentComponent, IconComponent } from '@ods/system';
import { createBinaryFileResource } from 'libs/binary-file-shared/test/binary-file';
import { FileSizePlainPipe } from 'libs/tech-shared/src/lib/pipe/file-size-plain.pipe';
import { MockComponent, MockPipe } from 'ng-mocks';
@@ -44,7 +44,7 @@ describe('BinaryFile2Component', () => {
BinaryFile2Component,
MockComponent(AttachmentComponent),
MockComponent(SpinnerComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
MockPipe(FileSizePlainPipe),
],
});
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html
index f3c58f129d..7a718f5d5f 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html
@@ -46,6 +46,6 @@
dataTestId="collaboration-request-cancel-button"
(clickEmitter)="abbrechen.emit()"
>
- <ods-close-icon icon class="fill-primary"></ods-close-icon>
+ <ods-icon icon name="close" />
</ods-button>
</div>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.spec.ts
index dba0a73c80..ac172ed614 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.spec.ts
@@ -29,7 +29,7 @@ import { SnackBarService } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
import { ButtonWithSpinnerComponent, TextEditorComponent, TextareaEditorComponent } from '@ods/component';
-import { ButtonComponent, CloseIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
import { createCommandResource } from 'libs/command-shared/test/command';
@@ -73,7 +73,7 @@ describe('CollaborationRequestFormComponent', () => {
CollaborationRequestFormComponent,
MockComponent(ButtonComponent),
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
MockComponent(TextEditorComponent),
MockComponent(TextareaEditorComponent),
],
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts
index d5726c7752..75992d2f0d 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts
@@ -28,10 +28,12 @@ import { Mock, mock } from '@alfa-client/test-utils';
import { SnackBarService } from '@alfa-client/ui';
import { TestBed } from '@angular/core/testing';
import { UntypedFormBuilder } from '@angular/forms';
+import { IconComponent } from '@ods/system';
import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
import { createCommandErrorResource, createCommandResource } from 'libs/command-shared/test/command';
import { singleColdCompleted } from 'libs/tech-shared/test/marbles';
+import { MockComponent } from 'ng-mocks';
import { Observable, of } from 'rxjs';
import { CollaborationRequestFormService } from './collaboration.request.formservice';
@@ -48,6 +50,7 @@ describe('CollaborationRequestFormService', () => {
snackBarService = mock(SnackBarService);
TestBed.configureTestingModule({
+ imports: [MockComponent(IconComponent)],
providers: [
CollaborationRequestFormService,
UntypedFormBuilder,
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index 62308b9704..e5e715a85e 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -31,8 +31,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ButtonWithSpinnerComponent, TextEditorComponent, TextareaEditorComponent } from '@ods/component';
import {
ButtonComponent,
- CloseIconComponent,
ExternalUnitIconComponent,
+ IconComponent,
OfficeIconComponent,
PublicAdministrationIconComponent,
SaveIconComponent,
@@ -55,7 +55,7 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
CommonModule,
ButtonComponent,
SaveIconComponent,
- CloseIconComponent,
+ IconComponent,
SearchIconComponent,
CollaborationSharedModule,
UsersIconComponent,
diff --git a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.spec.ts b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.spec.ts
index 8a67d24b41..41fd2baad6 100644
--- a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.spec.ts
@@ -1,7 +1,7 @@
import { dispatchEventFromFixture, existsAsHtmlElement, mock, Mock, MockEvent } from '@alfa-client/test-utils';
import { OzgcloudDialogService } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ButtonComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { CancelDialogButtonComponent } from './cancel-dialog-button.component';
@@ -20,7 +20,7 @@ describe('CancelDialogButtonComponent', () => {
await TestBed.configureTestingModule({
imports: [CancelDialogButtonComponent],
- declarations: [MockComponent(ButtonComponent)],
+ declarations: [MockComponent(ButtonComponent), MockComponent(IconComponent)],
providers: [
{
provide: OzgcloudDialogService,
diff --git a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
index 03ac3acbe3..04c547aa0e 100644
--- a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
@@ -1,11 +1,11 @@
import { OzgcloudDialogService } from '@alfa-client/ui';
import { Component, inject, Input } from '@angular/core';
-import { ButtonComponent, CloseIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
@Component({
selector: 'ods-cancel-dialog-button',
standalone: true,
- imports: [ButtonComponent, CloseIconComponent, TooltipDirective],
+ imports: [ButtonComponent, IconComponent, TooltipDirective],
template: ` @if (showAsIconButton) {
<ods-button
(clickEmitter)="cancel()"
@@ -16,9 +16,7 @@ import { ButtonComponent, CloseIconComponent, TooltipDirective } from '@ods/syst
dataTestId="cancel-dialog-icon-button"
data-test-id="cancel-dialog-icon-button-container"
>
- <ng-container icon>
- <ods-close-icon class="fill-primary" />
- </ng-container>
+ <ods-icon icon name="close" />
</ods-button>
} @else {
<ods-button
@@ -28,9 +26,7 @@ import { ButtonComponent, CloseIconComponent, TooltipDirective } from '@ods/syst
dataTestId="cancel-dialog-button"
data-test-id="cancel-dialog-button-container"
>
- <ng-container icon>
- <ods-close-icon class="fill-primary" />
- </ng-container>
+ <ods-icon icon name="close" />
</ods-button>
}`,
})
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 58278e9160..425ba58f65 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/check-icon/check-icon.component';
-export * from './lib/icons/close-icon/close-icon.component';
export * from './lib/icons/delete-icon/delete-icon.component';
export * from './lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component';
export * from './lib/icons/discard-vorgang-icon/discard-vorgang-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.spec.ts b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.spec.ts
index ddcab3ac98..e5a94f95a1 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.spec.ts
@@ -24,6 +24,8 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
+import { MockComponent } from 'ng-mocks';
+import { IconComponent } from '../icon/icon.component';
import { BescheidStatusTextComponent } from './bescheid-status-text.component';
describe('BescheidStatusTextComponent', () => {
@@ -34,7 +36,7 @@ describe('BescheidStatusTextComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [BescheidStatusTextComponent],
+ imports: [BescheidStatusTextComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(BescheidStatusTextComponent);
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
index 25cccb9448..0b6ee4f204 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
@@ -24,27 +24,22 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { CloseIconComponent } from '../icons/close-icon/close-icon.component';
+import { IconComponent } from '../icon/icon.component';
import { StampIconComponent } from '../icons/stamp-icon/stamp-icon.component';
@Component({
selector: 'ods-bescheid-status-text',
standalone: true,
- imports: [CommonModule, StampIconComponent, CloseIconComponent],
+ imports: [CommonModule, StampIconComponent, IconComponent],
template: ` <p class="flex gap-2 text-base font-medium text-text">
<span class="flex items-center gap-2" *ngIf="bewilligt"
><ods-stamp-icon size="medium" class="fill-bewilligt" />Bewilligt am {{ dateText }}</span
>
- <span class="flex items-center gap-2" *ngIf="!bewilligt"
- ><ods-close-icon class="fill-abgelehnt" />Abgelehnt am
- {{ dateText }}
+ <span class="flex items-center gap-2" *ngIf="!bewilligt">
+ <ods-icon name="close" color="abgelehnt" />
+ Abgelehnt am {{ dateText }}
</span>
- <span
- *ngIf="hasBescheidDraft"
- class="flex items-center text-error"
- data-test-class="bescheid-status-draft"
- >(Entwurf)</span
- >
+ <span *ngIf="hasBescheidDraft" class="flex items-center text-error" data-test-class="bescheid-status-draft">(Entwurf)</span>
</p>`,
})
export class BescheidStatusTextComponent {
diff --git a/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.spec.ts
index b628713544..bf751b55ad 100644
--- a/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.spec.ts
@@ -24,6 +24,8 @@
import { existsAsHtmlElement, getElementFromFixture, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { MockComponent } from 'ng-mocks';
+import { IconComponent } from '../../icon/icon.component';
import { ButtonToggleComponent } from './button-toggle.component';
describe('ButtonToggleComponent', () => {
@@ -34,7 +36,7 @@ describe('ButtonToggleComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [ButtonToggleComponent],
+ imports: [ButtonToggleComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(ButtonToggleComponent);
diff --git a/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts b/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts
index 682b688db3..5acc3f1220 100644
--- a/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts
+++ b/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts
@@ -23,12 +23,12 @@
*/
import { CommonModule } from '@angular/common';
import { Component, HostBinding, Input } from '@angular/core';
-import { CheckIconComponent } from '../../icons/check-icon/check-icon.component';
+import { IconComponent } from '../../icon/icon.component';
@Component({
selector: 'ods-button-toggle',
standalone: true,
- imports: [CommonModule, CheckIconComponent],
+ imports: [CommonModule, IconComponent],
template: `<button
class="flex h-full cursor-pointer items-center gap-1 px-3 py-1.5 outline-none hover:bg-neutral-300 focus-visible:bg-neutral-300 dark:hover:bg-neutral-600 dark:focus-visible:bg-neutral-600"
[ngClass]="{
@@ -41,7 +41,9 @@ import { CheckIconComponent } from '../../icons/check-icon/check-icon.component'
(blur)="isFocused = false"
data-test-id="button-toggle"
>
- <ods-check-icon size="small" *ngIf="isChecked" data-test-id="toggle-check-icon" />
+ @if (isChecked) {
+ <ods-icon name="check" size="small" data-test-id="toggle-check-icon" />
+ }
<p class="text-sm">{{ label }}</p>
</button>`,
})
diff --git a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
index 0c0ba2fd02..fbdbc9ab29 100644
--- a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
@@ -25,7 +25,6 @@ import { CommonModule } from '@angular/common';
import { FormGroupDirective } from '@angular/forms';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { CloseIconComponent } from '../../icons/close-icon/close-icon.component';
import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { SendIconComponent } from '../../icons/send-icon/send-icon.component';
import { StampIconComponent } from '../../icons/stamp-icon/stamp-icon.component';
@@ -36,14 +35,7 @@ const meta: Meta<RadioButtonCardComponent> = {
component: RadioButtonCardComponent,
decorators: [
moduleMetadata({
- imports: [
- CommonModule,
- RadioButtonCardComponent,
- StampIconComponent,
- CloseIconComponent,
- SaveIconComponent,
- SendIconComponent,
- ],
+ imports: [CommonModule, RadioButtonCardComponent, StampIconComponent, SaveIconComponent, SendIconComponent],
providers: [FormGroupDirective],
}),
],
@@ -76,6 +68,7 @@ export const Default: Story = {
value="abgelehnt"
variant="bescheid_abgelehnt"
>
+ //TODO OZG-7707
<ods-close-icon class="fill-abgelehnt" size="large" />
</ods-radio-button-card>
</div>`,
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index 1e5fbb384c..6e32cb5a7a 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -45,6 +45,7 @@ const iconVariants = cva('', {
error: 'fill-error',
pdf: 'fill-pdf',
neutral: 'fill-neutral-500 dark:fill-neutral-400',
+ abgelehnt: 'fill-abgelehnt',
},
},
});
diff --git a/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.spec.ts
deleted file mode 100644
index 3430f50b18..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CheckIconComponent } from './check-icon.component';
-
-describe('CheckIconComponent', () => {
- let component: CheckIconComponent;
- let fixture: ComponentFixture<CheckIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [CheckIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(CheckIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.ts
deleted file mode 100644
index a6b377a382..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-check-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path d="M9.55 18L3.85 12.3L5.275 10.875L9.55 15.15L18.725 5.975L20.15 7.4L9.55 18Z" />
- </svg>`,
-})
-export class CheckIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.stories.ts
deleted file mode 100644
index 266e78c3af..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/check-icon/check-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { CheckIconComponent } from './check-icon.component';
-
-const meta: Meta<CheckIconComponent> = {
- title: 'Icons/Check icon',
- component: CheckIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<CheckIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.spec.ts
deleted file mode 100644
index 55ce6d22e4..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CloseIconComponent } from './close-icon.component';
-
-describe('CloseIconComponent', () => {
- let component: CloseIconComponent;
- let fixture: ComponentFixture<CloseIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [CloseIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(CloseIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts
deleted file mode 100644
index 4fa60adf3d..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-close-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-black', class)]"
- aria-hidden="true"
- viewBox="0 0 24 24"
- fill="inherit"
- >
- <path
- d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z"
- />
- </svg>`,
-})
-export class CloseIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.stories.ts
deleted file mode 100644
index a147cbf0e2..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { CloseIconComponent } from './close-icon.component';
-
-const meta: Meta<CloseIconComponent> = {
- title: 'Icons/Close icon',
- component: CloseIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<CloseIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.spec.ts b/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.spec.ts
index 5204dd054f..2e9143632c 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.spec.ts
@@ -26,7 +26,9 @@ import { getElementFromFixtureByType, mock } from '@alfa-client/test-utils';
import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormControl } from '@angular/forms';
+import { MockComponent } from 'ng-mocks';
import { TextInputComponent } from '../../form/text-input/text-input.component';
+import { IconComponent } from '../../icon/icon.component';
import { SearchFieldComponent } from './search-field.component';
describe('SearchFieldComponent', () => {
@@ -35,7 +37,7 @@ describe('SearchFieldComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [SearchFieldComponent],
+ imports: [SearchFieldComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(SearchFieldComponent);
diff --git a/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts b/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts
index 2f45e945d8..614257e698 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts
@@ -26,13 +26,13 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormControl } from '@angular/forms';
import { EMPTY_STRING } from '../../../../../tech-shared/src';
import { TextInputComponent } from '../../form/text-input/text-input.component';
-import { CloseIconComponent } from '../../icons/close-icon/close-icon.component';
+import { IconComponent } from '../../icon/icon.component';
import { SearchIconComponent } from '../../icons/search-icon/search-icon.component';
@Component({
selector: 'ods-search-field',
standalone: true,
- imports: [CommonModule, TextInputComponent, SearchIconComponent, CloseIconComponent],
+ imports: [CommonModule, TextInputComponent, SearchIconComponent, IconComponent],
template: `<ods-text-input
label="instant search"
[fieldControl]="control"
@@ -46,7 +46,7 @@ import { SearchIconComponent } from '../../icons/search-icon/search-icon.compone
>
<ods-search-icon prefix aria-hidden="true" aria-label="Suchfeld" />
<button suffix *ngIf="control.value" (click)="clearInput()" aria-label="Eingabe löschen" data-test-id="clear-instant-search">
- <ods-close-icon class="fill-primary hover:fill-primary-hover" />
+ <ods-icon name="close" class="hover:fill-primary-hover" />
</button>
</ods-text-input>`,
})
diff --git a/alfa-client/libs/user-settings/src/lib/user-settings.module.ts b/alfa-client/libs/user-settings/src/lib/user-settings.module.ts
index fce1e22c3e..66bd954af7 100644
--- a/alfa-client/libs/user-settings/src/lib/user-settings.module.ts
+++ b/alfa-client/libs/user-settings/src/lib/user-settings.module.ts
@@ -26,7 +26,7 @@ import { SlideToggleComponent } from '@alfa-client/ui';
import { UserSettingsSharedModule } from '@alfa-client/user-settings-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { CloseIconComponent, DropdownMenuComponent, SettingsIconComponent } from '@ods/system';
+import { DropdownMenuComponent, SettingsIconComponent } from '@ods/system';
import { UserSettingsContainerComponent } from './user-settings-container/user-settings-container.component';
import { UserSettingsDarkmodeContainerComponent } from './user-settings-container/user-settings/user-settings-dropdown/user-settings-darkmode-container/user-settings-darkmode-container.component';
import { UserSettingsDarkmodeComponent } from './user-settings-container/user-settings/user-settings-dropdown/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component';
@@ -40,7 +40,6 @@ import { UserSettingsComponent } from './user-settings-container/user-settings/u
CommonModule,
UserSettingsSharedModule,
DropdownMenuComponent,
- CloseIconComponent,
SettingsIconComponent,
SlideToggleComponent,
HasLinkPipe,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index 0188a0a906..433acff379 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -35,7 +35,7 @@
size="fit"
(clickEmitter)="abschliessen()"
>
- <ods-check-icon icon class="fill-text" />
+ <ods-icon icon name="check" color="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -45,7 +45,7 @@
variant="outline"
(clickEmitter)="abschliessen()"
>
- <ods-check-icon icon />
+ <ods-icon icon name="check" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
index 599cf99c8d..5113915512 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
@@ -27,7 +27,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -52,7 +52,7 @@ describe('AbschliessenButtonComponent', () => {
declarations: [
AbschliessenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CheckIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
HasLinkPipe,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.html
index 881e47d601..0329ba8ad0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.html
@@ -30,5 +30,5 @@
variant="outline"
text="Vorgang vorprüfen"
>
- <ods-check-icon icon />
-</ods-button-with-spinner>
\ No newline at end of file
+ <ods-icon icon name="check" />
+</ods-button-with-spinner>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.spec.ts
index 773833bfe5..a422c49df4 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-process-vorgang-container/vorgang-process-vorgang-container.component.spec.ts
@@ -27,7 +27,7 @@ import { dispatchEventFromFixture, getMockComponent, mock } from '@alfa-client/t
import { VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
@@ -46,11 +46,7 @@ describe('ProcessVorgangContainerComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [
- ProcessVorgangContainerComponent,
- MockComponent(ButtonWithSpinnerComponent),
- MockComponent(CheckIconComponent),
- ],
+ declarations: [ProcessVorgangContainerComponent, MockComponent(ButtonWithSpinnerComponent), MockComponent(IconComponent)],
providers: [
{
provide: VorgangService,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index e1a8a6f374..41fa07bdd0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -73,8 +73,6 @@ import {
BescheidStatusTextComponent,
ButtonCardComponent,
ButtonComponent,
- CheckIconComponent,
- CloseIconComponent,
DiscardVorgangIconComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
@@ -153,7 +151,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- CloseIconComponent,
EditIconComponent,
ExclamationIconComponent,
SaveIconComponent,
@@ -170,7 +167,6 @@ const routes: Routes = [
BescheidStatusTextComponent,
ErrorMessageComponent,
CollaborationModule,
- CheckIconComponent,
MatDialogContent,
ReactiveFormsModule,
MatIcon,
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html
index bc4470c540..d72dfccc45 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html
@@ -27,7 +27,7 @@
<div class="flex gap-48 py-6 lg:gap-96">
<h1 class="text-xl font-bold text-primary">{{ title }}</h1>
<ods-button variant="ghost" size="fit" (clickEmitter)="closeDialog()" dataTestId="close-search-dialog">
- <ods-close-icon class="fill-primary" icon />
+ <ods-icon icon name="close" />
</ods-button>
</div>
<alfa-search-zustaendige-stelle-form-container (searchResultSelected)="searchResultSelected($event)" />
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
index 0cd130bb32..319218affb 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
@@ -27,7 +27,7 @@ import { OrganisationsEinheitService, ZUSTAENDIGE_STELLE_SERVICE } from '@alfa-c
import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Resource } from '@ngxp/rest';
-import { ButtonComponent, CloseIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { SearchZustaendigeStelleDialogComponent } from '././search-zustaendige-stelle-dialog.component';
import { SearchZustaendigeStelleFormContainerComponent } from './search-zustaendige-stelle-form-container/search-zustaendige-stelle-form-container.component';
@@ -52,7 +52,7 @@ describe('SearchZustaendigeStelleDialogComponent', () => {
ToEmbeddedResourcesPipe,
MockComponent(SearchZustaendigeStelleFormContainerComponent),
MockComponent(ButtonComponent),
- MockComponent(CloseIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index 11e5ee19ea..3aabe3c7d7 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -26,9 +26,9 @@ import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
ButtonComponent,
- CloseIconComponent,
EditIconComponent,
ExternalUnitIconComponent,
+ IconComponent,
InstantSearchComponent,
OfficeIconComponent,
PublicAdministrationIconComponent,
@@ -49,7 +49,7 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
imports: [
CommonModule,
ButtonComponent,
- CloseIconComponent,
+ IconComponent,
InstantSearchComponent,
FormsModule,
ReactiveFormsModule,
--
GitLab
From 4daca25fb7ee56310967a964ddd865ea22ccab80 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 10:37:11 +0200
Subject: [PATCH 10/36] OZG-7707 replace delete icon
---
...regation-mapping-field-form.component.html | 2 +-
...ation-mapping-field-form.component.spec.ts | 4 +--
...ggregation-mapping-field-form.component.ts | 4 +--
...n-delete-open-dialog-button.component.html | 2 +-
...elete-open-dialog-button.component.spec.ts | 4 +--
...min-delete-open-dialog-button.component.ts | 4 +--
alfa-client/libs/design-system/src/index.ts | 1 -
.../delete-icon/delete-icon.component.spec.ts | 21 ---------------
.../delete-icon/delete-icon.component.ts | 27 -------------------
.../icons/delete-icon/delete-icon.stories.ts | 27 -------------------
10 files changed, 10 insertions(+), 86 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.stories.ts
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
index a70383f4bc..12f62f2474 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
@@ -13,7 +13,7 @@
[dataTestId]="'remove-mapping-button-' + index"
[attr.data-test-id]="'remove-mapping-' + index"
>
- <ods-delete-icon icon />
+ <ods-icon icon name="delete" color="error" />
</ods-button>
</div>
<div class="flex flex-col gap-4">
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts
index d5f466dd45..4cb8475306 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts
@@ -5,7 +5,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { expect } from '@jest/globals';
import { TextEditorComponent } from '@ods/component';
-import { ButtonComponent, DeleteIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { getDataTestIdOf } from '../../../../../../../../tech-shared/test/data-test';
import { AggregationMappingFormservice } from '../../aggregation-mapping.formservice';
@@ -51,7 +51,7 @@ describe('AggregationMappingFieldFormComponent', () => {
AggregationMappingFieldFormComponent,
MockComponent(TextEditorComponent),
MockComponent(ButtonComponent),
- MockComponent(DeleteIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts
index 346d5f2704..5f30dff6d7 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts
@@ -2,14 +2,14 @@ import { ADMIN_FORMSERVICE } from '@admin-client/shared';
import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { TextEditorComponent } from '@ods/component';
-import { ButtonComponent, DeleteIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { AggregationMappingFormservice } from '../../aggregation-mapping.formservice';
@Component({
selector: 'admin-aggregation-mapping-field-form',
standalone: true,
templateUrl: './aggregation-mapping-field-form.component.html',
- imports: [ButtonComponent, DeleteIconComponent, ReactiveFormsModule, TextEditorComponent],
+ imports: [ButtonComponent, IconComponent, ReactiveFormsModule, TextEditorComponent],
})
export class AggregationMappingFieldFormComponent {
@Input({ required: true }) index: number;
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
index c006d95c84..a9f8785944 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
@@ -1,3 +1,3 @@
<ods-open-dialog-button variant="outline_error" label="Löschen" dataTestId="delete-button">
- <ods-delete-icon icon />
+ <ods-icon icon name="delete" color="error" />
</ods-open-dialog-button>
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.spec.ts b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.spec.ts
index 3250b9c18a..09555f5f7e 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.spec.ts
+++ b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { OpenDialogButtonComponent } from '@ods/component';
-import { DeleteIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { AdminDeleteOpenDialogButtonComponent } from './admin-delete-open-dialog-button.component';
@@ -11,7 +11,7 @@ describe('AdminDeleteOpenDialogButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [AdminDeleteOpenDialogButtonComponent],
- declarations: [MockComponent(OpenDialogButtonComponent), MockComponent(DeleteIconComponent)],
+ declarations: [MockComponent(OpenDialogButtonComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(AdminDeleteOpenDialogButtonComponent);
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.ts b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.ts
index f9bcd34727..0dd72cbdcf 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.ts
+++ b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.ts
@@ -1,11 +1,11 @@
import { Component } from '@angular/core';
import { OpenDialogButtonComponent } from '@ods/component';
-import { DeleteIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
@Component({
selector: 'admin-delete-open-dialog-button',
standalone: true,
- imports: [DeleteIconComponent, OpenDialogButtonComponent],
+ imports: [OpenDialogButtonComponent, IconComponent],
templateUrl: './admin-delete-open-dialog-button.component.html',
})
export class AdminDeleteOpenDialogButtonComponent {}
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 425ba58f65..0e0db7fec4 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,7 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/delete-icon/delete-icon.component';
export * from './lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component';
export * from './lib/icons/discard-vorgang-icon/discard-vorgang-icon.component';
export * from './lib/icons/edit-icon/edit-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.spec.ts
deleted file mode 100644
index 354449bdfb..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DeleteIconComponent } from './delete-icon.component';
-
-describe('DeleteIconComponent', () => {
- let component: DeleteIconComponent;
- let fixture: ComponentFixture<DeleteIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DeleteIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DeleteIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.ts
deleted file mode 100644
index fc06f683c6..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-delete-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-error', class)]"
- aria-hidden="true"
- >
- <path
- d="M7 21C6.45 21 5.97917 20.8042 5.5875 20.4125C5.19583 20.0208 5 19.55 5 19V6H4V4H9V3H15V4H20V6H19V19C19 19.55 18.8042 20.0208 18.4125 20.4125C18.0208 20.8042 17.55 21 17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17Z"
- />
- </svg> `,
-})
-export class DeleteIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.stories.ts
deleted file mode 100644
index 4602289bc5..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-icon/delete-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { DeleteIconComponent } from './delete-icon.component';
-
-const meta: Meta<DeleteIconComponent> = {
- title: 'Icons/Delete icon',
- component: DeleteIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<DeleteIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
--
GitLab
From c1235a8992cde39fbcf7224e610aff7ff0f6a216 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 2 Apr 2025 14:54:55 +0200
Subject: [PATCH 11/36] OZG-7707 rename "color" prop to "fill"
---
alfa-client/apps/demo/src/app/app.component.html | 6 +++---
.../libs/design-system/src/lib/icon/icon.component.ts | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 4af108d3a3..66408514bb 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -58,10 +58,10 @@
<div class="my-12">
<h2 class="heading-2">Icons</h2>
- <div class="mb-6 flex">
+ <div class="mb-6 flex gap-1">
<ods-icon name="account-circle" size="xxl" />
- <ods-icon name="accessibility" size="extra-large" color="text" />
- <ods-icon name="accessibility" size="large" color="error" />
+ <ods-icon name="accessibility" size="extra-large" fill="text" />
+ <ods-icon name="accessibility" size="large" fill="error" />
<ods-icon name="accessibility" class="fill-red-500" />
<ods-icon name="accessibility" size="small" />
<ods-icon name="admin-logo" size="unset" />
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index 6e32cb5a7a..df7f281cd8 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -38,7 +38,7 @@ const iconVariants = cva('', {
xxl: 'size-12',
unset: '',
},
- color: {
+ fill: {
primary: 'fill-primary',
text: 'fill-text',
whitetext: 'fill-whitetext',
@@ -56,14 +56,14 @@ type IconVariants = VariantProps<typeof iconVariants>;
selector: 'ods-icon',
standalone: true,
imports: [CommonModule, SvgIconComponent],
- template: `<svg-icon [src]="'assets/icons/' + name + '.svg'" [svgClass]="twMerge(iconVariants({ size, color }), class)" />`,
+ template: `<svg-icon [src]="'assets/icons/' + name + '.svg'" [svgClass]="twMerge(iconVariants({ size, fill }), class)" />`,
styles: [':host {@apply block w-fit}'],
})
export class IconComponent {
@Input({ required: true }) name!: string;
@Input() class: string;
@Input() size: IconVariants['size'] = 'medium';
- @Input() color: IconVariants['color'] = 'primary';
+ @Input() fill: IconVariants['fill'] = 'primary';
readonly iconVariants = iconVariants;
readonly twMerge = twMerge;
--
GitLab
From 4066b9eeb44fef3bbe06662dd532f2d1118dc324 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 13:58:41 +0200
Subject: [PATCH 12/36] OZG-7707 replace more icons - delete vorgang finally
icon - discard vorgang icon
---
alfa-client/libs/design-system/src/index.ts | 2 -
...ete-vorgang-finally-icon.component.spec.ts | 21 ------
.../delete-vorgang-finally-icon.component.ts | 65 -------------------
.../delete-vorgang-finally-icon.stories.ts | 27 --------
.../discard-vorgang-icon.component.spec.ts | 21 ------
.../discard-vorgang-icon.component.ts | 32 ---------
.../discard-vorgang-icon.stories.ts | 27 --------
.../endgueltig-loeschen-button.component.html | 4 +-
...dgueltig-loeschen-button.component.spec.ts | 4 +-
.../src/lib/loesch-anforderung.module.ts | 4 +-
.../verwerfen-button.component.html | 4 +-
.../verwerfen-button.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 2 -
13 files changed, 10 insertions(+), 207 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 0e0db7fec4..31432b99ab 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component';
-export * from './lib/icons/discard-vorgang-icon/discard-vorgang-icon.component';
export * from './lib/icons/edit-icon/edit-icon.component';
export * from './lib/icons/error-icon/error-icon.component';
export * from './lib/icons/exclamation-icon/exclamation-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts
deleted file mode 100644
index badea86a5e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DeleteVorgangFinallyIconComponent } from './delete-vorgang-finally-icon.component';
-
-describe('DeleteVorgangFinallyIconComponent', () => {
- let component: DeleteVorgangFinallyIconComponent;
- let fixture: ComponentFixture<DeleteVorgangFinallyIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DeleteVorgangFinallyIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DeleteVorgangFinallyIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts
deleted file mode 100644
index 4d99ed334f..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-delete-vorgang-finally-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- fill-rule="evenodd"
- clip-rule="evenodd"
- d="M17.7366 13V3.11101H12.4405L7.74777 8.05811L7.74777 13H5.75V8.05811C5.75 7.49738 5.96112 6.95968 6.3368 6.56365L11.0296 1.61654C11.4041 1.22173 11.9115 1 12.4405 1H17.7366C18.8399 1 19.7344 1.94513 19.7344 3.11101V13H17.7366Z"
- />
- <path
- d="M7.75 20C7.75 19.4477 8.19772 19 8.75 19C9.30228 19 9.75 19.4477 9.75 20C9.75 20.5523 9.30228 21 8.75 21C8.19772 21 7.75 20.5523 7.75 20Z"
- />
- <path
- d="M7.75 20C7.75 19.4477 8.19772 19 8.75 19C9.30228 19 9.75 19.4477 9.75 20C9.75 20.5523 9.30228 21 8.75 21C8.19772 21 7.75 20.5523 7.75 20Z"
- />
- <path
- d="M11.75 21C11.75 20.4477 12.1977 20 12.75 20C13.3023 20 13.75 20.4477 13.75 21V22C13.75 22.5523 13.3023 23 12.75 23C12.1977 23 11.75 22.5523 11.75 22V21Z"
- />
- <path
- d="M11.75 21C11.75 20.4477 12.1977 20 12.75 20C13.3023 20 13.75 20.4477 13.75 21V22C13.75 22.5523 13.3023 23 12.75 23C12.1977 23 11.75 22.5523 11.75 22V21Z"
- />
- <path
- d="M11.75 13C11.75 12.4477 12.1977 12 12.75 12C13.3023 12 13.75 12.4477 13.75 13V17C13.75 17.5523 13.3023 18 12.75 18C12.1977 18 11.75 17.5523 11.75 17V13Z"
- />
- <path
- d="M11.75 13C11.75 12.4477 12.1977 12 12.75 12C13.3023 12 13.75 12.4477 13.75 13V17C13.75 17.5523 13.3023 18 12.75 18C12.1977 18 11.75 17.5523 11.75 17V13Z"
- />
- <path
- d="M7.75 15C7.75 14.4477 8.19772 14 8.75 14C9.30228 14 9.75 14.4477 9.75 15V16C9.75 16.5523 9.30228 17 8.75 17C8.19772 17 7.75 16.5523 7.75 16V15Z"
- />
- <path
- d="M7.75 15C7.75 14.4477 8.19772 14 8.75 14C9.30228 14 9.75 14.4477 9.75 15V16C9.75 16.5523 9.30228 17 8.75 17C8.19772 17 7.75 16.5523 7.75 16V15Z"
- />
- <path
- d="M15.75 20C15.75 19.4477 16.1977 19 16.75 19C17.3023 19 17.75 19.4477 17.75 20V21C17.75 21.5523 17.3023 22 16.75 22C16.1977 22 15.75 21.5523 15.75 21V20Z"
- />
- <path
- d="M15.75 20C15.75 19.4477 16.1977 19 16.75 19C17.3023 19 17.75 19.4477 17.75 20V21C17.75 21.5523 17.3023 22 16.75 22C16.1977 22 15.75 21.5523 15.75 21V20Z"
- />
- <path
- d="M15.75 15C15.75 14.4477 16.1977 14 16.75 14C17.3023 14 17.75 14.4477 17.75 15V16C17.75 16.5523 17.3023 17 16.75 17C16.1977 17 15.75 16.5523 15.75 16V15Z"
- />
- <path
- d="M15.75 15C15.75 14.4477 16.1977 14 16.75 14C17.3023 14 17.75 14.4477 17.75 15V16C17.75 16.5523 17.3023 17 16.75 17C16.1977 17 15.75 16.5523 15.75 16V15Z"
- />
- </svg> `,
-})
-export class DeleteVorgangFinallyIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts
deleted file mode 100644
index ddb92e8a00..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { DeleteVorgangFinallyIconComponent } from './delete-vorgang-finally-icon.component';
-
-const meta: Meta<DeleteVorgangFinallyIconComponent> = {
- title: 'Icons/Delete Vorgang finally icon',
- component: DeleteVorgangFinallyIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<DeleteVorgangFinallyIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
deleted file mode 100644
index 42eed91241..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DiscardVorgangIconComponent } from './discard-vorgang-icon.component';
-
-describe('DiscardVorgangIconComponent', () => {
- let component: DiscardVorgangIconComponent;
- let fixture: ComponentFixture<DiscardVorgangIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DiscardVorgangIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DiscardVorgangIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
deleted file mode 100644
index 1cee910fac..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-discard-vorgang-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M12.75 19.4L14.35 21L16.75 18.6286L19.15 21L20.75 19.4L18.3786 17L20.75 14.6L19.15 13L16.75 15.4L14.35 13L12.75 14.6L15.15 17L12.75 19.4Z"
- />
- <path
- fill-rule="evenodd"
- clip-rule="evenodd"
- d="M17 11V3.77384H12.0294L7.625 7.93078L7.625 18.408H10.75V20.1818H7.625C6.58947 20.1818 5.75 19.3876 5.75 18.408V7.93078C5.75 7.4596 5.94815 7.00779 6.30074 6.67501L10.7051 2.51807C11.0566 2.18631 11.5329 2 12.0294 2H17C18.0355 2 18.875 2.79417 18.875 3.77384V11H17Z"
- />
- </svg>`,
-})
-export class DiscardVorgangIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
deleted file mode 100644
index 6c73a8fd59..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { DiscardVorgangIconComponent } from './discard-vorgang-icon.component';
-
-const meta: Meta<DiscardVorgangIconComponent> = {
- title: 'Icons/Discard Vorgang icon',
- component: DiscardVorgangIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<DiscardVorgangIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
index 0043c92cb7..1c9a07a514 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
@@ -32,7 +32,7 @@
size="fit"
(clickEmitter)="endgueltigLoeschen.emit()"
>
- <ods-delete-vorgang-finally-icon icon class="fill-text" />
+ <ods-icon icon name="delete-vorgang-finally" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -41,6 +41,6 @@
variant="outline"
(clickEmitter)="endgueltigLoeschen.emit()"
>
- <ods-delete-vorgang-finally-icon icon />
+ <ods-icon icon name="delete-vorgang-finally" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
index a2a4b7a68f..75deac820c 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
@@ -24,7 +24,7 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DeleteVorgangFinallyIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { EndgueltigLoeschenButtonComponent } from './endgueltig-loeschen-button.component';
@@ -41,7 +41,7 @@ describe('EndgueltigLoeschenButtonComponent', () => {
declarations: [
EndgueltigLoeschenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(DeleteVorgangFinallyIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
}).compileComponents();
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
index ff527cfc47..b3de65bde7 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
@@ -29,7 +29,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonWithSpinnerComponent } from '@ods/component';
import {
- DeleteVorgangFinallyIconComponent,
+ IconComponent,
RequestVorgangDeletionIconComponent,
TooltipDirective,
UndoRequestVorgangDeletionIconComponent,
@@ -51,7 +51,7 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
HasLinkPipe,
RequestVorgangDeletionIconComponent,
ButtonWithSpinnerComponent,
- DeleteVorgangFinallyIconComponent,
+ IconComponent,
UndoRequestVorgangDeletionIconComponent,
TooltipDirective,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index 0c3fa80c34..ebd75e2249 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -34,7 +34,7 @@
size="fit"
(clickEmitter)="verwerfen()"
>
- <ods-discard-vorgang-icon icon class="fill-text" />
+ <ods-icon icon name="discard-vorgang" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -44,7 +44,7 @@
variant="outline"
(clickEmitter)="verwerfen()"
>
- <ods-discard-vorgang-icon icon />
+ <ods-icon icon name="discard-vorgang" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
index 32e09c8c15..dabf46abb0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DiscardVorgangIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -51,7 +51,7 @@ describe('VerwerfenButtonComponent', () => {
declarations: [
VerwerfenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(DiscardVorgangIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
HasLinkPipe,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 41fa07bdd0..38309b9811 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -73,7 +73,6 @@ import {
BescheidStatusTextComponent,
ButtonCardComponent,
ButtonComponent,
- DiscardVorgangIconComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
EditIconComponent,
@@ -199,7 +198,6 @@ const routes: Routes = [
ForwardingButtonContainerComponent,
TooltipDirective,
EditIconComponent,
- DiscardVorgangIconComponent,
MatTabContent,
IconComponent,
],
--
GitLab
From d6ee7fd72f38364291120fd40213b69241ec7cd1 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 14:12:30 +0200
Subject: [PATCH 13/36] OZG-7707 rename color to fill for all icons
---
.../apps/admin/src/app/app.component.html | 2 +-
alfa-client/apps/demo/src/app/app.component.html | 16 ++++++++--------
...aggregation-mapping-field-form.component.html | 2 +-
.../organisations-einheit-list.component.html | 2 +-
...dmin-delete-open-dialog-button.component.html | 2 +-
.../bescheid-wizard-container.component.html | 2 +-
...-wizard-antrag-bescheiden-form.component.html | 2 +-
...wizard-cancel-dialog-container.component.html | 2 +-
...-wizard-create-document-button.component.html | 2 +-
...-wizard-upload-document-button.component.html | 2 +-
.../beschieden-date-container.component.html | 2 +-
.../binary-file2/binary-file2.component.html | 2 +-
.../accessibility-button.component.ts | 2 +-
.../bescheid-status-text.component.ts | 2 +-
.../ui/back-button/back-button.component.html | 2 +-
...-user-profile-button-container.component.html | 2 +-
.../abschliessen-button.component.html | 2 +-
.../annehmen-button.component.html | 2 +-
.../vorgang-archive-status.component.html | 2 +-
.../erledigen-button-container.component.html | 2 +-
...edereroeffnen-button-container.component.html | 2 +-
21 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index e6cf848872..d383d837c6 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -54,7 +54,7 @@
caption="Organisationseinheiten"
[path]="routes.ORGANISATIONSEINHEITEN"
>
- <ods-icon icon name="orga-unit" color="text" />
+ <ods-icon icon name="orga-unit" fill="text" />
</ods-nav-item>
<hr />
}
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 66408514bb..0931407fea 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -504,7 +504,7 @@
<ods-stamp-icon />
</ods-radio-button-card>
<ods-radio-button-card label="abgelehnt" name="exampleName" value="abgelehnt" variant="bescheid_abgelehnt">
- <ods-icon name="close" color="abgelehnt" size="large" />
+ <ods-icon name="close" fill="abgelehnt" size="large" />
</ods-radio-button-card>
</div>
</form>
@@ -557,19 +557,19 @@
<div class="flex flex-col gap-4 bg-background-200 p-6">
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="false" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
</div>
@@ -580,26 +580,26 @@
text="Bescheiddokument und noch mehr"
subText="Subtext in der 2ten Reihe"
>
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="false" id="upload117" dataTestId="demo-upload-1">
- <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-upload" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="true" id="upload117" dataTestId="demo-upload-2">
- <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-upload" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
index 12f62f2474..acf4e94784 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
@@ -13,7 +13,7 @@
[dataTestId]="'remove-mapping-button-' + index"
[attr.data-test-id]="'remove-mapping-' + index"
>
- <ods-icon icon name="delete" color="error" />
+ <ods-icon icon name="delete" fill="error" />
</ods-button>
</div>
<div class="flex flex-col gap-4">
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
index fd66640a20..7fb1f503e3 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
@@ -39,7 +39,7 @@
data-test-id="delete-organisations-einheit-dialog-button"
[dialogData]="{ organisationsEinheitName: organisationsEinheit.name, organisationsEinheitId: organisationsEinheit.id }"
>
- <ods-icon icon name="delete" color="error" />
+ <ods-icon icon name="delete" fill="error" />
</ods-open-dialog-button>
</div>
</ods-list-item>
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
index a9f8785944..179f269b0d 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
@@ -1,3 +1,3 @@
<ods-open-dialog-button variant="outline_error" label="Löschen" dataTestId="delete-button">
- <ods-icon icon name="delete" color="error" />
+ <ods-icon icon name="delete" fill="error" />
</ods-open-dialog-button>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
index 649d125a51..33e0e261cd 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
@@ -37,7 +37,7 @@
(clickEmitter)="cancelWizard(bescheidStateResource.resource)"
dataTestId="close-bescheid"
>
- <ods-icon icon name="close" color="text" />
+ <ods-icon icon name="close" fill="text" />
</ods-button>
<alfa-bescheid-wizard
[vorgangWithEingangResource]="vorgangWithEingangResource"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
index 6c90dcd130..aa96d4bae0 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
@@ -41,7 +41,7 @@
data-test-id="button-abgelehnt"
variant="bescheid_abgelehnt"
>
- <ods-icon name="close" size="large" color="abgelehnt" />
+ <ods-icon name="close" size="large" fill="abgelehnt" />
</ods-radio-button-card>
</div>
<div class="flex">
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
index d566e92d9e..3ed2d41755 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
@@ -38,7 +38,7 @@
dataTestId="bescheiderstellung-abbrechen-entwurf-speichern"
text="Entwurf speichern"
>
- <ods-icon icon name="check" color="whitetext" />
+ <ods-icon icon name="check" fill="whitetext" />
</ods-button-with-spinner>
<ods-button-with-spinner
[stateResource]="deleteStateResource$ | async"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
index f283d60473..8eba96e6b3 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
@@ -6,5 +6,5 @@
subText="automatisch erstellen"
data-test-id="create-bescheid-document-button"
>
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
index 1633e3b160..1cecd65412 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
@@ -6,7 +6,7 @@
class="w-72"
data-test-id="bescheid-wizard-upload-document-upload-editor"
>
- <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-upload" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<div text class="text-center">Bescheiddokument hochladen</div>
</ods-single-file-upload-editor>
diff --git a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
index 03c6c749e0..cef4e8571a 100644
--- a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
@@ -28,7 +28,7 @@
@if (bescheid.bewilligt) {
<ods-stamp-icon data-test-id="bewilligt-icon" size="small" class="fill-bewilligt" />
} @else {
- <ods-icon name="close" color="abgelehnt" data-test-id="abgelehnt-icon" />
+ <ods-icon name="close" fill="abgelehnt" data-test-id="abgelehnt-icon" />
}
{{ bescheid.beschiedenAm | formatFullDatePipe }}
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index aed6ff10ce..49c0340b57 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -42,7 +42,7 @@
aria-label="Anhang löschen Button"
data-test-class="delete-file-button"
>
- <ods-icon name="close" color="text" />
+ <ods-icon name="close" fill="text" />
</button>
</div>
</ods-attachment>
diff --git a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
index c8151a459a..939f6bf256 100644
--- a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
+++ b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
@@ -8,7 +8,7 @@ import { IconComponent } from '../../../../design-system/src/lib/icon/icon.compo
standalone: true,
imports: [CommonModule, LinkComponent, TooltipDirective, IconComponent],
template: `<ods-link [url]="url" [linkTestId]="linkTestId" tooltip="Barrierefreiheit" [openInNewTab]="true">
- <ods-icon name="accessibility" size="large" color="neutral" />
+ <ods-icon name="accessibility" size="large" fill="neutral" />
</ods-link>`,
})
export class AccessibilityButtonComponent {
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
index 0b6ee4f204..85a4e7fe7c 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
@@ -36,7 +36,7 @@ import { StampIconComponent } from '../icons/stamp-icon/stamp-icon.component';
><ods-stamp-icon size="medium" class="fill-bewilligt" />Bewilligt am {{ dateText }}</span
>
<span class="flex items-center gap-2" *ngIf="!bewilligt">
- <ods-icon name="close" color="abgelehnt" />
+ <ods-icon name="close" fill="abgelehnt" />
Abgelehnt am {{ dateText }}
</span>
<span *ngIf="hasBescheidDraft" class="flex items-center text-error" data-test-class="bescheid-status-draft">(Entwurf)</span>
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
index ff29f8519d..0c9b6ef278 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
@@ -25,6 +25,6 @@
-->
<a [routerLink]="linkTo" data-test-id="back-button" tabindex="-1">
<ods-button variant="ghost" size="fit" [tooltip]="label" tooltipAriaType="aria-labelledby">
- <ods-icon name="arrow-back" icon color="text" />
+ <ods-icon name="arrow-back" icon fill="text" />
</ods-button>
</a>
diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
index e116c9cf44..519af1f8ec 100644
--- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
+++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="showUserProfileSearch()"
>
- <ods-icon icon name="account-circle" color="text" />
+ <ods-icon icon name="account-circle" fill="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index 433acff379..66dcd512e7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -35,7 +35,7 @@
size="fit"
(clickEmitter)="abschliessen()"
>
- <ods-icon icon name="check" color="text" />
+ <ods-icon icon name="check" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index 1c8396c66a..b7252d4f0e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -34,7 +34,7 @@
size="fit"
dataTestId="annehmen-icon-button"
>
- <ods-icon icon name="check-circle" color="text" />
+ <ods-icon icon name="check-circle" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
index 123e10b9d3..e46e98e4a7 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
@@ -1,4 +1,4 @@
<div class="flex items-center gap-1">
- <ods-icon name="archive" color="text" />
+ <ods-icon name="archive" fill="text" />
<span>in Archivierung</span>
</div>
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index c0be85781e..c249b2a2c2 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="erledigen()"
>
- <ods-icon icon name="check-circle" color="text" />
+ <ods-icon icon name="check-circle" fill="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
index be8296d701..a5600b7200 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="wiedereroeffnen()"
>
- <ods-icon icon name="check-circle" color="text" />
+ <ods-icon icon name="check-circle" fill="text" />
</ods-button-with-spinner>
}
--
GitLab
From 8617af75158a50383748af40b1ffa8a8ec5b0f11 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 15:02:00 +0200
Subject: [PATCH 14/36] OZG-7707 replace more icons - edit icon - error icon
---
alfa-client/libs/design-system/src/index.ts | 2 -
.../edit-icon/edit-icon.component.spec.ts | 44 ----------------
.../icons/edit-icon/edit-icon.component.ts | 50 ------------------
.../lib/icons/edit-icon/edit-icon.stories.ts | 50 ------------------
.../error-icon/error-icon.component.spec.ts | 44 ----------------
.../icons/error-icon/error-icon.component.ts | 51 -------------------
.../icons/error-icon/error-icon.stories.ts | 50 ------------------
.../lib/user-icon/user-icon.component.html | 6 ++-
.../lib/user-icon/user-icon.component.spec.ts | 4 +-
.../src/lib/user-profile.module.ts | 2 -
.../aktenzeichen-editable.component.html | 2 +-
.../aktenzeichen-editable.component.spec.ts | 4 +-
.../bearbeiten-button.component.html | 4 +-
.../bearbeiten-button.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 3 --
...t-zustaendige-stelle-button.component.html | 2 +-
...ustaendige-stelle-button.component.spec.ts | 4 +-
.../src/lib/zustaendige-stelle.module.ts | 3 +-
18 files changed, 17 insertions(+), 312 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.stories.ts
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 31432b99ab..eda60fb424 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/edit-icon/edit-icon.component';
-export * from './lib/icons/error-icon/error-icon.component';
export * from './lib/icons/exclamation-icon/exclamation-icon.component';
export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.spec.ts
deleted file mode 100644
index 67bff50443..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { EditIconComponent } from './edit-icon.component';
-
-describe('EditIconComponent', () => {
- let component: EditIconComponent;
- let fixture: ComponentFixture<EditIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [EditIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(EditIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts
deleted file mode 100644
index c5c54a6669..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-edit-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)"
- aria-hidden="true"
- >
- <path
- d="M5 19H6.425L16.2 9.225L14.775 7.8L5 17.575V19ZM3 21V16.75L16.2 3.575C16.4 3.39167 16.6208 3.25 16.8625 3.15C17.1042 3.05 17.3583 3 17.625 3C17.8917 3 18.15 3.05 18.4 3.15C18.65 3.25 18.8667 3.4 19.05 3.6L20.425 5C20.625 5.18333 20.7708 5.4 20.8625 5.65C20.9542 5.9 21 6.15 21 6.4C21 6.66667 20.9542 6.92083 20.8625 7.1625C20.7708 7.40417 20.625 7.625 20.425 7.825L7.25 21H3ZM15.475 8.525L14.775 7.8L16.2 9.225L15.475 8.525Z"
- />
- </svg>`,
-})
-export class EditIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.stories.ts
deleted file mode 100644
index 0fc98077e5..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { EditIconComponent } from './edit-icon.component';
-
-const meta: Meta<EditIconComponent> = {
- title: 'Icons/Edit icon',
- component: EditIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<EditIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.spec.ts
deleted file mode 100644
index 00a740349a..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ErrorIconComponent } from './error-icon.component';
-
-describe('ErrorIconComponent', () => {
- let component: ErrorIconComponent;
- let fixture: ComponentFixture<ErrorIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ErrorIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(ErrorIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.ts
deleted file mode 100644
index 0d93cbe0a2..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-error-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- viewBox="0 0 24 24"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-error', class)]"
- aria-hidden="true"
- fill="inherit"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M12 17C12.2833 17 12.5208 16.9042 12.7125 16.7125C12.9042 16.5208 13 16.2833 13 16C13 15.7167 12.9042 15.4792 12.7125 15.2875C12.5208 15.0958 12.2833 15 12 15C11.7167 15 11.4792 15.0958 11.2875 15.2875C11.0958 15.4792 11 15.7167 11 16C11 16.2833 11.0958 16.5208 11.2875 16.7125C11.4792 16.9042 11.7167 17 12 17ZM11 13H13V7H11V13ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z"
- />
- </svg>`,
-})
-export class ErrorIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.stories.ts
deleted file mode 100644
index 7fdad04af1..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/error-icon/error-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ErrorIconComponent } from './error-icon.component';
-
-const meta: Meta<ErrorIconComponent> = {
- title: 'Icons/Error icon',
- component: ErrorIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ErrorIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
index a6866ab9d0..2a57e10d8f 100644
--- a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
+++ b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
@@ -41,10 +41,12 @@
style="--mdc-icon-button-icon-size: 36px"
/>
<span *ngIf="errorMessageCode === messageCode.RESOURCE_NOT_FOUND" data-test-class="user-profile-user-not-found">!</span>
- <ods-error-icon
+ <ods-icon
*ngIf="errorMessageCode === messageCode.SERVICE_UNAVAILABLE"
+ name="error"
+ fill="error"
+ size="extra-large"
data-test-class="user-profile-service-unavailable"
- style="--mdc-icon-button-icon-size: 42px"
/>
</ng-template>
</div>
diff --git a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
index 5a26a51d01..c1e0a1e574 100644
--- a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
@@ -35,7 +35,7 @@ import { NO_NAME_MESSAGE, UserProfileResource, userProfileMessage } from '@alfa-
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { faker } from '@faker-js/faker';
-import { ErrorIconComponent, UserIconComponent as OdsUserIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, UserIconComponent as OdsUserIconComponent, TooltipDirective } from '@ods/system';
import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile';
import { MockComponent, MockDirective } from 'ng-mocks';
@@ -60,7 +60,7 @@ describe('UserIconComponent', () => {
MatIcon,
MockComponent(SpinnerComponent),
MockDirective(TooltipDirective),
- MockComponent(ErrorIconComponent),
+ MockComponent(IconComponent),
MockComponent(OdsUserIconComponent),
],
});
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
index 1f8af984ac..e8b6bcbc3a 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
@@ -41,7 +41,6 @@ import {
DropdownMenuButtonItemComponent,
DropdownMenuComponent,
DropdownMenuItemComponent,
- ErrorIconComponent,
IconComponent,
LogoutIconComponent,
UserIconComponent as OdsUserIconComponent,
@@ -74,7 +73,6 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
RouterModule,
OdsUserIconComponent,
LogoutIconComponent,
- ErrorIconComponent,
IconButtonWithSpinnerComponent,
HasLinkPipe,
MatTooltip,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
index a90a52997e..3ffe89952d 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
@@ -35,7 +35,7 @@
data-test-id="aktenzeichen-editieren"
(clickEmitter)="onEdit()"
>
- <ods-edit-icon icon />
+ <ods-icon icon name="edit" />
</ods-button>
</div>
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts
index c930351baf..bdbc6ef459 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts
@@ -27,7 +27,7 @@ import { DialogService } from '@alfa-client/ui';
import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { AktenzeichenComponent } from '@alfa-client/vorgang-shared-ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ButtonComponent, EditIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent, MockDirective } from 'ng-mocks';
@@ -48,7 +48,7 @@ describe('AktenzeichenComponent', () => {
HasLinkPipe,
AktenzeichenEditableComponent,
MockComponent(ButtonComponent),
- MockComponent(EditIconComponent),
+ MockComponent(IconComponent),
MockComponent(AktenzeichenComponent),
MockDirective(TooltipDirective),
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
index 46880b0531..81d7b6b8e9 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
@@ -35,7 +35,7 @@
size="fit"
(clickEmitter)="bearbeiten()"
>
- <ods-edit-icon icon class="fill-text" />
+ <ods-icon icon name="edit" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -45,7 +45,7 @@
variant="outline"
(clickEmitter)="bearbeiten()"
>
- <ods-edit-icon icon />
+ <ods-icon icon name="edit" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
index 382edfc27f..8c920c6a3c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { EditIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -51,7 +51,7 @@ describe('BearbeitenButtonComponent', () => {
declarations: [
BearbeitenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(EditIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
HasLinkPipe,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 38309b9811..9217c0de90 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -75,7 +75,6 @@ import {
ButtonComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
- EditIconComponent,
ErrorMessageComponent,
ExclamationIconComponent,
FileIconComponent,
@@ -150,7 +149,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- EditIconComponent,
ExclamationIconComponent,
SaveIconComponent,
SendIconComponent,
@@ -197,7 +195,6 @@ const routes: Routes = [
FileIconComponent,
ForwardingButtonContainerComponent,
TooltipDirective,
- EditIconComponent,
MatTabContent,
IconComponent,
],
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html
index d2d7f16b24..85dd821da8 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html
@@ -30,5 +30,5 @@
[dataTestId]="dataTestId"
(clickEmitter)="openSearchDialog()"
>
- <ods-edit-icon icon />
+ <ods-icon icon name="edit" />
</ods-button>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.spec.ts
index 86cefaca99..4adbe4b78e 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.spec.ts
@@ -26,7 +26,7 @@ import { OzgcloudDialogService } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
import { Resource } from '@ngxp/rest';
-import { ButtonComponent, EditIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { SearchZustaendigeStelleDialogComponent } from '../search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component';
@@ -47,7 +47,7 @@ describe('EditZustaendigeStelleButtonComponent', () => {
dialogService = mock(OzgcloudDialogService);
await TestBed.configureTestingModule({
declarations: [EditZustaendigeStelleButtonComponent],
- imports: [MockComponent(ButtonComponent), MockComponent(EditIconComponent)],
+ imports: [MockComponent(ButtonComponent), MockComponent(IconComponent)],
providers: [
{
provide: OzgcloudDialogService,
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index 3aabe3c7d7..e18c59b1fd 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -26,7 +26,6 @@ import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
ButtonComponent,
- EditIconComponent,
ExternalUnitIconComponent,
IconComponent,
InstantSearchComponent,
@@ -57,7 +56,7 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
OfficeIconComponent,
SearchIconComponent,
ExternalUnitIconComponent,
- EditIconComponent,
+ IconComponent,
PublicAdministrationIconComponent,
],
declarations: [
--
GitLab
From 4c599d3b9ea36f9f8b6735791a25103a43656517 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 15:59:09 +0200
Subject: [PATCH 15/36] OZG-7707 replace more icons - exclamation icon -
forward vorgang icon
---
.../apps/demo/src/app/app.component.spec.ts | 4 +-
...ganisations-einheit-list.component.spec.ts | 3 +-
.../user-form-roles.component.spec.ts | 8 ++-
.../checkbox-editor.component.spec.ts | 5 +-
alfa-client/libs/design-system/src/index.ts | 2 -
.../error-message.component.spec.ts | 5 +-
.../error-message/error-message.component.ts | 6 +--
.../forwarding-item.component.spec.ts | 4 +-
.../forwarding-item.component.ts | 6 +--
.../exclamation-icon.component.spec.ts | 44 ---------------
.../exclamation-icon.component.ts | 52 ------------------
.../exclamation-icon.stories.ts | 50 -----------------
.../forward-vorgang-icon.component.spec.ts | 44 ---------------
.../forward-vorgang-icon.component.ts | 53 -------------------
.../forward-vorgang-icon.stories.ts | 50 -----------------
.../icons/user-icon/user-icon.component.ts | 3 +-
...forwarding-button-container.component.html | 4 +-
...warding-button-container.component.spec.ts | 8 +--
.../forwarding-button-container.component.ts | 4 +-
.../forwarding-button.component.html | 2 +-
.../forwarding-button.component.spec.ts | 4 +-
.../forwarding-button.component.ts | 4 +-
.../vorgang-export-container.component.html | 2 +-
...vorgang-export-container.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 2 -
25 files changed, 41 insertions(+), 332 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.spec.ts b/alfa-client/apps/demo/src/app/app.component.spec.ts
index 4a014cf975..c532d28824 100644
--- a/alfa-client/apps/demo/src/app/app.component.spec.ts
+++ b/alfa-client/apps/demo/src/app/app.component.spec.ts
@@ -23,14 +23,14 @@
*/
import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
-import { IconComponent } from '@ods/system';
+import { ErrorMessageComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent)],
+ imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent), MockComponent(ErrorMessageComponent)],
}).compileComponents();
});
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
index a680943511..7f17b5fbc0 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
@@ -28,7 +28,7 @@ import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { OpenDialogButtonComponent } from '@ods/component';
-import { ExclamationIconComponent, IconComponent, ListComponent, ListItemComponent } from '@ods/system';
+import { IconComponent, ListComponent, ListItemComponent } from '@ods/system';
import { getConvertedDataTestIdOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { createAdminOrganisationsEinheit } from '../../../../../organisations-einheit-shared/src/test/organisations-einheit';
@@ -55,7 +55,6 @@ describe('OrganisationsEinheitListComponent', () => {
OrganisationsEinheitListComponent,
MockComponent(ListComponent),
MockComponent(ListItemComponent),
- MockComponent(ExclamationIconComponent),
MockComponent(IconComponent),
],
}).compileComponents();
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts
index 5f21edb7a5..39a21b7faf 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts
@@ -21,7 +21,13 @@ describe('UserFormRolesComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [UserFormRolesComponent, ReactiveFormsModule, MockComponent(InfoIconComponent), MockDirective(TooltipDirective)],
+ imports: [
+ UserFormRolesComponent,
+ ReactiveFormsModule,
+ MockComponent(InfoIconComponent),
+ MockComponent(ValidationErrorComponent),
+ MockDirective(TooltipDirective),
+ ],
}).compileComponents();
fixture = TestBed.createComponent(UserFormRolesComponent);
diff --git a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
index cada7efb7a..ca7100ac03 100644
--- a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
@@ -24,9 +24,12 @@
import { getElementFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
+import { ErrorMessageComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createInvalidParam } from 'libs/tech-shared/test/error';
+import { MockComponent } from 'ng-mocks';
import { MockNgControl } from '../../../../test/form/MockNgControl';
+import { ValidationErrorComponent } from '../validation-error/validation-error.component';
import { CheckboxEditorComponent } from './checkbox-editor.component';
describe('CheckboxEditorComponent', () => {
@@ -38,7 +41,7 @@ describe('CheckboxEditorComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [CheckboxEditorComponent],
+ imports: [CheckboxEditorComponent, ValidationErrorComponent, MockComponent(ErrorMessageComponent)],
}).compileComponents();
fixture = TestBed.createComponent(CheckboxEditorComponent);
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index eda60fb424..489ff70ab8 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,10 +45,8 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/exclamation-icon/exclamation-icon.component';
export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
-export * from './lib/icons/forward-vorgang-icon/forward-vorgang-icon.component';
export * from './lib/icons/help-icon/help-icon.component';
export * from './lib/icons/iconVariants';
export * from './lib/icons/info-icon/info-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts
index b5a5674105..5590fa5a7a 100644
--- a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.spec.ts
@@ -22,7 +22,8 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExclamationIconComponent } from '../../icons/exclamation-icon/exclamation-icon.component';
+import { MockComponent } from 'ng-mocks';
+import { IconComponent } from '../../icon/icon.component';
import { ErrorMessageComponent } from './error-message.component';
describe('ErrorMessageComponent', () => {
@@ -31,7 +32,7 @@ describe('ErrorMessageComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [ErrorMessageComponent, ExclamationIconComponent],
+ imports: [ErrorMessageComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(ErrorMessageComponent);
diff --git a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts
index 7e8cc5ae0e..cf7a5aacc0 100644
--- a/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts
+++ b/alfa-client/libs/design-system/src/lib/form/error-message/error-message.component.ts
@@ -24,14 +24,14 @@
import { EMPTY_STRING } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { ExclamationIconComponent } from '../../icons/exclamation-icon/exclamation-icon.component';
+import { IconComponent } from '../../icon/icon.component';
@Component({
selector: 'ods-error-message',
standalone: true,
- imports: [CommonModule, ExclamationIconComponent],
+ imports: [CommonModule, IconComponent],
styles: [':host {@apply flex text-error my-2 text-sm items-center font-medium}'],
- template: `<ods-exclamation-icon class="mr-1"></ods-exclamation-icon>
+ template: `<ods-icon name="exclamation" class="mr-1" fill="error" />
<div class="flex-grow break-words" [id]="id">
{{ text }}
<br *ngIf="subText" aria-hidden="true" />
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
index 5700f02837..5caa55f029 100644
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.spec.ts
@@ -22,6 +22,8 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
+import { IconComponent } from '../icon/icon.component';
import { ForwardingItemComponent } from './forwarding-item.component';
describe('ForwardingItemComponent', () => {
@@ -30,7 +32,7 @@ describe('ForwardingItemComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [ForwardingItemComponent],
+ imports: [ForwardingItemComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(ForwardingItemComponent);
diff --git a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
index e1322cfcde..09f4565fcc 100644
--- a/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
+++ b/alfa-client/libs/design-system/src/lib/forwarding-item/forwarding-item.component.ts
@@ -22,7 +22,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { Component, Input } from '@angular/core';
-import { ForwardVorgangIconComponent } from '../icons/forward-vorgang-icon/forward-vorgang-icon.component';
+import { IconComponent } from '../icon/icon.component';
export enum ForwardingDirection {
FROM = 'Weitergeleitet von',
@@ -32,11 +32,11 @@ export enum ForwardingDirection {
@Component({
selector: 'ods-forwarding-item',
standalone: true,
- imports: [ForwardVorgangIconComponent],
+ imports: [IconComponent],
template: ` <div class="h-full rounded-lg border border-grayborder">
<div class="flex flex-col gap-3 p-3 align-top sm:flex-row">
<div class="flex gap-3">
- <ods-forward-vorgang-icon class="fill-text" />
+ <ods-icon name="forward-vorgang" fill="text" />
<div class="font-medium text-gray-500">{{ direction }}:</div>
</div>
<div class="grow"><ng-content /></div>
diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts
deleted file mode 100644
index 88727f81f8..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExclamationIconComponent } from './exclamation-icon.component';
-
-describe('ExclamationIconComponent', () => {
- let component: ExclamationIconComponent;
- let fixture: ComponentFixture<ExclamationIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ExclamationIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(ExclamationIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts
deleted file mode 100644
index f5ccacb8ed..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-exclamation-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-error', class)]"
- aria-hidden="true"
- viewBox="0 0 20 20"
- fill="inherit"
- >
- <path
- d="M10.3069 14.7308C10.5416 14.7308 10.7383 14.6533 10.8971 14.4985C11.0559 14.3437 11.1353 14.1518 11.1353 13.923C11.1353 13.6942 11.0559 13.5023 10.8971 13.3475C10.7383 13.1928 10.5416 13.1155 10.3069 13.1155C10.0722 13.1155 9.87548 13.1928 9.71668 13.3475C9.55789 13.5023 9.47849 13.6942 9.47849 13.923C9.47849 14.1518 9.55789 14.3437 9.71668 14.4985C9.87548 14.6533 10.0722 14.7308 10.3069 14.7308ZM10.3072 11.077C10.5253 11.077 10.7079 11.0051 10.8551 10.8613C11.0024 10.7176 11.0761 10.5395 11.0761 10.327V5.827C11.0761 5.6145 11.0023 5.43633 10.8548 5.2925C10.7073 5.14883 10.5246 5.077 10.3066 5.077C10.0885 5.077 9.9059 5.14883 9.75873 5.2925C9.61139 5.43633 9.53772 5.6145 9.53772 5.827V10.327C9.53772 10.5395 9.61148 10.7176 9.75899 10.8613C9.9065 11.0051 10.0892 11.077 10.3072 11.077ZM10.3087 19.5C8.96109 19.5 7.69442 19.2507 6.50868 18.752C5.32295 18.2533 4.29156 17.5766 3.41452 16.7218C2.53748 15.8669 1.84308 14.8617 1.33132 13.706C0.81973 12.5503 0.563934 11.3156 0.563934 10.0017C0.563934 8.68775 0.819644 7.45267 1.33106 6.2965C1.84248 5.14033 2.53654 4.13467 3.41324 3.2795C4.28994 2.42433 5.3209 1.74725 6.50612 1.24825C7.69134 0.749417 8.95767 0.5 10.3051 0.5C11.6527 0.5 12.9194 0.749333 14.1051 1.248C15.2909 1.74667 16.3222 2.42342 17.1993 3.27825C18.0763 4.13308 18.7707 5.13833 19.2825 6.294C19.7941 7.44967 20.0499 8.68442 20.0499 9.99825C20.0499 11.3123 19.7942 12.5473 19.2827 13.7035C18.7713 14.8597 18.0773 15.8653 17.2006 16.7205C16.3239 17.5757 15.2929 18.2528 14.1077 18.7518C12.9225 19.2506 11.6561 19.5 10.3087 19.5Z"
- />
- </svg>`,
-})
-export class ExclamationIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts
deleted file mode 100644
index 4a2cfccb0f..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ExclamationIconComponent } from './exclamation-icon.component';
-
-const meta: Meta<ExclamationIconComponent> = {
- title: 'Icons/Exclamation icon',
- component: ExclamationIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ExclamationIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts
deleted file mode 100644
index dcbe4c3e63..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ForwardVorgangIconComponent } from './forward-vorgang-icon.component';
-
-describe('ForwardVorgangIconComponent', () => {
- let component: ForwardVorgangIconComponent;
- let fixture: ComponentFixture<ForwardVorgangIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ForwardVorgangIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(ForwardVorgangIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts
deleted file mode 100644
index 983f661619..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-forward-vorgang-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)"
- aria-hidden="true"
- >
- <path d="M17.7222 16.4V14L22 18.2L17.7222 22.4V19.94C14.6667 19.94 12.5278 20.9 11 23C11.6111 20 13.4444 17 17.7222 16.4Z" />
- <path
- fill-rule="evenodd"
- clip-rule="evenodd"
- d="M16.25 11V3.77384H11.2794L6.875 7.93078L6.875 18.408H9V20.1818H6.875C5.83947 20.1818 5 19.3876 5 18.408V7.93078C5 7.4596 5.19815 7.00779 5.55074 6.67501L9.95513 2.51807C10.3066 2.18631 10.7829 2 11.2794 2H16.25C17.2855 2 18.125 2.79417 18.125 3.77384V11H16.25Z"
- />
- </svg>`,
-})
-export class ForwardVorgangIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts
deleted file mode 100644
index 2fd3fa932e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/forward-vorgang-icon/forward-vorgang-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ForwardVorgangIconComponent } from './forward-vorgang-icon.component';
-
-const meta: Meta<ForwardVorgangIconComponent> = {
- title: 'Icons/Forward Vorgang icon',
- component: ForwardVorgangIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ForwardVorgangIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts
index 5fd4ae92c4..466b89fda0 100644
--- a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts
@@ -24,13 +24,12 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { twMerge } from 'tailwind-merge';
-import { ExclamationIconComponent } from '../exclamation-icon/exclamation-icon.component';
import { IconVariants, iconVariants } from '../iconVariants';
@Component({
selector: 'ods-user-icon',
standalone: true,
- imports: [CommonModule, ExclamationIconComponent],
+ imports: [CommonModule],
template: `
<svg
viewBox="0 0 112 112"
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
index bdf8537e74..b6d4f9244f 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
@@ -7,11 +7,11 @@
size="fit"
dataTestId="forwarding-icon-button"
>
- <ods-forward-vorgang-icon icon class="fill-text" />
+ <ods-icon icon name="forward-vorgang" fill="text" />
</ods-open-dialog-button>
} @else {
<ods-open-dialog-button label="Weiterleiten" variant="outline" dataTestId="forwarding-button">
- <ods-forward-vorgang-icon icon class="fill-primary" />
+ <ods-icon icon name="forward-vorgang" />
</ods-open-dialog-button>
}
}
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
index 64f911229d..f1c52ac963 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
@@ -3,7 +3,7 @@ import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-u
import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { OpenDialogButtonComponent } from '@ods/component';
-import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent, MockDirective } from 'ng-mocks';
@@ -19,11 +19,7 @@ describe('ForwardingButtonContainerComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [ForwardingButtonContainerComponent, HasLinkPipe],
- declarations: [
- MockComponent(OpenDialogButtonComponent),
- MockComponent(ForwardVorgangIconComponent),
- MockDirective(TooltipDirective),
- ],
+ declarations: [MockComponent(OpenDialogButtonComponent), MockComponent(IconComponent), MockDirective(TooltipDirective)],
}).compileComponents();
fixture = TestBed.createComponent(ForwardingButtonContainerComponent);
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
index 0f6d13f6a5..773d800ddc 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
@@ -4,13 +4,13 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { OpenDialogButtonComponent } from '@ods/component';
-import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { ForwardingDialogContainerComponent } from '../forwarding-dialog-container/forwarding-dialog-container.component';
@Component({
selector: 'alfa-forwarding-button-container',
standalone: true,
- imports: [CommonModule, ForwardVorgangIconComponent, TooltipDirective, HasLinkPipe, OpenDialogButtonComponent],
+ imports: [CommonModule, IconComponent, TooltipDirective, HasLinkPipe, OpenDialogButtonComponent],
templateUrl: './forwarding-button-container.component.html',
providers: [{ provide: DIALOG_COMPONENT, useValue: ForwardingDialogContainerComponent }],
styles: [':host {@apply empty:hidden}'],
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
index 6995cd3356..7f70fca2f1 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
@@ -8,5 +8,5 @@
dataTestId="forwarding-dialog-forwarding-button"
data-test-id="forwarding-button-container"
>
- <ods-forward-vorgang-icon icon class="fill-whitetext" />
+ <ods-icon icon name="forward-vorgang" fill="whitetext" />
</ods-button-with-spinner>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
index 661105c1ad..2fa8341da7 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
@@ -2,7 +2,7 @@ import { EMPTY_STRING } from '@alfa-client/tech-shared';
import { dispatchEventFromFixture, MockEvent } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { ForwardVorgangIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { ForwardingButtonComponent } from './forwarding-button.component';
@@ -16,7 +16,7 @@ describe('ForwardingButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [ForwardingButtonComponent],
- declarations: [MockComponent(ForwardVorgangIconComponent), MockComponent(ButtonWithSpinnerComponent)],
+ declarations: [MockComponent(IconComponent), MockComponent(ButtonWithSpinnerComponent)],
}).compileComponents();
fixture = TestBed.createComponent(ForwardingButtonComponent);
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
index e881014e93..b66d9b2c1a 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
@@ -2,12 +2,12 @@ import { CommandResource } from '@alfa-client/command-shared';
import { EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
@Component({
selector: 'alfa-forwarding-button',
standalone: true,
- imports: [ButtonWithSpinnerComponent, ForwardVorgangIconComponent, TooltipDirective],
+ imports: [ButtonWithSpinnerComponent, IconComponent, TooltipDirective],
templateUrl: './forwarding-button.component.html',
})
export class ForwardingButtonComponent {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
index 1ab39ddeb6..832c4fdcde 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
@@ -36,7 +36,7 @@
</ods-button-with-spinner>
<ng-template #exportNotPossible>
<div class="flex items-start gap-2" data-test-id="cannot-export-vorgang">
- <ods-exclamation-icon />
+ <ods-icon name="exclamation" fill="error" />
<div>
<p class="text-sm font-medium text-error">Vorgang exportieren nicht möglich.</p>
<p class="text-sm">
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts
index 56a9ee5d0e..ff4d404d4a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts
@@ -26,7 +26,7 @@ import { getElementFromFixture, mock } from '@alfa-client/test-utils';
import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { ExclamationIconComponent, SaveIconComponent } from '@ods/system';
+import { IconComponent, SaveIconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
@@ -49,7 +49,7 @@ describe('VorgangExportContainerComponent', () => {
HasLinkPipe,
VorgangExportContainerComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(ExclamationIconComponent),
+ MockComponent(IconComponent),
MockComponent(SaveIconComponent),
],
providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 9217c0de90..fafa33cc28 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -76,7 +76,6 @@ import {
DropdownMenuComponent,
DropdownMenuTextItemComponent,
ErrorMessageComponent,
- ExclamationIconComponent,
FileIconComponent,
IconComponent,
MoreIconComponent,
@@ -149,7 +148,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- ExclamationIconComponent,
SaveIconComponent,
SendIconComponent,
StampIconComponent,
--
GitLab
From 526bc1c459badc6a03d1dbd68581471899826185 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 16:33:56 +0200
Subject: [PATCH 16/36] OZG-7077 replace more icons - help icon - info icon
---
.../user-form-roles.component.html | 10 ++--
.../user-form-roles.component.spec.ts | 4 +-
.../user-form-roles.component.ts | 11 +---
alfa-client/libs/design-system/src/index.ts | 2 -
.../help-icon/help-icon.component.spec.ts | 44 ----------------
.../icons/help-icon/help-icon.component.ts | 50 -------------------
.../lib/icons/help-icon/help-icon.stories.ts | 50 -------------------
.../info-icon/info-icon.component.spec.ts | 44 ----------------
.../icons/info-icon/info-icon.component.ts | 50 -------------------
.../lib/icons/info-icon/info-icon.stories.ts | 50 -------------------
.../help-button/help-button.component.html | 4 +-
.../help-button/help-button.component.spec.ts | 4 +-
.../lib/help-menu/help-menu.component.spec.ts | 10 +---
.../src/lib/user-assistance.module.ts | 12 ++---
14 files changed, 20 insertions(+), 325 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.stories.ts
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.html b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.html
index d3d39a71ce..80bf7e3280 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.html
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.html
@@ -15,7 +15,7 @@
data-test-id="admin-role-info-button"
tooltip="Diese Rolle kann Funktionen der OZG-Cloud konfigurieren, z.B. Benutzer anlegen, Organisationseinheiten hinzufügen und Rollen zuweisen."
>
- <ods-info-icon />
+ <ods-icon name="info" />
</button>
</div>
<div class="flex items-center gap-2">
@@ -28,7 +28,7 @@
data-test-id="datenbeauftragung-role-info-button"
tooltip='Diese Rolle kann in der Administration unter dem Menüpunkt "Statistik" Felder zur Auswertung konfigurieren. Sie ist mit allen anderen Rollen kompatibel.'
>
- <ods-info-icon />
+ <ods-icon name="info" />
</button>
</div>
</div>
@@ -40,7 +40,7 @@
data-test-id="loschen-role-info-button"
tooltip='Diese Rolle hat dieselben Rechte wie die Rolle "User". Zusätzlich kann "Löschen" Löschanträge aus Alfa bestätigen. '
>
- <ods-info-icon />
+ <ods-icon name="info" />
</button>
</div>
<div class="flex items-center gap-2">
@@ -49,13 +49,13 @@
data-test-id="user-role-info-button"
tooltip="Diese Rolle kann alle Vorgänge sehen und bearbeiten, wenn diese seiner Organisationseinheit zugewiesen sind."
>
- <ods-info-icon />
+ <ods-icon name="info" />
</button>
</div>
<div class="flex items-center gap-2">
<ods-checkbox-editor [formControlName]="UserFormService.POSTSTELLE" label="Poststelle" inputId="post_office" />
<button data-test-id="poststelle-role-info-button" tooltip="Diese Rolle kann alle neu eingegangenen Vorgänge sehen.">
- <ods-info-icon />
+ <ods-icon name="info" />
</button>
</div>
</div>
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts
index 39a21b7faf..a154d726b2 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.spec.ts
@@ -3,7 +3,7 @@ import { existsAsHtmlElement, getElementComponentFromFixtureByCss } from '@alfa-
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AbstractControl, FormControl, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
import { expect } from '@jest/globals';
-import { InfoIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { MockComponent, MockDirective } from 'ng-mocks';
import { of } from 'rxjs';
import { ValidationErrorComponent } from '../../../../../../design-component/src/lib/form/validation-error/validation-error.component';
@@ -24,7 +24,7 @@ describe('UserFormRolesComponent', () => {
imports: [
UserFormRolesComponent,
ReactiveFormsModule,
- MockComponent(InfoIconComponent),
+ MockComponent(IconComponent),
MockComponent(ValidationErrorComponent),
MockDirective(TooltipDirective),
],
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.ts b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.ts
index 7a8c901dab..e2c967474a 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-roles/user-form-roles.component.ts
@@ -3,7 +3,7 @@ import { AsyncPipe } from '@angular/common';
import { Component, Input, OnInit } from '@angular/core';
import { AbstractControl, FormControlStatus, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
import { CheckboxEditorComponent, ValidationErrorComponent } from '@ods/component';
-import { InfoIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { isEmpty } from 'lodash-es';
import { map, Observable, of, tap } from 'rxjs';
import { UserFormService } from '../user.formservice';
@@ -11,14 +11,7 @@ import { UserFormService } from '../user.formservice';
@Component({
selector: 'admin-user-form-roles',
standalone: true,
- imports: [
- CheckboxEditorComponent,
- ReactiveFormsModule,
- TooltipDirective,
- InfoIconComponent,
- ValidationErrorComponent,
- AsyncPipe,
- ],
+ imports: [CheckboxEditorComponent, ReactiveFormsModule, TooltipDirective, IconComponent, ValidationErrorComponent, AsyncPipe],
templateUrl: './user-form-roles.component.html',
})
export class UserFormRolesComponent implements OnInit {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 489ff70ab8..0533237790 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -47,9 +47,7 @@ export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
-export * from './lib/icons/help-icon/help-icon.component';
export * from './lib/icons/iconVariants';
-export * from './lib/icons/info-icon/info-icon.component';
export * from './lib/icons/logout-icon/logout-icon.component';
export * from './lib/icons/mailbox-icon/mailbox-icon.component';
export * from './lib/icons/more-icon/more-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.spec.ts
deleted file mode 100644
index 42c9caea29..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { HelpIconComponent } from './help-icon.component';
-
-describe('HelpIconComponent', () => {
- let component: HelpIconComponent;
- let fixture: ComponentFixture<HelpIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [HelpIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(HelpIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.ts
deleted file mode 100644
index 2c80a27434..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-help-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="twMerge(iconVariants({ size }), 'fill-neutral-500 dark:fill-neutral-400', class)"
- aria-hidden="true"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M11.95 18C12.3 18 12.5958 17.8792 12.8375 17.6375C13.0792 17.3958 13.2 17.1 13.2 16.75C13.2 16.4 13.0792 16.1042 12.8375 15.8625C12.5958 15.6208 12.3 15.5 11.95 15.5C11.6 15.5 11.3042 15.6208 11.0625 15.8625C10.8208 16.1042 10.7 16.4 10.7 16.75C10.7 17.1 10.8208 17.3958 11.0625 17.6375C11.3042 17.8792 11.6 18 11.95 18ZM11.05 14.15H12.9C12.9 13.6 12.9625 13.1667 13.0875 12.85C13.2125 12.5333 13.5667 12.1 14.15 11.55C14.5833 11.1167 14.925 10.7042 15.175 10.3125C15.425 9.92083 15.55 9.45 15.55 8.9C15.55 7.96667 15.2083 7.25 14.525 6.75C13.8417 6.25 13.0333 6 12.1 6C11.15 6 10.3792 6.25 9.7875 6.75C9.19583 7.25 8.78333 7.85 8.55 8.55L10.2 9.2C10.2833 8.9 10.4708 8.575 10.7625 8.225C11.0542 7.875 11.5 7.7 12.1 7.7C12.6333 7.7 13.0333 7.84583 13.3 8.1375C13.5667 8.42917 13.7 8.75 13.7 9.1C13.7 9.43333 13.6 9.74583 13.4 10.0375C13.2 10.3292 12.95 10.6 12.65 10.85C11.9167 11.5 11.4667 11.9917 11.3 12.325C11.1333 12.6583 11.05 13.2667 11.05 14.15ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z"
- />
- </svg>`,
-})
-export class HelpIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- protected readonly iconVariants = iconVariants;
- protected readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.stories.ts
deleted file mode 100644
index 5e7821e204..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/help-icon/help-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { HelpIconComponent } from './help-icon.component';
-
-const meta: Meta<HelpIconComponent> = {
- title: 'Icons/Help icon',
- component: HelpIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<HelpIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.spec.ts
deleted file mode 100644
index 7b0b08534c..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { InfoIconComponent } from './info-icon.component';
-
-describe('InfoIconComponent', () => {
- let component: InfoIconComponent;
- let fixture: ComponentFixture<InfoIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [InfoIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(InfoIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.ts
deleted file mode 100644
index 5fd6e58c33..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-info-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)"
- aria-hidden="true"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M11.25 16.75H12.75V11H11.25V16.75ZM12 9.2885C12.2288 9.2885 12.4207 9.21108 12.5755 9.05625C12.7303 8.90142 12.8077 8.70958 12.8077 8.48075C12.8077 8.25192 12.7303 8.06008 12.5755 7.90525C12.4207 7.75058 12.2288 7.67325 12 7.67325C11.7712 7.67325 11.5793 7.75058 11.4245 7.90525C11.2697 8.06008 11.1923 8.25192 11.1923 8.48075C11.1923 8.70958 11.2697 8.90142 11.4245 9.05625C11.5793 9.21108 11.7712 9.2885 12 9.2885ZM12.0017 21.5C10.6877 21.5 9.45267 21.2507 8.2965 20.752C7.14033 20.2533 6.13467 19.5766 5.2795 18.7218C4.42433 17.8669 3.74725 16.8617 3.24825 15.706C2.74942 14.5503 2.5 13.3156 2.5 12.0017C2.5 10.6877 2.74933 9.45267 3.248 8.2965C3.74667 7.14033 4.42342 6.13467 5.27825 5.2795C6.13308 4.42433 7.13833 3.74725 8.294 3.24825C9.44967 2.74942 10.6844 2.5 11.9983 2.5C13.3123 2.5 14.5473 2.74933 15.7035 3.248C16.8597 3.74667 17.8653 4.42342 18.7205 5.27825C19.5757 6.13308 20.2528 7.13833 20.7518 8.294C21.2506 9.44967 21.5 10.6844 21.5 11.9983C21.5 13.3123 21.2507 14.5473 20.752 15.7035C20.2533 16.8597 19.5766 17.8653 18.7218 18.7205C17.8669 19.5757 16.8617 20.2528 15.706 20.7518C14.5503 21.2506 13.3156 21.5 12.0017 21.5ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z"
- />
- </svg>`,
-})
-export class InfoIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- protected readonly iconVariants = iconVariants;
- protected readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.stories.ts
deleted file mode 100644
index 70a6e79405..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/info-icon/info-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { InfoIconComponent } from './info-icon.component';
-
-const meta: Meta<InfoIconComponent> = {
- title: 'Icons/Info icon',
- component: InfoIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<InfoIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.html b/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.html
index c2e1745ad1..d18dea1e0b 100644
--- a/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.html
+++ b/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.html
@@ -1,4 +1,4 @@
<div class="flex items-center text-ozggray-800 dark:text-ozggray-300">
- <ods-help-icon />
+ <ods-icon name="help" fill="neutral" />
<div class="ml-1 text-sm font-medium">Hilfe</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.spec.ts b/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.spec.ts
index 4430d6bc1e..aee29ce4ce 100644
--- a/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.spec.ts
+++ b/alfa-client/libs/user-assistance/src/lib/help-menu/help-button/help-button.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { HelpIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { HelpButtonComponent } from './help-button.component';
@@ -10,7 +10,7 @@ describe('HelpButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [HelpButtonComponent, MockComponent(HelpIconComponent)],
+ imports: [HelpButtonComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(HelpButtonComponent);
diff --git a/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts b/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts
index 870deee5a2..e072b2f659 100644
--- a/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts
+++ b/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts
@@ -28,13 +28,7 @@ import { OzgcloudIconComponent, OzgcloudMenuComponent } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatMenuTrigger } from '@angular/material/menu';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import {
- DropdownMenuComponent,
- DropdownMenuLinkItemComponent,
- DropdownMenuTextItemComponent,
- FileIconComponent,
- HelpIconComponent,
-} from '@ods/system';
+import { DropdownMenuComponent, DropdownMenuLinkItemComponent, DropdownMenuTextItemComponent } from '@ods/system';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
@@ -60,8 +54,6 @@ describe('HelpMenuComponent', () => {
MockComponent(DocumentationComponent),
MockComponent(OzgcloudIconComponent),
MockComponent(DocumentationComponent),
- MockComponent(FileIconComponent),
- MockComponent(HelpIconComponent),
MockComponent(DropdownMenuTextItemComponent),
MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuLinkItemComponent),
diff --git a/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts b/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts
index f448be3a65..56c0c7c62f 100644
--- a/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts
+++ b/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts
@@ -21,22 +21,22 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CommonModule } from '@angular/common';
import { GetUrlPipe, HasLinkPipe } from '@alfa-client/tech-shared';
+import { OpenUrlButtonComponent } from '@alfa-client/ui';
+import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
+import { MatFabButton } from '@angular/material/button';
+import { MatMenuTrigger } from '@angular/material/menu';
import {
DropdownMenuComponent,
DropdownMenuLinkItemComponent,
DropdownMenuTextItemComponent,
FileIconComponent,
- HelpIconComponent,
+ IconComponent,
} from '@ods/system';
-import { MatFabButton } from '@angular/material/button';
-import { MatMenuTrigger } from '@angular/material/menu';
import { DocumentationComponent } from './help-menu/documentation/documentation.component';
import { HelpButtonComponent } from './help-menu/help-button/help-button.component';
import { HelpMenuComponent } from './help-menu/help-menu.component';
-import { OpenUrlButtonComponent } from '@alfa-client/ui';
@NgModule({
imports: [
@@ -46,7 +46,7 @@ import { OpenUrlButtonComponent } from '@alfa-client/ui';
GetUrlPipe,
MatFabButton,
FileIconComponent,
- HelpIconComponent,
+ IconComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
DropdownMenuLinkItemComponent,
--
GitLab
From 0e2a30d849d15f5849bcbcd37a468e1859bdb218 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 4 Apr 2025 10:14:46 +0200
Subject: [PATCH 17/36] OZG-7707 replace more icons - logout icon - more icon
---
.../admin-user-logout-button.component.html | 2 +-
...admin-user-logout-button.component.spec.ts | 4 +-
.../admin-user-logout-button.component.ts | 4 +-
...profile-button-container.component.spec.ts | 14 ++++--
alfa-client/libs/design-system/src/index.ts | 2 -
.../logout-icon/logout-icon.component.spec.ts | 44 ----------------
.../logout-icon/logout-icon.component.ts | 50 -------------------
.../icons/logout-icon/logout-icon.stories.ts | 50 -------------------
.../more-icon/more-icon.component.spec.ts | 44 ----------------
.../icons/more-icon/more-icon.component.ts | 50 -------------------
.../lib/icons/more-icon/more-icon.stories.ts | 50 -------------------
.../user-profile-in-header.component.html | 2 +-
.../user-profile-in-header.component.spec.ts | 12 +++--
.../src/lib/user-profile.module.ts | 2 -
.../vorgang-detail-more-menu.component.html | 2 +-
...vorgang-detail-more-menu.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 2 -
17 files changed, 30 insertions(+), 308 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.stories.ts
diff --git a/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.html b/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.html
index 9c5b0aa958..5a14cc8f16 100644
--- a/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.html
+++ b/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.html
@@ -1,3 +1,3 @@
<ods-dropdown-menu-button-item caption="Abmelden" (clickEmitter)="logout.emit()" data-test-id="popup-logout-button">
- <ods-logout-icon icon class="fill-primary" />
+ <ods-icon icon name="logout" />
</ods-dropdown-menu-button-item>
diff --git a/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.spec.ts b/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.spec.ts
index 092b7217e8..886d6d7e34 100644
--- a/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.spec.ts
+++ b/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.spec.ts
@@ -1,6 +1,8 @@
import { dispatchEventFromFixture, MockEvent } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { expect } from '@jest/globals';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
import { AdminUserLogoutButtonComponent } from './admin-user-logout-button.component';
@@ -12,7 +14,7 @@ describe('AdminUserLogoutButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [AdminUserLogoutButtonComponent],
+ imports: [AdminUserLogoutButtonComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(AdminUserLogoutButtonComponent);
diff --git a/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.ts b/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.ts
index 6e3f4cd7f8..0980d59e93 100644
--- a/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.ts
+++ b/alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.ts
@@ -1,11 +1,11 @@
import { Component, EventEmitter, Output } from '@angular/core';
-import { DropdownMenuButtonItemComponent, LogoutIconComponent } from '@ods/system';
+import { DropdownMenuButtonItemComponent, IconComponent } from '@ods/system';
@Component({
selector: 'admin-user-logout-button',
standalone: true,
templateUrl: './admin-user-logout-button.component.html',
- imports: [DropdownMenuButtonItemComponent, LogoutIconComponent],
+ imports: [DropdownMenuButtonItemComponent, IconComponent],
})
export class AdminUserLogoutButtonComponent {
@Output() logout = new EventEmitter<void>();
diff --git a/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts b/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts
index cb23876d95..3e35b294d9 100644
--- a/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts
+++ b/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts
@@ -23,13 +23,21 @@
*/
import { ApiRootLinkRel, ApiRootResource } from '@alfa-client/api-root-shared';
import { createStateResource, StateResource } from '@alfa-client/tech-shared';
-import { dispatchEventFromFixtureByType, existsAsHtmlElement, getElementComponentFromFixtureByCss, getElementFromFixture, mock, Mock, notExistsAsHtmlElement, } from '@alfa-client/test-utils';
+import {
+ dispatchEventFromFixtureByType,
+ existsAsHtmlElement,
+ getElementComponentFromFixtureByCss,
+ getElementFromFixture,
+ mock,
+ Mock,
+ notExistsAsHtmlElement,
+} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AuthenticationService } from '@authentication';
import { expect } from '@jest/globals';
import { getUrl } from '@ngxp/rest';
-import { DropdownMenuButtonItemComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
+import { DropdownMenuButtonItemComponent, DropdownMenuComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { createApiRootResource } from '../../../../../api-root-shared/test/api-root';
import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
@@ -60,7 +68,7 @@ describe('UserProfileButtonContainerComponent', () => {
RouterTestingModule,
MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuButtonItemComponent),
- MockComponent(LogoutIconComponent),
+ MockComponent(AdminUserLogoutButtonComponent),
],
providers: [
{
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 0533237790..6adfb59d87 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -48,9 +48,7 @@ export * from './lib/icon/icon.component';
export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
-export * from './lib/icons/logout-icon/logout-icon.component';
export * from './lib/icons/mailbox-icon/mailbox-icon.component';
-export * from './lib/icons/more-icon/more-icon.component';
export * from './lib/icons/office-icon/office-icon.component';
export * from './lib/icons/orga-unit-icon/orga-unit-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.spec.ts
deleted file mode 100644
index e7d849a188..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { LogoutIconComponent } from './logout-icon.component';
-
-describe('LogoutIconComponent', () => {
- let component: LogoutIconComponent;
- let fixture: ComponentFixture<LogoutIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [LogoutIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(LogoutIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.ts
deleted file mode 100644
index eaf45846fc..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-logout-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="twMerge(iconVariants({ size }), 'fill-text', class)"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M5 21C4.45 21 3.97917 20.8042 3.5875 20.4125C3.19583 20.0208 3 19.55 3 19V5C3 4.45 3.19583 3.97917 3.5875 3.5875C3.97917 3.19583 4.45 3 5 3H12V5H5V19H12V21H5ZM16 17L14.625 15.55L17.175 13H9V11H17.175L14.625 8.45L16 7L21 12L16 17Z"
- />
- </svg>`,
-})
-export class LogoutIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.stories.ts
deleted file mode 100644
index aa085bd2a4..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/logout-icon/logout-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { LogoutIconComponent } from './logout-icon.component';
-
-const meta: Meta<LogoutIconComponent> = {
- title: 'Icons/Logout icon',
- component: LogoutIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<LogoutIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.spec.ts
deleted file mode 100644
index 6cf758506b..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MoreIconComponent } from './more-icon.component';
-
-describe('MoreIconComponent', () => {
- let component: MoreIconComponent;
- let fixture: ComponentFixture<MoreIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [MoreIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(MoreIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.ts
deleted file mode 100644
index 56fc45b97e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-more-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="twMerge(iconVariants({ size }), 'fill-black', class)"
- aria-hidden="true"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M6 14C5.45 14 4.97917 13.8042 4.5875 13.4125C4.19583 13.0208 4 12.55 4 12C4 11.45 4.19583 10.9792 4.5875 10.5875C4.97917 10.1958 5.45 10 6 10C6.55 10 7.02083 10.1958 7.4125 10.5875C7.80417 10.9792 8 11.45 8 12C8 12.55 7.80417 13.0208 7.4125 13.4125C7.02083 13.8042 6.55 14 6 14ZM12 14C11.45 14 10.9792 13.8042 10.5875 13.4125C10.1958 13.0208 10 12.55 10 12C10 11.45 10.1958 10.9792 10.5875 10.5875C10.9792 10.1958 11.45 10 12 10C12.55 10 13.0208 10.1958 13.4125 10.5875C13.8042 10.9792 14 11.45 14 12C14 12.55 13.8042 13.0208 13.4125 13.4125C13.0208 13.8042 12.55 14 12 14ZM18 14C17.45 14 16.9792 13.8042 16.5875 13.4125C16.1958 13.0208 16 12.55 16 12C16 11.45 16.1958 10.9792 16.5875 10.5875C16.9792 10.1958 17.45 10 18 10C18.55 10 19.0208 10.1958 19.4125 10.5875C19.8042 10.9792 20 11.45 20 12C20 12.55 19.8042 13.0208 19.4125 13.4125C19.0208 13.8042 18.55 14 18 14Z"
- />
- </svg>`,
-})
-export class MoreIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- protected readonly iconVariants = iconVariants;
- protected readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.stories.ts
deleted file mode 100644
index 6464e18918..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/more-icon/more-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { MoreIconComponent } from './more-icon.component';
-
-const meta: Meta<MoreIconComponent> = {
- title: 'Icons/More icon',
- component: MoreIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<MoreIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
index 797bf6c78e..1d93a0979a 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
+++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
@@ -37,6 +37,6 @@
>
</alfa-user-icon>
<ods-dropdown-menu-button-item caption="Abmelden" (clickEmitter)="logoutEmitter.emit()" dataTestId="logout-button">
- <ods-logout-icon icon class="fill-primary" />
+ <ods-icon icon name="logout" />
</ods-dropdown-menu-button-item>
</ods-dropdown-menu>
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
index 2bf68369cd..2e37a8dd4b 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
@@ -22,7 +22,13 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { createStateResource } from '@alfa-client/tech-shared';
-import { dispatchEventFromFixture, getElementComponentFromFixtureByCss, mock, MockEvent, useFromMock, } from '@alfa-client/test-utils';
+import {
+ dispatchEventFromFixture,
+ getElementComponentFromFixtureByCss,
+ mock,
+ MockEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
import { UserIconComponent } from '@alfa-client/user-profile';
import { getUserName, UserProfileResource } from '@alfa-client/user-profile-shared';
import { EventEmitter } from '@angular/core';
@@ -30,7 +36,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { MatMenuTrigger } from '@angular/material/menu';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DropdownMenuButtonItemComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
+import { DropdownMenuButtonItemComponent, DropdownMenuComponent, IconComponent } from '@ods/system';
import { getDataTestIdAttributeOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile';
import { MockComponent } from 'ng-mocks';
@@ -54,7 +60,7 @@ describe('UserProfileInHeaderComponent', () => {
MockComponent(UserIconComponent),
MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuButtonItemComponent),
- MockComponent(LogoutIconComponent),
+ MockComponent(IconComponent),
],
imports: [NoopAnimationsModule],
}).compileComponents();
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
index e8b6bcbc3a..8def7af5e5 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
@@ -42,7 +42,6 @@ import {
DropdownMenuComponent,
DropdownMenuItemComponent,
IconComponent,
- LogoutIconComponent,
UserIconComponent as OdsUserIconComponent,
TooltipDirective,
} from '@ods/system';
@@ -72,7 +71,6 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
UserProfileSharedModule,
RouterModule,
OdsUserIconComponent,
- LogoutIconComponent,
IconButtonWithSpinnerComponent,
HasLinkPipe,
MatTooltip,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
index 334bbeedc2..fd46a637a0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
@@ -24,7 +24,7 @@
-->
<ods-dropdown-menu buttonTestId="more-menu-button">
- <ods-more-icon button-content *ngIf="buttonEnabled" data-test-id="more-menu-icon" class="fill-text" />
+ <ods-icon button-content *ngIf="buttonEnabled" name="more" data-test-id="more-menu-icon" fill="text" />
<ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE"
data-test-id="vorgang-archive-button"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
index 61f01959e1..0065cf4391 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
@@ -27,7 +27,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
import { ChangeDetectorRef, SimpleChanges } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DropdownMenuComponent, DropdownMenuTextItemComponent, FileIconComponent, MoreIconComponent } from '@ods/system';
+import { DropdownMenuComponent, DropdownMenuTextItemComponent, FileIconComponent, IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
@@ -54,7 +54,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
MockComponent(VorgangArchiveContainerComponent),
MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuTextItemComponent),
- MockComponent(MoreIconComponent),
+ MockComponent(IconComponent),
MockComponent(FileIconComponent),
HasLinkPipe,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index fafa33cc28..35d7845202 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -78,7 +78,6 @@ import {
ErrorMessageComponent,
FileIconComponent,
IconComponent,
- MoreIconComponent,
RadioButtonCardComponent,
SaveIconComponent,
SendIconComponent,
@@ -189,7 +188,6 @@ const routes: Routes = [
OzgcloudTextEditorComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
- MoreIconComponent,
FileIconComponent,
ForwardingButtonContainerComponent,
TooltipDirective,
--
GitLab
From 1587c61d5534b3c554b1bf29db2184516f61dc83 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 4 Apr 2025 10:44:43 +0200
Subject: [PATCH 18/36] OZG-7707 replace more icons - office icon - open link
icon
---
...profile-button-container.component.spec.ts | 1 +
.../src/lib/collaboration.module.ts | 2 -
alfa-client/libs/design-system/src/index.ts | 1 -
.../dropdown-menu-link-item.component.spec.ts | 4 +-
.../dropdown-menu-link-item.component.ts | 6 +--
.../office-icon/office-icon.component.spec.ts | 44 ----------------
.../office-icon/office-icon.component.ts | 51 -------------------
.../icons/office-icon/office-icon.stories.ts | 50 ------------------
.../open-link-icon.component.spec.ts | 44 ----------------
.../open-link-icon.component.ts | 50 ------------------
.../open-link-icon/open-link-icon.stories.ts | 50 ------------------
.../src/lib/navbar/navbar/navbar.stories.ts | 4 +-
.../src/lib/zustaendige-stelle.module.ts | 2 -
13 files changed, 8 insertions(+), 301 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.stories.ts
diff --git a/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts b/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts
index 3e35b294d9..cf9d6bd17b 100644
--- a/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts
+++ b/alfa-client/libs/admin/user-profile/src/lib/user-menu/user-profile-button-container.component.spec.ts
@@ -69,6 +69,7 @@ describe('UserProfileButtonContainerComponent', () => {
MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuButtonItemComponent),
MockComponent(AdminUserLogoutButtonComponent),
+ MockComponent(DocumentationComponent),
],
providers: [
{
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index e5e715a85e..b8adf8f12e 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -33,7 +33,6 @@ import {
ButtonComponent,
ExternalUnitIconComponent,
IconComponent,
- OfficeIconComponent,
PublicAdministrationIconComponent,
SaveIconComponent,
SearchIconComponent,
@@ -65,7 +64,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
ReactiveFormsModule,
ButtonWithSpinnerComponent,
ZustaendigeStelleModule,
- OfficeIconComponent,
ExternalUnitIconComponent,
PublicAdministrationIconComponent,
OrganisationsEinheitListItemContainerComponent,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 6adfb59d87..64f63f2328 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -49,7 +49,6 @@ export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
export * from './lib/icons/mailbox-icon/mailbox-icon.component';
-export * from './lib/icons/office-icon/office-icon.component';
export * from './lib/icons/orga-unit-icon/orga-unit-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.spec.ts
index c97938ebf9..4a31c1013f 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { getMockComponent } from '@alfa-client/test-utils';
import { faker } from '@faker-js/faker';
-import { LinkComponent } from '@ods/system';
+import { IconComponent, LinkComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { DropdownMenuLinkItemComponent } from './dropdown-menu-link-item.component';
@@ -12,7 +12,7 @@ describe('DropdownMenuLinkItemComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [DropdownMenuLinkItemComponent, MockComponent(LinkComponent)],
+ imports: [DropdownMenuLinkItemComponent, MockComponent(LinkComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(DropdownMenuLinkItemComponent);
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.ts
index 24427bb02e..9586e89e01 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-link-item/dropdown-menu-link-item.component.ts
@@ -1,12 +1,12 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { OpenLinkIconComponent } from '../../icons/open-link-icon/open-link-icon.component';
+import { IconComponent } from '../../icon/icon.component';
import { LinkComponent } from '../../link/link.component';
@Component({
selector: 'ods-dropdown-menu-link-item',
standalone: true,
- imports: [LinkComponent, OpenLinkIconComponent, CommonModule],
+ imports: [LinkComponent, IconComponent, CommonModule],
template: `<div class="w-full bg-whitetext p-1.5">
<ods-link [url]="url" [openInNewTab]="true">
<div class="flex min-w-80 gap-3 px-3 py-1.5">
@@ -17,7 +17,7 @@ import { LinkComponent } from '../../link/link.component';
}
<div class="flex items-center gap-2">
<p class="text-sm font-normal text-primary">{{ text }}</p>
- <ods-open-link-icon size="small" />
+ <ods-icon name="open-link" size="small" />
<span class="sr-only">Öffnet in einem neuen Tab</span>
</div>
</div>
diff --git a/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.spec.ts
deleted file mode 100644
index 33a1e479c7..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OfficeIconComponent } from './office-icon.component';
-
-describe('SaveIconComponent', () => {
- let component: OfficeIconComponent;
- let fixture: ComponentFixture<OfficeIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [OfficeIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(OfficeIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.ts
deleted file mode 100644
index 1543f68434..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-office-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="twMerge(iconVariants({ size }), 'fill-black', class)"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M2 21V4.75L7 1L12 4.75V7H22V21H2ZM4 19H6V17H4V19ZM4 15H6V13H4V15ZM4 11H6V9H4V11ZM4 7H6V5H4V7ZM8 7H10V5H8V7ZM8 19H20V9H8V19ZM14 13V11H18V13H14ZM14 17V15H18V17H14ZM10 13V11H12V13H10ZM10 17V15H12V17H10Z"
- />
- </svg>`,
-})
-export class OfficeIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.stories.ts
deleted file mode 100644
index fac0d470fc..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/office-icon/office-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { OfficeIconComponent } from './office-icon.component';
-
-const meta: Meta<OfficeIconComponent> = {
- title: 'Icons/Office icon',
- component: OfficeIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<OfficeIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.spec.ts
deleted file mode 100644
index 391bb8a99d..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OpenLinkIconComponent } from './open-link-icon.component';
-
-describe('OpenLinkIconComponent', () => {
- let component: OpenLinkIconComponent;
- let fixture: ComponentFixture<OpenLinkIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [OpenLinkIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(OpenLinkIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.ts
deleted file mode 100644
index e4774466ae..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-open-link-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)"
- aria-hidden="true"
- >
- <path
- d="M5 21c-.55 0-1.02-.196-1.413-.587A1.926 1.926 0 0 1 3 19V5c0-.55.196-1.02.587-1.413A1.926 1.926 0 0 1 5 3h7v2H5v14h14v-7h2v7c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 19 21H5Zm4.7-5.3-1.4-1.4L17.6 5H14V3h7v7h-2V6.4l-9.3 9.3Z"
- />
- </svg>`,
-})
-export class OpenLinkIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.stories.ts
deleted file mode 100644
index 8941a073fa..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/open-link-icon/open-link-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { OpenLinkIconComponent } from './open-link-icon.component';
-
-const meta: Meta<OpenLinkIconComponent> = {
- title: 'Icons/Open link icon',
- component: OpenLinkIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<OpenLinkIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts b/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts
index abb8515c0b..00bdcbaf4c 100644
--- a/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts
@@ -25,7 +25,6 @@ import { APP_BASE_HREF } from '@angular/common';
import { importProvidersFrom } from '@angular/core';
import { RouterModule } from '@angular/router';
import { applicationConfig, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { OfficeIconComponent } from '../../icons/office-icon/office-icon.component';
import { NavItemComponent } from '../nav-item/nav-item.component';
import { NavbarComponent } from './navbar.component';
@@ -39,7 +38,7 @@ const meta: Meta<NavbarComponent> = {
providers: [importProvidersFrom(RouterModule.forRoot([]))],
}),
moduleMetadata({
- imports: [NavItemComponent, OfficeIconComponent],
+ imports: [NavItemComponent],
providers: [
{
provide: APP_BASE_HREF,
@@ -57,6 +56,7 @@ export const Default: Story = {
args: {},
render: () => ({
template: `<ods-navbar>
+ //TODO OZG-7077
<ods-nav-item caption="First link" path="/"><ods-office-icon icon /></ods-nav-item>
<ods-nav-item caption="Second link" path="/second"><ods-office-icon icon /></ods-nav-item>
<hr />
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index e18c59b1fd..5abd3f4ee4 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -29,7 +29,6 @@ import {
ExternalUnitIconComponent,
IconComponent,
InstantSearchComponent,
- OfficeIconComponent,
PublicAdministrationIconComponent,
SearchIconComponent,
} from '@ods/system';
@@ -53,7 +52,6 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
FormsModule,
ReactiveFormsModule,
ZustaendigeStelleSharedModule,
- OfficeIconComponent,
SearchIconComponent,
ExternalUnitIconComponent,
IconComponent,
--
GitLab
From 25bb131b12bc8b129950f8811210bf2ad816e48b Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 4 Apr 2025 11:50:46 +0200
Subject: [PATCH 19/36] OZG-7707 replace more icons - orga unit icon - plus
icon
---
.../aggregation-mapping-form.component.html | 2 +-
...aggregation-mapping-form.component.spec.ts | 4 +-
.../aggregation-mapping-form.component.ts | 4 +-
alfa-client/libs/design-system/src/index.ts | 2 -
.../orga-unit-icon.component.spec.ts | 44 ----------------
.../orga-unit-icon.component.ts | 52 -------------------
.../orga-unit-icon/orga-unit-icon.stories.ts | 50 ------------------
.../plus-icon/plus-icon.component.spec.ts | 21 --------
.../icons/plus-icon/plus-icon.component.ts | 26 ----------
.../lib/icons/plus-icon/plus-icon.stories.ts | 50 ------------------
.../postfach-mail-button.component.html | 4 +-
.../postfach-mail-button.component.spec.ts | 4 +-
.../libs/postfach/src/lib/postfach.module.ts | 16 ++++--
...wiedervorlage-create-button.component.html | 2 +-
...dervorlage-create-button.component.spec.ts | 4 +-
.../src/lib/wiedervorlage.module.ts | 3 +-
16 files changed, 26 insertions(+), 262 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.stories.ts
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html
index 346b7322dd..3cc94bd512 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html
@@ -42,7 +42,7 @@
data-test-id="add-mapping"
(clickEmitter)="formService.addMapping()"
>
- <ods-plus-icon icon class="fill-whitetext" />
+ <ods-icon icon name="plus" fill="whitetext" />
</ods-button>
<div class="mt-4 flex gap-4">
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts
index 2abba71105..bc05913575 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts
@@ -13,7 +13,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { expect } from '@jest/globals';
import { TextEditorComponent } from '@ods/component';
-import { ButtonComponent, PlusIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
@@ -57,7 +57,7 @@ describe('AggregationMappingFormComponent', () => {
AggregationMappingFormComponent,
MockComponent(TextEditorComponent),
MockComponent(ButtonComponent),
- MockComponent(PlusIconComponent),
+ MockComponent(IconComponent),
MockComponent(AdminSaveButtonComponent),
MockComponent(AdminCancelButtonComponent),
MockComponent(AggregationMappingFieldListFormComponent),
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
index 4865e55212..40cb4986f1 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
@@ -5,7 +5,7 @@ import { AsyncPipe } from '@angular/common';
import { Component, inject } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { SpinnerComponent, TextEditorComponent } from '@ods/component';
-import { ButtonComponent, PlusIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { Observable } from 'rxjs';
import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component';
import { AggregationMappingFormservice } from './aggregation-mapping.formservice';
@@ -16,7 +16,7 @@ import { AggregationMappingFormservice } from './aggregation-mapping.formservice
standalone: true,
imports: [
ButtonComponent,
- PlusIconComponent,
+ IconComponent,
ReactiveFormsModule,
AdminSaveButtonComponent,
AdminCancelButtonComponent,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 64f63f2328..7f810265e8 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -49,10 +49,8 @@ export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
export * from './lib/icons/mailbox-icon/mailbox-icon.component';
-export * from './lib/icons/orga-unit-icon/orga-unit-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
-export * from './lib/icons/plus-icon/plus-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
export * from './lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component';
export * from './lib/icons/save-icon/save-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.spec.ts
deleted file mode 100644
index c17ebd9f4d..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OrgaUnitIconComponent } from './orga-unit-icon.component';
-
-describe('OrgaUnitIconComponent', () => {
- let component: OrgaUnitIconComponent;
- let fixture: ComponentFixture<OrgaUnitIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [OrgaUnitIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(OrgaUnitIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.ts
deleted file mode 100644
index 83f064cbb0..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-orga-unit-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-text', class)"
- >
- <path
- fill-rule="evenodd"
- d="M3 2.25a.75.75 0 0 0 0 1.5v16.5h-.75a.75.75 0 0 0 0 1.5H15v-18a.75.75 0 0 0 0-1.5H3ZM6.75 19.5v-2.25a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75v2.25a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75ZM6 6.75A.75.75 0 0 1 6.75 6h.75a.75.75 0 0 1 0 1.5h-.75A.75.75 0 0 1 6 6.75ZM6.75 9a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM6 12.75a.75.75 0 0 1 .75-.75h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 6a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75Zm-.75 3.75A.75.75 0 0 1 10.5 9h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 12a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM16.5 6.75v15h5.25a.75.75 0 0 0 0-1.5H21v-12a.75.75 0 0 0 0-1.5h-4.5Zm1.5 4.5a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Zm.75 2.25a.75.75 0 0 0-.75.75v.008c0 .414.336.75.75.75h.008a.75.75 0 0 0 .75-.75v-.008a.75.75 0 0 0-.75-.75h-.008ZM18 17.25a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Z"
- clip-rule="evenodd"
- />
- </svg>`,
-})
-export class OrgaUnitIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.stories.ts
deleted file mode 100644
index 84159a0691..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/orga-unit-icon/orga-unit-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { OrgaUnitIconComponent } from './orga-unit-icon.component';
-
-const meta: Meta<OrgaUnitIconComponent> = {
- title: 'Icons/Orgaunit icon',
- component: OrgaUnitIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<OrgaUnitIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.spec.ts
deleted file mode 100644
index 1f91573b1d..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PlusIconComponent } from './plus-icon.component';
-
-describe('PlusIconComponent', () => {
- let component: PlusIconComponent;
- let fixture: ComponentFixture<PlusIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [PlusIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(PlusIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts
deleted file mode 100644
index f5816ec7f3..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-plus-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path d="M11 13H5V11H11V5H13V11H19V13H13V19H11V13Z" />
- </svg>`,
-})
-export class PlusIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.stories.ts
deleted file mode 100644
index dbf9d8acaa..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/plus-icon/plus-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { PlusIconComponent } from './plus-icon.component';
-
-const meta: Meta<PlusIconComponent> = {
- title: 'Icons/Plus icon',
- component: PlusIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<PlusIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index eff1422c21..0d36e972d6 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -46,7 +46,7 @@
variant="outline"
(clickEmitter)="openPostfachNachrichtenDialog.emit()"
>
- <ods-plus-icon icon />
+ <ods-icon icon name="plus" />
</ods-button>
}
@if (!showAsIconButton && !text && toolTip) {
@@ -58,7 +58,7 @@
size="fit"
(clickEmitter)="openPostfachNachrichtenDialog.emit()"
>
- <ods-plus-icon icon />
+ <ods-icon icon name="plus" />
</ods-button>
}
}
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
index 10a405d105..3ada8d77eb 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
@@ -25,7 +25,7 @@ import { PostfachMailListLinkRel } from '@alfa-client/postfach-shared';
import { EMPTY_STRING, HasLinkPipe, createStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
-import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
@@ -46,7 +46,7 @@ describe('PostfachMailButtonComponent', () => {
PostfachMailButtonComponent,
HasLinkPipe,
MockComponent(ButtonComponent),
- MockComponent(PlusIconComponent),
+ MockComponent(IconComponent),
MockComponent(MailboxIconComponent),
MockDirective(TooltipDirective),
],
diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts
index 88fd93b41f..a8a162fe8d 100644
--- a/alfa-client/libs/postfach/src/lib/postfach.module.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts
@@ -24,7 +24,17 @@
import { BinaryFileModule } from '@alfa-client/binary-file';
import { ON_PAGE, PostfachSharedModule } from '@alfa-client/postfach-shared';
import { ConvertForDataTestPipe, FormatDateWithTimePipe, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
-import { BackButtonComponent, CheckboxEnumEditorComponent, IconButtonWithSpinnerComponent, OzgcloudIconComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, SubnavigationComponent, TextAreaEditorComponent, } from '@alfa-client/ui';
+import {
+ BackButtonComponent,
+ CheckboxEnumEditorComponent,
+ IconButtonWithSpinnerComponent,
+ OzgcloudIconComponent,
+ OzgcloudStrokedButtonWithSpinnerComponent,
+ OzgcloudTextEditorComponent,
+ SpinnerComponent,
+ SubnavigationComponent,
+ TextAreaEditorComponent,
+} from '@alfa-client/ui';
import { UserProfileModule } from '@alfa-client/user-profile';
import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui';
import { CommonModule } from '@angular/common';
@@ -32,7 +42,7 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatIcon } from '@angular/material/icon';
import { RouterModule, Routes } from '@angular/router';
-import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system';
import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component';
import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component';
@@ -85,7 +95,7 @@ const routes: Routes = [
BackButtonComponent,
IconButtonWithSpinnerComponent,
ButtonComponent,
- PlusIconComponent,
+ IconComponent,
MailboxIconComponent,
TooltipDirective,
MultiFileUploadComponent,
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
index 6fde7ac98e..bc13307615 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
@@ -39,7 +39,7 @@
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner data-test-id="create-wiedervorlage" text="Wiedervorlage" variant="outline">
- <ods-plus-icon icon />
+ <ods-icon icon name="plus" />
</ods-button-with-spinner>
}
</a>
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts
index 5060ed0101..a17d8393d3 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts
@@ -26,7 +26,7 @@ import { WiedervorlageListLinkRel } from '@alfa-client/wiedervorlage-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { PlusIconComponent, UpdateIconComponent } from '@ods/system';
+import { IconComponent, UpdateIconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createWiedervorlageListResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
import { MockComponent } from 'ng-mocks';
@@ -44,7 +44,7 @@ describe('WiedervorlageCreateButtonComponent', () => {
WiedervorlageCreateButtonComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(PlusIconComponent),
+ MockComponent(IconComponent),
MockComponent(UpdateIconComponent),
],
imports: [RouterTestingModule],
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
index ad7d40f128..bc76593bcd 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
@@ -52,7 +52,7 @@ import { MatIcon } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { RouterModule, Routes } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { IconComponent, PlusIconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
+import { IconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
import { CreateWiedervorlageButtonContainerComponent } from './create-wiedervorlage-button-container/create-wiedervorlage-button-container.component';
import { ErledigenButtonContainerComponent } from './erledigen-button-container/erledigen-button-container.component';
@@ -112,7 +112,6 @@ const routes: Routes = [
ButtonWithSpinnerComponent,
TooltipDirective,
UpdateIconComponent,
- PlusIconComponent,
IconComponent,
SaveIconComponent,
MultiFileUploadComponent,
--
GitLab
From d7121669158d98efb95bfe6a5f5599ee4e9bbdf5 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 4 Apr 2025 14:58:31 +0200
Subject: [PATCH 20/36] OZG-7707 replace more icons - request vorgang deletion
icon - save icon
---
.../apps/demo/src/app/app.component.html | 2 +-
.../apps/demo/src/app/app.component.ts | 2 -
...ard-bescheid-versenden-form.component.html | 2 +-
...-bescheid-versenden-form.component.spec.ts | 4 +-
.../libs/bescheid/src/lib/bescheid.module.ts | 2 -
.../src/lib/collaboration.module.ts | 2 -
.../download-button.component.spec.ts | 4 +-
.../download-button.component.ts | 6 +--
alfa-client/libs/design-system/src/index.ts | 2 -
.../attachment-header.stories.ts | 4 +-
.../attachment-wrapper.stories.ts | 4 +-
.../src/lib/button/button.stories.ts | 4 +-
.../dropdown-menu/dropdown-menu.stories.ts | 3 +-
.../radio-button-card.stories.ts | 7 +--
...st-vorgang-deletion-icon.component.spec.ts | 21 --------
...request-vorgang-deletion-icon.component.ts | 28 ----------
.../request-vorgang-deletion-icon.stories.ts | 27 ----------
.../save-icon/save-icon.component.spec.ts | 44 ----------------
.../icons/save-icon/save-icon.component.ts | 51 -------------------
.../lib/icons/save-icon/save-icon.stories.ts | 50 ------------------
.../src/lib/loesch-anforderung.module.ts | 8 +--
.../loeschen-anfordern-button.component.html | 4 +-
...oeschen-anfordern-button.component.spec.ts | 4 +-
.../vorgang-export-container.component.html | 2 +-
...vorgang-export-container.component.spec.ts | 3 +-
.../src/lib/vorgang-detail.module.ts | 2 -
...submit-wiedervorlage-button.component.html | 4 +-
...mit-wiedervorlage-button.component.spec.ts | 4 +-
.../src/lib/wiedervorlage.module.ts | 3 +-
29 files changed, 33 insertions(+), 270 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 0931407fea..398b34fb53 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -526,7 +526,7 @@
variant="bescheid_save"
[fullWidthText]="true"
>
- <ods-save-icon />
+ <ods-icon name="save" />
</ods-radio-button-card>
</div>
</form>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 6c8542f5fc..eed0bd055a 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -38,7 +38,6 @@ import {
IconComponent,
InstantSearchComponent,
RadioButtonCardComponent,
- SaveIconComponent,
SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
@@ -74,7 +73,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
RadioButtonCardComponent,
ReactiveFormsModule,
InstantSearchComponent,
- SaveIconComponent,
SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
index b9ebc81cb5..d74b1b2bcd 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
@@ -26,7 +26,7 @@
(change)="changeSendBy(bescheidSendBy.MANUAL)"
data-test-id="save-button"
>
- <ods-save-icon size="large"></ods-save-icon>
+ <ods-icon name="save" size="large" />
</ods-radio-button-card>
}
}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
index fc058c004d..1af30b671f 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
@@ -8,7 +8,7 @@ import {
} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { RadioButtonCardComponent, SaveIconComponent, SendIconComponent } from '@ods/system';
+import { IconComponent, RadioButtonCardComponent, SendIconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
@@ -34,7 +34,7 @@ describe('BescheidWizardBescheidVersendenFormComponent', () => {
BescheidWizardBescheidVersendenFormComponent,
MockComponent(RadioButtonCardComponent),
MockComponent(SendIconComponent),
- MockComponent(SaveIconComponent),
+ MockComponent(IconComponent),
HasLinkPipe,
ReactiveFormsModule,
],
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index f025ab427a..eccdfd5ac6 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -63,7 +63,6 @@ import {
ButtonComponent,
IconComponent,
RadioButtonCardComponent,
- SaveIconComponent,
SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
@@ -130,7 +129,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
AttachmentWrapperComponent,
FileUploadEditorComponent,
SendIconComponent,
- SaveIconComponent,
TextEditorComponent,
TextareaEditorComponent,
ConvertForDataTestPipe,
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index b8adf8f12e..d56d50c5ce 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -34,7 +34,6 @@ import {
ExternalUnitIconComponent,
IconComponent,
PublicAdministrationIconComponent,
- SaveIconComponent,
SearchIconComponent,
UsersIconComponent,
} from '@ods/system';
@@ -53,7 +52,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
imports: [
CommonModule,
ButtonComponent,
- SaveIconComponent,
IconComponent,
SearchIconComponent,
CollaborationSharedModule,
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
index 4f4cde74ff..a9c879b2d7 100644
--- a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
@@ -23,6 +23,8 @@
*/
import { createEmptyStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
import { DownloadButtonComponent } from './download-button.component';
describe('DownloadButtonComponent', () => {
@@ -31,7 +33,7 @@ describe('DownloadButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [DownloadButtonComponent],
+ imports: [DownloadButtonComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(DownloadButtonComponent);
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
index 14473d08c5..c06c96a111 100644
--- a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
@@ -25,7 +25,7 @@ import { CommandResource } from '@alfa-client/command-shared';
import { StateResource } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ButtonComponent, SaveIconComponent, iconVariants } from '@ods/system';
+import { ButtonComponent, IconComponent, iconVariants } from '@ods/system';
import { VariantProps } from 'class-variance-authority';
type IconVariants = VariantProps<typeof iconVariants>;
@@ -33,7 +33,7 @@ type IconVariants = VariantProps<typeof iconVariants>;
@Component({
selector: 'ods-download-button',
standalone: true,
- imports: [CommonModule, ButtonComponent, SaveIconComponent],
+ imports: [CommonModule, ButtonComponent, IconComponent],
template: `<ods-button
[dataTestId]="dataTestId"
variant="ghost"
@@ -42,7 +42,7 @@ type IconVariants = VariantProps<typeof iconVariants>;
[isLoading]="isLoading"
(click)="clickEmitter.emit()"
>
- <ods-save-icon icon [size]="size" class="fill-text"></ods-save-icon>
+ <ods-icon icon name="save" [size]="size" fill="text" />
</ods-button>`,
})
export class DownloadButtonComponent {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 7f810265e8..bbef2a6334 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -52,8 +52,6 @@ export * from './lib/icons/mailbox-icon/mailbox-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
-export * from './lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component';
-export * from './lib/icons/save-icon/save-icon.component';
export * from './lib/icons/search-icon/search-icon.component';
export * from './lib/icons/send-icon/send-icon.component';
export * from './lib/icons/settings-icon/settings-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
index ce3a2d8cf0..6ab4a39444 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
@@ -24,7 +24,6 @@
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
import { AttachmentComponent } from '../attachment/attachment.component';
-import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
import { AttachmentHeaderComponent } from './attachment-header.component';
const meta: Meta<AttachmentHeaderComponent> = {
@@ -39,7 +38,7 @@ const meta: Meta<AttachmentHeaderComponent> = {
},
decorators: [
moduleMetadata({
- imports: [AttachmentHeaderComponent, AttachmentComponent, SaveIconComponent],
+ imports: [AttachmentHeaderComponent, AttachmentComponent],
}),
],
excludeStories: /.*Data$/,
@@ -62,6 +61,7 @@ export const Default: Story = {
props: args,
template: `<ods-attachment-header ${argsToTemplate(args)}>
<button action-buttons>
+ //TODO OZG-7707
<ods-save-icon size="small" class="fill-text" />
</button>
</ods-attachment-header>`,
diff --git a/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
index 0280a18408..4ea7a26b79 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
@@ -25,7 +25,6 @@ import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
import { AttachmentHeaderComponent } from '../attachment-header/attachment-header.component';
import { AttachmentComponent } from '../attachment/attachment.component';
-import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
import { AttachmentWrapperComponent } from './attachment-wrapper.component';
const meta: Meta<AttachmentWrapperComponent> = {
@@ -40,7 +39,7 @@ const meta: Meta<AttachmentWrapperComponent> = {
},
decorators: [
moduleMetadata({
- imports: [AttachmentWrapperComponent, AttachmentComponent, SaveIconComponent, AttachmentHeaderComponent],
+ imports: [AttachmentWrapperComponent, AttachmentComponent, AttachmentHeaderComponent],
}),
],
excludeStories: /.*Data$/,
@@ -55,6 +54,7 @@ export const Default: Story = {
template: `<ods-attachment-wrapper>
<ods-attachment-header title="Anhänge">
<button action-buttons>
+ //TODO OZG-7707
<ods-save-icon size="small" class="fill-text" />
</button>
</ods-attachment-header>
diff --git a/alfa-client/libs/design-system/src/lib/button/button.stories.ts b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
index a04f3f564a..fa8a838ccf 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
@@ -23,7 +23,6 @@
*/
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
import { ButtonComponent } from './button.component';
const meta: Meta<ButtonComponent> = {
@@ -31,7 +30,7 @@ const meta: Meta<ButtonComponent> = {
component: ButtonComponent,
decorators: [
moduleMetadata({
- imports: [ButtonComponent, SaveIconComponent],
+ imports: [ButtonComponent],
}),
],
excludeStories: /.*Data$/,
@@ -81,6 +80,7 @@ export const PrimaryWithIcon: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
+ //TODO OZG-7707
<ods-save-icon icon size="small" class="fill-whitetext" />
</ods-button>`,
}),
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
index 122285175c..fe7c462d60 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
@@ -23,7 +23,6 @@
*/
import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { UserIconComponent } from '../../icons/user-icon/user-icon.component';
import { DropdownMenuButtonItemComponent } from '../dropdown-menu-button-item/dropdown-menu-button-item.component';
import { DropdownMenuItemComponent } from '../dropdown-menu-item/dropdown-menu-item.component';
@@ -40,7 +39,6 @@ const meta: Meta<DropdownMenuComponent> = {
DropdownMenuItemComponent,
DropdownMenuButtonItemComponent,
DropdownMenuTextItemComponent,
- SaveIconComponent,
UserIconComponent,
],
}),
@@ -94,6 +92,7 @@ export const ButtonWithIcon: Story = {
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
<ods-dropdown-menu-button-item caption="Lorem">
+ //TODO OZG-7707
<ods-save-icon icon size="small" />
</ods-dropdown-menu-button-item>
<ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet">
diff --git a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
index fbdbc9ab29..454418b34b 100644
--- a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
@@ -25,7 +25,6 @@ import { CommonModule } from '@angular/common';
import { FormGroupDirective } from '@angular/forms';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { SendIconComponent } from '../../icons/send-icon/send-icon.component';
import { StampIconComponent } from '../../icons/stamp-icon/stamp-icon.component';
import { RadioButtonCardComponent } from './radio-button-card.component';
@@ -35,7 +34,7 @@ const meta: Meta<RadioButtonCardComponent> = {
component: RadioButtonCardComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule, RadioButtonCardComponent, StampIconComponent, SaveIconComponent, SendIconComponent],
+ imports: [CommonModule, RadioButtonCardComponent, StampIconComponent, SendIconComponent],
providers: [FormGroupDirective],
}),
],
@@ -102,7 +101,9 @@ export const Message: Story = {
name="nachrichtOrManual"
variant="bescheid_save"
[fullWidthText]="true"
- ><ods-save-icon></ods-save-icon
+ >
+ //TODO OZG-7707
+ <ods-save-icon></ods-save-icon
></ods-radio-button-card>
</div>`,
}),
diff --git a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts
deleted file mode 100644
index e8655275d9..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { RequestVorgangDeletionIconComponent } from './request-vorgang-deletion-icon.component';
-
-describe('RequestVorgangDeletionIconComponent', () => {
- let component: RequestVorgangDeletionIconComponent;
- let fixture: ComponentFixture<RequestVorgangDeletionIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [RequestVorgangDeletionIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(RequestVorgangDeletionIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts
deleted file mode 100644
index ca9dd83e0e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.component.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-request-vorgang-deletion-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path d="M11.75 8H13.75V12.15L15.35 10.6L16.75 12L12.75 16L8.75 12L10.15 10.6L11.75 12.15V8Z" />
- <path
- d="M7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z"
- />
- </svg>`,
-})
-export class RequestVorgangDeletionIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts
deleted file mode 100644
index eed9f6bc60..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/request-vorgang-deletion-icon/request-vorgang-deletion-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { RequestVorgangDeletionIconComponent } from './request-vorgang-deletion-icon.component';
-
-const meta: Meta<RequestVorgangDeletionIconComponent> = {
- title: 'Icons/Request Vorgang deletion icon',
- component: RequestVorgangDeletionIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<RequestVorgangDeletionIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.spec.ts
deleted file mode 100644
index c3763a05e4..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SaveIconComponent } from './save-icon.component';
-
-describe('SaveIconComponent', () => {
- let component: SaveIconComponent;
- let fixture: ComponentFixture<SaveIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [SaveIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SaveIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
deleted file mode 100644
index bb788b58a0..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-save-icon',
- standalone: true,
- imports: [NgClass],
- template: ` <svg
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- viewBox="0 0 32 32"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M25.3333 16V25.3333H6.66667V16H4V25.3333C4 26.8 5.2 28 6.66667 28H25.3333C26.8 28 28 26.8 28 25.3333V16H25.3333ZM17.3333 16.8933L20.7867 13.4533L22.6667 15.3333L16 22L9.33333 15.3333L11.2133 13.4533L14.6667 16.8933V4H17.3333V16.8933Z"
- />
- </svg>`,
-})
-export class SaveIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.stories.ts
deleted file mode 100644
index 11dea2d96c..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { SaveIconComponent } from './save-icon.component';
-
-const meta: Meta<SaveIconComponent> = {
- title: 'Icons/Save icon',
- component: SaveIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<SaveIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
index b3de65bde7..52ad122fb7 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
@@ -28,12 +28,7 @@ import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import {
- IconComponent,
- RequestVorgangDeletionIconComponent,
- TooltipDirective,
- UndoRequestVorgangDeletionIconComponent,
-} from '@ods/system';
+import { IconComponent, TooltipDirective, UndoRequestVorgangDeletionIconComponent } from '@ods/system';
import { EndgueltigLoeschenButtonContainerComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button-container.component';
import { EndgueltigLoeschenButtonComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component';
import { LoeschAnforderungZuruecknehmenButtonContainerComponent } from './loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button-container.component';
@@ -49,7 +44,6 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
OzgcloudStrokedButtonWithSpinnerComponent,
IconButtonWithSpinnerComponent,
HasLinkPipe,
- RequestVorgangDeletionIconComponent,
ButtonWithSpinnerComponent,
IconComponent,
UndoRequestVorgangDeletionIconComponent,
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
index 869474ca10..95f1995157 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
@@ -33,7 +33,7 @@
size="fit"
(clickEmitter)="loeschenAnfordern.emit()"
>
- <ods-request-vorgang-deletion-icon icon class="fill-text" />
+ <ods-icon icon name="request-vorgang-deletion" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -43,6 +43,6 @@
variant="outline"
(clickEmitter)="loeschenAnfordern.emit()"
>
- <ods-request-vorgang-deletion-icon icon />
+ <ods-icon icon name="request-vorgang-deletion" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
index 41d80aba2d..b4a7afd745 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
@@ -24,7 +24,7 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { RequestVorgangDeletionIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button.component';
@@ -41,8 +41,8 @@ describe('LoeschenAnfordernButtonComponent', () => {
declarations: [
LoeschenAnfordernButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(RequestVorgangDeletionIconComponent),
MockDirective(TooltipDirective),
+ MockComponent(IconComponent),
],
}).compileComponents();
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
index 832c4fdcde..d89737b377 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.html
@@ -32,7 +32,7 @@
variant="outline"
text="Herunterladen"
>
- <ods-save-icon icon />
+ <ods-icon icon name="save" />
</ods-button-with-spinner>
<ng-template #exportNotPossible>
<div class="flex items-start gap-2" data-test-id="cannot-export-vorgang">
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts
index ff4d404d4a..d2a5387a27 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-export-container/vorgang-export-container.component.spec.ts
@@ -26,7 +26,7 @@ import { getElementFromFixture, mock } from '@alfa-client/test-utils';
import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { IconComponent, SaveIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
@@ -50,7 +50,6 @@ describe('VorgangExportContainerComponent', () => {
VorgangExportContainerComponent,
MockComponent(ButtonWithSpinnerComponent),
MockComponent(IconComponent),
- MockComponent(SaveIconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 35d7845202..19e384ed9a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -79,7 +79,6 @@ import {
FileIconComponent,
IconComponent,
RadioButtonCardComponent,
- SaveIconComponent,
SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
@@ -147,7 +146,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- SaveIconComponent,
SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
diff --git a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
index 231640ded0..55b017c0a3 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
@@ -33,7 +33,7 @@
size="fit"
dataTestId="speichern-icon-button"
>
- <ods-save-icon icon class="fill-text" />
+ <ods-icon icon name="save" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -43,6 +43,6 @@
variant="outline"
dataTestId="speichern-button"
>
- <ods-save-icon icon />
+ <ods-icon icon name="save" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts
index e5090f94ee..330c99e7f5 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts
@@ -30,7 +30,7 @@ import { WiedervorlageService } from '@alfa-client/wiedervorlage-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { SaveIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
import { createCommandResource } from 'libs/command-shared/test/command';
import { MockComponent } from 'ng-mocks';
@@ -56,7 +56,7 @@ describe('SubmitWiedervorlageButtonComponent', () => {
SubmitWiedervorlageButtonComponent,
MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(SaveIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
index bc76593bcd..aa33ff68cc 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
@@ -52,7 +52,7 @@ import { MatIcon } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { RouterModule, Routes } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { IconComponent, SaveIconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
import { CreateWiedervorlageButtonContainerComponent } from './create-wiedervorlage-button-container/create-wiedervorlage-button-container.component';
import { ErledigenButtonContainerComponent } from './erledigen-button-container/erledigen-button-container.component';
@@ -113,7 +113,6 @@ const routes: Routes = [
TooltipDirective,
UpdateIconComponent,
IconComponent,
- SaveIconComponent,
MultiFileUploadComponent,
],
declarations: [
--
GitLab
From daa6097d503859d8b32b743cff3e142f1fc9736f Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 4 Apr 2025 15:44:24 +0200
Subject: [PATCH 21/36] OZG-7707 replace more icons - search icon - send icon
---
.../apps/demo/src/app/app.component.html | 2 +-
.../apps/demo/src/app/app.component.spec.ts | 10 +++-
.../apps/demo/src/app/app.component.ts | 2 -
...ard-bescheid-versenden-form.component.html | 2 +-
...-bescheid-versenden-form.component.spec.ts | 3 +-
.../libs/bescheid/src/lib/bescheid.module.ts | 2 -
.../src/lib/collaboration.module.ts | 2 -
alfa-client/libs/design-system/src/index.ts | 2 -
.../radio-button-card.stories.ts | 7 +--
.../search-icon/search-icon.component.spec.ts | 44 ----------------
.../search-icon/search-icon.component.ts | 51 -------------------
.../icons/search-icon/search-icon.stories.ts | 50 ------------------
.../send-icon/send-icon.component.spec.ts | 44 ----------------
.../icons/send-icon/send-icon.component.ts | 50 ------------------
.../lib/icons/send-icon/send-icon.stories.ts | 50 ------------------
.../instant-search.component.spec.ts | 4 +-
.../search-field/search-field.component.ts | 5 +-
.../src/lib/vorgang-detail.module.ts | 2 -
.../zustaendige-stelle-button.component.html | 2 +-
...ustaendige-stelle-button.component.spec.ts | 4 +-
.../src/lib/zustaendige-stelle.module.ts | 2 -
21 files changed, 23 insertions(+), 317 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 398b34fb53..2062d4c7df 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -517,7 +517,7 @@
variant="bescheid_save"
[fullWidthText]="true"
>
- <ods-send-icon />
+ <ods-icon name="send" />
</ods-radio-button-card>
<ods-radio-button-card
label="Nur speichern"
diff --git a/alfa-client/apps/demo/src/app/app.component.spec.ts b/alfa-client/apps/demo/src/app/app.component.spec.ts
index c532d28824..6fd409e269 100644
--- a/alfa-client/apps/demo/src/app/app.component.spec.ts
+++ b/alfa-client/apps/demo/src/app/app.component.spec.ts
@@ -23,14 +23,20 @@
*/
import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
-import { ErrorMessageComponent, IconComponent } from '@ods/system';
+import { ErrorMessageComponent, IconComponent, InstantSearchComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent), MockComponent(ErrorMessageComponent)],
+ imports: [
+ AppComponent,
+ RouterTestingModule,
+ MockComponent(IconComponent),
+ MockComponent(ErrorMessageComponent),
+ MockComponent(InstantSearchComponent),
+ ],
}).compileComponents();
});
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index eed0bd055a..4cf3fde6a1 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -38,7 +38,6 @@ import {
IconComponent,
InstantSearchComponent,
RadioButtonCardComponent,
- SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
TextInputComponent,
@@ -73,7 +72,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
RadioButtonCardComponent,
ReactiveFormsModule,
InstantSearchComponent,
- SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
TextareaComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
index d74b1b2bcd..273b3dbd89 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.html
@@ -14,7 +14,7 @@
(change)="changeSendBy(bescheidSendBy.NACHRICHT)"
data-test-id="send-to-antragsteller-button"
>
- <ods-send-icon size="large"></ods-send-icon>
+ <ods-icon name="send" size="large" />
</ods-radio-button-card>
@if (bescheidResource | hasLink: bescheidLinkRel.BESCHEIDEN) {
<ods-radio-button-card
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
index 1af30b671f..8fd1ff959b 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/form/bescheid-wizard-bescheid-versenden-form.component.spec.ts
@@ -8,7 +8,7 @@ import {
} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { IconComponent, RadioButtonCardComponent, SendIconComponent } from '@ods/system';
+import { IconComponent, RadioButtonCardComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
@@ -33,7 +33,6 @@ describe('BescheidWizardBescheidVersendenFormComponent', () => {
declarations: [
BescheidWizardBescheidVersendenFormComponent,
MockComponent(RadioButtonCardComponent),
- MockComponent(SendIconComponent),
MockComponent(IconComponent),
HasLinkPipe,
ReactiveFormsModule,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index eccdfd5ac6..044ba3214a 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -63,7 +63,6 @@ import {
ButtonComponent,
IconComponent,
RadioButtonCardComponent,
- SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
} from '@ods/system';
@@ -128,7 +127,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
AttachmentComponent,
AttachmentWrapperComponent,
FileUploadEditorComponent,
- SendIconComponent,
TextEditorComponent,
TextareaEditorComponent,
ConvertForDataTestPipe,
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index d56d50c5ce..11be3c50a3 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -34,7 +34,6 @@ import {
ExternalUnitIconComponent,
IconComponent,
PublicAdministrationIconComponent,
- SearchIconComponent,
UsersIconComponent,
} from '@ods/system';
import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
@@ -53,7 +52,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
CommonModule,
ButtonComponent,
IconComponent,
- SearchIconComponent,
CollaborationSharedModule,
UsersIconComponent,
TextEditorComponent,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index bbef2a6334..e15ba1f81e 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -52,8 +52,6 @@ export * from './lib/icons/mailbox-icon/mailbox-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
-export * from './lib/icons/search-icon/search-icon.component';
-export * from './lib/icons/send-icon/send-icon.component';
export * from './lib/icons/settings-icon/settings-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
export * from './lib/icons/stamp-icon/stamp-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
index 454418b34b..3a53d9153a 100644
--- a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
@@ -25,7 +25,6 @@ import { CommonModule } from '@angular/common';
import { FormGroupDirective } from '@angular/forms';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { SendIconComponent } from '../../icons/send-icon/send-icon.component';
import { StampIconComponent } from '../../icons/stamp-icon/stamp-icon.component';
import { RadioButtonCardComponent } from './radio-button-card.component';
@@ -34,7 +33,7 @@ const meta: Meta<RadioButtonCardComponent> = {
component: RadioButtonCardComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule, RadioButtonCardComponent, StampIconComponent, SendIconComponent],
+ imports: [CommonModule, RadioButtonCardComponent, StampIconComponent],
providers: [FormGroupDirective],
}),
],
@@ -93,7 +92,9 @@ export const Message: Story = {
name="nachrichtOrManual"
variant="bescheid_save"
[fullWidthText]="true"
- ><ods-send-icon></ods-send-icon
+ >
+ //TODO OZG-7707
+ <ods-send-icon></ods-send-icon
></ods-radio-button-card>
<ods-radio-button-card
label="Nur speichern"
diff --git a/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.spec.ts
deleted file mode 100644
index a9f2077e63..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SearchIconComponent } from './search-icon.component';
-
-describe('SearchIconComponent', () => {
- let component: SearchIconComponent;
- let fixture: ComponentFixture<SearchIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [SearchIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SearchIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.ts
deleted file mode 100644
index c40fcb0be6..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-search-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M15.5 14H14.71L14.43 13.73C15.41 12.59 16 11.11 16 9.5C16 5.91 13.09 3 9.5 3C5.91 3 3 5.91 3 9.5C3 13.09 5.91 16 9.5 16C11.11 16 12.59 15.41 13.73 14.43L14 14.71V15.5L19 20.49L20.49 19L15.5 14ZM9.5 14C7.01 14 5 11.99 5 9.5C5 7.01 7.01 5 9.5 5C11.99 5 14 7.01 14 9.5C14 11.99 11.99 14 9.5 14Z"
- />
- </svg>`,
-})
-export class SearchIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.stories.ts
deleted file mode 100644
index 3138f554a1..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/search-icon/search-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { SearchIconComponent } from './search-icon.component';
-
-const meta: Meta<SearchIconComponent> = {
- title: 'Icons/Search icon',
- component: SearchIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<SearchIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.spec.ts
deleted file mode 100644
index b3ffbe02ef..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SendIconComponent } from './send-icon.component';
-
-describe('SendIconComponent', () => {
- let component: SendIconComponent;
- let fixture: ComponentFixture<SendIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [SendIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SendIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts
deleted file mode 100644
index 851ea807cf..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-send-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- viewBox="0 0 32 32"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M4 26.6688V5.33545L29.3333 16.0021L4 26.6688ZM6.66667 22.6688L22.4667 16.0021L6.66667 9.33545V14.0021L14.6667 16.0021L6.66667 18.0021V22.6688Z"
- />
- </svg>`,
-})
-export class SendIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.stories.ts
deleted file mode 100644
index ae463e2b66..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { SendIconComponent } from './send-icon.component';
-
-const meta: Meta<SendIconComponent> = {
- title: 'Icons/Send icon',
- component: SendIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<SendIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts b/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts
index 42ded4ce87..743b0237db 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts
@@ -26,8 +26,10 @@ import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing';
import { Resource } from '@ngxp/rest';
+import { MockComponent } from 'ng-mocks';
import { Subscription } from 'rxjs';
import { createKeydownKeyboardEvent } from '../../../../../test-utils/src/lib/keyboard';
+import { SearchFieldComponent } from '../search-field/search-field.component';
import { InstantSearchComponent } from './instant-search.component';
import { InstantSearchQuery, InstantSearchResult } from './instant-search.model';
@@ -49,7 +51,7 @@ describe('InstantSearchComponent', () => {
searchResultSelected = <any>mock(EventEmitter);
await TestBed.configureTestingModule({
- imports: [InstantSearchComponent],
+ imports: [InstantSearchComponent, MockComponent(SearchFieldComponent)],
}).compileComponents();
fixture = TestBed.createComponent(InstantSearchComponent);
diff --git a/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts b/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts
index 614257e698..1426a80b13 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/search-field/search-field.component.ts
@@ -27,12 +27,11 @@ import { FormControl } from '@angular/forms';
import { EMPTY_STRING } from '../../../../../tech-shared/src';
import { TextInputComponent } from '../../form/text-input/text-input.component';
import { IconComponent } from '../../icon/icon.component';
-import { SearchIconComponent } from '../../icons/search-icon/search-icon.component';
@Component({
selector: 'ods-search-field',
standalone: true,
- imports: [CommonModule, TextInputComponent, SearchIconComponent, IconComponent],
+ imports: [CommonModule, TextInputComponent, IconComponent],
template: `<ods-text-input
label="instant search"
[fieldControl]="control"
@@ -44,7 +43,7 @@ import { SearchIconComponent } from '../../icons/search-icon/search-icon.compone
(clickEmitter)="inputClicked.emit()"
role="combobox"
>
- <ods-search-icon prefix aria-hidden="true" aria-label="Suchfeld" />
+ <ods-icon prefix name="search" aria-label="Suchfeld" />
<button suffix *ngIf="control.value" (click)="clearInput()" aria-label="Eingabe löschen" data-test-id="clear-instant-search">
<ods-icon name="close" class="hover:fill-primary-hover" />
</button>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 19e384ed9a..5884a9c37b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -79,7 +79,6 @@ import {
FileIconComponent,
IconComponent,
RadioButtonCardComponent,
- SendIconComponent,
SpinnerIconComponent,
StampIconComponent,
TooltipDirective,
@@ -146,7 +145,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- SendIconComponent,
StampIconComponent,
SpinnerIconComponent,
AttachmentComponent,
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.html
index faad1e642e..a398c19db7 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.html
@@ -31,6 +31,6 @@
[dataTestId]="dataTestId"
(clickEmitter)="openSearchDialog()"
>
- <ods-search-icon icon />
+ <ods-icon icon name="search" />
</ods-button>
</div>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.spec.ts
index 27a7cb325f..df76a4a3c0 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-button/zustaendige-stelle-button.component.spec.ts
@@ -26,7 +26,7 @@ import { OzgcloudDialogService } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
import { Resource } from '@ngxp/rest';
-import { ButtonComponent, SearchIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { SearchZustaendigeStelleDialogComponent } from '../search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component';
@@ -47,7 +47,7 @@ describe('ZustaendigeStelleButtonComponent', () => {
dialogService = mock(OzgcloudDialogService);
await TestBed.configureTestingModule({
declarations: [ZustaendigeStelleButtonComponent],
- imports: [MockComponent(SearchIconComponent), MockComponent(ButtonComponent)],
+ imports: [MockComponent(IconComponent), MockComponent(ButtonComponent)],
providers: [
{
provide: OzgcloudDialogService,
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index 5abd3f4ee4..f4efa3bfb0 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -30,7 +30,6 @@ import {
IconComponent,
InstantSearchComponent,
PublicAdministrationIconComponent,
- SearchIconComponent,
} from '@ods/system';
import { ZustaendigeStelleSharedModule } from 'libs/zustaendige-stelle-shared/src/lib/zustaendige-stelle-shared.module';
import { EditZustaendigeStelleButtonComponent } from './edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component';
@@ -52,7 +51,6 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
FormsModule,
ReactiveFormsModule,
ZustaendigeStelleSharedModule,
- SearchIconComponent,
ExternalUnitIconComponent,
IconComponent,
PublicAdministrationIconComponent,
--
GitLab
From 9b0ab6f69105c69a0e50e006664759cd2630500b Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 08:44:53 +0200
Subject: [PATCH 22/36] OZG-7707 replace more icons - settings icon - stamp
icon
---
.../apps/demo/src/app/app.component.html | 2 +-
.../apps/demo/src/app/app.component.ts | 2 -
...zard-antrag-bescheiden-form.component.html | 2 +-
...d-antrag-bescheiden-form.component.spec.ts | 3 +-
.../libs/bescheid/src/lib/bescheid.module.ts | 2 -
.../beschieden-date-container.component.html | 4 +-
...eschieden-date-container.component.spec.ts | 9 +---
alfa-client/libs/design-system/src/index.ts | 2 -
.../bescheid-status-text.component.ts | 10 ++--
.../radio-button-card.stories.ts | 4 +-
.../src/lib/icon/icon.component.ts | 1 +
.../settings-icon/settengs-icon.stories.ts | 50 -----------------
.../settings-icon.component.spec.ts | 44 ---------------
.../settings-icon/settings-icon.component.ts | 50 -----------------
.../stamp-icon/stamp-icon.component.spec.ts | 45 ----------------
.../icons/stamp-icon/stamp-icon.component.ts | 54 -------------------
.../icons/stamp-icon/stamp-icon.stories.ts | 50 -----------------
.../user-settings.component.html | 2 +-
.../user-settings.component.spec.ts | 5 +-
.../src/lib/user-settings.module.ts | 11 +---
.../bescheiden-button.component.html | 4 +-
.../bescheiden-button.component.spec.ts | 16 ++++--
.../src/lib/vorgang-detail.module.ts | 2 -
23 files changed, 35 insertions(+), 339 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/settings-icon/settengs-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.stories.ts
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 2062d4c7df..fd0d2b4c32 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -501,7 +501,7 @@
<div class="my-10 flex gap-8">
<ods-radio-button-card label="bewilligt" name="exampleName" value="bewilligt" variant="bescheid_bewilligt">
- <ods-stamp-icon />
+ <ods-icon name="stamp" fill="bewilligt" size="large" />
</ods-radio-button-card>
<ods-radio-button-card label="abgelehnt" name="exampleName" value="abgelehnt" variant="bescheid_abgelehnt">
<ods-icon name="close" fill="abgelehnt" size="large" />
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 4cf3fde6a1..4fb116ef69 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -39,7 +39,6 @@ import {
InstantSearchComponent,
RadioButtonCardComponent,
SpinnerIconComponent,
- StampIconComponent,
TextInputComponent,
TextareaComponent,
TooltipDirective,
@@ -72,7 +71,6 @@ import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.com
RadioButtonCardComponent,
ReactiveFormsModule,
InstantSearchComponent,
- StampIconComponent,
SpinnerIconComponent,
TextareaComponent,
TextInputComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
index aa96d4bae0..7e51ff7adf 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
@@ -32,7 +32,7 @@
data-test-id="button-bewilligt"
variant="bescheid_bewilligt"
>
- <ods-stamp-icon size="large"></ods-stamp-icon>
+ <ods-icon name="stamp" fill="bewilligt" size="large" />
</ods-radio-button-card>
<ods-radio-button-card
label="abgelehnt"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
index 84be3eb452..4ea8314f1b 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
@@ -37,7 +37,7 @@ import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
-import { IconComponent, RadioButtonCardComponent, StampIconComponent } from '@ods/system';
+import { IconComponent, RadioButtonCardComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
@@ -67,7 +67,6 @@ describe('BescheidWizardAntragBescheidenFormComponent', () => {
HasLinkPipe,
MockComponent(BescheidWizardWeiterButtonComponent),
MockComponent(RadioButtonCardComponent),
- MockComponent(StampIconComponent),
MockComponent(IconComponent),
MockComponent(DateEditorComponent),
],
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index 044ba3214a..04e5cda02a 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -64,7 +64,6 @@ import {
IconComponent,
RadioButtonCardComponent,
SpinnerIconComponent,
- StampIconComponent,
} from '@ods/system';
import { FormatFullDatePipe } from '../../../tech-shared/src/lib/pipe/format-full-date.pipe';
import { BescheidWizardContainerComponent } from './bescheid-wizard-container/bescheid-wizard-container.component';
@@ -105,7 +104,6 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
CommandSharedModule,
BescheidStatusTextComponent,
BescheidWrapperComponent,
- StampIconComponent,
ButtonWithSpinnerComponent,
RadioButtonCardComponent,
ButtonComponent,
diff --git a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
index cef4e8571a..6b8f8d550c 100644
--- a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
@@ -26,9 +26,9 @@
<ng-container *ngIf="bescheid$ | async as bescheid">
<div class="flex items-center gap-2 text-text">
@if (bescheid.bewilligt) {
- <ods-stamp-icon data-test-id="bewilligt-icon" size="small" class="fill-bewilligt" />
+ <ods-icon name="stamp" fill="bewilligt" size="small" data-test-id="bewilligt-icon" />
} @else {
- <ods-icon name="close" fill="abgelehnt" data-test-id="abgelehnt-icon" />
+ <ods-icon name="close" fill="abgelehnt" size="small" data-test-id="abgelehnt-icon" />
}
{{ bescheid.beschiedenAm | formatFullDatePipe }}
diff --git a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts
index 21484521a0..e4c64ce498 100644
--- a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { BescheidService } from '@alfa-client/bescheid-shared';
-import { IconComponent, StampIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
import { FormatFullDatePipe } from 'libs/tech-shared/src/lib/pipe/format-full-date.pipe';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -48,12 +48,7 @@ describe('BeschiedenDateContainerComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [
- BeschiedenDateContainerComponent,
- FormatFullDatePipe,
- MockComponent(StampIconComponent),
- MockComponent(IconComponent),
- ],
+ declarations: [BeschiedenDateContainerComponent, FormatFullDatePipe, MockComponent(IconComponent)],
providers: [
{
provide: BescheidService,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index e15ba1f81e..462a77a07d 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -52,9 +52,7 @@ export * from './lib/icons/mailbox-icon/mailbox-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
-export * from './lib/icons/settings-icon/settings-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
-export * from './lib/icons/stamp-icon/stamp-icon.component';
export * from './lib/icons/statistic-icon/statistic-icon.component';
export * from './lib/icons/undo-icon/undo-icon.component';
export * from './lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
index 85a4e7fe7c..c90aaf0eb5 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
@@ -25,16 +25,16 @@ import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { IconComponent } from '../icon/icon.component';
-import { StampIconComponent } from '../icons/stamp-icon/stamp-icon.component';
@Component({
selector: 'ods-bescheid-status-text',
standalone: true,
- imports: [CommonModule, StampIconComponent, IconComponent],
+ imports: [CommonModule, IconComponent],
template: ` <p class="flex gap-2 text-base font-medium text-text">
- <span class="flex items-center gap-2" *ngIf="bewilligt"
- ><ods-stamp-icon size="medium" class="fill-bewilligt" />Bewilligt am {{ dateText }}</span
- >
+ <span class="flex items-center gap-2" *ngIf="bewilligt">
+ <ods-icon name="stamp" fill="bewilligt" />
+ Bewilligt am {{ dateText }}
+ </span>
<span class="flex items-center gap-2" *ngIf="!bewilligt">
<ods-icon name="close" fill="abgelehnt" />
Abgelehnt am {{ dateText }}
diff --git a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
index 3a53d9153a..c198e906ad 100644
--- a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
@@ -25,7 +25,6 @@ import { CommonModule } from '@angular/common';
import { FormGroupDirective } from '@angular/forms';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { StampIconComponent } from '../../icons/stamp-icon/stamp-icon.component';
import { RadioButtonCardComponent } from './radio-button-card.component';
const meta: Meta<RadioButtonCardComponent> = {
@@ -33,7 +32,7 @@ const meta: Meta<RadioButtonCardComponent> = {
component: RadioButtonCardComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule, RadioButtonCardComponent, StampIconComponent],
+ imports: [CommonModule, RadioButtonCardComponent],
providers: [FormGroupDirective],
}),
],
@@ -58,6 +57,7 @@ export const Default: Story = {
<ods-radio-button-card
${argsToTemplate(args)}
>
+ //TODO OZG-7707
<ods-stamp-icon />
</ods-radio-button-card>
<ods-radio-button-card
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index df7f281cd8..d8f6ef0f40 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -45,6 +45,7 @@ const iconVariants = cva('', {
error: 'fill-error',
pdf: 'fill-pdf',
neutral: 'fill-neutral-500 dark:fill-neutral-400',
+ bewilligt: 'fill-bewilligt',
abgelehnt: 'fill-abgelehnt',
},
},
diff --git a/alfa-client/libs/design-system/src/lib/icons/settings-icon/settengs-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/settings-icon/settengs-icon.stories.ts
deleted file mode 100644
index 790a794f48..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/settings-icon/settengs-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { SettingsIconComponent } from './settings-icon.component';
-
-const meta: Meta<SettingsIconComponent> = {
- title: 'Icons/Settings icon',
- component: SettingsIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<SettingsIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.spec.ts
deleted file mode 100644
index 6389ddedab..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SettingsIconComponent } from './settings-icon.component';
-
-describe('SettingsIconComponent', () => {
- let component: SettingsIconComponent;
- let fixture: ComponentFixture<SettingsIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [SettingsIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SettingsIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.ts
deleted file mode 100644
index d3d122cc20..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/settings-icon/settings-icon.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { IconVariants, iconVariants } from '@ods/system';
-import { twMerge } from 'tailwind-merge';
-
-@Component({
- selector: 'ods-settings-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-neutral-500 dark:fill-neutral-400', class)"
- >
- <path
- d="M 10.490234 2 C 10.011234 2 9.6017656 2.3385938 9.5097656 2.8085938 L 9.1757812 4.5234375 C 8.3550224 4.8338012 7.5961042 5.2674041 6.9296875 5.8144531 L 5.2851562 5.2480469 C 4.8321563 5.0920469 4.33375 5.2793594 4.09375 5.6933594 L 2.5859375 8.3066406 C 2.3469375 8.7216406 2.4339219 9.2485 2.7949219 9.5625 L 4.1132812 10.708984 C 4.0447181 11.130337 4 11.559284 4 12 C 4 12.440716 4.0447181 12.869663 4.1132812 13.291016 L 2.7949219 14.4375 C 2.4339219 14.7515 2.3469375 15.278359 2.5859375 15.693359 L 4.09375 18.306641 C 4.33275 18.721641 4.8321562 18.908906 5.2851562 18.753906 L 6.9296875 18.1875 C 7.5958842 18.734206 8.3553934 19.166339 9.1757812 19.476562 L 9.5097656 21.191406 C 9.6017656 21.661406 10.011234 22 10.490234 22 L 13.509766 22 C 13.988766 22 14.398234 21.661406 14.490234 21.191406 L 14.824219 19.476562 C 15.644978 19.166199 16.403896 18.732596 17.070312 18.185547 L 18.714844 18.751953 C 19.167844 18.907953 19.66625 18.721641 19.90625 18.306641 L 21.414062 15.691406 C 21.653063 15.276406 21.566078 14.7515 21.205078 14.4375 L 19.886719 13.291016 C 19.955282 12.869663 20 12.440716 20 12 C 20 11.559284 19.955282 11.130337 19.886719 10.708984 L 21.205078 9.5625 C 21.566078 9.2485 21.653063 8.7216406 21.414062 8.3066406 L 19.90625 5.6933594 C 19.66725 5.2783594 19.167844 5.0910937 18.714844 5.2460938 L 17.070312 5.8125 C 16.404116 5.2657937 15.644607 4.8336609 14.824219 4.5234375 L 14.490234 2.8085938 C 14.398234 2.3385937 13.988766 2 13.509766 2 L 10.490234 2 z M 12 8 C 14.209 8 16 9.791 16 12 C 16 14.209 14.209 16 12 16 C 9.791 16 8 14.209 8 12 C 8 9.791 9.791 8 12 8 z"
- />
- </svg>`,
-})
-export class SettingsIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- protected readonly iconVariants = iconVariants;
- protected readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.spec.ts
deleted file mode 100644
index a1b779a1a6..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.spec.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { StampIconComponent } from './stamp-icon.component';
-
-describe('StampIconComponent', () => {
- let component: StampIconComponent;
- let fixture: ComponentFixture<StampIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [StampIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(StampIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts
deleted file mode 100644
index 1a12d7ae78..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-stamp-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-bewilligt', class)]"
- aria-hidden="true"
- viewBox="0 0 24 24"
- fill="none"
- >
- <path
- fill-rule="evenodd"
- d="M2.742 21.213h-.409a.872.872 0 0 1-.63-.252.873.873 0 0 1-.253-.631v-3.333A2.557 2.557 0 0 1 4 14.447h4.667a.786.786 0 0 0 .783-.784v-.366c0-1.823-.434-3.522-1.315-4.907a4.388 4.388 0 0 1-.685-2.393c0-1.291.571-2.544 1.511-3.372a4.534 4.534 0 0 1 3.568-1.141c2.01.227 3.678 1.823 3.982 3.802a4.755 4.755 0 0 1-.527 2.973l-.012.02c-.945 1.575-1.422 3.212-1.422 4.818v.566c0 .43.353.784.783.784H20a2.557 2.557 0 0 1 2.55 2.55v3.333a.873.873 0 0 1-.253.63.873.873 0 0 1-.63.253h-.066a2.666 2.666 0 0 1-2.3 1.334H5.032a2.642 2.642 0 0 1-2.29-1.334Zm18.041-1.766v-2.45a.787.787 0 0 0-.783-.784h-4.667a2.557 2.557 0 0 1-2.55-2.55v-.566c0-1.925.555-3.817 1.635-5.7.307-.557.452-1.198.34-1.845-.195-1.196-1.196-2.17-2.415-2.308a2.8 2.8 0 0 0-1.949.51l-.246.202c-.606.496-.93 1.269-.93 2.04 0 .53.137 1.03.417 1.479 1.017 1.648 1.582 3.647 1.582 5.822v.366a2.557 2.557 0 0 1-2.55 2.55H4a.786.786 0 0 0-.783.784v2.45h17.566Z"
- clip-rule="evenodd"
- />
- </svg>`,
-})
-export class StampIconComponent {
- @Input() size: IconVariants['size'] = 'large';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.stories.ts
deleted file mode 100644
index 0d54ecf782..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { StampIconComponent } from './stamp-icon.component';
-
-const meta: Meta<StampIconComponent> = {
- title: 'Icons/Stamp icon',
- component: StampIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<StampIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'large' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html
index 3874b48bac..08f4c635d3 100644
--- a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html
+++ b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.html
@@ -27,6 +27,6 @@
buttonClass="p-2 rounded-full focus:outline-none focus:bg-neutral-200 hover:bg-neutral-100 dark:focus:bg-neutral-600 dark:hover:bg-neutral-700"
buttonTestId="user-settings-button"
>
- <ods-settings-icon button-content />
+ <ods-icon button-content name="settings" fill="neutral" />
<alfa-user-settings-dropdown [apiRoot]="apiRoot" />
</ods-dropdown-menu>
diff --git a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts
index f40d240d63..a1df4022e4 100644
--- a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts
+++ b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts
@@ -24,8 +24,7 @@
import { HasLinkPipe, createEmptyStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DropdownMenuComponent } from '@ods/system';
-import { SettingsIconComponent } from 'libs/design-system/src/lib/icons/settings-icon/settings-icon.component';
+import { DropdownMenuComponent, IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { UserSettingsDropdownComponent } from './user-settings-dropdown/user-settings-dropdown.component';
import { UserSettingsComponent } from './user-settings.component';
@@ -40,7 +39,7 @@ describe('UserSettingsComponent', () => {
declarations: [
HasLinkPipe,
UserSettingsComponent,
- MockComponent(SettingsIconComponent),
+ MockComponent(IconComponent),
MockComponent(UserSettingsDropdownComponent),
MockComponent(DropdownMenuComponent),
],
diff --git a/alfa-client/libs/user-settings/src/lib/user-settings.module.ts b/alfa-client/libs/user-settings/src/lib/user-settings.module.ts
index 66bd954af7..9de9fce60b 100644
--- a/alfa-client/libs/user-settings/src/lib/user-settings.module.ts
+++ b/alfa-client/libs/user-settings/src/lib/user-settings.module.ts
@@ -26,7 +26,7 @@ import { SlideToggleComponent } from '@alfa-client/ui';
import { UserSettingsSharedModule } from '@alfa-client/user-settings-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { DropdownMenuComponent, SettingsIconComponent } from '@ods/system';
+import { DropdownMenuComponent, IconComponent } from '@ods/system';
import { UserSettingsContainerComponent } from './user-settings-container/user-settings-container.component';
import { UserSettingsDarkmodeContainerComponent } from './user-settings-container/user-settings/user-settings-dropdown/user-settings-darkmode-container/user-settings-darkmode-container.component';
import { UserSettingsDarkmodeComponent } from './user-settings-container/user-settings/user-settings-dropdown/user-settings-darkmode-container/user-settings-darkmode/user-settings-darkmode.component';
@@ -36,14 +36,7 @@ import { UserSettingsEmailBenachrichtigungComponent } from './user-settings-cont
import { UserSettingsComponent } from './user-settings-container/user-settings/user-settings.component';
@NgModule({
- imports: [
- CommonModule,
- UserSettingsSharedModule,
- DropdownMenuComponent,
- SettingsIconComponent,
- SlideToggleComponent,
- HasLinkPipe,
- ],
+ imports: [CommonModule, UserSettingsSharedModule, DropdownMenuComponent, IconComponent, SlideToggleComponent, HasLinkPipe],
declarations: [
UserSettingsContainerComponent,
UserSettingsEmailBenachrichtigungComponent,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index 01e35c10b6..c9c22904c2 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -34,7 +34,7 @@
size="fit"
dataTestId="bescheiden-icon-button"
>
- <ods-stamp-icon icon class="fill-text" size="medium" />
+ <ods-icon icon name="stamp" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -44,7 +44,7 @@
variant="outline"
dataTestId="bescheiden-button"
>
- <ods-stamp-icon icon size="medium" class="fill-primary" />
+ <ods-icon icon name="stamp" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
index 728a67f054..45ff9a560b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
@@ -25,13 +25,23 @@ import { BescheidWizardContainerComponent } from '@alfa-client/bescheid';
import { BescheidWizardDialogResult } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
import { createStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
-import { createDialogRefMock, DialogRefMock, getElementComponentFromFixtureByCss, getMockComponent, Mock, mock, notExistsAsHtmlElement, tooltipExistsWithText, triggerEvent, } from '@alfa-client/test-utils';
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ getElementComponentFromFixtureByCss,
+ getMockComponent,
+ Mock,
+ mock,
+ notExistsAsHtmlElement,
+ tooltipExistsWithText,
+ triggerEvent,
+} from '@alfa-client/test-utils';
import { OzgcloudDialogService } from '@alfa-client/ui';
import { VorgangCommandService, VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { StampIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -67,7 +77,7 @@ describe('BescheidenButtonComponent', () => {
HasLinkPipe,
TooltipDirective,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(StampIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 5884a9c37b..9d9b70374c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -80,7 +80,6 @@ import {
IconComponent,
RadioButtonCardComponent,
SpinnerIconComponent,
- StampIconComponent,
TooltipDirective,
UndoIconComponent,
} from '@ods/system';
@@ -145,7 +144,6 @@ const routes: Routes = [
ButtonComponent,
ButtonCardComponent,
UndoIconComponent,
- StampIconComponent,
SpinnerIconComponent,
AttachmentComponent,
AttachmentWrapperComponent,
--
GitLab
From 25733ca3fc3cd33027d5ad67c6a40a6c8bc0793a Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 09:34:46 +0200
Subject: [PATCH 23/36] OZG-7707 replace more icons - statistic icon - undo
icon
---
.../menu-container/menu/menu.component.html | 2 +-
.../menu/menu.component.spec.ts | 4 +-
.../lib/menu-container/menu/menu.component.ts | 4 +-
alfa-client/libs/design-system/src/index.ts | 2 -
.../statistic-icon.component.spec.ts | 21 --------
.../statistic-icon.component.ts | 24 ---------
.../statistic-icon/statistic-icon.stories.ts | 50 -------------------
.../undo-icon/undo-icon.component.spec.ts | 21 --------
.../icons/undo-icon/undo-icon.component.ts | 27 ----------
.../lib/icons/undo-icon/undo-icon.stories.ts | 27 ----------
.../wiedereroeffnen-button.component.html | 4 +-
.../wiedereroeffnen-button.component.spec.ts | 4 +-
.../zurueckholen-button.component.html | 4 +-
.../zurueckholen-button.component.spec.ts | 4 +-
.../zurueckstellen-button.component.html | 4 +-
.../zurueckstellen-button.component.spec.ts | 4 +-
.../src/lib/vorgang-detail.module.ts | 2 -
17 files changed, 17 insertions(+), 191 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.stories.ts
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
index c319836e14..2ac0364135 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
@@ -5,6 +5,6 @@
}
@if (configurationStateResource.resource | hasLink: configurationLinkRel.AGGREGATION_MAPPINGS) {
<ods-nav-item data-test-id="statistik-navigation" caption="Statistik" [path]="'/' + ROUTES.AGGREGATION_MAPPING">
- <ods-statistic-icon icon />
+ <ods-icon icon name="statistic" fill="text" />
</ods-nav-item>
}
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
index 6fe7f6ec6a..83dd6d65db 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
@@ -2,7 +2,7 @@ import { ConfigurationLinkRel } from '@admin-client/configuration-shared';
import { createEmptyStateResource, createStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MailboxIconComponent, NavItemComponent } from '@ods/system';
+import { IconComponent, MailboxIconComponent, NavItemComponent } from '@ods/system';
import { createConfigurationResource } from 'libs/admin/configuration-shared/test/configuration';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
@@ -18,7 +18,7 @@ describe('MenuComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [MenuComponent, HasLinkPipe],
- declarations: [MockComponent(NavItemComponent), MockComponent(MailboxIconComponent)],
+ declarations: [MockComponent(NavItemComponent), MockComponent(MailboxIconComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(MenuComponent);
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
index c0845f3f13..4a02991815 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
@@ -3,12 +3,12 @@ import { ROUTES } from '@admin-client/shared';
import { HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { MailboxIconComponent, NavItemComponent, StatisticIconComponent } from '@ods/system';
+import { IconComponent, MailboxIconComponent, NavItemComponent } from '@ods/system';
@Component({
selector: 'admin-menu',
standalone: true,
- imports: [CommonModule, NavItemComponent, MailboxIconComponent, StatisticIconComponent, HasLinkPipe],
+ imports: [CommonModule, NavItemComponent, MailboxIconComponent, IconComponent, HasLinkPipe],
templateUrl: './menu.component.html',
})
export class MenuComponent {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 462a77a07d..7bc2a45f89 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -53,8 +53,6 @@ export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
-export * from './lib/icons/statistic-icon/statistic-icon.component';
-export * from './lib/icons/undo-icon/undo-icon.component';
export * from './lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component';
export * from './lib/icons/update-icon/update-icon.component';
export * from './lib/icons/user-icon/user-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.spec.ts
deleted file mode 100644
index 9f6bddf811..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { StatisticIconComponent } from './statistic-icon.component';
-
-describe('StatisticIconComponent', () => {
- let component: StatisticIconComponent;
- let fixture: ComponentFixture<StatisticIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [StatisticIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(StatisticIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.ts
deleted file mode 100644
index df5d2b5bdc..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-statistic-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="twMerge(iconVariants({ size }), 'fill-black', class)"
- >
- <path d="M2 21V19H22V21H2ZM3 18V11H6V18H3ZM8 18V6H11V18H8ZM13 18V9H16V18H13ZM18 18V3H21V18H18Z" />
- </svg>`,
-})
-export class StatisticIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.stories.ts
deleted file mode 100644
index 272f6fe850..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/statistic-icon/statistic-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { StatisticIconComponent } from './statistic-icon.component';
-
-const meta: Meta<StatisticIconComponent> = {
- title: 'Icons/Statistic icon',
- component: StatisticIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<StatisticIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.spec.ts
deleted file mode 100644
index fda1f7e237..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UndoIconComponent } from './undo-icon.component';
-
-describe('UndoIconComponent', () => {
- let component: UndoIconComponent;
- let fixture: ComponentFixture<UndoIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [UndoIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(UndoIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.ts
deleted file mode 100644
index 7b36f81af4..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-undo-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M13.25 8C10.6 8 8.2 8.99 6.35 10.6L2.75 7V16H11.75L8.13 12.38C9.52 11.22 11.29 10.5 13.25 10.5C16.79 10.5 19.8 12.81 20.85 16L23.22 15.22C21.83 11.03 17.9 8 13.25 8Z"
- />
- </svg>`,
-})
-export class UndoIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.stories.ts
deleted file mode 100644
index 0d2d78f814..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/undo-icon/undo-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UndoIconComponent } from './undo-icon.component';
-
-const meta: Meta<UndoIconComponent> = {
- title: 'Icons/Undo icon',
- component: UndoIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UndoIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
index 803643eefd..2406364334 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
@@ -34,7 +34,7 @@
size="fit"
(clickEmitter)="wiedereroeffnen()"
>
- <ods-undo-icon icon class="fill-text" />
+ <ods-icon icon name="undo" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -44,7 +44,7 @@
variant="outline"
(clickEmitter)="wiedereroeffnen()"
>
- <ods-undo-icon icon />
+ <ods-icon icon name="undo" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
index 9ab9c207ac..b13e96c87e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { TooltipDirective, UndoIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -51,7 +51,7 @@ describe('WiedereroeffnenButtonComponent', () => {
WiedereroeffnenButtonComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(UndoIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
index 8ee807e663..68f51ee99b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
@@ -34,7 +34,7 @@
tooltipAriaType="aria-labelledby"
(clickEmitter)="zurueckholen()"
>
- <ods-undo-icon icon class="fill-text" />
+ <ods-icon icon name="undo" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -44,7 +44,7 @@
variant="outline"
(clickEmitter)="zurueckholen()"
>
- <ods-undo-icon icon />
+ <ods-icon icon name="undo" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
index 80f81d1d5d..c8f83122cd 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { TooltipDirective, UndoIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -52,7 +52,7 @@ describe('ZurueckholenButtonComponent', () => {
ZurueckholenButtonComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(UndoIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
index d87c88a1a7..cdd1d66e27 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
@@ -35,7 +35,7 @@
size="fit"
(clickEmitter)="zurueckstellen()"
>
- <ods-undo-icon icon class="fill-text" />
+ <ods-icon icon name="undo" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -45,7 +45,7 @@
variant="outline"
(clickEmitter)="zurueckstellen()"
>
- <ods-undo-icon icon />
+ <ods-icon icon name="undo" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
index 51f20cf81b..df724ad374 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { TooltipDirective, UndoIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -52,7 +52,7 @@ describe('ZurueckstellenButtonComponent', () => {
ZurueckstellenButtonComponent,
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(UndoIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 9d9b70374c..6e02eacd8d 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -81,7 +81,6 @@ import {
RadioButtonCardComponent,
SpinnerIconComponent,
TooltipDirective,
- UndoIconComponent,
} from '@ods/system';
import { NotHasAnyLinkPipe } from '../../../tech-shared/src/lib/pipe/not-has-any-link.pipe';
import { ProgressBarComponent } from '../../../ui/src/lib/ui/progress-bar/progress-bar.component';
@@ -143,7 +142,6 @@ const routes: Routes = [
RadioButtonCardComponent,
ButtonComponent,
ButtonCardComponent,
- UndoIconComponent,
SpinnerIconComponent,
AttachmentComponent,
AttachmentWrapperComponent,
--
GitLab
From b63283638993f27c78f9699d38e0b9e308269a7c Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 09:56:32 +0200
Subject: [PATCH 24/36] OZG-7707 replace more icons - undo request vorgang
deletion icon - update icon
---
alfa-client/libs/design-system/src/index.ts | 2 --
...st-vorgang-deletion-icon.component.spec.ts | 21 ---------------
...request-vorgang-deletion-icon.component.ts | 27 -------------------
...o-request-vorgang-deletion-icon.stories.ts | 27 -------------------
.../update-icon/update-icon.component.spec.ts | 21 ---------------
.../update-icon/update-icon.component.ts | 27 -------------------
.../icons/update-icon/update-icon.stories.ts | 27 -------------------
...derung-zuruecknehmen-button.component.html | 4 +--
...ung-zuruecknehmen-button.component.spec.ts | 4 +--
.../src/lib/loesch-anforderung.module.ts | 3 +--
...wiedervorlage-create-button.component.html | 2 +-
...dervorlage-create-button.component.spec.ts | 3 +--
.../src/lib/wiedervorlage.module.ts | 3 +--
13 files changed, 8 insertions(+), 163 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.stories.ts
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 7bc2a45f89..6d03dda9b7 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -53,8 +53,6 @@ export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
-export * from './lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component';
-export * from './lib/icons/update-icon/update-icon.component';
export * from './lib/icons/user-icon/user-icon.component';
export * from './lib/icons/users-icon/users-icon.component';
export * from './lib/instant-search/instant-search/instant-search.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.spec.ts
deleted file mode 100644
index 8ac05bee99..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UndoRequestVorgangDeletionIconComponent } from './undo-request-vorgang-deletion-icon.component';
-
-describe('UndoRequestVorgangDeletionIconComponent', () => {
- let component: UndoRequestVorgangDeletionIconComponent;
- let fixture: ComponentFixture<UndoRequestVorgangDeletionIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [UndoRequestVorgangDeletionIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(UndoRequestVorgangDeletionIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.ts
deleted file mode 100644
index 0140ae651f..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-undo-request-vorgang-deletion-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M11.75 16H13.75V11.85L15.35 13.4L16.75 12L12.75 8L8.75 12L10.15 13.4L11.75 11.85V16ZM7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z"
- />
- </svg>`,
-})
-export class UndoRequestVorgangDeletionIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.stories.ts
deleted file mode 100644
index c5f0bd31fa..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/undo-request-vorgang-deletion-icon/undo-request-vorgang-deletion-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UndoRequestVorgangDeletionIconComponent } from './undo-request-vorgang-deletion-icon.component';
-
-const meta: Meta<UndoRequestVorgangDeletionIconComponent> = {
- title: 'Icons/Undo request vorgang deletion icon',
- component: UndoRequestVorgangDeletionIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UndoRequestVorgangDeletionIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.spec.ts
deleted file mode 100644
index d2e3620bad..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UpdateIconComponent } from './update-icon.component';
-
-describe('UpdateIconComponent', () => {
- let component: UpdateIconComponent;
- let fixture: ComponentFixture<UpdateIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [UpdateIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(UpdateIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.ts
deleted file mode 100644
index 34e40d8150..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { iconVariants, IconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-update-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M21.75 10.12H14.97L17.71 7.3C14.98 4.6 10.56 4.5 7.83 7.2C5.1 9.91 5.1 14.28 7.83 16.99C10.56 19.7 14.98 19.7 17.71 16.99C19.07 15.65 19.75 14.08 19.75 12.1H21.75C21.75 14.08 20.87 16.65 19.11 18.39C15.6 21.87 9.9 21.87 6.39 18.39C2.89 14.92 2.86 9.28 6.37 5.81C9.88 2.34 15.51 2.34 19.02 5.81L21.75 3V10.12ZM13.25 8V12.25L16.75 14.33L16.03 15.54L11.75 13V8H13.25Z"
- />
- </svg>`,
-})
-export class UpdateIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.stories.ts
deleted file mode 100644
index 7814dc21f7..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/update-icon/update-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UpdateIconComponent } from './update-icon.component';
-
-const meta: Meta<UpdateIconComponent> = {
- title: 'Icons/Update icon',
- component: UpdateIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UpdateIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
index a4536cb3f2..1fd15c717e 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
@@ -33,7 +33,7 @@
size="fit"
(clickEmitter)="loeschAnforderungZuruecknehmen.emit()"
>
- <ods-undo-request-vorgang-deletion-icon icon class="fill-text" />
+ <ods-icon icon name="undo-request-vorgang-deletion" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -43,6 +43,6 @@
variant="outline"
(clickEmitter)="loeschAnforderungZuruecknehmen.emit()"
>
- <ods-undo-request-vorgang-deletion-icon icon />
+ <ods-icon icon name="undo-request-vorgang-deletion" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts
index 83c5f617a4..913632ec2a 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts
@@ -24,7 +24,7 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { TooltipDirective, UndoRequestVorgangDeletionIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { LoeschAnforderungZuruecknehmenButtonComponent } from './loesch-anforderung-zuruecknehmen-button.component';
@@ -41,7 +41,7 @@ describe('LoeschAnforderungZuruecknehmenButtonComponent', () => {
declarations: [
LoeschAnforderungZuruecknehmenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(UndoRequestVorgangDeletionIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
}).compileComponents();
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
index 52ad122fb7..1d3ace6905 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
@@ -28,7 +28,7 @@ import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { IconComponent, TooltipDirective, UndoRequestVorgangDeletionIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { EndgueltigLoeschenButtonContainerComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button-container.component';
import { EndgueltigLoeschenButtonComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component';
import { LoeschAnforderungZuruecknehmenButtonContainerComponent } from './loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button-container.component';
@@ -46,7 +46,6 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
HasLinkPipe,
ButtonWithSpinnerComponent,
IconComponent,
- UndoRequestVorgangDeletionIconComponent,
TooltipDirective,
],
declarations: [
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
index bc13307615..dadf3a4fed 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
@@ -35,7 +35,7 @@
[tooltip]="'Wiedervorlage erstellen'"
tooltipAriaType="aria-labelledby"
>
- <ods-update-icon icon class="fill-text" />
+ <ods-icon icon name="update" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner data-test-id="create-wiedervorlage" text="Wiedervorlage" variant="outline">
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts
index a17d8393d3..23d4465856 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.spec.ts
@@ -26,7 +26,7 @@ import { WiedervorlageListLinkRel } from '@alfa-client/wiedervorlage-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { IconComponent, UpdateIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createWiedervorlageListResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
import { MockComponent } from 'ng-mocks';
@@ -45,7 +45,6 @@ describe('WiedervorlageCreateButtonComponent', () => {
HasLinkPipe,
MockComponent(ButtonWithSpinnerComponent),
MockComponent(IconComponent),
- MockComponent(UpdateIconComponent),
],
imports: [RouterTestingModule],
}).compileComponents();
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
index aa33ff68cc..95a9608c8f 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage.module.ts
@@ -52,7 +52,7 @@ import { MatIcon } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { RouterModule, Routes } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { IconComponent, TooltipDirective, UpdateIconComponent } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
import { CreateWiedervorlageButtonContainerComponent } from './create-wiedervorlage-button-container/create-wiedervorlage-button-container.component';
import { ErledigenButtonContainerComponent } from './erledigen-button-container/erledigen-button-container.component';
@@ -111,7 +111,6 @@ const routes: Routes = [
ConvertForDataTestPipe,
ButtonWithSpinnerComponent,
TooltipDirective,
- UpdateIconComponent,
IconComponent,
MultiFileUploadComponent,
],
--
GitLab
From 71740238c417cfab8068cead1193da64cadf2d05 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 13:47:30 +0200
Subject: [PATCH 25/36] Ozg-7707 replace more icons - user icon - users icon
---
.../apps/admin/src/app/app.component.html | 2 +-
...anfrage-erstellen-button.component.spec.ts | 4 +-
.../src/lib/collaboration.module.ts | 9 +--
.../libs/design-system/src/assets/users.svg | 39 ++--------
alfa-client/libs/design-system/src/index.ts | 2 -
.../dropdown-menu/dropdown-menu.stories.ts | 10 +--
.../user-icon/user-icon.component.spec.ts | 44 -----------
.../icons/user-icon/user-icon.component.ts | 53 -------------
.../lib/icons/user-icon/user-icon.stories.ts | 50 ------------
.../users-icon/users-icon.component.spec.ts | 44 -----------
.../icons/users-icon/users-icon.component.ts | 76 -------------------
.../icons/users-icon/users-icon.stories.ts | 50 ------------
.../lib/user-icon/user-icon.component.html | 4 +-
.../lib/user-icon/user-icon.component.spec.ts | 3 +-
.../src/lib/user-profile.module.ts | 2 -
15 files changed, 14 insertions(+), 378 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.stories.ts
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index d383d837c6..4a9d3f0ffe 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -45,7 +45,7 @@
<ods-navbar data-test-id="navigation">
@if (apiRoot | hasLink: apiRootLinkRel.USERS) {
<ods-nav-item data-test-id="users-roles-navigation" caption="Benutzer & Rollen" [path]="routes.BENUTZER">
- <ods-icon icon name="users" class="fill-none stroke-text" />
+ <ods-icon icon name="users" fill="text" />
</ods-nav-item>
}
@if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/anfrage-erstellen-button/anfrage-erstellen-button.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/anfrage-erstellen-button/anfrage-erstellen-button.component.spec.ts
index bfc2555681..cb3fd368d3 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/anfrage-erstellen-button/anfrage-erstellen-button.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/anfrage-erstellen-button/anfrage-erstellen-button.component.spec.ts
@@ -23,7 +23,7 @@
*/
import { dispatchEventFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ButtonComponent, UsersIconComponent } from '@ods/system';
+import { ButtonComponent } from '@ods/system';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { AnfrageErstellenButtonComponent } from './anfrage-erstellen-button.component';
@@ -37,7 +37,7 @@ describe('AnfrageErstellenButtonComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [AnfrageErstellenButtonComponent],
- imports: [MockComponent(ButtonComponent), MockComponent(UsersIconComponent)],
+ imports: [MockComponent(ButtonComponent)],
}).compileComponents();
fixture = TestBed.createComponent(AnfrageErstellenButtonComponent);
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index 11be3c50a3..1e1915c517 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -29,13 +29,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ButtonWithSpinnerComponent, TextEditorComponent, TextareaEditorComponent } from '@ods/component';
-import {
- ButtonComponent,
- ExternalUnitIconComponent,
- IconComponent,
- PublicAdministrationIconComponent,
- UsersIconComponent,
-} from '@ods/system';
+import { ButtonComponent, ExternalUnitIconComponent, IconComponent, PublicAdministrationIconComponent } from '@ods/system';
import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
import { OrganisationsEinheitListItemContainerComponent } from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component';
import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
@@ -53,7 +47,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
ButtonComponent,
IconComponent,
CollaborationSharedModule,
- UsersIconComponent,
TextEditorComponent,
TextareaEditorComponent,
FormsModule,
diff --git a/alfa-client/libs/design-system/src/assets/users.svg b/alfa-client/libs/design-system/src/assets/users.svg
index bd2e8130ce..a2e68f116c 100644
--- a/alfa-client/libs/design-system/src/assets/users.svg
+++ b/alfa-client/libs/design-system/src/assets/users.svg
@@ -1,34 +1,5 @@
-<svg
- viewBox="0 0 24 24"
- aria-hidden="true"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M16 21V19C16 17.9391 15.5786 16.9217 14.8284 16.1716C14.0783 15.4214 13.0609 15 12 15H6C4.93913 15 3.92172 15.4214 3.17157 16.1716C2.42143 16.9217 2 17.9391 2 19V21"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- <path
- d="M9 11C11.2091 11 13 9.20914 13 7C13 4.79086 11.2091 3 9 3C6.79086 3 5 4.79086 5 7C5 9.20914 6.79086 11 9 11Z"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- <path
- d="M22 20.9999V18.9999C21.9993 18.1136 21.7044 17.2527 21.1614 16.5522C20.6184 15.8517 19.8581 15.3515 19 15.1299"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- <path
- d="M16 3.12988C16.8604 3.35018 17.623 3.85058 18.1676 4.55219C18.7122 5.2538 19.0078 6.11671 19.0078 7.00488C19.0078 7.89305 18.7122 8.75596 18.1676 9.45757C17.623 10.1592 16.8604 10.6596 16 10.8799"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- </svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M8.404 2.045c-1.492.173-2.878 1.069-3.67 2.374a4.994 4.994 0 0 0 1.03 6.375 4.992 4.992 0 0 0 6.472 0c2.09-1.78 2.34-4.937.558-7.03a5.013 5.013 0 0 0-4.39-1.719m7.283.151a1.06 1.06 0 0 0-.578.504c-.124.239-.119.623.011.877.139.269.317.399.765.557.482.17.726.302 1.048.567.471.389.884 1.062 1.006 1.639.075.352.077.96.004 1.301-.227 1.073-1.048 1.945-2.127 2.258a1.653 1.653 0 0 0-.395.18c-.192.132-.371.436-.405.687-.07.51.339 1.025.872 1.099.213.029.653-.086 1.153-.301.996-.429 1.943-1.34 2.438-2.344.22-.446.32-.734.427-1.226.102-.47.101-1.521-.001-1.994a5.184 5.184 0 0 0-1.913-3.001 5.704 5.704 0 0 0-1.566-.778c-.419-.119-.461-.121-.739-.025M9.632 4.062c.388.079.955.352 1.264.609 1.081.9 1.41 2.384.804 3.629a2.93 2.93 0 0 1-1.4 1.4c-1.245.606-2.729.277-3.629-.804a3.408 3.408 0 0 1-.609-1.264 3.037 3.037 0 0 1 1.042-2.961c.298-.247.872-.529 1.236-.606a3.642 3.642 0 0 1 1.292-.003M5.32 14.061a5.019 5.019 0 0 0-3.837 2.824c-.397.846-.492 1.481-.475 3.166.013 1.345.016 1.36.299 1.642.209.21.391.285.693.285.397 0 .695-.186.893-.556.083-.155.088-.226.111-1.582.027-1.579.032-1.616.313-2.18.398-.8 1.201-1.425 2.051-1.598.462-.093 6.802-.093 7.264 0 .85.173 1.653.798 2.051 1.598.281.564.286.601.313 2.18.027 1.578.025 1.568.311 1.853.209.21.391.285.693.285.397 0 .695-.186.893-.556.083-.154.088-.219.099-1.371.009-.903-.003-1.324-.047-1.66-.153-1.156-.618-2.106-1.424-2.912a4.881 4.881 0 0 0-2.881-1.421c-.588-.079-6.748-.077-7.32.003m13.367.135a1.06 1.06 0 0 0-.578.504c-.124.239-.119.623.011.877.139.269.317.399.768.558.837.295 1.368.736 1.765 1.467.305.561.319.653.344 2.238.026 1.578.024 1.567.31 1.853.209.21.391.285.693.285.302 0 .484-.075.693-.285.29-.29.287-.269.287-1.853 0-1.2-.011-1.474-.071-1.768a4.952 4.952 0 0 0-1.408-2.612 4.39 4.39 0 0 0-1.351-.96c-.37-.175-1.004-.381-1.164-.379a1.458 1.458 0 0 0-.299.075"
+ fill-rule="evenodd" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 6d03dda9b7..895513a35d 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -53,8 +53,6 @@ export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
-export * from './lib/icons/user-icon/user-icon.component';
-export * from './lib/icons/users-icon/users-icon.component';
export * from './lib/instant-search/instant-search/instant-search.component';
export * from './lib/instant-search/instant-search/instant-search.model';
export * from './lib/link/link.component';
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
index fe7c462d60..0f0a475073 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
@@ -23,7 +23,6 @@
*/
import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { UserIconComponent } from '../../icons/user-icon/user-icon.component';
import { DropdownMenuButtonItemComponent } from '../dropdown-menu-button-item/dropdown-menu-button-item.component';
import { DropdownMenuItemComponent } from '../dropdown-menu-item/dropdown-menu-item.component';
import { DropdownMenuTextItemComponent } from '../dropdown-menu-text-item/dropdown-menu-text-item.component';
@@ -34,13 +33,7 @@ const meta: Meta<DropdownMenuComponent> = {
component: DropdownMenuComponent,
decorators: [
moduleMetadata({
- imports: [
- DropdownMenuComponent,
- DropdownMenuItemComponent,
- DropdownMenuButtonItemComponent,
- DropdownMenuTextItemComponent,
- UserIconComponent,
- ],
+ imports: [DropdownMenuComponent, DropdownMenuItemComponent, DropdownMenuButtonItemComponent, DropdownMenuTextItemComponent],
}),
componentWrapperDecorator((story) => `<div class="flex justify-center mb-32">${story}</div>`),
],
@@ -67,6 +60,7 @@ export const Button: Story = {
render: (args) => ({
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
+ //TODO OZG-7707
<ods-user-icon button-content />
<ods-dropdown-menu-button-item caption="Lorem" />
<ods-dropdown-menu-button-item caption="Ipsum" />
diff --git a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.spec.ts
deleted file mode 100644
index e707985388..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UserIconComponent } from './user-icon.component';
-
-describe('UserIconComponent', () => {
- let component: UserIconComponent;
- let fixture: ComponentFixture<UserIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [UserIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(UserIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts
deleted file mode 100644
index 466b89fda0..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-user-icon',
- standalone: true,
- imports: [CommonModule],
- template: `
- <svg
- viewBox="0 0 112 112"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-ozggray-300', class)]"
- >
- <path
- d="M56 0.970734C25.6239 0.970734 0.970886 25.6239 0.970886 56C0.970886 86.3761 25.6239 111.029 56 111.029C86.3761 111.029 111.029 86.3761 111.029 56C111.029 25.6239 86.3761 0.970734 56 0.970734ZM56 17.4795C65.135 17.4795 72.5087 24.8534 72.5087 33.9881C72.5087 43.1232 65.135 50.4969 56 50.4969C46.8652 50.4969 39.4912 43.1232 39.4912 33.9881C39.4912 24.8534 46.8652 17.4795 56 17.4795ZM56 95.621C42.2428 95.621 30.0814 88.5772 22.9825 77.9014C23.1477 66.9506 44.9943 60.9526 56 60.9526C66.9508 60.9526 88.8525 66.9506 89.0175 77.9014C81.9189 88.5772 69.7575 95.621 56 95.621Z"
- />
- </svg>
- `,
-})
-export class UserIconComponent {
- @Input() variant: 'user' | 'initials' = 'user';
- @Input() size: IconVariants['size'] = 'xxl';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.stories.ts
deleted file mode 100644
index a32dddd04e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/user-icon/user-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UserIconComponent } from './user-icon.component';
-
-const meta: Meta<UserIconComponent> = {
- title: 'Icons/User icon',
- component: UserIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UserIconComponent>;
-
-export const Default: Story = {
- args: { size: 'xxl' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'xxl', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'xxl' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.spec.ts
deleted file mode 100644
index ad8801b6de..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UsersIconComponent } from './users-icon.component';
-
-describe('UsersIconComponent', () => {
- let component: UsersIconComponent;
- let fixture: ComponentFixture<UsersIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [UsersIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(UsersIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.ts
deleted file mode 100644
index 4f96a451d5..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.component.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-users-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- [ngClass]="[twMerge(iconVariants({ size }), 'stroke-primary', class)]"
- aria-hidden="true"
- fill="inherit"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M16 21V19C16 17.9391 15.5786 16.9217 14.8284 16.1716C14.0783 15.4214 13.0609 15 12 15H6C4.93913 15 3.92172 15.4214 3.17157 16.1716C2.42143 16.9217 2 17.9391 2 19V21"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- <path
- d="M9 11C11.2091 11 13 9.20914 13 7C13 4.79086 11.2091 3 9 3C6.79086 3 5 4.79086 5 7C5 9.20914 6.79086 11 9 11Z"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- <path
- d="M22 20.9999V18.9999C21.9993 18.1136 21.7044 17.2527 21.1614 16.5522C20.6184 15.8517 19.8581 15.3515 19 15.1299"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- <path
- d="M16 3.12988C16.8604 3.35018 17.623 3.85058 18.1676 4.55219C18.7122 5.2538 19.0078 6.11671 19.0078 7.00488C19.0078 7.89305 18.7122 8.75596 18.1676 9.45757C17.623 10.1592 16.8604 10.6596 16 10.8799"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- fill="none"
- />
- </svg>`,
-})
-export class UsersIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- iconVariants = iconVariants;
- twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.stories.ts
deleted file mode 100644
index b40cbcc0d8..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/users-icon/users-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { UsersIconComponent } from './users-icon.component';
-
-const meta: Meta<UsersIconComponent> = {
- title: 'Icons/Users icon',
- component: UsersIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<UsersIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
index 2a57e10d8f..93bd67fb8e 100644
--- a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
+++ b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
@@ -34,11 +34,11 @@
<span data-test-class="user-profile-assigned">{{ initials }}</span>
</ng-container>
<ng-template #noUser>
- <ods-user-icon
+ <ods-icon
*ngIf="!userProfileStateResource.error"
+ name="user"
data-test-class="user-profile-unassigned"
class="size-9 fill-ozggray-800"
- style="--mdc-icon-button-icon-size: 36px"
/>
<span *ngIf="errorMessageCode === messageCode.RESOURCE_NOT_FOUND" data-test-class="user-profile-user-not-found">!</span>
<ods-icon
diff --git a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
index c1e0a1e574..3b8f8f26fc 100644
--- a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
@@ -35,7 +35,7 @@ import { NO_NAME_MESSAGE, UserProfileResource, userProfileMessage } from '@alfa-
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { faker } from '@faker-js/faker';
-import { IconComponent, UserIconComponent as OdsUserIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile';
import { MockComponent, MockDirective } from 'ng-mocks';
@@ -61,7 +61,6 @@ describe('UserIconComponent', () => {
MockComponent(SpinnerComponent),
MockDirective(TooltipDirective),
MockComponent(IconComponent),
- MockComponent(OdsUserIconComponent),
],
});
});
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
index 8def7af5e5..e12c5bdd55 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
@@ -42,7 +42,6 @@ import {
DropdownMenuComponent,
DropdownMenuItemComponent,
IconComponent,
- UserIconComponent as OdsUserIconComponent,
TooltipDirective,
} from '@ods/system';
import { AssignUserProfileButtonContainerComponent } from './assign-user-profile-button-container/assign-user-profile-button-container.component';
@@ -70,7 +69,6 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
CommonModule,
UserProfileSharedModule,
RouterModule,
- OdsUserIconComponent,
IconButtonWithSpinnerComponent,
HasLinkPipe,
MatTooltip,
--
GitLab
From aa64eb9da77028b86dd9edcd50693493abc74f41 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 14:07:27 +0200
Subject: [PATCH 26/36] OZG-7707 add/edit icons
---
.../libs/design-system/src/assets/external-unit.svg | 5 +++++
alfa-client/libs/design-system/src/assets/mailbox.svg | 8 +++-----
2 files changed, 8 insertions(+), 5 deletions(-)
create mode 100644 alfa-client/libs/design-system/src/assets/external-unit.svg
diff --git a/alfa-client/libs/design-system/src/assets/external-unit.svg b/alfa-client/libs/design-system/src/assets/external-unit.svg
new file mode 100644
index 0000000000..c2dc208516
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/external-unit.svg
@@ -0,0 +1,5 @@
+<svg width="45" height="37" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M20.962.045c-2.351.239-4.456 1.04-6.304 2.4-.645.475-1.76 1.513-1.752 1.632.003.047.324.368.713.713l.706.627.659-.627c1.337-1.272 2.919-2.11 4.816-2.552.927-.216 2.82-.271 3.768-.109 4.244.723 7.585 3.807 8.644 7.978.101.398.17.736.155.751-.016.016-.662-.346-1.435-.805-.773-.459-1.443-.82-1.488-.802-.045.018-.291.391-.546.829-.465.797-.465.797-.3.903.305.195 4.612 2.73 4.842 2.849a.997.997 0 0 0 1.328-.357c.262-.408 2.824-4.987 2.824-5.047-.001-.06-1.669-1.03-1.701-.989-.009.013-.347.614-.75 1.336-.403.722-.758 1.34-.79 1.374-.031.034-.116-.185-.188-.487-.366-1.529-1.226-3.328-2.217-4.637C29.972 2.418 27.155.701 24.003.182c-.658-.108-2.506-.191-3.041-.137M6.6 6.488c-1.134.674-2.093 1.274-2.131 1.334-.103.163.005.353.197.35.095-.001 1.078-.537 2.185-1.191l2.014-1.188 2.024 1.195c1.291.763 2.082 1.187 2.186 1.173.11-.016.169-.084.183-.211.02-.172-.157-.292-2.117-1.444-1.179-.692-2.215-1.253-2.309-1.25-.093.004-1.098.558-2.232 1.232m1.446 1.061c-.457.162-1.018.696-1.217 1.159-.47 1.091-.001 2.315 1.089 2.846.549.267 1.343.256 1.921-.027.792-.387 1.217-1.077 1.212-1.964-.002-.414-.044-.607-.198-.91-.242-.475-.774-.953-1.233-1.11-.428-.146-1.153-.143-1.574.006m1.335.487c.66.197 1.114.824 1.117 1.54.002.506-.077.701-.456 1.112-.611.662-1.557.718-2.242.132-1.384-1.185-.177-3.311 1.581-2.784m-.966.529c-.057.057-.09.343-.09.779 0 .772.007.782.55.78.394-.002.52-.081.488-.307-.02-.141-.078-.185-.269-.203L8.85 9.59v-.467c0-.449-.081-.648-.262-.648-.046 0-.124.04-.173.09m3.9 0c-.068.068-.09 1.437-.09 5.702 0 5.127.011 5.617.123 5.66a.308.308 0 0 0 .243-.029c.11-.069.123-.616.141-5.648.014-4.053-.004-5.599-.066-5.673-.104-.126-.233-.13-.351-.012m-7.272.297c-.072.072-.093 1.303-.093 5.506 0 5.784-.009 5.638.353 5.568.128-.024.135-.293.135-5.575 0-5.502-.002-5.549-.151-5.57a.323.323 0 0 0-.244.071M.578 11.297c-.029.029-.053 2.245-.053 4.923v4.87l.255.255.255.255h1.376c1.231-.001 1.402-.016 1.616-.146.258-.158.416-.547.344-.846-.066-.274-.399-.577-.69-.629a1.078 1.078 0 0 1-.456-.216c-.499-.451-1.091-.452-1.575-.005-.103.095-.28.195-.394.221l-.206.049V12.3h1.61c1.465 0 1.616-.012 1.681-.133a.27.27 0 0 0-.001-.263c-.065-.116-.236-.129-1.676-.129H1.06l-.024-.244c-.019-.197-.06-.248-.214-.266-.104-.012-.214.002-.244.032m16.119.068a.877.877 0 0 0-.047.265c0 .135-.086.143-1.631.162l-1.632.021v.449l1.632.021 1.631.02v7.725l-.206-.049a1.048 1.048 0 0 1-.394-.221c-.483-.446-1.07-.446-1.575.001a1.536 1.536 0 0 1-.502.255c-.409.116-.623.389-.621.79.001.327.147.57.424.712.103.053.671.084 1.527.084h1.362l.256-.256.255-.255-.019-4.901-.02-4.901-.196-.022c-.128-.015-.213.02-.244.1M2.268 13.512c-.127.127-.129 1.872-.003 1.998.133.133 1.366.121 1.478-.014.058-.07.08-.422.066-1.069l-.022-.964-.713-.022c-.491-.014-.743.008-.806.071m4.41.058c-.043.08-.078.504-.078.942 0 1.088 0 1.088.822 1.088.897 0 .903-.007.903-1.06 0-.454-.035-.89-.078-.97-.068-.128-.162-.145-.785-.145-.622 0-.716.017-.784.145m2.822-.095c-.027.027-.05.496-.05 1.042 0 .835.019.999.119 1.037.219.085 1.347.05 1.441-.044.124-.124.124-1.871 0-1.995-.096-.096-1.419-.131-1.51-.04m4.468.037c-.127.127-.129 1.872-.003 1.998.133.133 1.366.121 1.478-.014.058-.07.08-.422.066-1.069l-.022-.964-.713-.022c-.491-.014-.743.008-.806.071m-10.668 1v.563h-.6V13.95h.6v.562m4.425 0v.563H7.2V13.95h.525v.562m2.835-.018-.023.543-.281.024-.281.023V13.95h.607l-.022.544m4.44.023v.567l-.281-.023-.281-.024-.023-.543-.022-.544H15v.567M2.227 16.773c-.028.028-.052.484-.052 1.012 0 1.132-.013 1.115.843 1.115.818 0 .816.003.791-1.163l-.022-.975-.753-.021c-.415-.011-.778.003-.807.032m3.898.002c-.1.1-.047.322.095.397.08.043.332.078.561.078h.415l.021 1.286c.017 1.087.039 1.297.142 1.362a.308.308 0 0 0 .243.029c.107-.041.123-.214.123-1.362V17.25h2.246l.021 1.286c.017 1.087.039 1.297.142 1.362a.308.308 0 0 0 .243.029c.107-.041.123-.214.123-1.359v-1.311l.498-.022c.523-.024.7-.137.604-.387-.043-.111-.316-.123-2.737-.123-1.48 0-2.713.022-2.74.05m7.802-.002c-.028.028-.052.484-.052 1.012 0 1.132-.013 1.115.843 1.115.818 0 .816.003.791-1.163l-.022-.975-.753-.021c-.415-.011-.778.003-.807.032M3.3 17.775v.525h-.6v-1.05h.6v.525m11.7 0v.525h-.6v-1.05h.6v.525m16.97.379c-.47.186-.987.68-1.231 1.176-.15.303-.176.471-.176 1.108.001.666.023.791.2 1.125.848 1.598 2.985 1.751 3.958.283.297-.449.394-.822.391-1.501-.003-.912-.44-1.655-1.223-2.081-.537-.292-1.342-.338-1.919-.11m-23.306.268c-.068.067-.104.171-.081.231.023.06.042.123.042.141 0 .017.083.031.185.031.249 0 .383-.246.222-.407-.149-.149-.216-.148-.368.004m24.585.483c.423.118.844.534.993.984.298.897-.187 1.846-1.063 2.079-1.053.28-2.067-.761-1.821-1.87.113-.508.378-.852.827-1.076.431-.215.63-.237 1.064-.117M2.797 20.123c.091.095.201.235.244.311.056.099.172.14.411.146.257.006.339.038.359.142.061.313-.091.353-1.331.353-1.293 0-1.494-.054-1.394-.371.048-.149.092-.167.337-.134.338.046.418.005.521-.267a.513.513 0 0 1 .853-.18m12.688-.099c.106.041.215.133.241.206.103.29.248.381.546.341.246-.033.295-.016.339.124.107.339-.037.38-1.343.38-1.25 0-1.393-.032-1.393-.311 0-.191.217-.289.446-.201.16.061.21.046.304-.091.347-.504.501-.585.86-.448m-10.489.644c-.087.227-.048.762.063.854.189.157.376.062.402-.204l.024-.243h6.74v.22c0 .156.045.234.154.269.267.085.38-.092.356-.557l-.022-.42-3.836-.019c-3.449-.017-3.84-.007-3.881.1m19.163.57c-.823.407-1.032 1.593-.398 2.262.296.313.559.425.997.425.794 0 1.342-.565 1.342-1.382 0-.667-.281-1.117-.844-1.353-.38-.158-.709-.144-1.097.048m16.228-.049c-.526.283-.857.801-.86 1.344-.003.412.263.916.619 1.174.255.184.373.218.759.218.554-.001.848-.157 1.148-.61.172-.259.209-.399.209-.772 0-.532-.153-.846-.58-1.191-.347-.281-.939-.355-1.295-.163M6.923 22.342c-.3.189-.201.03-1.853 2.964l-1.39 2.469.864.483c.475.266.875.471.889.457.014-.015.374-.651.8-1.412.77-1.375.776-1.383.838-1.125.162.669.689 2.194.944 2.734 1.578 3.333 4.743 5.971 8.223 6.853 1.663.421 3.858.489 5.448.167 2.229-.45 4.419-1.576 6.027-3.098.392-.371.712-.7.712-.733 0-.032-.318-.347-.707-.699l-.708-.64-.524.503c-2.128 2.041-5.145 3.124-7.963 2.86-2.609-.244-4.8-1.274-6.624-3.112a11 11 0 0 1-2.827-5.093c-.078-.329-.134-.608-.123-.619.011-.011.676.366 1.477.837 1.019.6 1.474.83 1.511.766l.502-.841c.246-.413.425-.773.398-.799-.027-.027-1.178-.716-2.558-1.53-2.724-1.608-2.898-1.68-3.356-1.392m24.747 1.435c-1.409.149-2.758.659-3.407 1.29-.558.542-.695.916-.726 1.989l-.027.919H38.1l-.001-.881c0-.787-.021-.926-.192-1.294-.51-1.098-1.912-1.811-3.966-2.018-.897-.09-1.447-.091-2.271-.005m2.931.936c1.2.209 2.115.663 2.496 1.237.131.199.204.434.233.746l.041.455-4.529-.019-4.529-.019.01-.392c.023-.891.76-1.532 2.176-1.89.79-.2.857-.207 2.247-.22.788-.007 1.435.028 1.855.102m-11.073.298c-1.045.217-1.85.734-2.183 1.403-.16.32-.195.496-.195.976v.585H25.481l.039-1.069c.025-.692.082-1.21.164-1.47.069-.22.106-.421.082-.445-.097-.097-1.745-.082-2.238.02m16.535-.061c-.197.028-.24.062-.201.161.185.477.263 1.044.263 1.905v.959h4.35l-.002-.619c-.002-.755-.137-1.092-.617-1.532-.408-.375-.772-.569-1.372-.733-.445-.122-1.947-.209-2.421-.141"
+ fill-rule="evenodd" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/mailbox.svg b/alfa-client/libs/design-system/src/assets/mailbox.svg
index db574eb95f..5dfa0c5767 100644
--- a/alfa-client/libs/design-system/src/assets/mailbox.svg
+++ b/alfa-client/libs/design-system/src/assets/mailbox.svg
@@ -1,7 +1,5 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
- d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z"
- stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
- <path d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7"
- stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+ d="M3.485 3.045c-.303.05-.732.206-.998.362-.292.171-.909.788-1.08 1.08-.164.28-.309.691-.364 1.033-.059.36-.059 12.6 0 12.96.105.654.346 1.108.857 1.62.512.511.966.752 1.62.857.362.059 16.598.059 16.96 0 .654-.105 1.108-.346 1.62-.857.511-.512.752-.966.857-1.62.059-.36.059-12.6 0-12.96-.105-.654-.346-1.108-.857-1.62-.512-.511-.966-.752-1.62-.857-.326-.053-16.677-.051-16.995.002m16.935 2.05c.406.192.578.498.578 1.025l.001.34-4.283 2.72c-2.355 1.496-4.339 2.741-4.409 2.767a1.07 1.07 0 0 1-.307.047 1.07 1.07 0 0 1-.307-.047c-.07-.026-2.054-1.271-4.409-2.767L3.001 6.46v-.34c.001-.527.173-.833.579-1.025l.2-.094h16.44l.2.094M6.671 11.147a420.62 420.62 0 0 0 3.869 2.445 2.957 2.957 0 0 0 2.92 0c.132-.075 1.873-1.176 3.869-2.445a425.93 425.93 0 0 1 3.65-2.307c.012 0 .021 2.11.02 4.69-.001 4.632-.002 4.692-.082 4.87a.951.951 0 0 1-.497.505l-.2.094H3.78l-.2-.094a.951.951 0 0 1-.497-.505c-.08-.178-.081-.238-.082-4.87-.001-2.58.008-4.69.02-4.69.011 0 1.653 1.038 3.65 2.307"
+ fill-rule="evenodd" />
</svg>
\ No newline at end of file
--
GitLab
From 812d12a19401879a4b24d165cae3b6d6e8b9c605 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 14:37:56 +0200
Subject: [PATCH 27/36] OZG-7707 replace more icons - external unit icon -
mailbox icon
---
.../menu-container/menu/menu.component.html | 2 +-
.../menu/menu.component.spec.ts | 4 +-
.../lib/menu-container/menu/menu.component.ts | 4 +-
.../user/user-data/user-data.component.html | 2 +-
.../user-data/user-data.component.spec.ts | 4 +-
.../user/user-data/user-data.component.ts | 4 +-
...xterne-fachstelle-container.component.html | 2 +-
...rne-fachstelle-container.component.spec.ts | 4 +-
.../src/lib/collaboration.module.ts | 3 +-
alfa-client/libs/design-system/src/index.ts | 2 -
.../external-unit-icon.component.html | 92 -------------------
.../external-unit-icon.component.spec.ts | 44 ---------
.../external-unit-icon.component.ts | 38 --------
.../external-unit-icon.stories.ts | 38 --------
.../mailbox-icon.component.spec.ts | 44 ---------
.../mailbox-icon/mailbox-icon.component.ts | 59 ------------
.../mailbox-icon/mailbox-icon.stories.ts | 50 ----------
...elle-list-item-container.component.spec.ts | 6 +-
...xterne-fachstelle-list-item.component.html | 4 +-
...rne-fachstelle-list-item.component.spec.ts | 4 +-
.../externe-fachstelle-list-item.component.ts | 4 +-
...ganisations-einheit-list-item.component.ts | 4 +-
.../postfach-mail-button.component.html | 2 +-
.../postfach-mail-button.component.spec.ts | 3 +-
.../libs/postfach/src/lib/postfach.module.ts | 3 +-
...xterne-fachstelle-container.component.html | 4 +-
...rne-fachstelle-container.component.spec.ts | 4 +-
.../src/lib/zustaendige-stelle.module.ts | 9 +-
28 files changed, 37 insertions(+), 406 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
index 2ac0364135..672cb8f71c 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
@@ -1,6 +1,6 @@
@if (configurationStateResource.resource | hasLink: configurationLinkRel.SETTING) {
<ods-nav-item data-test-id="postfach-navigation" caption="Postfach" path="/postfach">
- <ods-mailbox-icon icon />
+ <ods-icon icon name="mailbox" fill="text" />
</ods-nav-item>
}
@if (configurationStateResource.resource | hasLink: configurationLinkRel.AGGREGATION_MAPPINGS) {
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
index 83dd6d65db..bc802c253d 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
@@ -2,7 +2,7 @@ import { ConfigurationLinkRel } from '@admin-client/configuration-shared';
import { createEmptyStateResource, createStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { IconComponent, MailboxIconComponent, NavItemComponent } from '@ods/system';
+import { IconComponent, NavItemComponent } from '@ods/system';
import { createConfigurationResource } from 'libs/admin/configuration-shared/test/configuration';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
@@ -18,7 +18,7 @@ describe('MenuComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [MenuComponent, HasLinkPipe],
- declarations: [MockComponent(NavItemComponent), MockComponent(MailboxIconComponent), MockComponent(IconComponent)],
+ declarations: [MockComponent(NavItemComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(MenuComponent);
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
index 4a02991815..ad10332330 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
@@ -3,12 +3,12 @@ import { ROUTES } from '@admin-client/shared';
import { HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { IconComponent, MailboxIconComponent, NavItemComponent } from '@ods/system';
+import { IconComponent, NavItemComponent } from '@ods/system';
@Component({
selector: 'admin-menu',
standalone: true,
- imports: [CommonModule, NavItemComponent, MailboxIconComponent, IconComponent, HasLinkPipe],
+ imports: [CommonModule, NavItemComponent, IconComponent, HasLinkPipe],
templateUrl: './menu.component.html',
})
export class MenuComponent {
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
index a09af6b607..29819104c6 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
@@ -2,7 +2,7 @@
<div *ngIf="user.email" class="flex items-center gap-2">
<dt>
<span class="sr-only">E-Mail:</span>
- <ods-mailbox-icon size="small" class="stroke-gray-600" />
+ <ods-icon name="mailbox" size="small" class="fill-gray-600" />
</dt>
<dd data-test-class="email">{{ user.email }}</dd>
</div>
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts
index 1e7e38f598..01d7d4efb6 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts
@@ -1,4 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
import { createUser } from '../../../../../../../user-shared/test/user';
import { UserDataComponent } from './user-data.component';
@@ -8,7 +10,7 @@ describe('UserDataComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [UserDataComponent],
+ imports: [UserDataComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(UserDataComponent);
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
index 06483d8051..64e255cf1d 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
@@ -1,12 +1,12 @@
import { User } from '@admin-client/user-shared';
import { NgIf } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { MailboxIconComponent, PersonIconComponent } from '@ods/system';
+import { IconComponent, PersonIconComponent } from '@ods/system';
@Component({
selector: 'admin-user-data',
standalone: true,
- imports: [MailboxIconComponent, NgIf, PersonIconComponent],
+ imports: [IconComponent, NgIf, PersonIconComponent],
templateUrl: './user-data.component.html',
})
export class UserDataComponent {
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
index bba37e15e6..5f062757f3 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
@@ -37,7 +37,7 @@
</ng-container>
<ng-template #anfrageErstellenButton>
<div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
- <ods-external-unit-icon />
+ <ods-icon name="external-unit" size="unset" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Externe Fachstelle</p>
<p class="text-text">Private Organisation, Verein, Schule</p>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
index b886ae38b6..3a7d082b2f 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
@@ -37,7 +37,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
import { SearchExterneFachstelleContainerComponent } from '@alfa-client/zustaendige-stelle';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder } from '@angular/forms';
-import { ExternalUnitIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -87,7 +87,7 @@ describe('ExterneFachstelleContainerComponent', () => {
MockComponent(SearchExterneFachstelleContainerComponent),
MockComponent(CollaborationRequestFormComponent),
MockComponent(AnfrageErstellenButtonComponent),
- MockComponent(ExternalUnitIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index 1e1915c517..6078fdee08 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -29,7 +29,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ButtonWithSpinnerComponent, TextEditorComponent, TextareaEditorComponent } from '@ods/component';
-import { ButtonComponent, ExternalUnitIconComponent, IconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent, PublicAdministrationIconComponent } from '@ods/system';
import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
import { OrganisationsEinheitListItemContainerComponent } from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component';
import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
@@ -53,7 +53,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
ReactiveFormsModule,
ButtonWithSpinnerComponent,
ZustaendigeStelleModule,
- ExternalUnitIconComponent,
PublicAdministrationIconComponent,
OrganisationsEinheitListItemContainerComponent,
ExterneFachstelleListItemContainerComponent,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 895513a35d..0508336b21 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,10 +45,8 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/external-unit-icon/external-unit-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
-export * from './lib/icons/mailbox-icon/mailbox-icon.component';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/person-icon/person-icon.component';
export * from './lib/icons/public-administration-icon/public-administration-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html
deleted file mode 100644
index 21c59c0b92..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-
- Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- Ministerpräsidenten des Landes Schleswig-Holstein
- Staatskanzlei
- Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-
- Lizenziert unter der EUPL, Version 1.2 oder - sobald
- diese von der Europäischen Kommission genehmigt wurden -
- Folgeversionen der EUPL ("Lizenz");
- Sie dürfen dieses Werk ausschließlich gemäß
- dieser Lizenz nutzen.
- Eine Kopie der Lizenz finden Sie hier:
-
- https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-
- Sofern nicht durch anwendbare Rechtsvorschriften
- gefordert oder in schriftlicher Form vereinbart, wird
- die unter der Lizenz verbreitete Software "so wie sie
- ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- ausdrücklich oder stillschweigend - verbreitet.
- Die sprachspezifischen Genehmigungen und Beschränkungen
- unter der Lizenz sind dem Lizenztext zu entnehmen.
-
--->
-<svg width="45" height="37" viewBox="0 0 45 37" fill="none" xmlns="http://www.w3.org/2000/svg">
- <g [ngClass]="[twMerge('fill-primary', class)]">
- <path
- d="M9.13165 9.58598H8.85322V8.76559C8.85322 8.61465 8.72877 8.49214 8.57479 8.49214C8.42081 8.49214 8.29636 8.61465 8.29636 8.76559V9.85943C8.29636 10.0104 8.42081 10.1329 8.57479 10.1329H9.13169C9.28567 10.1329 9.41012 10.0104 9.41012 9.85943C9.41012 9.70849 9.28563 9.58598 9.13165 9.58598Z"
- />
- <path
- d="M3.56334 16.6978H2.44898C2.29492 16.6978 2.17041 16.8203 2.17041 16.9712V18.6121C2.17041 18.763 2.29492 18.8855 2.44898 18.8855H3.56331C3.71737 18.8855 3.84188 18.763 3.84188 18.6121V16.9712C3.84191 16.8203 3.7174 16.6978 3.56334 16.6978ZM3.28473 18.3386H2.72759V17.2447H3.28477L3.28473 18.3386Z"
- />
- <path
- d="M3.84191 13.69C3.84191 13.5391 3.7174 13.4166 3.56334 13.4166H2.44898C2.29492 13.4166 2.17041 13.5391 2.17041 13.69V15.3309C2.17041 15.4818 2.29492 15.6043 2.44898 15.6043H3.56331C3.71737 15.6043 3.84188 15.4818 3.84188 15.3309L3.84191 13.69ZM3.28473 15.0574H2.72759V13.9635H3.28477L3.28473 15.0574Z"
- />
- <path
- d="M4.40016 12.0495C4.40016 11.8985 4.27565 11.776 4.12159 11.776H1.05715V11.5026C1.05715 11.3516 0.932633 11.2291 0.778574 11.2291C0.624514 11.2291 0.5 11.3516 0.5 11.5026V20.8005C0.5 21.2528 0.874979 21.6209 1.33575 21.6209H3.56444C4.02521 21.6209 4.40019 21.2528 4.40019 20.8005C4.40019 20.3482 4.02521 19.9801 3.56444 19.9801C3.51625 19.9801 3.46833 19.9842 3.42125 19.9924C3.22932 19.6525 2.86296 19.4332 2.45011 19.4332C2.03726 19.4332 1.6709 19.6525 1.47897 19.9924C1.4319 19.9842 1.38397 19.9801 1.33579 19.9801C1.23745 19.9801 1.14467 19.9998 1.05721 20.0304V12.323H4.12165C4.27561 12.323 4.40016 12.2005 4.40016 12.0495ZM1.33572 20.5271C1.38893 20.5271 1.4399 20.5421 1.48671 20.5716C1.56278 20.62 1.65833 20.6288 1.74247 20.5952C1.8266 20.5618 1.88843 20.4902 1.90935 20.4035C1.96786 20.1543 2.19018 19.9801 2.45008 19.9801C2.70998 19.9801 2.93204 20.1543 2.99081 20.4035C3.0117 20.4902 3.07353 20.5618 3.1577 20.5952C3.24183 20.6288 3.33709 20.6201 3.41345 20.5716C3.5951 20.4568 3.84301 20.5973 3.84301 20.8005C3.84301 20.9512 3.71821 21.074 3.56444 21.074H1.33572C1.18196 21.074 1.05715 20.9512 1.05715 20.8005C1.05715 20.6498 1.18196 20.5271 1.33572 20.5271Z"
- />
- <path
- d="M12.4807 20.525H5.23751C5.08345 20.525 4.95894 20.6476 4.95894 20.7986V21.3458C4.95894 21.4968 5.08345 21.6194 5.23751 21.6194C5.39157 21.6194 5.51608 21.4968 5.51608 21.3458V21.0722H12.2021V21.3458C12.2021 21.4968 12.3266 21.6194 12.4807 21.6194C12.6347 21.6194 12.7593 21.4968 12.7593 21.3458V20.7986C12.7593 20.6476 12.6347 20.525 12.4807 20.525Z"
- />
- <path
- d="M5.23751 19.9765C5.39157 19.9765 5.51608 19.854 5.51608 19.703V9.03772C5.51608 8.88677 5.39157 8.76426 5.23751 8.76426C5.08345 8.76426 4.95894 8.88677 4.95894 9.03772V19.703C4.95891 19.854 5.08345 19.9765 5.23751 19.9765Z"
- />
- <path
- d="M12.4816 8.49214C12.3275 8.49214 12.203 8.61466 12.203 8.7656V19.7044C12.203 19.8553 12.3275 19.9778 12.4816 19.9778C12.6357 19.9778 12.7602 19.8553 12.7602 19.7044V8.7656C12.7602 8.61466 12.6357 8.49214 12.4816 8.49214Z"
- />
- <path
- d="M16.9258 11.2291C16.7717 11.2291 16.6472 11.3516 16.6472 11.5026V11.776H13.5828C13.4287 11.776 13.3042 11.8985 13.3042 12.0495C13.3042 12.2004 13.4287 12.3229 13.5828 12.3229H16.6472V20.0304C16.5595 19.9998 16.4667 19.9801 16.3686 19.9801C16.3205 19.9801 16.2725 19.9842 16.2254 19.9924C16.0335 19.6525 15.6672 19.4331 15.2543 19.4331C14.8415 19.4331 14.4751 19.6525 14.2832 19.9924C14.2361 19.9842 14.1882 19.9801 14.14 19.9801C13.6792 19.9801 13.3042 20.3482 13.3042 20.8005C13.3042 21.2528 13.6792 21.6209 14.14 21.6209H16.3687C16.8294 21.6209 17.2044 21.2528 17.2044 20.8005V11.5026C17.2044 11.3516 17.0798 11.2291 16.9258 11.2291ZM16.3686 21.074H14.1399C13.9862 21.074 13.8613 20.9512 13.8613 20.8006C13.8613 20.6499 13.9862 20.5271 14.1399 20.5271C14.1931 20.5271 14.2441 20.5421 14.2909 20.5717C14.3672 20.6201 14.4625 20.6288 14.5467 20.5952C14.6308 20.5618 14.6926 20.4902 14.7135 20.4035C14.772 20.1544 14.9943 19.9802 15.2542 19.9802C15.5142 19.9802 15.7362 20.1544 15.795 20.4035C15.8159 20.4902 15.8777 20.5618 15.9618 20.5952C16.046 20.6289 16.1412 20.6201 16.2176 20.5717C16.3995 20.4568 16.6471 20.5974 16.6471 20.8006C16.6472 20.9512 16.5224 21.074 16.3686 21.074Z"
- />
- <path
- d="M13.1829 7.71134L9.00411 5.25012C8.9158 5.19788 8.80549 5.19788 8.71718 5.25012L4.53841 7.71134C4.40665 7.78899 4.36375 7.95692 4.44315 8.08655C4.52225 8.21589 4.69303 8.258 4.82538 8.18007L8.86066 5.80335L12.8959 8.18007C12.9408 8.2066 12.9904 8.21916 13.0391 8.21916C13.1338 8.21916 13.2261 8.17186 13.2782 8.08652C13.3575 7.95692 13.3146 7.78903 13.1829 7.71134Z"
- />
- <path
- d="M13.8734 18.6121C13.8734 18.763 13.9979 18.8855 14.152 18.8855H15.2663C15.4204 18.8855 15.5449 18.763 15.5449 18.6121V16.9712C15.5449 16.8203 15.4204 16.6978 15.2663 16.6978H14.152C13.9979 16.6978 13.8734 16.8203 13.8734 16.9712V18.6121ZM14.4306 17.2447H14.9878V18.3386H14.4306V17.2447Z"
- />
- <path
- d="M14.152 15.6043H15.2663C15.4204 15.6043 15.5449 15.4818 15.5449 15.3309V13.69C15.5449 13.5391 15.4204 13.4166 15.2663 13.4166H14.152C13.9979 13.4166 13.8734 13.5391 13.8734 13.69V15.3309C13.8734 15.4818 13.9979 15.6043 14.152 15.6043ZM14.4306 13.9635H14.9878V15.0574H14.4306V13.9635Z"
- />
- <path
- d="M8.64818 18.4117C8.59777 18.4636 8.56742 18.532 8.56742 18.6058C8.56742 18.6769 8.59777 18.748 8.64818 18.8C8.70082 18.8492 8.77041 18.8793 8.84589 18.8793C8.91829 18.8793 8.9904 18.8492 9.04359 18.8C9.09371 18.748 9.12435 18.6769 9.12435 18.6058C9.12435 18.532 9.09371 18.4636 9.04359 18.4117C8.94055 18.3105 8.74816 18.3105 8.64818 18.4117Z"
- />
- <path
- d="M6.62596 15.3309C6.62596 15.4818 6.75047 15.6043 6.90453 15.6043H8.01886C8.17292 15.6043 8.29743 15.4818 8.29743 15.3309V13.69C8.29743 13.5391 8.17292 13.4166 8.01886 13.4166H6.90453C6.75047 13.4166 6.62596 13.5391 6.62596 13.69V15.3309ZM7.18314 13.9635H7.74032V15.0574H7.18314V13.9635Z"
- />
- <path
- d="M9.69306 13.4166C9.539 13.4166 9.41449 13.5391 9.41449 13.69V15.3309C9.41449 15.4818 9.539 15.6043 9.69306 15.6043H10.8074C10.9614 15.6043 11.086 15.4818 11.086 15.3309V13.69C11.086 13.5391 10.9614 13.4166 10.8074 13.4166H9.69306ZM10.5288 15.0574H9.97163V13.9635H10.5288V15.0574Z"
- />
- <path
- d="M8.85464 7.40016C7.62579 7.40016 6.62596 8.38164 6.62596 9.58793C6.62596 10.7942 7.62579 11.7757 8.85464 11.7757C10.0835 11.7757 11.0833 10.7942 11.0833 9.58793C11.0833 8.38164 10.0835 7.40016 8.85464 7.40016ZM8.85464 11.2287C7.9328 11.2287 7.18314 10.4928 7.18314 9.5879C7.18314 8.68298 7.9328 7.94708 8.85464 7.94708C9.77649 7.94708 10.5261 8.68298 10.5261 9.5879C10.5261 10.4928 9.77649 11.2287 8.85464 11.2287Z"
- />
- <path
- d="M6.07367 16.9712C6.07367 17.1222 6.19819 17.2447 6.35225 17.2447H7.188V19.7059C7.188 19.8569 7.31251 19.9794 7.46657 19.9794C7.62063 19.9794 7.74515 19.8569 7.74515 19.7059V17.2447H9.97383V19.7059C9.97383 19.8569 10.0983 19.9794 10.2524 19.9794C10.4065 19.9794 10.531 19.8569 10.531 19.7059V17.2447H11.3667C11.5208 17.2447 11.6453 17.1222 11.6453 16.9712C11.6453 16.8203 11.5208 16.6978 11.3667 16.6978H6.35221C6.19819 16.6978 6.07367 16.8203 6.07367 16.9712Z"
- />
- <path
- d="M21.1445 28V27.1651C21.1445 26.5194 21.481 25.9821 22.1541 25.5532C22.8271 25.1244 23.6984 24.9099 24.7679 24.9099C24.9151 24.9099 25.0813 24.9181 25.2663 24.9345C25.4514 24.951 25.6413 24.9746 25.8359 25.0053C25.7352 25.285 25.6563 25.562 25.5991 25.8361C25.542 26.1102 25.5134 26.3844 25.5134 26.6587V28H21.1445ZM27.514 28V26.7447C27.514 26.295 27.6382 25.8839 27.8866 25.5114C28.135 25.139 28.5014 24.8169 28.9858 24.545C29.4704 24.2733 30.0349 24.0695 30.6793 23.9336C31.3237 23.7976 32.0351 23.7296 32.8136 23.7296C33.6071 23.7296 34.3261 23.7976 34.9704 23.9336C35.6148 24.0695 36.1793 24.2733 36.6639 24.545C37.1483 24.8169 37.5138 25.139 37.7602 25.5114C38.0065 25.8839 38.1297 26.295 38.1297 26.7447V28H27.514ZM40.1302 28V26.6652C40.1302 26.3661 40.106 26.0775 40.0577 25.7993C40.0094 25.521 39.9281 25.257 39.8138 25.0073C40.0357 24.9753 40.2353 24.951 40.4126 24.9345C40.5898 24.9181 40.7544 24.9099 40.9062 24.9099C41.9778 24.9099 42.8446 25.1202 43.5065 25.5407C44.1682 25.9613 44.4991 26.5028 44.4991 27.1651V28H40.1302ZM28.3101 27.1416H37.3335V26.8239C37.3743 26.1501 36.9855 25.609 36.1668 25.2006C35.3482 24.7922 34.2332 24.588 32.8218 24.588C31.4241 24.588 30.3125 24.7922 29.4871 25.2006C28.6616 25.609 28.2693 26.1522 28.3101 26.8303V27.1416ZM24.7411 23.9871C24.3618 23.9871 24.0384 23.8447 23.7709 23.5597C23.5035 23.2748 23.3698 22.9309 23.3698 22.5279C23.3698 22.1317 23.5054 21.7931 23.7764 21.5119C24.0475 21.2307 24.3746 21.0901 24.7579 21.0901C25.1349 21.0901 25.4605 21.2307 25.7348 21.5119C26.009 21.7931 26.1461 22.138 26.1461 22.5465C26.1461 22.9304 26.0127 23.2665 25.7459 23.5547C25.4793 23.843 25.1444 23.9871 24.7411 23.9871ZM40.8945 23.9871C40.5253 23.9871 40.2035 23.8424 39.9293 23.553C39.655 23.2637 39.5179 22.9241 39.5179 22.5343C39.5179 22.1339 39.6556 21.7931 39.9309 21.5119C40.2062 21.2307 40.5325 21.0901 40.9099 21.0901C41.2979 21.0901 41.6257 21.2307 41.8932 21.5119C42.1605 21.7931 42.2942 22.1358 42.2942 22.5401C42.2942 22.9372 42.1613 23.2776 41.8956 23.5614C41.6298 23.8452 41.2961 23.9871 40.8945 23.9871ZM32.829 22.8927C32.1846 22.8927 31.6344 22.6549 31.1785 22.1792C30.7225 21.7036 30.4946 21.1261 30.4946 20.4465C30.4946 19.7534 30.7208 19.1724 31.1732 18.7035C31.6258 18.2345 32.1753 18 32.8218 18C33.4812 18 34.0339 18.2338 34.48 18.7013C34.926 19.1687 35.149 19.7479 35.149 20.439C35.149 21.1163 34.9267 21.6946 34.4821 22.1739C34.0375 22.6531 33.4864 22.8927 32.829 22.8927ZM32.8414 22.0344C33.2611 22.0344 33.6145 21.8802 33.9017 21.5718C34.1888 21.2635 34.3324 20.8815 34.3324 20.4259C34.3324 19.9847 34.1884 19.6132 33.9004 19.3111C33.6123 19.0093 33.2559 18.8584 32.8311 18.8584C32.4098 18.8584 32.0512 19.0098 31.7552 19.3128C31.4592 19.6156 31.3112 19.9902 31.3112 20.4367C31.3112 20.8796 31.4579 21.2565 31.7512 21.5677C32.0446 21.8788 32.408 22.0344 32.8414 22.0344Z"
- />
- </g>
- <g [ngClass]="[twMerge('stroke-primary', class)]">
- <path
- d="M7.76319 23.4211C7.77138 26.1365 8.70174 28.7709 10.3957 30.8753C12.0897 32.9797 14.4426 34.424 17.0533 34.9621C19.6641 35.5001 22.3712 35.0986 24.7135 33.826C25.8548 33.206 26.875 32.3978 27.7381 31.4423M4.54687 28.2841L7.4063 23.2109L12.3942 26.1609"
- stroke-width="2"
- stroke-linejoin="round"
- />
- <path
- d="M33.5608 12.7737C33.5526 10.0582 32.6223 7.42389 30.9283 5.31947C29.2343 3.21505 26.8815 1.77077 24.2707 1.23273C21.6599 0.694683 18.9528 1.09616 16.6105 2.36875C15.4692 2.98879 14.449 3.79695 13.5859 4.75251M36.7772 7.91068L33.9177 12.9838L28.9298 10.0338"
- stroke-width="2"
- stroke-linejoin="round"
- />
- </g>
-</svg>
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts
deleted file mode 100644
index 7fb5c999de..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExternalUnitIconComponent } from './external-unit-icon.component';
-
-describe('ExternalUnitIconComponent', () => {
- let component: ExternalUnitIconComponent;
- let fixture: ComponentFixture<ExternalUnitIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ExternalUnitIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(ExternalUnitIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts
deleted file mode 100644
index 46a6ad95d1..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-@Component({
- selector: 'ods-external-unit-icon',
- standalone: true,
- imports: [CommonModule],
- templateUrl: './external-unit-icon.component.html',
-})
-export class ExternalUnitIconComponent {
- @Input() class: string = undefined;
-
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts
deleted file mode 100644
index c90341e69b..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ExternalUnitIconComponent } from './external-unit-icon.component';
-
-const meta: Meta<ExternalUnitIconComponent> = {
- title: 'Icons/External unit icon',
- component: ExternalUnitIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ExternalUnitIconComponent>;
-
-export const Default: Story = {};
diff --git a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts
deleted file mode 100644
index eb5ef24893..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MailboxIconComponent } from './mailbox-icon.component';
-
-describe('MailboxIconComponent', () => {
- let component: MailboxIconComponent;
- let fixture: ComponentFixture<MailboxIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [MailboxIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(MailboxIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts
deleted file mode 100644
index 87f8cf2610..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-mailbox-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="twMerge(iconVariants({ size }), 'stroke-text', class)"
- >
- <path
- d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- <path
- d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>`,
-})
-export class MailboxIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = undefined;
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts
deleted file mode 100644
index 975bf8afb5..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { MailboxIconComponent } from './mailbox-icon.component';
-
-const meta: Meta<MailboxIconComponent> = {
- title: 'Icons/Mailbox icon',
- component: MailboxIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<MailboxIconComponent>;
-
-export const Default: Story = {
- args: { size: 'medium' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts
index 59dd77af3d..5369dceefd 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts
@@ -27,8 +27,10 @@ import { ExterneFachstelleResourceService } from '@alfa-client/externe-fachstell
import { createStateResource } from '@alfa-client/tech-shared';
import { mock, Mock } from '@alfa-client/test-utils';
import { createExterneFachstelle } from 'libs/zustaendige-stelle-shared/test/externe-fachstelle';
+import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { ExterneFachstelleListItemContainerComponent } from './externe-fachstelle-list-item-container.component';
+import { ExterneFachstelleListItemComponent } from './externe-fachstelle-list-item/externe-fachstelle-list-item.component';
describe('ExterneFachstelleListItemContainerComponent', () => {
let component: ExterneFachstelleListItemContainerComponent;
@@ -45,7 +47,9 @@ describe('ExterneFachstelleListItemContainerComponent', () => {
getExterneFachstelle: jest.fn().mockReturnValue(of(externeFachstelleStateResource)),
};
- await TestBed.configureTestingModule({ imports: [ExterneFachstelleListItemContainerComponent] })
+ await TestBed.configureTestingModule({
+ imports: [ExterneFachstelleListItemContainerComponent, MockComponent(ExterneFachstelleListItemComponent)],
+ })
.overrideComponent(ExterneFachstelleListItemContainerComponent, {
set: {
providers: [{ provide: ExterneFachstelleResourceService, useValue: externeFachstelleResourceService }],
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
index 354c579307..4f9f87ff25 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
@@ -28,10 +28,10 @@
<div class="border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
<div class="flex flex-1 gap-6">
<div class="flex flex-1 gap-3">
- <ods-external-unit-icon />
+ <ods-icon name="external-unit" size="unset" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Externe Fachstelle</p>
- <p class="text-text font-bold">{{ resource.name }}</p>
+ <p class="font-bold text-text">{{ resource.name }}</p>
</div>
</div>
<div class="flex-1">
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts
index 20656fa1be..c25c5868e9 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts
@@ -25,8 +25,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createStateResource, StateResource } from '@alfa-client/tech-shared';
import { ExterneFachstelleResource } from '@alfa-client/zustaendige-stelle-shared';
+import { IconComponent } from '@ods/system';
import { toResource } from 'libs/tech-shared/test/resource';
import { createExterneFachstelle } from 'libs/zustaendige-stelle-shared/test/externe-fachstelle';
+import { MockComponent } from 'ng-mocks';
import { ExterneFachstelleListItemComponent } from './externe-fachstelle-list-item.component';
describe('ExterneFachstelleListItemComponent', () => {
@@ -38,7 +40,7 @@ describe('ExterneFachstelleListItemComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [ExterneFachstelleListItemComponent],
+ imports: [ExterneFachstelleListItemComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(ExterneFachstelleListItemComponent);
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts
index 274c1b9090..9886ffa51a 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts
@@ -25,12 +25,12 @@ import { StateResource } from '@alfa-client/tech-shared';
import { SpinnerComponent } from '@alfa-client/ui';
import { ExterneFachstelleResource } from '@alfa-client/zustaendige-stelle-shared';
import { Component, Input } from '@angular/core';
-import { ExternalUnitIconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
@Component({
selector: 'alfa-externe-fachstelle-list-item',
standalone: true,
- imports: [PublicAdministrationIconComponent, ExternalUnitIconComponent, SpinnerComponent],
+ imports: [SpinnerComponent, IconComponent],
templateUrl: './externe-fachstelle-list-item.component.html',
})
export class ExterneFachstelleListItemComponent {
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
index 05558ae4b7..266ad33a8a 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
@@ -25,12 +25,12 @@ import { StateResource } from '@alfa-client/tech-shared';
import { SpinnerComponent } from '@alfa-client/ui';
import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
import { Component, Input } from '@angular/core';
-import { ExternalUnitIconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { PublicAdministrationIconComponent } from '@ods/system';
@Component({
selector: 'alfa-organisations-einheit-list-item',
standalone: true,
- imports: [ExternalUnitIconComponent, PublicAdministrationIconComponent, SpinnerComponent],
+ imports: [PublicAdministrationIconComponent, SpinnerComponent],
templateUrl: './organisations-einheit-list-item.component.html',
})
export class OrganisationsEinheitListItemComponent {
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index 0d36e972d6..893f933310 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -35,7 +35,7 @@
size="fit"
(clickEmitter)="openPostfachNachrichtenDialog.emit()"
>
- <ods-mailbox-icon icon />
+ <ods-icon icon name="mailbox" fill="text" />
</ods-button>
}
@if (!showAsIconButton && text && !toolTip) {
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
index 3ada8d77eb..582edc1c96 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
@@ -25,7 +25,7 @@ import { PostfachMailListLinkRel } from '@alfa-client/postfach-shared';
import { EMPTY_STRING, HasLinkPipe, createStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
-import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
@@ -47,7 +47,6 @@ describe('PostfachMailButtonComponent', () => {
HasLinkPipe,
MockComponent(ButtonComponent),
MockComponent(IconComponent),
- MockComponent(MailboxIconComponent),
MockDirective(TooltipDirective),
],
}).compileComponents();
diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts
index a8a162fe8d..a57c2ce810 100644
--- a/alfa-client/libs/postfach/src/lib/postfach.module.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts
@@ -42,7 +42,7 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatIcon } from '@angular/material/icon';
import { RouterModule, Routes } from '@angular/router';
-import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component';
import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component';
@@ -96,7 +96,6 @@ const routes: Routes = [
IconButtonWithSpinnerComponent,
ButtonComponent,
IconComponent,
- MailboxIconComponent,
TooltipDirective,
MultiFileUploadComponent,
],
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
index 3e26825816..7bba8e78bd 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
@@ -25,7 +25,7 @@
-->
<ng-container *ngIf="externeFachstelleResource$ | async as externeFachstelleResource; else searchButton">
<alfa-zustaendige-stelle-header title="Externe Fachstelle" [subTitle]="externeFachstelleResource.name" [isSubTitleBold]="true">
- <ods-external-unit-icon icon />
+ <ods-icon icon name="external-unit" size="unset" />
<div class="flex flex-1 flex-col text-sm text-text" info>
<p>{{ externeFachstelleResource.anschrift }}</p>
<p>{{ 'Email: ' + externeFachstelleResource.email }}</p>
@@ -38,7 +38,7 @@
</ng-container>
<ng-template #searchButton>
<alfa-zustaendige-stelle-header title="Externe Fachstelle" subTitle="Private Organisation, Verein, Schule">
- <ods-external-unit-icon icon />
+ <ods-icon icon name="external-unit" size="unset" />
<alfa-zustaendige-stelle-button title="Zuständige externe Fachstelle auswählen" dataTestId="externe-fachstelle-button" />
</alfa-zustaendige-stelle-header>
</ng-template>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts
index 92e5cfada5..db3d5670ad 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts
@@ -30,7 +30,7 @@ import {
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormControl } from '@angular/forms';
import { getUrl } from '@ngxp/rest';
-import { ExternalUnitIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { createExterneFachstelleResource } from 'libs/zustaendige-stelle-shared/test/externe-fachstelle';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -68,7 +68,7 @@ describe('SearchExterneFachstelleContainerComponent', () => {
MockComponent(EditZustaendigeStelleButtonComponent),
MockComponent(ZustaendigeStelleButtonComponent),
MockComponent(ZustaendigeStelleHeaderComponent),
- MockComponent(ExternalUnitIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index f4efa3bfb0..0d6d6ee902 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -24,13 +24,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
- ButtonComponent,
- ExternalUnitIconComponent,
- IconComponent,
- InstantSearchComponent,
- PublicAdministrationIconComponent,
-} from '@ods/system';
+import { ButtonComponent, IconComponent, InstantSearchComponent, PublicAdministrationIconComponent } from '@ods/system';
import { ZustaendigeStelleSharedModule } from 'libs/zustaendige-stelle-shared/src/lib/zustaendige-stelle-shared.module';
import { EditZustaendigeStelleButtonComponent } from './edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component';
import { SearchExterneFachstelleContainerComponent } from './search-externe-fachstelle-container/search-externe-fachstelle-container.component';
@@ -51,7 +45,6 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
FormsModule,
ReactiveFormsModule,
ZustaendigeStelleSharedModule,
- ExternalUnitIconComponent,
IconComponent,
PublicAdministrationIconComponent,
],
--
GitLab
From d9b21deddd618e836080706c1b209e368d1dbd0c Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 14:49:28 +0200
Subject: [PATCH 28/36] OZG-7707 add icons - person icon - public
administration icon
---
alfa-client/libs/design-system/src/assets/person.svg | 5 +++++
.../libs/design-system/src/assets/public-administration.svg | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 alfa-client/libs/design-system/src/assets/person.svg
create mode 100644 alfa-client/libs/design-system/src/assets/public-administration.svg
diff --git a/alfa-client/libs/design-system/src/assets/person.svg b/alfa-client/libs/design-system/src/assets/person.svg
new file mode 100644
index 0000000000..3609afd166
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/person.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24">
+ <path
+ d="M11.38.244C8.46.544 6.201 3.055 6.201 6c0 2.167 1.254 4.2 3.191 5.176 3.313 1.669 7.33-.175 8.226-3.775a5.52 5.52 0 0 0 0-2.802 5.554 5.554 0 0 0-1.489-2.653C14.878.671 13.17.06 11.38.244m1.54 2.076c.743.18 1.564.705 2.037 1.306.312.396.615 1.008.729 1.474.125.507.125 1.293 0 1.8a4.033 4.033 0 0 1-1.31 2.058 4.528 4.528 0 0 1-1.456.729c-.488.131-1.352.131-1.84 0a4.496 4.496 0 0 1-1.463-.735C9.01 8.465 8.501 7.663 8.314 6.9c-.125-.507-.125-1.293 0-1.8.366-1.487 1.609-2.613 3.159-2.86.336-.053 1.058-.013 1.447.08M7.78 14.644c-2.403.246-4.401 1.987-5 4.355-.16.637-.186 1.031-.173 2.624l.013 1.483.121.197a.998.998 0 0 0 1.718 0l.121-.196.024-1.644c.028-1.891.046-2.011.394-2.723A3.851 3.851 0 0 1 7.5 16.711l.36-.091h8.28l.36.091a3.851 3.851 0 0 1 2.502 2.029c.348.712.366.832.394 2.723l.024 1.644.121.196a.998.998 0 0 0 1.718 0l.121-.197.013-1.483c.013-1.593-.013-1.987-.173-2.624a5.574 5.574 0 0 0-1.491-2.653 5.667 5.667 0 0 0-3.563-1.704c-.493-.05-7.899-.048-8.386.002"
+ fill-rule="evenodd" />
+</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/public-administration.svg b/alfa-client/libs/design-system/src/assets/public-administration.svg
new file mode 100644
index 0000000000..6e081a1d90
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/public-administration.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 38" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M20.79 3.05c-1.904.275-2.997.592-4.324 1.255a12.06 12.06 0 0 0-3.18 2.252l-.687.665.252.221c.139.121.472.413.739.65l.487.429.643-.598c1.439-1.337 3.285-2.315 5.063-2.682a10.437 10.437 0 0 1 6.653.806c2.565 1.233 4.537 3.418 5.587 6.191.2.529.557 1.89.523 1.993-.013.037-.683-.329-1.489-.812-.807-.484-1.487-.88-1.512-.88-.025 0-.266.368-.536.819-.396.662-.472.835-.394.906.219.203 5.078 3.063 5.313 3.128.213.058.315.042.598-.1.338-.168.359-.201 1.859-2.901l1.518-2.732-.306-.175c-.824-.472-1.388-.778-1.432-.776-.027.001-.411.66-.853 1.465l-.805 1.464-.196-.753c-.424-1.625-.933-2.759-1.866-4.158-1.967-2.952-4.972-4.924-8.428-5.534-.64-.112-2.781-.208-3.227-.143M6.277 9.674c-1.207.722-2.224 1.368-2.262 1.435-.048.086-.031.163.06.263.07.078.151.141.18.141.029 0 .94-.531 2.024-1.181a97.55 97.55 0 0 1 2.127-1.255c.131-.061.448.102 2.077 1.073 1.057.63 2.011 1.192 2.12 1.248.247.128.45.033.45-.21 0-.147-.32-.362-2.233-1.5-1.228-.73-2.259-1.328-2.291-1.327-.033 0-1.046.591-2.252 1.313m1.511 1.093c-1.903.681-2.059 3.282-.251 4.17.349.172.512.206.97.204.727-.003 1.197-.21 1.68-.738.593-.649.755-1.498.443-2.331-.404-1.081-1.745-1.697-2.842-1.305m1.535.658c.993.517 1.186 1.873.383 2.685-.783.791-2.16.575-2.684-.422-.117-.223-.16-.433-.16-.781 0-1.313 1.292-2.091 2.461-1.482m-1.325.519c-.123.231-.098 1.194.036 1.386.202.289 1.059.194 1.059-.118 0-.187-.146-.305-.378-.305-.2 0-.202-.006-.223-.532-.021-.516-.028-.532-.219-.554-.137-.016-.22.021-.275.123m4.004-.088c-.027.026-.049 2.66-.049 5.852 0 4.415.021 5.824.088 5.891.12.119.246.11.384-.028.103-.102.115-.734.115-5.852 0-4.364-.021-5.757-.088-5.824-.095-.095-.37-.119-.45-.039m-7.327.25c-.12.07-.128.422-.128 5.752 0 5.537.003 5.679.142 5.753.183.098.193.097.329-.04.103-.102.115-.722.115-5.714 0-4.993-.012-5.612-.115-5.715-.133-.134-.169-.137-.343-.036M.088 14.681C.021 14.748 0 15.973 0 19.745c0 5.46-.014 5.284.438 5.517.169.088.499.111 1.542.111 1.418 0 1.628-.043 1.866-.382.147-.21.147-.712 0-.922-.134-.191-.476-.382-.683-.382-.08 0-.241-.096-.358-.214-.461-.46-1.208-.46-1.638.001-.121.129-.274.213-.39.213h-.19v-7.92h1.544c.925 0 1.602-.031 1.687-.076.171-.092.188-.404.026-.466-.064-.025-.823-.045-1.687-.045H.587v-.178c0-.314-.308-.512-.499-.321m16.5 0c-.048.049-.088.181-.088.294v.205h-1.635c-1.642 0-1.812.025-1.812.266 0 .05.052.142.116.205.097.098.359.116 1.723.116H16.5v7.92h-.206c-.134 0-.281-.078-.419-.222-.434-.454-1.088-.466-1.57-.031-.154.139-.353.253-.443.253-.255 0-.575.226-.704.499-.157.33-.088.666.194.936l.224.215h3.009l.209-.234c.13-.146.226-.353.254-.55.025-.174.036-2.454.024-5.067-.019-4.128-.036-4.761-.132-4.821-.148-.094-.247-.089-.352.016M1.763 17.009c-.042.078-.076.525-.076.994s.034.917.076.995c.066.125.158.142.751.141.372-.001.725-.033.786-.071.089-.056.11-.26.11-1.065 0-.805-.021-1.008-.11-1.065-.061-.038-.414-.07-.786-.07-.593-.001-.685.016-.751.141m4.546 0c-.042.078-.076.525-.076.994s.034.917.076.995c.067.125.159.142.765.142.948 0 .937.014.907-1.187-.019-.742-.048-.96-.134-1.015-.061-.038-.414-.07-.786-.07-.594-.001-.685.016-.752.141m2.872-.054c-.122.122-.122 1.975 0 2.097.056.056.334.088.756.088.421 0 .699-.032.755-.088.122-.122.122-1.975 0-2.097-.056-.056-.334-.088-.755-.088-.422 0-.7.032-.756.088m4.547 0c-.059.059-.088.399-.088 1.048 0 .65.029.99.088 1.049.106.106 1.362.12 1.525.016.089-.056.11-.26.11-1.065 0-.805-.021-1.008-.11-1.065-.163-.103-1.419-.09-1.525.017M2.86 18.003v.55h-.587v-1.1h.587v.55m4.547 0v.55H6.82v-1.1h.587v.55m2.786 0v.55H9.68v-1.1h.513v.55m4.62 0v.55h-.586v-1.1h.586v.55m18.402.786c-1.93 1.16-2.232 1.365-2.232 1.516 0 .441.148.383 2.287-.892 1.125-.67 2.094-1.237 2.153-1.259.061-.023 1.007.499 2.193 1.209 1.147.687 2.134 1.24 2.192 1.228.143-.028.265-.233.215-.362-.034-.089-4.177-2.628-4.474-2.742-.057-.022-1.107.564-2.334 1.302m1.688 1.034c-.454.128-.817.363-1.162.756-.948 1.077-.565 2.824.763 3.478.302.148.475.179.989.179.532-.001.678-.03.995-.196a2.6 2.6 0 0 0 1.083-1.151c.182-.398.211-1.204.059-1.642-.353-1.021-1.687-1.717-2.727-1.424m-33.128.578c-.122.122-.122 1.902 0 2.024.056.057.345.088.804.088.633 0 .725-.016.792-.142.098-.184.098-1.731 0-1.916-.067-.125-.159-.142-.792-.142-.459 0-.748.032-.804.088m3.973.018a.52.52 0 0 0-.015.238c.021.111.112.137.556.155l.531.021v1.351c0 1.26.009 1.356.142 1.427.183.098.193.097.329-.04.097-.096.116-.332.116-1.43v-1.314H9.68v1.342c0 1.341.031 1.518.266 1.518.05 0 .142-.052.205-.116.097-.096.116-.332.116-1.426v-1.312l.487-.021c.511-.023.684-.134.59-.379-.042-.108-.318-.12-2.801-.12-2.331 0-2.761.017-2.795.106m7.937.01c-.086.224-.05 1.904.043 1.996.057.057.346.088.808.088.706 0 .722-.003.792-.188.096-.25.092-1.69-.004-1.87-.067-.126-.159-.142-.835-.142-.625 0-.768.021-.804.116m22.584.089c.969.497 1.202 1.751.482 2.593-1 1.167-2.948.458-2.943-1.071.001-.272.054-.559.138-.744.154-.338.601-.746.971-.887.332-.126.998-.072 1.352.109m-33.424.877-.022.568-.275.023-.275.023v-1.182h.593l-.021.568m11.953 0-.021.568-.275.023-.275.023v-1.182h.593l-.022.568m20.197-.407c-.12.119-.12 1.391 0 1.511.091.091.694.121.896.043.153-.059.153-.439 0-.497a.85.85 0 0 0-.257-.045c-.124 0-.141-.055-.141-.462 0-.469-.077-.638-.293-.638a.336.336 0 0 0-.205.088m3.95.049c-.107.201-.11 11.401-.002 11.601a.257.257 0 0 0 .428.042c.061-.072.078-1.681.064-5.921l-.018-5.822-.197-.023c-.137-.016-.221.022-.275.123m-7.407.294c-.083.156-.115 10.901-.032 11.208.052.197.288.286.435.164.092-.076.104-.867.088-5.781l-.019-5.692-.197-.023c-.137-.016-.22.022-.275.124m-23.256.785c-.129.155-.001.361.225.361.196 0 .336-.186.27-.357-.058-.153-.37-.156-.495-.004M2.27 23.758c.073.039.201.186.283.326.138.233.177.254.467.24.306-.014.317-.007.317.206v.22H.623v-.22c0-.207.018-.22.294-.227.444-.01.452-.014.55-.251.142-.341.482-.466.803-.294m13.053 0c.074.039.203.188.287.331.143.243.171.257.433.215.346-.055.515.09.386.331-.077.144-.143.152-1.353.152-1.364 0-1.504-.037-1.399-.369.043-.134.097-.152.388-.132.29.021.35 0 .421-.14.214-.422.514-.561.837-.388m11.739.074c-.146.146-.149.227-.149 4.99 0 5.255-.006 5.162.405 5.486.191.15.277.159 1.589.159 1.564 0 1.717-.038 1.927-.481.238-.502-.064-1.073-.623-1.178a1.159 1.159 0 0 1-.484-.263c-.438-.413-1.155-.408-1.575.012a.926.926 0 0 1-.429.238l-.223.033V24.86h1.608c1.364 0 1.626-.017 1.723-.115.137-.137.138-.146.04-.33-.072-.134-.17-.142-1.724-.142H27.5v-.217c0-.307-.235-.427-.438-.224m16.571-.088c-.148.051-.217.166-.219.363l-.001.164-1.623.019c-1.454.018-1.633.033-1.705.148-.059.094-.059.163 0 .257.072.115.251.13 1.705.148l1.623.02v7.97l-.201-.036c-.111-.019-.305-.133-.431-.252a1.149 1.149 0 0 0-1.585.021c-.118.118-.286.214-.373.214-.237.001-.63.267-.711.481-.146.383-.089.69.177.956l.25.25h1.396c.767 0 1.48-.033 1.584-.072.103-.039.253-.179.334-.312.143-.233.146-.372.147-5.242 0-4.69-.008-5.007-.128-5.069a.358.358 0 0 0-.239-.028m-39.042.645c-.077.202-.048.805.044.896.212.212.498.013.498-.347 0-.151.013-.151 3.41-.151h3.41v.205c0 .362.356.529.511.239.104-.193.096-.762-.012-.87-.066-.066-1.044-.088-3.952-.088-3.456 0-3.869.013-3.909.116m24.204 1.663c-.111.081-.124.218-.106 1.119l.021 1.026.723.021c.469.013.758-.009.825-.064.078-.065.102-.315.102-1.064 0-.892-.012-.985-.142-1.054-.203-.109-1.269-.096-1.423.016m4.547 0c-.111.081-.124.218-.106 1.119l.021 1.026.722.021c.47.013.759-.009.825-.064.079-.065.103-.315.103-1.064 0-.892-.013-.985-.142-1.054-.203-.109-1.269-.096-1.423.016m2.811.055c-.128.128-.146.244-.146.948 0 .441.032.887.071.99.07.185.086.188.792.188.463 0 .752-.031.809-.088.059-.059.088-.393.088-1.021 0-1.168.002-1.164-.849-1.164-.52 0-.641.023-.765.147m4.595-.055c-.11.081-.123.218-.105 1.119l.02 1.026.723.021c.47.013.758-.009.825-.064.078-.065.102-.315.102-1.064 0-.892-.012-.985-.142-1.054-.202-.109-1.268-.096-1.423.016M6.519 26.2c-.199.133-.55.706-1.734 2.833C3.968 30.5 3.3 31.726 3.3 31.759c0 .065 1.405.872 1.611.926.1.026.296-.274.92-1.402.437-.79.804-1.425.817-1.413.012.012.105.34.206.729.591 2.276 1.655 4.188 3.273 5.88 3.425 3.582 8.411 4.848 13.022 3.305 1.328-.444 2.327-.968 3.508-1.839.592-.437 1.886-1.637 1.854-1.72-.011-.031-.343-.344-.738-.695l-.716-.638-.691.661c-1.902 1.818-4.146 2.756-6.823 2.849-1.004.035-1.3.019-2.053-.117-4.349-.783-7.713-4.036-8.768-8.476-.083-.351-.141-.648-.128-.661.013-.013.699.384 1.523.882 1.331.804 1.509.892 1.582.783.181-.27.839-1.39.881-1.497.033-.089-.52-.453-2.4-1.58a151.696 151.696 0 0 0-2.678-1.583.955.955 0 0 0-.983.047m23.254.933v.587h-.513v-1.173h.513v.586m4.547 0v.587h-.513v-1.173h.513v.586m2.86.005v.591l-.275-.023-.275-.023-.021-.568-.022-.568h.593v.591m4.547-.005v.587h-.514v-1.173h.514v.586m-13.005 2.323c-.027.026-.049.504-.049 1.06 0 1.193-.021 1.164.844 1.164.861 0 .843.024.843-1.125 0-.658-.028-1.001-.088-1.06-.094-.094-1.461-.129-1.55-.039m3.999.039c-.245.245.072.498.625.498h.387l.001 1.192c.001.655.021 1.265.045 1.354.048.181.236.269.421.198.105-.04.12-.212.12-1.395v-1.349H36.593v1.252c0 1.281.047 1.535.282 1.535.277 0 .305-.134.305-1.473V30.01l.486-.03c.542-.035.745-.181.609-.437-.07-.129-.215-.136-2.77-.136-1.999 0-2.718.022-2.784.088m7.955-.039c-.027.026-.049.504-.049 1.06 0 1.197-.025 1.164.87 1.164.815 0 .816-.003.816-1.164 0-.628-.028-.962-.088-1.021-.093-.094-1.46-.129-1.549-.039m-10.903 1.087v.55h-.513v-1.1h.513v.55m11.954 0v.55h-.514v-1.1h.514v.55m-6.442.615c-.054.034-.087.141-.073.237.031.221.34.285.476.099.185-.253-.126-.512-.403-.336m-6.03 1.75c.086.071.199.211.25.312.08.156.138.181.392.165.335-.021.502.11.43.337-.064.202-.235.229-1.444.23-.929.001-1.096-.017-1.238-.132-.142-.115-.152-.156-.076-.299.077-.143.127-.159.372-.117.27.045.292.034.467-.244.257-.407.549-.494.847-.252m13.042-.014c.09.063.216.215.279.338.104.202.139.218.372.174.286-.054.465.046.465.26 0 .237-.248.287-1.411.287-1.231 0-1.409-.048-1.364-.37.023-.165.054-.178.377-.162.339.018.357.009.458-.234.167-.4.502-.519.824-.293m-10.765.661a.995.995 0 0 0 .001.728c.059.154.114.189.275.17.168-.019.206-.063.225-.261l.023-.239h6.78l.071.239c.075.256.266.343.44.198.131-.109.145-.809.018-.935-.066-.067-1.038-.088-3.925-.088h-3.837l-.071.188"
+ fill-rule="evenodd" />
+</svg>
\ No newline at end of file
--
GitLab
From 6206d5fa49dce9a710aefc5f4d92b160845e4b69 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 15:04:10 +0200
Subject: [PATCH 29/36] OZG-7707 replace more icons - person icon - public
administration icon
---
.../user/user-data/user-data.component.html | 2 +-
.../user/user-data/user-data.component.ts | 4 +-
...nisations-einheit-container.component.html | 4 +-
...ations-einheit-container.component.spec.ts | 4 +-
.../src/lib/collaboration.module.ts | 3 +-
alfa-client/libs/design-system/src/index.ts | 2 -
.../person-icon/person-icon.component.spec.ts | 44 ------
.../person-icon/person-icon.component.ts | 56 -------
.../icons/person-icon/person-icon.stories.ts | 50 -------
.../public-administration-icon.component.html | 137 ------------------
...blic-administration-icon.component.spec.ts | 44 ------
.../public-administration-icon.component.ts | 38 -----
.../public-administration-icon.stories.ts | 38 -----
...heit-list-item-container.component.spec.ts | 6 +-
...nisations-einheit-list-item.component.html | 2 +-
...ations-einheit-list-item.component.spec.ts | 4 +-
...ganisations-einheit-list-item.component.ts | 4 +-
...nisations-einheit-container.component.html | 4 +-
...ations-einheit-container.component.spec.ts | 4 +-
.../src/lib/zustaendige-stelle.module.ts | 3 +-
20 files changed, 24 insertions(+), 429 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.stories.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.html
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.stories.ts
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
index 29819104c6..724611322e 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
@@ -9,7 +9,7 @@
<div class="flex items-center gap-2">
<dt>
<span class="sr-only">Benutzername:</span>
- <ods-person-icon />
+ <ods-icon name="person" class="fill-gray-600" size="small" />
</dt>
<dd data-test-class="username">{{ user.username }}</dd>
</div>
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
index 64e255cf1d..1db08327d3 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
@@ -1,12 +1,12 @@
import { User } from '@admin-client/user-shared';
import { NgIf } from '@angular/common';
import { Component, Input } from '@angular/core';
-import { IconComponent, PersonIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
@Component({
selector: 'admin-user-data',
standalone: true,
- imports: [IconComponent, NgIf, PersonIconComponent],
+ imports: [IconComponent, NgIf],
templateUrl: './user-data.component.html',
})
export class UserDataComponent {
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
index 01e0cf1d65..e9b0fde49e 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
@@ -36,8 +36,8 @@
></alfa-collaboration-request-form>
</ng-container>
<ng-template #anfrageErstellenButton>
- <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 bg-background-100 p-4 p-4 shadow shadow-grayborder">
- <ods-public-administration-icon />
+ <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
+ <ods-icon name="public-administration" size="unset" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Öffentliche Verwaltung</p>
<p class="text-text">Kommune, Amt, Ministerium</p>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index 35e90199d7..54f8892b82 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -37,7 +37,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
import { SearchOrganisationsEinheitContainerComponent } from '@alfa-client/zustaendige-stelle';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder } from '@angular/forms';
-import { PublicAdministrationIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -87,7 +87,7 @@ describe('OrganisationsEinheitContainerComponent', () => {
MockComponent(SearchOrganisationsEinheitContainerComponent),
MockComponent(CollaborationRequestFormComponent),
MockComponent(AnfrageErstellenButtonComponent),
- MockComponent(PublicAdministrationIconComponent),
+ MockComponent(IconComponent),
],
providers: [
{
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index 6078fdee08..810a13a59b 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -29,7 +29,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ButtonWithSpinnerComponent, TextEditorComponent, TextareaEditorComponent } from '@ods/component';
-import { ButtonComponent, IconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent } from '@ods/system';
import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
import { OrganisationsEinheitListItemContainerComponent } from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component';
import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
@@ -53,7 +53,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
ReactiveFormsModule,
ButtonWithSpinnerComponent,
ZustaendigeStelleModule,
- PublicAdministrationIconComponent,
OrganisationsEinheitListItemContainerComponent,
ExterneFachstelleListItemContainerComponent,
HasLinkPipe,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 0508336b21..94d26b160a 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -48,8 +48,6 @@ export * from './lib/icon/icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
-export * from './lib/icons/person-icon/person-icon.component';
-export * from './lib/icons/public-administration-icon/public-administration-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
export * from './lib/instant-search/instant-search/instant-search.component';
export * from './lib/instant-search/instant-search/instant-search.model';
diff --git a/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.spec.ts
deleted file mode 100644
index 632d475137..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PersonIconComponent } from './person-icon.component';
-
-describe('PersonIconComponent', () => {
- let component: PersonIconComponent;
- let fixture: ComponentFixture<PersonIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [PersonIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(PersonIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.ts
deleted file mode 100644
index 5c17fa93df..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.component.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-person-icon',
- standalone: true,
- imports: [NgClass],
- template: `<svg
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'stroke-gray-600', class)]"
- aria-hidden="true"
- viewBox="0 0 24 24"
- fill="none"
- >
- <path
- d="M20.4 22.8v-2.4a4.8 4.8 0 00-4.8-4.8H8.4a4.8 4.8 0 00-4.8 4.8v2.4m8.4-12a4.8 4.8 0 100-9.6 4.8 4.8 0 000 9.6z"
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- fill="none"
- />
- </svg>`,
-})
-export class PersonIconComponent {
- @Input() size: IconVariants['size'] = 'small';
- @Input() class: string = undefined;
-
- public readonly iconVariants = iconVariants;
- public readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.stories.ts
deleted file mode 100644
index 825ceebfba..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/person-icon/person-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { PersonIconComponent } from './person-icon.component';
-
-const meta: Meta<PersonIconComponent> = {
- title: 'Icons/Person icon',
- component: PersonIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<PersonIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'small' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.html b/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.html
deleted file mode 100644
index 98f44144fb..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!--
-
- Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- Ministerpräsidenten des Landes Schleswig-Holstein
- Staatskanzlei
- Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-
- Lizenziert unter der EUPL, Version 1.2 oder - sobald
- diese von der Europäischen Kommission genehmigt wurden -
- Folgeversionen der EUPL ("Lizenz");
- Sie dürfen dieses Werk ausschließlich gemäß
- dieser Lizenz nutzen.
- Eine Kopie der Lizenz finden Sie hier:
-
- https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-
- Sofern nicht durch anwendbare Rechtsvorschriften
- gefordert oder in schriftlicher Form vereinbart, wird
- die unter der Lizenz verbreitete Software "so wie sie
- ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- ausdrücklich oder stillschweigend - verbreitet.
- Die sprachspezifischen Genehmigungen und Beschränkungen
- unter der Lizenz sind dem Lizenztext zu entnehmen.
-
--->
-<svg width="44" height="44" viewBox="0 0 44 38" fill="none" xmlns="http://www.w3.org/2000/svg">
- <g [ngClass]="[twMerge('fill-primary', class)]">
- <path
- d="M8.81083 9.89993H8.52662V9.04961C8.52662 8.89316 8.39959 8.76618 8.24241 8.76618C8.08523 8.76618 7.9582 8.89316 7.9582 9.04961V10.1834C7.9582 10.3398 8.08523 10.4668 8.24241 10.4668H8.81086C8.96804 10.4668 9.09507 10.3398 9.09507 10.1834C9.09507 10.0269 8.96801 9.89993 8.81083 9.89993Z"
- />
- <path
- d="M3.12693 17.2713H1.98944C1.83218 17.2713 1.70508 17.3983 1.70508 17.5547V19.2554C1.70508 19.4119 1.83218 19.5388 1.98944 19.5388H3.1269C3.28415 19.5388 3.41125 19.4119 3.41125 19.2554V17.5547C3.41129 17.3983 3.28419 17.2713 3.12693 17.2713ZM2.84254 18.972H2.27383V17.8382H2.84257L2.84254 18.972Z"
- />
- <path
- d="M3.41129 14.1538C3.41129 13.9973 3.28419 13.8703 3.12693 13.8703H1.98944C1.83218 13.8703 1.70508 13.9973 1.70508 14.1538V15.8545C1.70508 16.0109 1.83218 16.1379 1.98944 16.1379H3.1269C3.28415 16.1379 3.41125 16.0109 3.41125 15.8545L3.41129 14.1538ZM2.84254 15.571H2.27383V14.4372H2.84257L2.84254 15.571Z"
- />
- <path
- d="M3.98112 12.4533C3.98112 12.2969 3.85402 12.1699 3.69676 12.1699H0.568712V11.8865C0.568712 11.73 0.441614 11.603 0.284356 11.603C0.127099 11.603 0 11.73 0 11.8865V21.5237C0 21.9926 0.382763 22.3741 0.853102 22.3741H3.12805C3.59839 22.3741 3.98115 21.9926 3.98115 21.5237C3.98115 21.0549 3.59839 20.6734 3.12805 20.6734C3.07887 20.6734 3.02995 20.6776 2.98189 20.6861C2.78598 20.3338 2.41201 20.1065 1.99059 20.1065C1.56917 20.1065 1.19521 20.3338 0.999296 20.6861C0.951242 20.6776 0.902322 20.6734 0.853135 20.6734C0.752763 20.6734 0.658055 20.6938 0.568779 20.7255V12.7368H3.69683C3.85399 12.7368 3.98112 12.6098 3.98112 12.4533ZM0.853069 21.2403C0.907387 21.2403 0.959406 21.2559 1.00719 21.2865C1.08484 21.3367 1.18238 21.3457 1.26826 21.3109C1.35413 21.2763 1.41725 21.202 1.43861 21.1122C1.49833 20.854 1.72527 20.6734 1.99056 20.6734C2.25586 20.6734 2.48253 20.854 2.54251 21.1122C2.56384 21.202 2.62695 21.2763 2.71286 21.3109C2.79874 21.3458 2.89598 21.3367 2.97393 21.2865C3.15934 21.1675 3.41241 21.3131 3.41241 21.5237C3.41241 21.6799 3.28501 21.8072 3.12805 21.8072H0.853069C0.696111 21.8072 0.568712 21.6799 0.568712 21.5237C0.568712 21.3676 0.696111 21.2403 0.853069 21.2403Z"
- />
- <path
- d="M12.2294 21.2381H4.83585C4.6786 21.2381 4.5515 21.3652 4.5515 21.5217V22.0889C4.5515 22.2454 4.6786 22.3725 4.83585 22.3725C4.99311 22.3725 5.12021 22.2454 5.12021 22.0889V21.8053H11.945V22.0889C11.945 22.2454 12.0721 22.3725 12.2294 22.3725C12.3866 22.3725 12.5137 22.2454 12.5137 22.0889V21.5217C12.5138 21.3652 12.3866 21.2381 12.2294 21.2381Z"
- />
- <path
- d="M4.83585 20.6696C4.99311 20.6696 5.12021 20.5427 5.12021 20.3862V9.33167C5.12021 9.17522 4.99311 9.04823 4.83585 9.04823C4.6786 9.04823 4.5515 9.17522 4.5515 9.33167V20.3862C4.55146 20.5427 4.6786 20.6696 4.83585 20.6696Z"
- />
- <path
- d="M12.2303 8.76618C12.073 8.76618 11.9459 8.89317 11.9459 9.04962V20.3876C11.9459 20.544 12.073 20.671 12.2303 20.671C12.3876 20.671 12.5147 20.544 12.5147 20.3876V9.04962C12.5147 8.89317 12.3876 8.76618 12.2303 8.76618Z"
- />
- <path
- d="M16.7668 11.603C16.6095 11.603 16.4824 11.73 16.4824 11.8865V12.1699H13.3543C13.1971 12.1699 13.07 12.2969 13.07 12.4533C13.07 12.6098 13.1971 12.7368 13.3543 12.7368H16.4824V20.7255C16.3928 20.6938 16.2981 20.6734 16.198 20.6734C16.1489 20.6734 16.0999 20.6776 16.0519 20.6861C15.856 20.3338 15.482 20.1065 15.0606 20.1065C14.6392 20.1065 14.2652 20.3338 14.0693 20.6861C14.0212 20.6776 13.9723 20.6734 13.9231 20.6734C13.4528 20.6734 13.07 21.0549 13.07 21.5237C13.07 21.9925 13.4528 22.3741 13.9231 22.3741H16.1981C16.6684 22.3741 17.0512 21.9925 17.0512 21.5237V11.8865C17.0511 11.73 16.924 11.603 16.7668 11.603ZM16.198 21.8072H13.9231C13.7661 21.8072 13.6387 21.68 13.6387 21.5238C13.6387 21.3676 13.7661 21.2403 13.9231 21.2403C13.9774 21.2403 14.0294 21.2559 14.0772 21.2865C14.1551 21.3367 14.2524 21.3458 14.3382 21.3109C14.4241 21.2763 14.4872 21.2021 14.5086 21.1122C14.5683 20.854 14.7952 20.6734 15.0605 20.6734C15.3258 20.6734 15.5525 20.854 15.6125 21.1122C15.6338 21.2021 15.6969 21.2763 15.7828 21.3109C15.8687 21.3458 15.9659 21.3367 16.0438 21.2865C16.2295 21.1675 16.4823 21.3132 16.4823 21.5238C16.4824 21.68 16.355 21.8072 16.198 21.8072Z"
- />
- <path
- d="M12.9462 7.95689L8.68064 5.40584C8.5905 5.3517 8.4779 5.3517 8.38775 5.40584L4.12224 7.95689C3.98775 8.03737 3.94396 8.21143 4.025 8.34579C4.10575 8.47985 4.28007 8.5235 4.41516 8.44272L8.53422 5.97926L12.6533 8.44272C12.6991 8.47022 12.7497 8.48324 12.7994 8.48324C12.8961 8.48324 12.9902 8.43421 13.0434 8.34576C13.1244 8.21143 13.0806 8.0374 12.9462 7.95689Z"
- />
- <path
- d="M13.651 19.2554C13.651 19.4119 13.7781 19.5388 13.9354 19.5388H15.0728C15.2301 19.5388 15.3572 19.4119 15.3572 19.2554V17.5547C15.3572 17.3983 15.2301 17.2713 15.0728 17.2713H13.9354C13.7781 17.2713 13.651 17.3983 13.651 17.5547V19.2554ZM14.2198 17.8382H14.7885V18.972H14.2198V17.8382Z"
- />
- <path
- d="M13.9354 16.1379H15.0728C15.2301 16.1379 15.3572 16.0109 15.3572 15.8545V14.1538C15.3572 13.9973 15.2301 13.8703 15.0728 13.8703H13.9354C13.7781 13.8703 13.651 13.9973 13.651 14.1538V15.8545C13.651 16.0109 13.7781 16.1379 13.9354 16.1379ZM14.2198 14.4372H14.7885V15.571H14.2198V14.4372Z"
- />
- <path
- d="M8.31732 19.0477C8.26586 19.1015 8.23489 19.1724 8.23489 19.2489C8.23489 19.3226 8.26586 19.3963 8.31732 19.4502C8.37105 19.5012 8.44209 19.5324 8.51913 19.5324C8.59304 19.5324 8.66665 19.5012 8.72094 19.4502C8.7721 19.3964 8.80337 19.3226 8.80337 19.2489C8.80337 19.1724 8.7721 19.1016 8.72094 19.0477C8.61576 18.9428 8.41938 18.9428 8.31732 19.0477Z"
- />
- <path
- d="M6.25312 15.8545C6.25312 16.0109 6.38022 16.1379 6.53748 16.1379H7.67493C7.83219 16.1379 7.95929 16.0109 7.95929 15.8545V14.1538C7.95929 13.9973 7.83219 13.8703 7.67493 13.8703H6.53748C6.38022 13.8703 6.25312 13.9973 6.25312 14.1538V15.8545ZM6.82187 14.4372H7.39061V15.571H6.82187V14.4372Z"
- />
- <path
- d="M9.38389 13.8703C9.22663 13.8703 9.09953 13.9973 9.09953 14.1538V15.8545C9.09953 16.0109 9.22663 16.1379 9.38389 16.1379H10.5213C10.6786 16.1379 10.8057 16.0109 10.8057 15.8545V14.1538C10.8057 13.9973 10.6786 13.8703 10.5213 13.8703H9.38389ZM10.237 15.571H9.66825V14.4372H10.237V15.571Z"
- />
- <path
- d="M8.52807 7.63435C7.27371 7.63435 6.25312 8.65165 6.25312 9.90196C6.25312 11.1523 7.27371 12.1696 8.52807 12.1696C9.78243 12.1696 10.803 11.1523 10.803 9.90196C10.803 8.65165 9.78243 7.63435 8.52807 7.63435ZM8.52807 11.6026C7.58709 11.6026 6.82187 10.8399 6.82187 9.90192C6.82187 8.96398 7.58709 8.20123 8.52807 8.20123C9.46905 8.20123 10.2343 8.96398 10.2343 9.90192C10.2343 10.8399 9.46905 11.6026 8.52807 11.6026Z"
- />
- <path
- d="M5.68937 17.5547C5.68937 17.7112 5.81647 17.8381 5.97373 17.8381H6.82683V20.3892C6.82683 20.5456 6.95393 20.6726 7.11118 20.6726C7.26844 20.6726 7.39554 20.5456 7.39554 20.3892V17.8381H9.67049V20.3892C9.67049 20.5456 9.79759 20.6726 9.95485 20.6726C10.1121 20.6726 10.2392 20.5456 10.2392 20.3892V17.8381H11.0923C11.2496 17.8381 11.3767 17.7112 11.3767 17.5547C11.3767 17.3983 11.2496 17.2713 11.0923 17.2713H5.97369C5.81647 17.2713 5.68937 17.3983 5.68937 17.5547Z"
- />
- <path
- d="M35.76 19.0093H35.4758V18.159C35.4758 18.0025 35.3488 17.8756 35.1916 17.8756C35.0345 17.8756 34.9074 18.0025 34.9074 18.159V19.2927C34.9074 19.4492 35.0345 19.5762 35.1916 19.5762H35.7601C35.9173 19.5762 36.0443 19.4492 36.0443 19.2927C36.0443 19.1363 35.9172 19.0093 35.76 19.0093Z"
- />
- <path
- d="M30.0761 26.3806H28.9387C28.7814 26.3806 28.6543 26.5076 28.6543 26.6641V28.3648C28.6543 28.5212 28.7814 28.6482 28.9387 28.6482H30.0761C30.2334 28.6482 30.3605 28.5212 30.3605 28.3648V26.6641C30.3605 26.5076 30.2334 26.3806 30.0761 26.3806ZM29.7918 28.0813H29.223V26.9476H29.7918L29.7918 28.0813Z"
- />
- <path
- d="M30.3605 23.2631C30.3605 23.1067 30.2334 22.9797 30.0761 22.9797H28.9387C28.7814 22.9797 28.6543 23.1067 28.6543 23.2631V24.9638C28.6543 25.1203 28.7814 25.2473 28.9387 25.2473H30.0761C30.2334 25.2473 30.3605 25.1203 30.3605 24.9638L30.3605 23.2631ZM29.7918 24.6804H29.223V23.5466H29.7918L29.7918 24.6804Z"
- />
- <path
- d="M30.9303 21.5627C30.9303 21.4063 30.8032 21.2793 30.646 21.2793H27.5179V20.9958C27.5179 20.8394 27.3908 20.7124 27.2336 20.7124C27.0763 20.7124 26.9492 20.8394 26.9492 20.9958V30.6331C26.9492 31.1019 27.332 31.4835 27.8023 31.4835H30.0773C30.5476 31.4835 30.9304 31.1019 30.9304 30.6331C30.9304 30.1643 30.5476 29.7828 30.0773 29.7828C30.0281 29.7828 29.9792 29.787 29.9311 29.7955C29.7352 29.4432 29.3612 29.2159 28.9398 29.2159C28.5184 29.2159 28.1444 29.4432 27.9485 29.7955C27.9005 29.787 27.8515 29.7828 27.8024 29.7828C27.702 29.7828 27.6073 29.8032 27.518 29.8349V21.8462H30.6461C30.8032 21.8462 30.9303 21.7192 30.9303 21.5627ZM27.8023 30.3497C27.8566 30.3497 27.9086 30.3653 27.9564 30.3959C28.0341 30.446 28.1316 30.4551 28.2175 30.4203C28.3034 30.3857 28.3665 30.3114 28.3878 30.2216C28.4475 29.9633 28.6745 29.7828 28.9398 29.7828C29.2051 29.7828 29.4317 29.9633 29.4917 30.2216C29.5131 30.3114 29.5762 30.3857 29.6621 30.4203C29.748 30.4551 29.8452 30.4461 29.9231 30.3959C30.1086 30.2768 30.3616 30.4225 30.3616 30.6331C30.3616 30.7893 30.2342 30.9166 30.0773 30.9166H27.8023C27.6453 30.9166 27.5179 30.7893 27.5179 30.6331C27.5179 30.4769 27.6453 30.3497 27.8023 30.3497Z"
- />
- <path
- d="M39.1786 30.3475H31.7851C31.6278 30.3475 31.5007 30.4746 31.5007 30.6311V31.1983C31.5007 31.3548 31.6278 31.4818 31.7851 31.4818C31.9423 31.4818 32.0694 31.3548 32.0694 31.1983V30.9147H38.8942V31.1983C38.8942 31.3548 39.0213 31.4818 39.1786 31.4818C39.3359 31.4818 39.463 31.3548 39.463 31.1983V30.6311C39.463 30.4746 39.3359 30.3475 39.1786 30.3475Z"
- />
- <path
- d="M31.7851 29.779C31.9423 29.779 32.0694 29.652 32.0694 29.4956V18.441C32.0694 18.2846 31.9423 18.1576 31.7851 18.1576C31.6278 18.1576 31.5007 18.2846 31.5007 18.441V29.4956C31.5007 29.652 31.6278 29.779 31.7851 29.779Z"
- />
- <path
- d="M39.1795 17.8756C39.0223 17.8756 38.8952 18.0025 38.8952 18.159V29.497C38.8952 29.6534 39.0223 29.7804 39.1795 29.7804C39.3368 29.7804 39.4639 29.6534 39.4639 29.497V18.159C39.4639 18.0025 39.3368 17.8756 39.1795 17.8756Z"
- />
- <path
- d="M43.716 20.7124C43.5587 20.7124 43.4316 20.8394 43.4316 20.9958V21.2793H40.3036C40.1463 21.2793 40.0192 21.4063 40.0192 21.5627C40.0192 21.7192 40.1463 21.8462 40.3036 21.8462H43.4316V29.8349C43.342 29.8031 43.2473 29.7827 43.1473 29.7827C43.0981 29.7827 43.0492 29.787 43.0011 29.7955C42.8052 29.4432 42.4312 29.2158 42.0098 29.2158C41.5884 29.2158 41.2144 29.4432 41.0185 29.7955C40.9704 29.787 40.9215 29.7827 40.8723 29.7827C40.402 29.7827 40.0192 30.1643 40.0192 30.6331C40.0192 31.1019 40.402 31.4834 40.8723 31.4834H43.1473C43.6176 31.4834 44.0004 31.1019 44.0004 30.6331V20.9959C44.0003 20.8394 43.8732 20.7124 43.716 20.7124ZM43.1472 30.9166H40.8723C40.7153 30.9166 40.5879 30.7893 40.5879 30.6332C40.5879 30.477 40.7153 30.3497 40.8723 30.3497C40.9266 30.3497 40.9786 30.3653 41.0264 30.3959C41.1043 30.4461 41.2016 30.4551 41.2875 30.4203C41.3733 30.3857 41.4365 30.3114 41.4578 30.2216C41.5175 29.9634 41.7444 29.7828 42.0097 29.7828C42.2751 29.7828 42.5017 29.9634 42.5617 30.2216C42.583 30.3114 42.6461 30.3857 42.732 30.4203C42.8179 30.4552 42.9151 30.4461 42.9931 30.3959C43.1787 30.2769 43.4315 30.4226 43.4315 30.6332C43.4316 30.7893 43.3042 30.9166 43.1472 30.9166Z"
- />
- <path
- d="M39.8954 17.0663L35.6299 14.5152C35.5397 14.4611 35.4271 14.4611 35.337 14.5152L31.0715 17.0663C30.937 17.1467 30.8932 17.3208 30.9742 17.4552C31.055 17.5892 31.2293 17.6329 31.3644 17.5521L35.4834 15.0886L39.6025 17.5521C39.6483 17.5796 39.6989 17.5926 39.7486 17.5926C39.8453 17.5926 39.9395 17.5436 39.9926 17.4551C40.0737 17.3208 40.0299 17.1468 39.8954 17.0663Z"
- />
- <path
- d="M40.6003 28.3648C40.6003 28.5212 40.7273 28.6482 40.8846 28.6482H42.0221C42.1793 28.6482 42.3064 28.5212 42.3064 28.3648V26.6641C42.3064 26.5076 42.1793 26.3806 42.0221 26.3806H40.8846C40.7273 26.3806 40.6003 26.5076 40.6003 26.6641V28.3648ZM41.169 26.9476H41.7377V28.0813H41.169V26.9476Z"
- />
- <path
- d="M40.8846 25.2473H42.0221C42.1793 25.2473 42.3064 25.1203 42.3064 24.9638V23.2631C42.3064 23.1067 42.1793 22.9797 42.0221 22.9797H40.8846C40.7273 22.9797 40.6003 23.1067 40.6003 23.2631V24.9638C40.6003 25.1203 40.7273 25.2473 40.8846 25.2473ZM41.169 23.5466H41.7377V24.6804H41.169V23.5466Z"
- />
- <path
- d="M35.2665 28.1571C35.2151 28.2109 35.1841 28.2818 35.1841 28.3583C35.1841 28.432 35.2151 28.5057 35.2665 28.5596C35.3203 28.6106 35.3913 28.6418 35.4684 28.6418C35.5423 28.6418 35.6159 28.6106 35.6702 28.5596C35.7213 28.5057 35.7526 28.432 35.7526 28.3583C35.7526 28.2818 35.7213 28.2109 35.6702 28.1571C35.565 28.0522 35.3686 28.0522 35.2665 28.1571Z"
- />
- <path
- d="M33.2023 24.9638C33.2023 25.1203 33.3294 25.2473 33.4867 25.2473H34.6242C34.7814 25.2473 34.9085 25.1203 34.9085 24.9638V23.2631C34.9085 23.1067 34.7814 22.9797 34.6242 22.9797H33.4867C33.3294 22.9797 33.2023 23.1067 33.2023 23.2631V24.9638ZM33.7711 23.5466H34.3398V24.6804H33.7711V23.5466Z"
- />
- <path
- d="M36.3331 22.9797C36.1759 22.9797 36.0488 23.1067 36.0488 23.2631V24.9638C36.0488 25.1203 36.1759 25.2473 36.3331 25.2473H37.4706C37.6278 25.2473 37.7549 25.1203 37.7549 24.9638V23.2631C37.7549 23.1067 37.6278 22.9797 37.4706 22.9797H36.3331ZM37.1862 24.6804H36.6175V23.5466H37.1862V24.6804Z"
- />
- <path
- d="M35.4773 16.7437C34.2229 16.7437 33.2023 17.761 33.2023 19.0113C33.2023 20.2616 34.2229 21.2789 35.4773 21.2789C36.7316 21.2789 37.7522 20.2616 37.7522 19.0113C37.7522 17.761 36.7316 16.7437 35.4773 16.7437ZM35.4773 20.712C34.5363 20.712 33.7711 19.9492 33.7711 19.0113C33.7711 18.0734 34.5363 17.3106 35.4773 17.3106C36.4183 17.3106 37.1835 18.0734 37.1835 19.0113C37.1835 19.9492 36.4183 20.712 35.4773 20.712Z"
- />
- <path
- d="M32.6386 26.6641C32.6386 26.8205 32.7657 26.9475 32.9229 26.9475H33.776V29.4986C33.776 29.655 33.9031 29.782 34.0604 29.782C34.2177 29.782 34.3448 29.655 34.3448 29.4986V26.9475H36.6197V29.4986C36.6197 29.655 36.7468 29.782 36.9041 29.782C37.0613 29.782 37.1884 29.655 37.1884 29.4986V26.9475H38.0415C38.1988 26.9475 38.3259 26.8205 38.3259 26.6641C38.3259 26.5076 38.1988 26.3806 38.0415 26.3806H32.9229C32.7657 26.3806 32.6386 26.5076 32.6386 26.6641Z"
- />
- </g>
- <g [ngClass]="[twMerge('stroke-primary', class)]">
- <path
- d="M7.41198 24.2393C7.42035 27.0539 8.37002 29.7843 10.0992 31.9656C11.8283 34.1468 14.23 35.6438 16.895 36.2014C19.5599 36.7591 22.3233 36.343 24.7142 35.024C25.8791 34.3813 26.9205 33.5436 27.8015 32.5532M4.12891 29.2798L7.04768 24.0215L12.1392 27.0791"
- stroke-width="2"
- stroke-linejoin="round"
- />
- <path
- d="M33.745 13.2033C33.7367 10.3888 32.787 7.65832 31.0578 5.4771C29.3287 3.29588 26.927 1.7989 24.262 1.24122C21.5971 0.683541 18.8337 1.09967 16.4428 2.4187C15.2779 3.06137 14.2365 3.89902 13.3555 4.88946M37.0281 8.16288L34.1093 13.4212L29.0178 10.3635"
- stroke-width="2"
- stroke-linejoin="round"
- />
- </g>
-</svg>
diff --git a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.spec.ts
deleted file mode 100644
index 3513bce21c..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PublicAdministrationIconComponent } from './public-administration-icon.component';
-
-describe('PublicAdministrationIconComponent', () => {
- let component: PublicAdministrationIconComponent;
- let fixture: ComponentFixture<PublicAdministrationIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [PublicAdministrationIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(PublicAdministrationIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.ts
deleted file mode 100644
index 7135b5af6e..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-@Component({
- selector: 'ods-public-administration-icon',
- standalone: true,
- imports: [CommonModule],
- templateUrl: './public-administration-icon.component.html',
-})
-export class PublicAdministrationIconComponent {
- @Input() class: string = undefined;
-
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.stories.ts
deleted file mode 100644
index 9762fb3709..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/public-administration-icon/public-administration-icon.stories.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { PublicAdministrationIconComponent } from './public-administration-icon.component';
-
-const meta: Meta<PublicAdministrationIconComponent> = {
- title: 'Icons/Public administration icon',
- component: PublicAdministrationIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<PublicAdministrationIconComponent>;
-
-export const Default: Story = {};
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts
index b2fffc3af3..c695366e66 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component.spec.ts
@@ -28,8 +28,10 @@ import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-sh
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { toResource } from 'libs/tech-shared/test/resource';
import { createOrganisationsEinheit } from 'libs/zustaendige-stelle-shared/test/organisations-einheit';
+import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { OrganisationsEinheitListItemContainerComponent } from './organisations-einheit-list-item-container.component';
+import { OrganisationsEinheitListItemComponent } from './organisations-einheit-list-item/organisations-einheit-list-item.component';
describe('OrganisationsEinheitListItemContainerComponent', () => {
let component: OrganisationsEinheitListItemContainerComponent;
@@ -47,7 +49,9 @@ describe('OrganisationsEinheitListItemContainerComponent', () => {
getOrganisationsEinheit: jest.fn().mockReturnValue(of(organisationsEInheitStateResource)),
};
- await TestBed.configureTestingModule({ imports: [OrganisationsEinheitListItemContainerComponent] })
+ await TestBed.configureTestingModule({
+ imports: [OrganisationsEinheitListItemContainerComponent, MockComponent(OrganisationsEinheitListItemComponent)],
+ })
.overrideComponent(OrganisationsEinheitListItemContainerComponent, {
set: {
providers: [{ provide: OrganisationsEinheitResourceService, useValue: organisationsEinheitResourceService }],
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html
index 809541ff23..8ee981db8c 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html
@@ -28,7 +28,7 @@
<div class="border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
<div class="flex flex-1 gap-6">
<div class="flex flex-1 gap-3">
- <ods-public-administration-icon />
+ <ods-icon name="public-administration" size="unset" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Organisationseinheit</p>
<p class="font-bold text-text">{{ resource.name }}</p>
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.spec.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.spec.ts
index 849e99bf1b..e5775383a4 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.spec.ts
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.spec.ts
@@ -25,8 +25,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createStateResource, StateResource } from '@alfa-client/tech-shared';
import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
+import { IconComponent } from '@ods/system';
import { toResource } from 'libs/tech-shared/test/resource';
import { createOrganisationsEinheit } from 'libs/zustaendige-stelle-shared/test/organisations-einheit';
+import { MockComponent } from 'ng-mocks';
import { OrganisationsEinheitListItemComponent } from './organisations-einheit-list-item.component';
describe('OrganisationsEinheitListItemComponent', () => {
@@ -39,7 +41,7 @@ describe('OrganisationsEinheitListItemComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [OrganisationsEinheitListItemComponent],
+ imports: [OrganisationsEinheitListItemComponent, MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(OrganisationsEinheitListItemComponent);
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
index 266ad33a8a..ae6eeec58e 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
@@ -25,12 +25,12 @@ import { StateResource } from '@alfa-client/tech-shared';
import { SpinnerComponent } from '@alfa-client/ui';
import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
import { Component, Input } from '@angular/core';
-import { PublicAdministrationIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
@Component({
selector: 'alfa-organisations-einheit-list-item',
standalone: true,
- imports: [PublicAdministrationIconComponent, SpinnerComponent],
+ imports: [IconComponent, SpinnerComponent],
templateUrl: './organisations-einheit-list-item.component.html',
})
export class OrganisationsEinheitListItemComponent {
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
index cdc9cdec3d..1a6f560ec2 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
@@ -29,7 +29,7 @@
[subTitle]="organisationsEinheitResource.name"
[isSubTitleBold]="true"
>
- <ods-public-administration-icon icon />
+ <ods-icon icon name="public-administration" size="unset" />
<alfa-organisations-einheit
data-test-id="organisations-einheit-in-collaboration"
[organisationsEinheitResource]="organisationsEinheitResource"
@@ -41,7 +41,7 @@
</ng-container>
<ng-template #searchButton>
<alfa-zustaendige-stelle-header title="Öffentliche Verwaltung" subTitle="Kommune, Amt, Ministerium">
- <ods-public-administration-icon icon />
+ <ods-icon icon name="public-administration" size="unset" />
<alfa-zustaendige-stelle-button title="Zuständige Stelle auswählen" dataTestId="organisations-einheit-search-button" />
</alfa-zustaendige-stelle-header>
</ng-template>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts
index 811d795ad3..3e2edb8f47 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts
@@ -30,7 +30,7 @@ import {
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormControl } from '@angular/forms';
import { getUrl } from '@ngxp/rest';
-import { PublicAdministrationIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createOrganisationsEinheitResource } from 'libs/zustaendige-stelle-shared/test/organisations-einheit';
import { MockComponent } from 'ng-mocks';
@@ -72,7 +72,7 @@ describe('SearchOrganisationsEinheitContainerComponent', () => {
MockComponent(OrganisationsEinheitComponent),
MockComponent(ZustaendigeStelleButtonComponent),
MockComponent(ZustaendigeStelleHeaderComponent),
- MockComponent(PublicAdministrationIconComponent),
+ MockComponent(IconComponent),
MockComponent(EditZustaendigeStelleButtonComponent),
],
providers: [
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index 0d6d6ee902..d7b0a49b0c 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -24,7 +24,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ButtonComponent, IconComponent, InstantSearchComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent, InstantSearchComponent } from '@ods/system';
import { ZustaendigeStelleSharedModule } from 'libs/zustaendige-stelle-shared/src/lib/zustaendige-stelle-shared.module';
import { EditZustaendigeStelleButtonComponent } from './edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component';
import { SearchExterneFachstelleContainerComponent } from './search-externe-fachstelle-container/search-externe-fachstelle-container.component';
@@ -46,7 +46,6 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
ReactiveFormsModule,
ZustaendigeStelleSharedModule,
IconComponent,
- PublicAdministrationIconComponent,
],
declarations: [
SearchOrganisationsEinheitContainerComponent,
--
GitLab
From a0535d7b39f46451abf39a41a40922966a5d00ba Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Mon, 7 Apr 2025 15:42:42 +0200
Subject: [PATCH 30/36] OZG-7707 add new icon to info app
---
alfa-client/apps/info/project.json | 10 +-
.../apps/info/src/app/app.component.html | 2 +-
.../apps/info/src/app/app.component.spec.ts | 4 +-
.../apps/info/src/app/app.component.ts | 4 +-
alfa-client/apps/info/src/app/app.config.ts | 8 +-
alfa-client/libs/design-system/src/index.ts | 1 -
.../ozg-logo-icon.component.html | 159 ------------------
.../ozg-logo-icon.component.spec.ts | 21 ---
.../ozg-logo-icon/ozg-logo-icon.component.ts | 10 --
.../ozg-logo-icon/ozg-logo-icon.stories.ts | 15 --
10 files changed, 22 insertions(+), 212 deletions(-)
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.html
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.spec.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.ts
delete mode 100644 alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.stories.ts
diff --git a/alfa-client/apps/info/project.json b/alfa-client/apps/info/project.json
index 38c9788b9f..fd9afdcd09 100644
--- a/alfa-client/apps/info/project.json
+++ b/alfa-client/apps/info/project.json
@@ -16,7 +16,15 @@
"polyfills": ["zone.js"],
"tsConfig": "apps/info/tsconfig.app.json",
"inlineStyleLanguage": "scss",
- "assets": ["apps/info/src/favicon.svg", "apps/info/src/assets"],
+ "assets": [
+ "apps/info/src/favicon.svg",
+ "apps/info/src/assets",
+ {
+ "input": "libs/design-system/src/assets",
+ "glob": "**/*",
+ "output": "assets/icons"
+ }
+ ],
"styles": ["apps/info/src/styles.scss"],
"scripts": [],
"stylePreprocessorOptions": {
diff --git a/alfa-client/apps/info/src/app/app.component.html b/alfa-client/apps/info/src/app/app.component.html
index b30e793d25..42663f0f82 100644
--- a/alfa-client/apps/info/src/app/app.component.html
+++ b/alfa-client/apps/info/src/app/app.component.html
@@ -4,7 +4,7 @@
aria-label="OZG-Cloud Information"
routerLink="/"
>
- <ods-ozg-logo-icon />
+ <ods-icon name="ozg-logo" class="h-auto w-16" />
</a>
</header>
<div class="relative flex w-full flex-auto flex-col justify-center gap-14 p-6">
diff --git a/alfa-client/apps/info/src/app/app.component.spec.ts b/alfa-client/apps/info/src/app/app.component.spec.ts
index a9aef32a46..c9435dcd17 100644
--- a/alfa-client/apps/info/src/app/app.component.spec.ts
+++ b/alfa-client/apps/info/src/app/app.component.spec.ts
@@ -1,7 +1,9 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { provideRouter } from '@angular/router';
+import { IconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { MockComponent } from 'ng-mocks';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
@@ -12,7 +14,7 @@ describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [AppComponent],
+ imports: [AppComponent, MockComponent(IconComponent)],
providers: [provideRouter([])],
}).compileComponents();
diff --git a/alfa-client/apps/info/src/app/app.component.ts b/alfa-client/apps/info/src/app/app.component.ts
index 65ebf90d0d..79ad1c3873 100644
--- a/alfa-client/apps/info/src/app/app.component.ts
+++ b/alfa-client/apps/info/src/app/app.component.ts
@@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { RouterModule } from '@angular/router';
-import { OzgLogoIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
import { environment } from '../environments/environment';
@Component({
standalone: true,
- imports: [RouterModule, OzgLogoIconComponent],
+ imports: [RouterModule, IconComponent],
selector: 'app-root',
templateUrl: './app.component.html',
})
diff --git a/alfa-client/apps/info/src/app/app.config.ts b/alfa-client/apps/info/src/app/app.config.ts
index 422eab26e2..dc485d9658 100644
--- a/alfa-client/apps/info/src/app/app.config.ts
+++ b/alfa-client/apps/info/src/app/app.config.ts
@@ -1,7 +1,13 @@
+import { provideHttpClient } from '@angular/common/http';
import { ApplicationConfig } from '@angular/core';
import { provideRouter, withInMemoryScrolling } from '@angular/router';
+import { provideAngularSvgIcon } from 'angular-svg-icon';
import { appRoutes } from './app.routes';
export const appConfig: ApplicationConfig = {
- providers: [provideRouter(appRoutes, withInMemoryScrolling({ scrollPositionRestoration: 'enabled' }))],
+ providers: [
+ provideRouter(appRoutes, withInMemoryScrolling({ scrollPositionRestoration: 'enabled' })),
+ provideHttpClient(),
+ provideAngularSvgIcon(),
+ ],
};
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 94d26b160a..be39753a4e 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -47,7 +47,6 @@ export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
-export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
export * from './lib/instant-search/instant-search/instant-search.component';
export * from './lib/instant-search/instant-search/instant-search.model';
diff --git a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.html b/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.html
deleted file mode 100644
index 766aba86f0..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<svg data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 233.91">
- <defs>
- <style>
- .cls-1 {
- fill: #001e49;
- }
-
- .cls-2 {
- clip-path: url(#clippath-4);
- }
-
- .cls-3 {
- fill: none;
- }
-
- .cls-4 {
- clip-path: url(#clippath-1);
- }
-
- .cls-5 {
- clip-path: url(#clippath-5);
- }
-
- .cls-6 {
- clip-path: url(#clippath-3);
- }
-
- .cls-7 {
- fill: url(#Unbenannter_Verlauf_11);
- }
-
- .cls-8 {
- fill: url(#Unbenannter_Verlauf_11-2);
- }
-
- .cls-9 {
- clip-path: url(#clippath-2);
- }
-
- .cls-10 {
- clip-path: url(#clippath);
- }
-
- .cls-11 {
- fill: #003064;
- }
- </style>
- <linearGradient
- id="Unbenannter_Verlauf_11"
- data-name="Unbenannter Verlauf 11"
- x1="0"
- y1="216.4"
- x2="36.09"
- y2="216.4"
- gradientUnits="userSpaceOnUse"
- >
- <stop offset="0" stop-color="#003064" />
- <stop offset="1" stop-color="#d4004b" />
- </linearGradient>
- <linearGradient
- id="Unbenannter_Verlauf_11-2"
- data-name="Unbenannter Verlauf 11"
- x1="168.58"
- y1="105.58"
- x2="229.31"
- y2="105.58"
- xlink:href="#Unbenannter_Verlauf_11"
- />
- <clipPath id="clippath">
- <path
- class="cls-3"
- d="M188.53,149.59c0,12.64-10.26,22.96-22.89,22.96s-22.14-9.47-22.82-21.5c0-18.49-12.83-34.05-30.05-38.24,7.68-2.48,13.76-8.54,16.21-16.24,4.18,17.28,19.67,30.13,38.02,30.13,12.06.68,21.53,10.73,21.53,22.89Z"
- />
- </clipPath>
- <clipPath id="clippath-1">
- <rect class="cls-3" x="107.77" y="91.57" width="85.76" height="85.97" />
- </clipPath>
- <clipPath id="clippath-2">
- <rect class="cls-3" x="107.77" y="91.57" width="85.76" height="85.97" />
- </clipPath>
- <clipPath id="clippath-3">
- <path
- class="cls-3"
- d="M188.53,27.96c0,12.16-9.45,22.2-21.44,22.89-21.26,0-38.65,17.15-39.2,38.37-.02.36-.02.71-.02,1.07-.66,11.73-10.22,20.97-21.94,21.48h-.09c-.29.02-.61.02-.91.02-1.25,0-2.47-.09-3.68-.32-.36-.07-.73-.14-1.09-.21-1.07-.21-2.09-.5-3.09-.87-1.27-.48-2.48-1.05-3.63-1.73-.36-.2-.7-.41-1.02-.64-.09-.05-.18-.11-.27-.18-.45-.3-.89-.61-1.29-.93-.07-.05-.14-.09-.2-.18-.52-.41-1.02-.84-1.5-1.3-.3-.3-.59-.59-.89-.91-1-1.02-1.86-2.14-2.61-3.35-.18-.3-.36-.61-.55-.91-.55-.91-1.02-1.89-1.41-2.89-.41-1-.75-2.05-1-3.12-.09-.36-.18-.71-.23-1.07-.07-.36-.14-.73-.18-1.09-.11-.73-.18-1.48-.23-2.23-.02-.34-.02-.68-.02-1.02,0-.48.02-.93.05-1.39.05-.66.11-1.32.2-1.98.07-.52.16-1.05.27-1.57.02-.05.02-.09.05-.11.09-.52.23-1.05.39-1.55.09-.32.2-.66.32-.98.11-.34.25-.71.39-1.05.23-.57.48-1.14.75-1.69.2-.43.43-.84.66-1.23.39-.68.82-1.34,1.27-1.98.36-.52.75-1.02,1.16-1.5.02-.02.05-.05.07-.07.25-.3.5-.57.77-.84.2-.23.41-.43.61-.64.32-.32.64-.61.98-.89.29-.27.59-.52.91-.75.73-.59,1.5-1.12,2.29-1.59.5-.3,1-.57,1.52-.82.3-.18.61-.32.93-.46.23-.11.45-.21.7-.3.23-.11.48-.21.73-.27,2-.75,4.13-1.21,6.36-1.32h.29c.68,0,1.36-.02,2.02-.07h.07c20.62-1.23,37.02-18.38,37.02-39.19.68-12.09,10.7-21.59,22.82-21.59s22.89,10.32,22.89,22.96Z"
- />
- </clipPath>
- <clipPath id="clippath-4">
- <rect class="cls-3" x="77.04" y="0" width="116.49" height="116.78" />
- </clipPath>
- <clipPath id="clippath-5">
- <rect class="cls-3" x="77.04" y="0" width="116.49" height="116.78" />
- </clipPath>
- </defs>
- <g>
- <path
- class="cls-7"
- d="M18.02,233.91c-10.35,0-18.02-7.14-18.02-17.65s7.68-17.37,18.02-17.37,18.07,6.71,18.07,17.37-7.68,17.65-18.07,17.65ZM18.02,206.12c-5.62,0-9.46,4.32-9.46,10.14s3.89,10.33,9.46,10.33,9.5-4.32,9.5-10.33-3.89-10.14-9.5-10.14Z"
- />
- <path class="cls-1" d="M45.69,233.02v-6.95l15.77-19.48h-15.4v-6.81h25.42v6.43l-16.15,19.86h16.48v6.95h-26.12Z" />
- <path
- class="cls-1"
- d="M100.7,233.86c-10.58,0-18.21-7.04-18.21-17.51s7.86-17.46,17.98-17.46c5.19,0,10.02,1.74,12.78,4.41l-5.06,5.77c-1.54-1.78-4.21-3.1-7.44-3.1-5.62,0-9.74,4.41-9.74,10.37s3.6,10.47,10.11,10.47c1.87,0,3.6-.28,5.01-.89v-6.06h-6.32v-6.48h13.67v17.6c-3.23,1.69-7.68,2.86-12.78,2.86Z"
- />
- <path class="cls-1" d="M125.33,223.77v-6.1h11.89v6.1h-11.89Z" />
- <path
- class="cls-1"
- d="M177.95,228.09c-2.76,3.57-6.51,5.82-12.08,5.82-9.97,0-17.09-7.37-17.09-17.51s7.26-17.51,17.13-17.51c4.87,0,9.04,1.69,11.42,4.84l-1.92,1.78c-1.92-2.44-5.38-4.23-9.46-4.23-8.85,0-14.37,6.85-14.37,15.12s5.52,15.12,14.37,15.12c3.89,0,7.16-1.17,10.16-4.88l1.83,1.45Z"
- />
- <path class="cls-1" d="M193.68,233.02h-2.53v-35.49h2.53v35.49Z" />
- <path
- class="cls-1"
- d="M219.38,233.63c-6.74,0-11.47-4.93-11.47-11.55s4.73-11.5,11.47-11.5,11.52,4.88,11.52,11.5-4.73,11.55-11.52,11.55ZM219.38,212.78c-5.43,0-8.85,4.08-8.85,9.29s3.42,9.25,8.85,9.25,8.9-3.99,8.9-9.25-3.42-9.29-8.9-9.29Z"
- />
- <path
- class="cls-1"
- d="M261.05,233.02c-.14-1.17-.19-3.19-.19-4.32h-.09c-1.26,3-4.45,4.93-7.77,4.93-5.76,0-8.19-3.99-8.19-9.11v-13.38h2.57v12.39c0,4.32,1.31,7.93,6.18,7.93,3.75,0,7.21-3.1,7.21-9.2v-11.13h2.53v16.85c0,1.27.09,3.57.24,5.02h-2.48Z"
- />
- <path
- class="cls-1"
- d="M297.33,228.7c-1.87,3.19-5.29,4.93-8.71,4.93-6.65,0-11.14-5.02-11.14-11.55s4.5-11.5,11.14-11.5c3.42,0,6.84,1.69,8.71,5.02h.1v-18.07h2.57v35.49h-2.57v-4.32h-.1ZM288.86,231.42c5.15,0,8.85-4.08,8.85-9.34s-3.7-9.39-8.85-9.39c-5.48,0-8.71,4.27-8.71,9.39s3.23,9.34,8.71,9.34Z"
- />
- </g>
- <g>
- <g>
- <path
- class="cls-11"
- d="M203.5,83.95h-40.58c-5.02,0-9.08-4.08-9.08-9.11s4.07-9.11,9.08-9.11h40.58c5.02,0,9.08,4.08,9.08,9.11s-4.07,9.11-9.08,9.11Z"
- />
- <path
- class="cls-8"
- d="M220.23,114.69h-42.57c-5.02,0-9.08-4.08-9.08-9.11s4.07-9.11,9.08-9.11h42.57c5.02,0,9.08,4.08,9.08,9.11s-4.07,9.11-9.08,9.11Z"
- />
- </g>
- <g class="cls-10">
- <g class="cls-4">
- <g class="cls-9">
- <image
- width="180"
- height="180"
- transform="translate(107.58 91.49) scale(.48)"
- xlink:href="data:image/png;base64,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"
- />
- </g>
- </g>
- </g>
- <g class="cls-6">
- <g class="cls-2">
- <g class="cls-5">
- <image
- width="244"
- height="244"
- transform="translate(76.86 -.19) scale(.48)"
- xlink:href="data:image/png;base64,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"
- />
- </g>
- </g>
- </g>
- </g>
-</svg>
diff --git a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.spec.ts
deleted file mode 100644
index 2a8851d3a6..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OzgLogoIconComponent } from './ozg-logo-icon.component';
-
-describe('OzgLogoIconComponent', () => {
- let component: OzgLogoIconComponent;
- let fixture: ComponentFixture<OzgLogoIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [OzgLogoIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(OzgLogoIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.ts
deleted file mode 100644
index 1d1736aceb..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'ods-ozg-logo-icon',
- standalone: true,
- imports: [CommonModule],
- templateUrl: './ozg-logo-icon.component.html',
-})
-export class OzgLogoIconComponent {}
diff --git a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.stories.ts
deleted file mode 100644
index 6a02cd6c80..0000000000
--- a/alfa-client/libs/design-system/src/lib/icons/ozg-logo-icon/ozg-logo-icon.stories.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { OzgLogoIconComponent } from './ozg-logo-icon.component';
-
-const meta: Meta<OzgLogoIconComponent> = {
- title: 'Icons/OZG logo icon',
- component: OzgLogoIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<OzgLogoIconComponent>;
-
-export const Default: Story = {};
--
GitLab
From 384390ecad1446fd6b2bd4f7164ddcc146c15774 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 8 Apr 2025 10:57:23 +0200
Subject: [PATCH 31/36] OZG-7707 move aria-hidden from icons to component
---
alfa-client/apps/admin/src/app/app.component.html | 2 +-
alfa-client/apps/demo/src/app/app.component.html | 2 +-
.../externe-fachstelle-container.component.html | 2 +-
.../organisations-einheit-container.component.html | 2 +-
.../libs/design-system/src/assets/accessibility.svg | 2 +-
.../libs/design-system/src/assets/account-circle.svg | 2 +-
alfa-client/libs/design-system/src/assets/admin-logo.svg | 2 +-
alfa-client/libs/design-system/src/assets/archive.svg | 2 +-
alfa-client/libs/design-system/src/assets/arrow-back.svg | 2 +-
alfa-client/libs/design-system/src/assets/attachment.svg | 2 +-
.../libs/design-system/src/assets/bescheid-generate.svg | 2 +-
.../libs/design-system/src/assets/bescheid-upload.svg | 2 +-
.../libs/design-system/src/assets/check-circle.svg | 2 +-
alfa-client/libs/design-system/src/assets/check.svg | 2 +-
alfa-client/libs/design-system/src/assets/close.svg | 2 +-
.../design-system/src/assets/delete-vorgang-finally.svg | 2 +-
alfa-client/libs/design-system/src/assets/delete.svg | 2 +-
.../libs/design-system/src/assets/discard-vorgang.svg | 2 +-
alfa-client/libs/design-system/src/assets/edit.svg | 2 +-
alfa-client/libs/design-system/src/assets/error.svg | 2 +-
.../libs/design-system/src/assets/exclamation.svg | 2 +-
.../libs/design-system/src/assets/forward-vorgang.svg | 2 +-
alfa-client/libs/design-system/src/assets/help.svg | 2 +-
alfa-client/libs/design-system/src/assets/info.svg | 2 +-
alfa-client/libs/design-system/src/assets/logout.svg | 2 +-
alfa-client/libs/design-system/src/assets/more.svg | 2 +-
alfa-client/libs/design-system/src/assets/office.svg | 2 +-
alfa-client/libs/design-system/src/assets/open-link.svg | 2 +-
alfa-client/libs/design-system/src/assets/orga-unit.svg | 2 +-
alfa-client/libs/design-system/src/assets/plus.svg | 2 +-
.../src/assets/request-vorgang-deletion.svg | 2 +-
alfa-client/libs/design-system/src/assets/save.svg | 2 +-
alfa-client/libs/design-system/src/assets/search.svg | 2 +-
alfa-client/libs/design-system/src/assets/send.svg | 2 +-
alfa-client/libs/design-system/src/assets/settings.svg | 2 +-
alfa-client/libs/design-system/src/assets/stamp.svg | 2 +-
alfa-client/libs/design-system/src/assets/statistic.svg | 2 +-
.../src/assets/undo-request-vorgang-deletion.svg | 2 +-
alfa-client/libs/design-system/src/assets/undo.svg | 2 +-
alfa-client/libs/design-system/src/assets/update.svg | 2 +-
alfa-client/libs/design-system/src/assets/user.svg | 2 +-
alfa-client/libs/design-system/src/assets/users.svg | 2 +-
.../libs/design-system/src/lib/icon/icon.component.ts | 9 ++++++---
.../externe-fachstelle-list-item.component.html | 2 +-
.../organisations-einheit-list-item.component.html | 2 +-
.../search-externe-fachstelle-container.component.html | 4 ++--
...search-organisations-einheit-container.component.html | 4 ++--
47 files changed, 54 insertions(+), 51 deletions(-)
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index 4a9d3f0ffe..e3f678a098 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -34,7 +34,7 @@
routerLink="/"
data-test-id="logo-link"
>
- <ods-icon name="admin-logo" size="unset" />
+ <ods-icon name="admin-logo" size="full" />
</a>
<user-profile-button-container
[apiRootStateResource]="apiRootStateResource$ | async"
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index fd0d2b4c32..778bcbc872 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -64,7 +64,7 @@
<ods-icon name="accessibility" size="large" fill="error" />
<ods-icon name="accessibility" class="fill-red-500" />
<ods-icon name="accessibility" size="small" />
- <ods-icon name="admin-logo" size="unset" />
+ <ods-icon name="admin-logo" size="full" />
</div>
<h1 class="mb-6 text-2xl font-semibold text-text">Auswertungen</h1>
<ods-button text="Auswertung hinzufügen" />
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
index 5f062757f3..80b24af5bb 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
@@ -37,7 +37,7 @@
</ng-container>
<ng-template #anfrageErstellenButton>
<div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
- <ods-icon name="external-unit" size="unset" />
+ <ods-icon name="external-unit" size="full" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Externe Fachstelle</p>
<p class="text-text">Private Organisation, Verein, Schule</p>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
index e9b0fde49e..b7d68a92c3 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
@@ -37,7 +37,7 @@
</ng-container>
<ng-template #anfrageErstellenButton>
<div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
- <ods-icon name="public-administration" size="unset" />
+ <ods-icon name="public-administration" size="full" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Öffentliche Verwaltung</p>
<p class="text-text">Kommune, Amt, Ministerium</p>
diff --git a/alfa-client/libs/design-system/src/assets/accessibility.svg b/alfa-client/libs/design-system/src/assets/accessibility.svg
index 5f0c8a9197..aae97169d3 100644
--- a/alfa-client/libs/design-system/src/assets/accessibility.svg
+++ b/alfa-client/libs/design-system/src/assets/accessibility.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
<rect x="2" y="2" width="22" height="22" rx="11" />
<path
d="M13 8.87508C12.6828 8.87508 12.3726 8.781 12.1088 8.60473C11.845 8.42846 11.6394 8.17793 11.518 7.8848C11.3966 7.59168 11.3648 7.26914 11.4267 6.95796C11.4886 6.64678 11.6414 6.36095 11.8657 6.1366C12.0901 5.91225 12.3759 5.75947 12.6871 5.69757C12.9983 5.63568 13.3208 5.66744 13.6139 5.78886C13.907 5.91027 14.1576 6.11588 14.3339 6.37969C14.5101 6.64349 14.6042 6.95364 14.6042 7.27092C14.6038 7.69623 14.4346 8.10399 14.1339 8.40473C13.8331 8.70547 13.4253 8.87463 13 8.87508Z"
diff --git a/alfa-client/libs/design-system/src/assets/account-circle.svg b/alfa-client/libs/design-system/src/assets/account-circle.svg
index e6e1d1517a..689d2b5404 100644
--- a/alfa-client/libs/design-system/src/assets/account-circle.svg
+++ b/alfa-client/libs/design-system/src/assets/account-circle.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M12.75 2C7.23 2 2.75 6.48 2.75 12C2.75 17.52 7.23 22 12.75 22C18.27 22 22.75 17.52 22.75 12C22.75 6.48 18.27 2 12.75 2ZM7.82 18.28C8.25 17.38 10.87 16.5 12.75 16.5C14.63 16.5 17.26 17.38 17.68 18.28C16.32 19.36 14.61 20 12.75 20C10.89 20 9.18 19.36 7.82 18.28ZM19.11 16.83C17.68 15.09 14.21 14.5 12.75 14.5C11.29 14.5 7.82 15.09 6.39 16.83C5.37 15.49 4.75 13.82 4.75 12C4.75 7.59 8.34 4 12.75 4C17.16 4 20.75 7.59 20.75 12C20.75 13.82 20.13 15.49 19.11 16.83ZM12.75 6C10.81 6 9.25 7.56 9.25 9.5C9.25 11.44 10.81 13 12.75 13C14.69 13 16.25 11.44 16.25 9.5C16.25 7.56 14.69 6 12.75 6ZM12.75 11C11.92 11 11.25 10.33 11.25 9.5C11.25 8.67 11.92 8 12.75 8C13.58 8 14.25 8.67 14.25 9.5C14.25 10.33 13.58 11 12.75 11Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/admin-logo.svg b/alfa-client/libs/design-system/src/assets/admin-logo.svg
index f26c24debf..09b36728eb 100644
--- a/alfa-client/libs/design-system/src/assets/admin-logo.svg
+++ b/alfa-client/libs/design-system/src/assets/admin-logo.svg
@@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" width="143" height="38"
- viewBox="0 0 143 38" aria-hidden="true">
+ viewBox="0 0 143 38">
<g clip-path="url(#a)">
<path fill="#003064"
d="M28.747 17.906h-9.604c-1.188 0-2.15-.925-2.15-2.065s.963-2.066 2.15-2.066h9.604c1.187 0 2.15.926 2.15 2.066 0 1.14-.963 2.065-2.15 2.065Z" />
diff --git a/alfa-client/libs/design-system/src/assets/archive.svg b/alfa-client/libs/design-system/src/assets/archive.svg
index cca0b02d27..afec31e1cf 100644
--- a/alfa-client/libs/design-system/src/assets/archive.svg
+++ b/alfa-client/libs/design-system/src/assets/archive.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M4.96804 21L2.85693 9H21.8569L19.7458 21H4.96804ZM6.7361 19H17.9778L19.3236 11H5.39027L6.7361 19ZM10.2458 15H14.468C14.7671 15 15.0178 14.9042 15.2201 14.7125C15.4224 14.5208 15.5236 14.2833 15.5236 14C15.5236 13.7167 15.4224 13.4792 15.2201 13.2875C15.0178 13.0958 14.7671 13 14.468 13H10.2458C9.94675 13 9.69605 13.0958 9.49374 13.2875C9.29142 13.4792 9.19027 13.7167 9.19027 14C9.19027 14.2833 9.29142 14.5208 9.49374 14.7125C9.69605 14.9042 9.94675 15 10.2458 15ZM6.0236 8C5.72453 8 5.47383 7.90417 5.27152 7.7125C5.0692 7.52083 4.96804 7.28333 4.96804 7C4.96804 6.71667 5.0692 6.47917 5.27152 6.2875C5.47383 6.09583 5.72453 6 6.0236 6H18.6903C18.9893 6 19.24 6.09583 19.4424 6.2875C19.6447 6.47917 19.7458 6.71667 19.7458 7C19.7458 7.28333 19.6447 7.52083 19.4424 7.7125C19.24 7.90417 18.9893 8 18.6903 8H6.0236ZM8.13471 5C7.83564 5 7.58494 4.90417 7.38263 4.7125C7.18031 4.52083 7.07916 4.28333 7.07916 4C7.07916 3.71667 7.18031 3.47917 7.38263 3.2875C7.58494 3.09583 7.83564 3 8.13471 3H16.5792C16.8782 3 17.1289 3.09583 17.3312 3.2875C17.5336 3.47917 17.6347 3.71667 17.6347 4C17.6347 4.28333 17.5336 4.52083 17.3312 4.7125C17.1289 4.90417 16.8782 5 16.5792 5H8.13471Z" />
<path
diff --git a/alfa-client/libs/design-system/src/assets/arrow-back.svg b/alfa-client/libs/design-system/src/assets/arrow-back.svg
index 61a866594a..aabf69479a 100644
--- a/alfa-client/libs/design-system/src/assets/arrow-back.svg
+++ b/alfa-client/libs/design-system/src/assets/arrow-back.svg
@@ -1,3 +1,3 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M20.75 11H8.58L14.17 5.41L12.75 4L4.75 12L12.75 20L14.16 18.59L8.58 13H20.75V11Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/attachment.svg b/alfa-client/libs/design-system/src/assets/attachment.svg
index aaeff270ef..19083d518f 100644
--- a/alfa-client/libs/design-system/src/assets/attachment.svg
+++ b/alfa-client/libs/design-system/src/assets/attachment.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 16 25">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 25">
<path
d="M15.874 17c0 2.08-.73 3.85-2.19 5.31-1.46 1.46-3.23 2.19-5.31 2.19-2.08 0-3.85-.73-5.31-2.19C1.604 20.85.874 19.08.874 17V5.9c0-1.5.525-2.775 1.575-3.825C3.499 1.025 4.774.5 6.274.5s2.775.525 3.825 1.575c1.05 1.05 1.575 2.325 1.575 3.825v10.5c0 .92-.32 1.7-.96 2.34-.64.64-1.42.96-2.34.96-.92 0-1.7-.32-2.34-.96-.64-.64-.96-1.42-.96-2.34V5.3h2.4v11.1c0 .26.085.475.255.645.17.17.385.255.645.255s.475-.085.645-.255a.874.874 0 0 0 .255-.645V5.9c-.02-.84-.315-1.55-.885-2.13-.57-.58-1.275-.87-2.115-.87-.84 0-1.55.29-2.13.87-.58.58-.87 1.29-.87 2.13V17c-.02 1.42.47 2.625 1.47 3.615 1 .99 2.21 1.485 3.63 1.485 1.4 0 2.59-.495 3.57-1.485.98-.99 1.49-2.195 1.53-3.615V5.3h2.4V17Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/bescheid-generate.svg b/alfa-client/libs/design-system/src/assets/bescheid-generate.svg
index ed128fff26..8bdd8a1f5d 100644
--- a/alfa-client/libs/design-system/src/assets/bescheid-generate.svg
+++ b/alfa-client/libs/design-system/src/assets/bescheid-generate.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 32 40">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 40">
<path d="M32 12 20 0H4C1.8 0 .02 1.8.02 4L0 36c0 2.2 1.78 4 3.98 4H28c2.2 0 4-1.8 4-4V12Zm-4 24H4V4h14v10h10v22Z" />
<path d="M18.273 2.86H2.856v34.285h26.429V13.574H18.273V2.86Z" />
<circle cx="16" cy="20" r="11.5" stroke="#fff" stroke-opacity=".3" stroke-width="3" />
diff --git a/alfa-client/libs/design-system/src/assets/bescheid-upload.svg b/alfa-client/libs/design-system/src/assets/bescheid-upload.svg
index 11e83845c1..ea682be253 100644
--- a/alfa-client/libs/design-system/src/assets/bescheid-upload.svg
+++ b/alfa-client/libs/design-system/src/assets/bescheid-upload.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="none" viewBox="0 0 32 40">
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 40">
<path d="M32 12 20 0H4C1.8 0 .02 1.8.02 4L0 36c0 2.2 1.78 4 3.98 4H28c2.2 0 4-1.8 4-4V12Zm-4 24H4V4h14v10h10v22Z" />
<path d="M18.273 2.86H2.856v34.285h26.429V13.574H18.273V2.86Z" />
<path fill="#FEFEFE"
diff --git a/alfa-client/libs/design-system/src/assets/check-circle.svg b/alfa-client/libs/design-system/src/assets/check-circle.svg
index 39e7d50a3a..83f1930135 100644
--- a/alfa-client/libs/design-system/src/assets/check-circle.svg
+++ b/alfa-client/libs/design-system/src/assets/check-circle.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M22 5.18L10.59 16.6L6.35 12.36L7.76 10.95L10.59 13.78L20.59 3.78L22 5.18ZM19.79 10.22C19.92 10.79 20 11.39 20 12C20 16.42 16.42 20 12 20C7.58 20 4 16.42 4 12C4 7.58 7.58 4 12 4C13.58 4 15.04 4.46 16.28 5.25L17.72 3.81C16.1 2.67 14.13 2 12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 10.81 21.78 9.67 21.4 8.61L19.79 10.22Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/check.svg b/alfa-client/libs/design-system/src/assets/check.svg
index c046b477f5..d64b370d6b 100644
--- a/alfa-client/libs/design-system/src/assets/check.svg
+++ b/alfa-client/libs/design-system/src/assets/check.svg
@@ -1,3 +1,3 @@
-<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M9.55 18L3.85 12.3L5.275 10.875L9.55 15.15L18.725 5.975L20.15 7.4L9.55 18Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/close.svg b/alfa-client/libs/design-system/src/assets/close.svg
index 08970d6eb3..27f1b66079 100644
--- a/alfa-client/libs/design-system/src/assets/close.svg
+++ b/alfa-client/libs/design-system/src/assets/close.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path
d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg b/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg
index 955bcaad76..234ed181cd 100644
--- a/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg
+++ b/alfa-client/libs/design-system/src/assets/delete-vorgang-finally.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M17.7366 13V3.11101H12.4405L7.74777 8.05811L7.74777 13H5.75V8.05811C5.75 7.49738 5.96112 6.95968 6.3368 6.56365L11.0296 1.61654C11.4041 1.22173 11.9115 1 12.4405 1H17.7366C18.8399 1 19.7344 1.94513 19.7344 3.11101V13H17.7366Z" />
<path
diff --git a/alfa-client/libs/design-system/src/assets/delete.svg b/alfa-client/libs/design-system/src/assets/delete.svg
index a19f68607f..0860838030 100644
--- a/alfa-client/libs/design-system/src/assets/delete.svg
+++ b/alfa-client/libs/design-system/src/assets/delete.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M7 21C6.45 21 5.97917 20.8042 5.5875 20.4125C5.19583 20.0208 5 19.55 5 19V6H4V4H9V3H15V4H20V6H19V19C19 19.55 18.8042 20.0208 18.4125 20.4125C18.0208 20.8042 17.55 21 17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/discard-vorgang.svg b/alfa-client/libs/design-system/src/assets/discard-vorgang.svg
index 71bb09f3d5..f7c8d2393d 100644
--- a/alfa-client/libs/design-system/src/assets/discard-vorgang.svg
+++ b/alfa-client/libs/design-system/src/assets/discard-vorgang.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M12.75 19.4L14.35 21L16.75 18.6286L19.15 21L20.75 19.4L18.3786 17L20.75 14.6L19.15 13L16.75 15.4L14.35 13L12.75 14.6L15.15 17L12.75 19.4Z" />
<path fill-rule="evenodd" clip-rule="evenodd"
diff --git a/alfa-client/libs/design-system/src/assets/edit.svg b/alfa-client/libs/design-system/src/assets/edit.svg
index 8aa1db91fd..b7d856cf83 100644
--- a/alfa-client/libs/design-system/src/assets/edit.svg
+++ b/alfa-client/libs/design-system/src/assets/edit.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M5 19H6.425L16.2 9.225L14.775 7.8L5 17.575V19ZM3 21V16.75L16.2 3.575C16.4 3.39167 16.6208 3.25 16.8625 3.15C17.1042 3.05 17.3583 3 17.625 3C17.8917 3 18.15 3.05 18.4 3.15C18.65 3.25 18.8667 3.4 19.05 3.6L20.425 5C20.625 5.18333 20.7708 5.4 20.8625 5.65C20.9542 5.9 21 6.15 21 6.4C21 6.66667 20.9542 6.92083 20.8625 7.1625C20.7708 7.40417 20.625 7.625 20.425 7.825L7.25 21H3ZM15.475 8.525L14.775 7.8L16.2 9.225L15.475 8.525Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/error.svg b/alfa-client/libs/design-system/src/assets/error.svg
index a6b6a8ad0d..e9500c7420 100644
--- a/alfa-client/libs/design-system/src/assets/error.svg
+++ b/alfa-client/libs/design-system/src/assets/error.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M12 17C12.2833 17 12.5208 16.9042 12.7125 16.7125C12.9042 16.5208 13 16.2833 13 16C13 15.7167 12.9042 15.4792 12.7125 15.2875C12.5208 15.0958 12.2833 15 12 15C11.7167 15 11.4792 15.0958 11.2875 15.2875C11.0958 15.4792 11 15.7167 11 16C11 16.2833 11.0958 16.5208 11.2875 16.7125C11.4792 16.9042 11.7167 17 12 17ZM11 13H13V7H11V13ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/exclamation.svg b/alfa-client/libs/design-system/src/assets/exclamation.svg
index 330adc7d46..884b58338e 100644
--- a/alfa-client/libs/design-system/src/assets/exclamation.svg
+++ b/alfa-client/libs/design-system/src/assets/exclamation.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 20 20">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
<path
d="M10.3069 14.7308C10.5416 14.7308 10.7383 14.6533 10.8971 14.4985C11.0559 14.3437 11.1353 14.1518 11.1353 13.923C11.1353 13.6942 11.0559 13.5023 10.8971 13.3475C10.7383 13.1928 10.5416 13.1155 10.3069 13.1155C10.0722 13.1155 9.87548 13.1928 9.71668 13.3475C9.55789 13.5023 9.47849 13.6942 9.47849 13.923C9.47849 14.1518 9.55789 14.3437 9.71668 14.4985C9.87548 14.6533 10.0722 14.7308 10.3069 14.7308ZM10.3072 11.077C10.5253 11.077 10.7079 11.0051 10.8551 10.8613C11.0024 10.7176 11.0761 10.5395 11.0761 10.327V5.827C11.0761 5.6145 11.0023 5.43633 10.8548 5.2925C10.7073 5.14883 10.5246 5.077 10.3066 5.077C10.0885 5.077 9.9059 5.14883 9.75873 5.2925C9.61139 5.43633 9.53772 5.6145 9.53772 5.827V10.327C9.53772 10.5395 9.61148 10.7176 9.75899 10.8613C9.9065 11.0051 10.0892 11.077 10.3072 11.077ZM10.3087 19.5C8.96109 19.5 7.69442 19.2507 6.50868 18.752C5.32295 18.2533 4.29156 17.5766 3.41452 16.7218C2.53748 15.8669 1.84308 14.8617 1.33132 13.706C0.81973 12.5503 0.563934 11.3156 0.563934 10.0017C0.563934 8.68775 0.819644 7.45267 1.33106 6.2965C1.84248 5.14033 2.53654 4.13467 3.41324 3.2795C4.28994 2.42433 5.3209 1.74725 6.50612 1.24825C7.69134 0.749417 8.95767 0.5 10.3051 0.5C11.6527 0.5 12.9194 0.749333 14.1051 1.248C15.2909 1.74667 16.3222 2.42342 17.1993 3.27825C18.0763 4.13308 18.7707 5.13833 19.2825 6.294C19.7941 7.44967 20.0499 8.68442 20.0499 9.99825C20.0499 11.3123 19.7942 12.5473 19.2827 13.7035C18.7713 14.8597 18.0773 15.8653 17.2006 16.7205C16.3239 17.5757 15.2929 18.2528 14.1077 18.7518C12.9225 19.2506 11.6561 19.5 10.3087 19.5Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/forward-vorgang.svg b/alfa-client/libs/design-system/src/assets/forward-vorgang.svg
index 7f5ccf6422..2e616b460f 100644
--- a/alfa-client/libs/design-system/src/assets/forward-vorgang.svg
+++ b/alfa-client/libs/design-system/src/assets/forward-vorgang.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M17.7222 16.4V14L22 18.2L17.7222 22.4V19.94C14.6667 19.94 12.5278 20.9 11 23C11.6111 20 13.4444 17 17.7222 16.4Z" />
<path fill-rule="evenodd" clip-rule="evenodd"
diff --git a/alfa-client/libs/design-system/src/assets/help.svg b/alfa-client/libs/design-system/src/assets/help.svg
index 03b7bf7b89..558327f920 100644
--- a/alfa-client/libs/design-system/src/assets/help.svg
+++ b/alfa-client/libs/design-system/src/assets/help.svg
@@ -1,4 +1,4 @@
-<svg aria-hidden="true" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M11.95 18C12.3 18 12.5958 17.8792 12.8375 17.6375C13.0792 17.3958 13.2 17.1 13.2 16.75C13.2 16.4 13.0792 16.1042 12.8375 15.8625C12.5958 15.6208 12.3 15.5 11.95 15.5C11.6 15.5 11.3042 15.6208 11.0625 15.8625C10.8208 16.1042 10.7 16.4 10.7 16.75C10.7 17.1 10.8208 17.3958 11.0625 17.6375C11.3042 17.8792 11.6 18 11.95 18ZM11.05 14.15H12.9C12.9 13.6 12.9625 13.1667 13.0875 12.85C13.2125 12.5333 13.5667 12.1 14.15 11.55C14.5833 11.1167 14.925 10.7042 15.175 10.3125C15.425 9.92083 15.55 9.45 15.55 8.9C15.55 7.96667 15.2083 7.25 14.525 6.75C13.8417 6.25 13.0333 6 12.1 6C11.15 6 10.3792 6.25 9.7875 6.75C9.19583 7.25 8.78333 7.85 8.55 8.55L10.2 9.2C10.2833 8.9 10.4708 8.575 10.7625 8.225C11.0542 7.875 11.5 7.7 12.1 7.7C12.6333 7.7 13.0333 7.84583 13.3 8.1375C13.5667 8.42917 13.7 8.75 13.7 9.1C13.7 9.43333 13.6 9.74583 13.4 10.0375C13.2 10.3292 12.95 10.6 12.65 10.85C11.9167 11.5 11.4667 11.9917 11.3 12.325C11.1333 12.6583 11.05 13.2667 11.05 14.15ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/info.svg b/alfa-client/libs/design-system/src/assets/info.svg
index 84304b828d..50c6c22e8c 100644
--- a/alfa-client/libs/design-system/src/assets/info.svg
+++ b/alfa-client/libs/design-system/src/assets/info.svg
@@ -1,4 +1,4 @@
-<svg aria-hidden="true" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M11.25 16.75H12.75V11H11.25V16.75ZM12 9.2885C12.2288 9.2885 12.4207 9.21108 12.5755 9.05625C12.7303 8.90142 12.8077 8.70958 12.8077 8.48075C12.8077 8.25192 12.7303 8.06008 12.5755 7.90525C12.4207 7.75058 12.2288 7.67325 12 7.67325C11.7712 7.67325 11.5793 7.75058 11.4245 7.90525C11.2697 8.06008 11.1923 8.25192 11.1923 8.48075C11.1923 8.70958 11.2697 8.90142 11.4245 9.05625C11.5793 9.21108 11.7712 9.2885 12 9.2885ZM12.0017 21.5C10.6877 21.5 9.45267 21.2507 8.2965 20.752C7.14033 20.2533 6.13467 19.5766 5.2795 18.7218C4.42433 17.8669 3.74725 16.8617 3.24825 15.706C2.74942 14.5503 2.5 13.3156 2.5 12.0017C2.5 10.6877 2.74933 9.45267 3.248 8.2965C3.74667 7.14033 4.42342 6.13467 5.27825 5.2795C6.13308 4.42433 7.13833 3.74725 8.294 3.24825C9.44967 2.74942 10.6844 2.5 11.9983 2.5C13.3123 2.5 14.5473 2.74933 15.7035 3.248C16.8597 3.74667 17.8653 4.42342 18.7205 5.27825C19.5757 6.13308 20.2528 7.13833 20.7518 8.294C21.2506 9.44967 21.5 10.6844 21.5 11.9983C21.5 13.3123 21.2507 14.5473 20.752 15.7035C20.2533 16.8597 19.5766 17.8653 18.7218 18.7205C17.8669 19.5757 16.8617 20.2528 15.706 20.7518C14.5503 21.2506 13.3156 21.5 12.0017 21.5ZM12 20C14.2333 20 16.125 19.225 17.675 17.675C19.225 16.125 20 14.2333 20 12C20 9.76667 19.225 7.875 17.675 6.325C16.125 4.775 14.2333 4 12 4C9.76667 4 7.875 4.775 6.325 6.325C4.775 7.875 4 9.76667 4 12C4 14.2333 4.775 16.125 6.325 17.675C7.875 19.225 9.76667 20 12 20Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/logout.svg b/alfa-client/libs/design-system/src/assets/logout.svg
index 5294c26bd3..fa25346b8c 100644
--- a/alfa-client/libs/design-system/src/assets/logout.svg
+++ b/alfa-client/libs/design-system/src/assets/logout.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M5 21C4.45 21 3.97917 20.8042 3.5875 20.4125C3.19583 20.0208 3 19.55 3 19V5C3 4.45 3.19583 3.97917 3.5875 3.5875C3.97917 3.19583 4.45 3 5 3H12V5H5V19H12V21H5ZM16 17L14.625 15.55L17.175 13H9V11H17.175L14.625 8.45L16 7L21 12L16 17Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/more.svg b/alfa-client/libs/design-system/src/assets/more.svg
index f7830ecca8..92d6caf778 100644
--- a/alfa-client/libs/design-system/src/assets/more.svg
+++ b/alfa-client/libs/design-system/src/assets/more.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M6 14C5.45 14 4.97917 13.8042 4.5875 13.4125C4.19583 13.0208 4 12.55 4 12C4 11.45 4.19583 10.9792 4.5875 10.5875C4.97917 10.1958 5.45 10 6 10C6.55 10 7.02083 10.1958 7.4125 10.5875C7.80417 10.9792 8 11.45 8 12C8 12.55 7.80417 13.0208 7.4125 13.4125C7.02083 13.8042 6.55 14 6 14ZM12 14C11.45 14 10.9792 13.8042 10.5875 13.4125C10.1958 13.0208 10 12.55 10 12C10 11.45 10.1958 10.9792 10.5875 10.5875C10.9792 10.1958 11.45 10 12 10C12.55 10 13.0208 10.1958 13.4125 10.5875C13.8042 10.9792 14 11.45 14 12C14 12.55 13.8042 13.0208 13.4125 13.4125C13.0208 13.8042 12.55 14 12 14ZM18 14C17.45 14 16.9792 13.8042 16.5875 13.4125C16.1958 13.0208 16 12.55 16 12C16 11.45 16.1958 10.9792 16.5875 10.5875C16.9792 10.1958 17.45 10 18 10C18.55 10 19.0208 10.1958 19.4125 10.5875C19.8042 10.9792 20 11.45 20 12C20 12.55 19.8042 13.0208 19.4125 13.4125C19.0208 13.8042 18.55 14 18 14Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/office.svg b/alfa-client/libs/design-system/src/assets/office.svg
index b106ec7355..d7a626b609 100644
--- a/alfa-client/libs/design-system/src/assets/office.svg
+++ b/alfa-client/libs/design-system/src/assets/office.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M2 21V4.75L7 1L12 4.75V7H22V21H2ZM4 19H6V17H4V19ZM4 15H6V13H4V15ZM4 11H6V9H4V11ZM4 7H6V5H4V7ZM8 7H10V5H8V7ZM8 19H20V9H8V19ZM14 13V11H18V13H14ZM14 17V15H18V17H14ZM10 13V11H12V13H10ZM10 17V15H12V17H10Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/open-link.svg b/alfa-client/libs/design-system/src/assets/open-link.svg
index 3ee831d0bf..b76b85957b 100644
--- a/alfa-client/libs/design-system/src/assets/open-link.svg
+++ b/alfa-client/libs/design-system/src/assets/open-link.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path
d="M5 21c-.55 0-1.02-.196-1.413-.587A1.926 1.926 0 0 1 3 19V5c0-.55.196-1.02.587-1.413A1.926 1.926 0 0 1 5 3h7v2H5v14h14v-7h2v7c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 19 21H5Zm4.7-5.3-1.4-1.4L17.6 5H14V3h7v7h-2V6.4l-9.3 9.3Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/orga-unit.svg b/alfa-client/libs/design-system/src/assets/orga-unit.svg
index b74d1307d8..24f5315bdd 100644
--- a/alfa-client/libs/design-system/src/assets/orga-unit.svg
+++ b/alfa-client/libs/design-system/src/assets/orga-unit.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path fill-rule="evenodd"
d="M3 2.25a.75.75 0 0 0 0 1.5v16.5h-.75a.75.75 0 0 0 0 1.5H15v-18a.75.75 0 0 0 0-1.5H3ZM6.75 19.5v-2.25a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75v2.25a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75ZM6 6.75A.75.75 0 0 1 6.75 6h.75a.75.75 0 0 1 0 1.5h-.75A.75.75 0 0 1 6 6.75ZM6.75 9a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM6 12.75a.75.75 0 0 1 .75-.75h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 6a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75Zm-.75 3.75A.75.75 0 0 1 10.5 9h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 12a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM16.5 6.75v15h5.25a.75.75 0 0 0 0-1.5H21v-12a.75.75 0 0 0 0-1.5h-4.5Zm1.5 4.5a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Zm.75 2.25a.75.75 0 0 0-.75.75v.008c0 .414.336.75.75.75h.008a.75.75 0 0 0 .75-.75v-.008a.75.75 0 0 0-.75-.75h-.008ZM18 17.25a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Z"
clip-rule="evenodd" />
diff --git a/alfa-client/libs/design-system/src/assets/plus.svg b/alfa-client/libs/design-system/src/assets/plus.svg
index 673de9ce3a..e069c06f41 100644
--- a/alfa-client/libs/design-system/src/assets/plus.svg
+++ b/alfa-client/libs/design-system/src/assets/plus.svg
@@ -1,3 +1,3 @@
-<svg aria-hidden="true" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M11 13H5V11H11V5H13V11H19V13H13V19H11V13Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg b/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg
index 1b1a479253..72ce55b535 100644
--- a/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg
+++ b/alfa-client/libs/design-system/src/assets/request-vorgang-deletion.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M11.75 8H13.75V12.15L15.35 10.6L16.75 12L12.75 16L8.75 12L10.15 10.6L11.75 12.15V8Z" />
<path
d="M7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z" />
diff --git a/alfa-client/libs/design-system/src/assets/save.svg b/alfa-client/libs/design-system/src/assets/save.svg
index c97a1ea3dd..a0d06f5a6d 100644
--- a/alfa-client/libs/design-system/src/assets/save.svg
+++ b/alfa-client/libs/design-system/src/assets/save.svg
@@ -1,4 +1,4 @@
-<svg aria-hidden="true" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path
d="M25.3333 16V25.3333H6.66667V16H4V25.3333C4 26.8 5.2 28 6.66667 28H25.3333C26.8 28 28 26.8 28 25.3333V16H25.3333ZM17.3333 16.8933L20.7867 13.4533L22.6667 15.3333L16 22L9.33333 15.3333L11.2133 13.4533L14.6667 16.8933V4H17.3333V16.8933Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/search.svg b/alfa-client/libs/design-system/src/assets/search.svg
index 9e138b8a79..fef2d7fec7 100644
--- a/alfa-client/libs/design-system/src/assets/search.svg
+++ b/alfa-client/libs/design-system/src/assets/search.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M15.5 14H14.71L14.43 13.73C15.41 12.59 16 11.11 16 9.5C16 5.91 13.09 3 9.5 3C5.91 3 3 5.91 3 9.5C3 13.09 5.91 16 9.5 16C11.11 16 12.59 15.41 13.73 14.43L14 14.71V15.5L19 20.49L20.49 19L15.5 14ZM9.5 14C7.01 14 5 11.99 5 9.5C5 7.01 7.01 5 9.5 5C11.99 5 14 7.01 14 9.5C14 11.99 11.99 14 9.5 14Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/send.svg b/alfa-client/libs/design-system/src/assets/send.svg
index 2a1e1a931e..e50b77db98 100644
--- a/alfa-client/libs/design-system/src/assets/send.svg
+++ b/alfa-client/libs/design-system/src/assets/send.svg
@@ -1,4 +1,4 @@
-<svg aria-hidden="true" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path
d="M4 26.6688V5.33545L29.3333 16.0021L4 26.6688ZM6.66667 22.6688L22.4667 16.0021L6.66667 9.33545V14.0021L14.6667 16.0021L6.66667 18.0021V22.6688Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/settings.svg b/alfa-client/libs/design-system/src/assets/settings.svg
index 40651bfee5..e6b768b39d 100644
--- a/alfa-client/libs/design-system/src/assets/settings.svg
+++ b/alfa-client/libs/design-system/src/assets/settings.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M 10.490234 2 C 10.011234 2 9.6017656 2.3385938 9.5097656 2.8085938 L 9.1757812 4.5234375 C 8.3550224 4.8338012 7.5961042 5.2674041 6.9296875 5.8144531 L 5.2851562 5.2480469 C 4.8321563 5.0920469 4.33375 5.2793594 4.09375 5.6933594 L 2.5859375 8.3066406 C 2.3469375 8.7216406 2.4339219 9.2485 2.7949219 9.5625 L 4.1132812 10.708984 C 4.0447181 11.130337 4 11.559284 4 12 C 4 12.440716 4.0447181 12.869663 4.1132812 13.291016 L 2.7949219 14.4375 C 2.4339219 14.7515 2.3469375 15.278359 2.5859375 15.693359 L 4.09375 18.306641 C 4.33275 18.721641 4.8321562 18.908906 5.2851562 18.753906 L 6.9296875 18.1875 C 7.5958842 18.734206 8.3553934 19.166339 9.1757812 19.476562 L 9.5097656 21.191406 C 9.6017656 21.661406 10.011234 22 10.490234 22 L 13.509766 22 C 13.988766 22 14.398234 21.661406 14.490234 21.191406 L 14.824219 19.476562 C 15.644978 19.166199 16.403896 18.732596 17.070312 18.185547 L 18.714844 18.751953 C 19.167844 18.907953 19.66625 18.721641 19.90625 18.306641 L 21.414062 15.691406 C 21.653063 15.276406 21.566078 14.7515 21.205078 14.4375 L 19.886719 13.291016 C 19.955282 12.869663 20 12.440716 20 12 C 20 11.559284 19.955282 11.130337 19.886719 10.708984 L 21.205078 9.5625 C 21.566078 9.2485 21.653063 8.7216406 21.414062 8.3066406 L 19.90625 5.6933594 C 19.66725 5.2783594 19.167844 5.0910937 18.714844 5.2460938 L 17.070312 5.8125 C 16.404116 5.2657937 15.644607 4.8336609 14.824219 4.5234375 L 14.490234 2.8085938 C 14.398234 2.3385937 13.988766 2 13.509766 2 L 10.490234 2 z M 12 8 C 14.209 8 16 9.791 16 12 C 16 14.209 14.209 16 12 16 C 9.791 16 8 14.209 8 12 C 8 9.791 9.791 8 12 8 z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/stamp.svg b/alfa-client/libs/design-system/src/assets/stamp.svg
index 77bb27f812..d66c3bc50b 100644
--- a/alfa-client/libs/design-system/src/assets/stamp.svg
+++ b/alfa-client/libs/design-system/src/assets/stamp.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path fill-rule="evenodd"
d="M2.742 21.213h-.409a.872.872 0 0 1-.63-.252.873.873 0 0 1-.253-.631v-3.333A2.557 2.557 0 0 1 4 14.447h4.667a.786.786 0 0 0 .783-.784v-.366c0-1.823-.434-3.522-1.315-4.907a4.388 4.388 0 0 1-.685-2.393c0-1.291.571-2.544 1.511-3.372a4.534 4.534 0 0 1 3.568-1.141c2.01.227 3.678 1.823 3.982 3.802a4.755 4.755 0 0 1-.527 2.973l-.012.02c-.945 1.575-1.422 3.212-1.422 4.818v.566c0 .43.353.784.783.784H20a2.557 2.557 0 0 1 2.55 2.55v3.333a.873.873 0 0 1-.253.63.873.873 0 0 1-.63.253h-.066a2.666 2.666 0 0 1-2.3 1.334H5.032a2.642 2.642 0 0 1-2.29-1.334Zm18.041-1.766v-2.45a.787.787 0 0 0-.783-.784h-4.667a2.557 2.557 0 0 1-2.55-2.55v-.566c0-1.925.555-3.817 1.635-5.7.307-.557.452-1.198.34-1.845-.195-1.196-1.196-2.17-2.415-2.308a2.8 2.8 0 0 0-1.949.51l-.246.202c-.606.496-.93 1.269-.93 2.04 0 .53.137 1.03.417 1.479 1.017 1.648 1.582 3.647 1.582 5.822v.366a2.557 2.557 0 0 1-2.55 2.55H4a.786.786 0 0 0-.783.784v2.45h17.566Z"
clip-rule="evenodd" />
diff --git a/alfa-client/libs/design-system/src/assets/statistic.svg b/alfa-client/libs/design-system/src/assets/statistic.svg
index cdd6483e88..6dc03bef98 100644
--- a/alfa-client/libs/design-system/src/assets/statistic.svg
+++ b/alfa-client/libs/design-system/src/assets/statistic.svg
@@ -1,3 +1,3 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M2 21V19H22V21H2ZM3 18V11H6V18H3ZM8 18V6H11V18H8ZM13 18V9H16V18H13ZM18 18V3H21V18H18Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg b/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg
index a3ee32d8a2..a2e0e88620 100644
--- a/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg
+++ b/alfa-client/libs/design-system/src/assets/undo-request-vorgang-deletion.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M11.75 16H13.75V11.85L15.35 13.4L16.75 12L12.75 8L8.75 12L10.15 13.4L11.75 11.85V16ZM7.75 21C7.2 21 6.72917 20.8042 6.3375 20.4125C5.94583 20.0208 5.75 19.55 5.75 19V6H4.75V4H9.75V3H15.75V4H20.75V6H19.75V19C19.75 19.55 19.5542 20.0208 19.1625 20.4125C18.7708 20.8042 18.3 21 17.75 21H7.75ZM17.75 6H7.75V19H17.75V6Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/undo.svg b/alfa-client/libs/design-system/src/assets/undo.svg
index 2bdb826365..4a6139a989 100644
--- a/alfa-client/libs/design-system/src/assets/undo.svg
+++ b/alfa-client/libs/design-system/src/assets/undo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M13.25 8C10.6 8 8.2 8.99 6.35 10.6L2.75 7V16H11.75L8.13 12.38C9.52 11.22 11.29 10.5 13.25 10.5C16.79 10.5 19.8 12.81 20.85 16L23.22 15.22C21.83 11.03 17.9 8 13.25 8Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/update.svg b/alfa-client/libs/design-system/src/assets/update.svg
index ef6280b2fe..e93e76fbc3 100644
--- a/alfa-client/libs/design-system/src/assets/update.svg
+++ b/alfa-client/libs/design-system/src/assets/update.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M21.75 10.12H14.97L17.71 7.3C14.98 4.6 10.56 4.5 7.83 7.2C5.1 9.91 5.1 14.28 7.83 16.99C10.56 19.7 14.98 19.7 17.71 16.99C19.07 15.65 19.75 14.08 19.75 12.1H21.75C21.75 14.08 20.87 16.65 19.11 18.39C15.6 21.87 9.9 21.87 6.39 18.39C2.89 14.92 2.86 9.28 6.37 5.81C9.88 2.34 15.51 2.34 19.02 5.81L21.75 3V10.12ZM13.25 8V12.25L16.75 14.33L16.03 15.54L11.75 13V8H13.25Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/user.svg b/alfa-client/libs/design-system/src/assets/user.svg
index 4e0d58f849..5202c96d5c 100644
--- a/alfa-client/libs/design-system/src/assets/user.svg
+++ b/alfa-client/libs/design-system/src/assets/user.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 112 112" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<svg viewBox="0 0 112 112" xmlns="http://www.w3.org/2000/svg">
<path
d="M56 0.970734C25.6239 0.970734 0.970886 25.6239 0.970886 56C0.970886 86.3761 25.6239 111.029 56 111.029C86.3761 111.029 111.029 86.3761 111.029 56C111.029 25.6239 86.3761 0.970734 56 0.970734ZM56 17.4795C65.135 17.4795 72.5087 24.8534 72.5087 33.9881C72.5087 43.1232 65.135 50.4969 56 50.4969C46.8652 50.4969 39.4912 43.1232 39.4912 33.9881C39.4912 24.8534 46.8652 17.4795 56 17.4795ZM56 95.621C42.2428 95.621 30.0814 88.5772 22.9825 77.9014C23.1477 66.9506 44.9943 60.9526 56 60.9526C66.9508 60.9526 88.8525 66.9506 89.0175 77.9014C81.9189 88.5772 69.7575 95.621 56 95.621Z" />
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/design-system/src/assets/users.svg b/alfa-client/libs/design-system/src/assets/users.svg
index a2e68f116c..87e03eefa7 100644
--- a/alfa-client/libs/design-system/src/assets/users.svg
+++ b/alfa-client/libs/design-system/src/assets/users.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path
d="M8.404 2.045c-1.492.173-2.878 1.069-3.67 2.374a4.994 4.994 0 0 0 1.03 6.375 4.992 4.992 0 0 0 6.472 0c2.09-1.78 2.34-4.937.558-7.03a5.013 5.013 0 0 0-4.39-1.719m7.283.151a1.06 1.06 0 0 0-.578.504c-.124.239-.119.623.011.877.139.269.317.399.765.557.482.17.726.302 1.048.567.471.389.884 1.062 1.006 1.639.075.352.077.96.004 1.301-.227 1.073-1.048 1.945-2.127 2.258a1.653 1.653 0 0 0-.395.18c-.192.132-.371.436-.405.687-.07.51.339 1.025.872 1.099.213.029.653-.086 1.153-.301.996-.429 1.943-1.34 2.438-2.344.22-.446.32-.734.427-1.226.102-.47.101-1.521-.001-1.994a5.184 5.184 0 0 0-1.913-3.001 5.704 5.704 0 0 0-1.566-.778c-.419-.119-.461-.121-.739-.025M9.632 4.062c.388.079.955.352 1.264.609 1.081.9 1.41 2.384.804 3.629a2.93 2.93 0 0 1-1.4 1.4c-1.245.606-2.729.277-3.629-.804a3.408 3.408 0 0 1-.609-1.264 3.037 3.037 0 0 1 1.042-2.961c.298-.247.872-.529 1.236-.606a3.642 3.642 0 0 1 1.292-.003M5.32 14.061a5.019 5.019 0 0 0-3.837 2.824c-.397.846-.492 1.481-.475 3.166.013 1.345.016 1.36.299 1.642.209.21.391.285.693.285.397 0 .695-.186.893-.556.083-.155.088-.226.111-1.582.027-1.579.032-1.616.313-2.18.398-.8 1.201-1.425 2.051-1.598.462-.093 6.802-.093 7.264 0 .85.173 1.653.798 2.051 1.598.281.564.286.601.313 2.18.027 1.578.025 1.568.311 1.853.209.21.391.285.693.285.397 0 .695-.186.893-.556.083-.154.088-.219.099-1.371.009-.903-.003-1.324-.047-1.66-.153-1.156-.618-2.106-1.424-2.912a4.881 4.881 0 0 0-2.881-1.421c-.588-.079-6.748-.077-7.32.003m13.367.135a1.06 1.06 0 0 0-.578.504c-.124.239-.119.623.011.877.139.269.317.399.768.558.837.295 1.368.736 1.765 1.467.305.561.319.653.344 2.238.026 1.578.024 1.567.31 1.853.209.21.391.285.693.285.302 0 .484-.075.693-.285.29-.29.287-.269.287-1.853 0-1.2-.011-1.474-.071-1.768a4.952 4.952 0 0 0-1.408-2.612 4.39 4.39 0 0 0-1.351-.96c-.37-.175-1.004-.381-1.164-.379a1.458 1.458 0 0 0-.299.075"
fill-rule="evenodd" />
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index d8f6ef0f40..835fe41dfa 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -36,7 +36,6 @@ const iconVariants = cva('', {
large: 'size-8',
'extra-large': 'size-10',
xxl: 'size-12',
- unset: '',
},
fill: {
primary: 'fill-primary',
@@ -57,8 +56,12 @@ type IconVariants = VariantProps<typeof iconVariants>;
selector: 'ods-icon',
standalone: true,
imports: [CommonModule, SvgIconComponent],
- template: `<svg-icon [src]="'assets/icons/' + name + '.svg'" [svgClass]="twMerge(iconVariants({ size, fill }), class)" />`,
- styles: [':host {@apply block w-fit}'],
+ template: `<svg-icon
+ [src]="'assets/icons/' + name + '.svg'"
+ [svgClass]="twMerge(iconVariants({ size, fill }), class)"
+ aria-hidden="true"
+ />`,
+ styles: [':host {@apply block size-fit}'],
})
export class IconComponent {
@Input({ required: true }) name!: string;
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
index 4f9f87ff25..7ec042380f 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
@@ -28,7 +28,7 @@
<div class="border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
<div class="flex flex-1 gap-6">
<div class="flex flex-1 gap-3">
- <ods-icon name="external-unit" size="unset" />
+ <ods-icon name="external-unit" size="full" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Externe Fachstelle</p>
<p class="font-bold text-text">{{ resource.name }}</p>
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html
index 8ee981db8c..5aca27713f 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.html
@@ -28,7 +28,7 @@
<div class="border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
<div class="flex flex-1 gap-6">
<div class="flex flex-1 gap-3">
- <ods-icon name="public-administration" size="unset" />
+ <ods-icon name="public-administration" size="full" />
<div class="flex flex-1 flex-col text-base">
<p class="text-primary">Organisationseinheit</p>
<p class="font-bold text-text">{{ resource.name }}</p>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
index 7bba8e78bd..b4c217c330 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
@@ -25,7 +25,7 @@
-->
<ng-container *ngIf="externeFachstelleResource$ | async as externeFachstelleResource; else searchButton">
<alfa-zustaendige-stelle-header title="Externe Fachstelle" [subTitle]="externeFachstelleResource.name" [isSubTitleBold]="true">
- <ods-icon icon name="external-unit" size="unset" />
+ <ods-icon icon name="external-unit" size="full" />
<div class="flex flex-1 flex-col text-sm text-text" info>
<p>{{ externeFachstelleResource.anschrift }}</p>
<p>{{ 'Email: ' + externeFachstelleResource.email }}</p>
@@ -38,7 +38,7 @@
</ng-container>
<ng-template #searchButton>
<alfa-zustaendige-stelle-header title="Externe Fachstelle" subTitle="Private Organisation, Verein, Schule">
- <ods-icon icon name="external-unit" size="unset" />
+ <ods-icon icon name="external-unit" size="full" />
<alfa-zustaendige-stelle-button title="Zuständige externe Fachstelle auswählen" dataTestId="externe-fachstelle-button" />
</alfa-zustaendige-stelle-header>
</ng-template>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
index 1a6f560ec2..713bacea92 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
@@ -29,7 +29,7 @@
[subTitle]="organisationsEinheitResource.name"
[isSubTitleBold]="true"
>
- <ods-icon icon name="public-administration" size="unset" />
+ <ods-icon icon name="public-administration" size="full" />
<alfa-organisations-einheit
data-test-id="organisations-einheit-in-collaboration"
[organisationsEinheitResource]="organisationsEinheitResource"
@@ -41,7 +41,7 @@
</ng-container>
<ng-template #searchButton>
<alfa-zustaendige-stelle-header title="Öffentliche Verwaltung" subTitle="Kommune, Amt, Ministerium">
- <ods-icon icon name="public-administration" size="unset" />
+ <ods-icon icon name="public-administration" size="full" />
<alfa-zustaendige-stelle-button title="Zuständige Stelle auswählen" dataTestId="organisations-einheit-search-button" />
</alfa-zustaendige-stelle-header>
</ng-template>
--
GitLab
From 135ad0261e56d73e9513d38d6a76c3e1bab9fe19 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 9 Apr 2025 09:45:22 +0200
Subject: [PATCH 32/36] OZG-7707 add new icon component to storybook
---
.../libs/design-system/.storybook/preview.ts | 12 ++-
alfa-client/libs/design-system/project.json | 22 ++++-
.../attachment-header.stories.ts | 6 +-
.../attachment-wrapper.stories.ts | 6 +-
.../lib/button-card/button-card.stories.ts | 6 +-
.../src/lib/button/button.stories.ts | 16 ++--
.../dropdown-menu/dropdown-menu.stories.ts | 25 +++--
.../file-upload-button.stories.ts | 7 +-
.../radio-button-card.stories.ts | 23 ++---
.../src/lib/icon/icon.component.ts | 1 +
.../src/lib/icon/icon.stories.ts | 95 ++++++++++++++++++-
.../src/lib/link/link.stories.ts | 10 +-
.../src/lib/navbar/navbar/navbar.stories.ts | 10 +-
13 files changed, 177 insertions(+), 62 deletions(-)
diff --git a/alfa-client/libs/design-system/.storybook/preview.ts b/alfa-client/libs/design-system/.storybook/preview.ts
index d57171a4c3..3c1f85a567 100644
--- a/alfa-client/libs/design-system/.storybook/preview.ts
+++ b/alfa-client/libs/design-system/.storybook/preview.ts
@@ -21,13 +21,21 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Preview } from '@storybook/angular';
+import { provideHttpClient } from '@angular/common/http';
+import { provideZoneChangeDetection } from '@angular/core';
+import { applicationConfig, Preview } from '@storybook/angular';
+import { provideAngularSvgIcon } from 'angular-svg-icon';
const preview: Preview = {
globalTypes: {
darkMode: { defaultValue: false },
},
+ decorators: [
+ applicationConfig({
+ providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideHttpClient(), provideAngularSvgIcon()],
+ }),
+ ],
- tags: ['autodocs']
+ tags: ['autodocs'],
};
export default preview;
diff --git a/alfa-client/libs/design-system/project.json b/alfa-client/libs/design-system/project.json
index bc681e80f5..d5d0f6b725 100644
--- a/alfa-client/libs/design-system/project.json
+++ b/alfa-client/libs/design-system/project.json
@@ -25,7 +25,14 @@
"configDir": "libs/design-system/.storybook",
"browserTarget": "design-system:build-storybook",
"compodoc": false,
- "styles": ["libs/design-system/.storybook/styles.scss"]
+ "styles": ["libs/design-system/.storybook/styles.scss"],
+ "assets": [
+ {
+ "input": "libs/design-system/src/assets",
+ "glob": "**/*",
+ "output": "assets/icons"
+ }
+ ]
},
"configurations": {
"ci": {
@@ -41,7 +48,14 @@
"configDir": "libs/design-system/.storybook",
"browserTarget": "design-system:build-storybook",
"compodoc": false,
- "styles": ["libs/design-system/.storybook/styles.scss"]
+ "styles": ["libs/design-system/.storybook/styles.scss"],
+ "assets": [
+ {
+ "input": "libs/design-system/src/assets",
+ "glob": "**/*",
+ "output": "assets/icons"
+ }
+ ]
},
"configurations": {
"ci": {
@@ -58,9 +72,7 @@
"metadata": {
"images": ["docker.ozg-sh.de/storybook"],
"load": true,
- "tags": [
- "build-latest"
- ]
+ "tags": ["build-latest"]
}
}
}
diff --git a/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
index 6ab4a39444..99c277f893 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-header/attachment-header.stories.ts
@@ -24,6 +24,7 @@
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
import { AttachmentComponent } from '../attachment/attachment.component';
+import { IconComponent } from '../icon/icon.component';
import { AttachmentHeaderComponent } from './attachment-header.component';
const meta: Meta<AttachmentHeaderComponent> = {
@@ -38,7 +39,7 @@ const meta: Meta<AttachmentHeaderComponent> = {
},
decorators: [
moduleMetadata({
- imports: [AttachmentHeaderComponent, AttachmentComponent],
+ imports: [AttachmentHeaderComponent, AttachmentComponent, IconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -61,8 +62,7 @@ export const Default: Story = {
props: args,
template: `<ods-attachment-header ${argsToTemplate(args)}>
<button action-buttons>
- //TODO OZG-7707
- <ods-save-icon size="small" class="fill-text" />
+ <ods-icon name="save" size="small" fill="text" />
</button>
</ods-attachment-header>`,
}),
diff --git a/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
index 4ea7a26b79..96ca28e29e 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-wrapper/attachment-wrapper.stories.ts
@@ -25,6 +25,7 @@ import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
import { AttachmentHeaderComponent } from '../attachment-header/attachment-header.component';
import { AttachmentComponent } from '../attachment/attachment.component';
+import { IconComponent } from '../icon/icon.component';
import { AttachmentWrapperComponent } from './attachment-wrapper.component';
const meta: Meta<AttachmentWrapperComponent> = {
@@ -39,7 +40,7 @@ const meta: Meta<AttachmentWrapperComponent> = {
},
decorators: [
moduleMetadata({
- imports: [AttachmentWrapperComponent, AttachmentComponent, AttachmentHeaderComponent],
+ imports: [AttachmentWrapperComponent, AttachmentComponent, AttachmentHeaderComponent, IconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -54,8 +55,7 @@ export const Default: Story = {
template: `<ods-attachment-wrapper>
<ods-attachment-header title="Anhänge">
<button action-buttons>
- //TODO OZG-7707
- <ods-save-icon size="small" class="fill-text" />
+ <ods-icon name="save" size="small" fill="text" />
</button>
</ods-attachment-header>
<ods-attachment caption="Attachment" description="200 kB" fileType="pdf"></ods-attachment>
diff --git a/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts b/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts
index 86908c6adc..f741322f7f 100644
--- a/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button-card/button-card.stories.ts
@@ -23,6 +23,7 @@
*/
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { IconComponent } from '../icon/icon.component';
import { ButtonCardComponent } from './button-card.component';
const meta: Meta<ButtonCardComponent> = {
@@ -37,7 +38,7 @@ const meta: Meta<ButtonCardComponent> = {
},
decorators: [
moduleMetadata({
- imports: [ButtonCardComponent],
+ imports: [ButtonCardComponent, IconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -60,8 +61,7 @@ export const Default: Story = {
render: (args: ButtonCardComponent) => ({
props: args,
template: `<ods-button-card ${argsToTemplate(args)} class="w-72">
- //TODO OZG-7707
- <ods-bescheid-generate-icon icon fileType="auto"></ods-bescheid-generate-icon>
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>`,
}),
};
diff --git a/alfa-client/libs/design-system/src/lib/button/button.stories.ts b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
index fa8a838ccf..45acb55a32 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
@@ -23,6 +23,7 @@
*/
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { IconComponent } from '../icon/icon.component';
import { ButtonComponent } from './button.component';
const meta: Meta<ButtonComponent> = {
@@ -30,7 +31,7 @@ const meta: Meta<ButtonComponent> = {
component: ButtonComponent,
decorators: [
moduleMetadata({
- imports: [ButtonComponent],
+ imports: [ButtonComponent, IconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -80,8 +81,7 @@ export const PrimaryWithIcon: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
- //TODO OZG-7707
- <ods-save-icon icon size="small" class="fill-whitetext" />
+ <ods-icon icon name="save" size="small" fill="whitetext" />
</ods-button>`,
}),
};
@@ -94,7 +94,7 @@ export const SecondaryWithIcon: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
- <ods-save-icon icon size="small" />
+ <ods-icon icon name="save" size="small" />
</ods-button>`,
}),
};
@@ -107,7 +107,7 @@ export const SecondaryIconOnly: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
- <ods-save-icon icon size="small" />
+ <ods-icon icon name="save" size="small" />
</ods-button>`,
}),
};
@@ -134,7 +134,7 @@ export const GhostIcon: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
- <ods-save-icon icon size='medium' />
+ <ods-icon icon name="save" />
</ods-button>`,
}),
};
@@ -148,7 +148,7 @@ export const GhostIconDestructive: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
- <ods-save-icon icon size='medium' class="fill-destructive" />
+ <ods-icon icon name="save" fill="destructive" />
</ods-button>`,
}),
};
@@ -162,7 +162,7 @@ export const GhostLoadingIcon: Story = {
render: (args) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
- <ods-save-icon icon size='medium' />
+ <ods-icon icon name="save" />
</ods-button>`,
}),
};
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
index 0f0a475073..5c81f238c6 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
@@ -23,6 +23,7 @@
*/
import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { IconComponent } from '../../icon/icon.component';
import { DropdownMenuButtonItemComponent } from '../dropdown-menu-button-item/dropdown-menu-button-item.component';
import { DropdownMenuItemComponent } from '../dropdown-menu-item/dropdown-menu-item.component';
import { DropdownMenuTextItemComponent } from '../dropdown-menu-text-item/dropdown-menu-text-item.component';
@@ -33,7 +34,13 @@ const meta: Meta<DropdownMenuComponent> = {
component: DropdownMenuComponent,
decorators: [
moduleMetadata({
- imports: [DropdownMenuComponent, DropdownMenuItemComponent, DropdownMenuButtonItemComponent, DropdownMenuTextItemComponent],
+ imports: [
+ DropdownMenuComponent,
+ DropdownMenuItemComponent,
+ DropdownMenuButtonItemComponent,
+ DropdownMenuTextItemComponent,
+ IconComponent,
+ ],
}),
componentWrapperDecorator((story) => `<div class="flex justify-center mb-32">${story}</div>`),
],
@@ -60,8 +67,7 @@ export const Button: Story = {
render: (args) => ({
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
- //TODO OZG-7707
- <ods-user-icon button-content />
+ <ods-icon button-content name="user" size="extra-large" fill="neutral" />
<ods-dropdown-menu-button-item caption="Lorem" />
<ods-dropdown-menu-button-item caption="Ipsum" />
<ods-dropdown-menu-button-item caption="Dolor" />
@@ -86,11 +92,10 @@ export const ButtonWithIcon: Story = {
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
<ods-dropdown-menu-button-item caption="Lorem">
- //TODO OZG-7707
- <ods-save-icon icon size="small" />
+ <ods-icon icon name="save" size="small" />
</ods-dropdown-menu-button-item>
<ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet">
- <ods-save-icon icon size="small" />
+ <ods-icon icon name="save" size="small" />
</ods-dropdown-menu-button-item>
</ods-dropdown-menu>`,
}),
@@ -104,10 +109,10 @@ export const StructuredContent: Story = {
<ods-dropdown-menu-text-item title="Item 1" description="The quick brown fox jumps over the lazy dog">
</ods-dropdown-menu-text-item>
<ods-dropdown-menu-text-item title="Item 2" description="The quick brown fox jumps over the lazy dog">
- <ods-save-icon icon size="large" />
+ <ods-icon icon name="save" size="large" />
</ods-dropdown-menu-text-item>
<ods-dropdown-menu-text-item title="Item 3" description="The quick brown fox jumps over the lazy dog">
- <ods-save-icon icon size="large" />
+ <ods-icon icon name="save" size="large" />
<button additionalContent class="border">Button</button>
</ods-dropdown-menu-text-item>
</ods-dropdown-menu>`,
@@ -120,7 +125,9 @@ export const AnyContent: Story = {
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
<ods-dropdown-menu-item class="border-t">Item 1</ods-dropdown-menu-item>
- <ods-dropdown-menu-item class="border-t border-b"><ods-save-icon size="small" /> Text <ods-save-icon size="large" /></ods-dropdown-menu-item>
+ <ods-dropdown-menu-item class="border-t border-b">
+ <ods-icon icon name="save" size="small" /> Text <ods-icon icon name="save" size="large" />
+ </ods-dropdown-menu-item>
</ods-dropdown-menu>`,
}),
};
diff --git a/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
index 5dd83fb819..b4ca47e18d 100644
--- a/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
@@ -24,7 +24,7 @@
import { CommonModule } from '@angular/common';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { AttachmentIconComponent } from '../../icons/attachment-icon/attachment-icon.component';
+import { IconComponent } from '../../icon/icon.component';
import { SpinnerIconComponent } from '../../icons/spinner-icon/spinner-icon.component';
import { FileUploadButtonComponent } from './file-upload-button.component';
@@ -33,7 +33,7 @@ const meta: Meta<FileUploadButtonComponent> = {
component: FileUploadButtonComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule, FileUploadButtonComponent, AttachmentIconComponent, SpinnerIconComponent],
+ imports: [CommonModule, FileUploadButtonComponent, SpinnerIconComponent, IconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -51,8 +51,7 @@ export const Upload: Story = {
render: (args: FileUploadButtonComponent) => ({
props: args,
template: `<ods-file-upload-button ${argsToTemplate(args)}>
- // TODO OZG-7707
- <ods-attachment-icon icon></ods-attachment-icon>
+ <ods-icon icon name="attachment" />
<ods-spinner-icon spinner size="medium"></ods-spinner-icon>
<p text>Anhang hochladen</p>
</ods-file-upload-button>`,
diff --git a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
index c198e906ad..7d60189700 100644
--- a/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/radio-button-card/radio-button-card.stories.ts
@@ -25,6 +25,7 @@ import { CommonModule } from '@angular/common';
import { FormGroupDirective } from '@angular/forms';
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { IconComponent } from '../../icon/icon.component';
import { RadioButtonCardComponent } from './radio-button-card.component';
const meta: Meta<RadioButtonCardComponent> = {
@@ -32,7 +33,7 @@ const meta: Meta<RadioButtonCardComponent> = {
component: RadioButtonCardComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule, RadioButtonCardComponent],
+ imports: [CommonModule, RadioButtonCardComponent, IconComponent],
providers: [FormGroupDirective],
}),
],
@@ -57,8 +58,7 @@ export const Default: Story = {
<ods-radio-button-card
${argsToTemplate(args)}
>
- //TODO OZG-7707
- <ods-stamp-icon />
+ <ods-icon name="stamp" fill="bewilligt" />
</ods-radio-button-card>
<ods-radio-button-card
label="abgelehnt"
@@ -66,8 +66,7 @@ export const Default: Story = {
value="abgelehnt"
variant="bescheid_abgelehnt"
>
- //TODO OZG-7707
- <ods-close-icon class="fill-abgelehnt" size="large" />
+ <ods-icon name="close" fill="abgelehnt" size="large" />
</ods-radio-button-card>
</div>`,
}),
@@ -92,20 +91,18 @@ export const Message: Story = {
name="nachrichtOrManual"
variant="bescheid_save"
[fullWidthText]="true"
- >
- //TODO OZG-7707
- <ods-send-icon></ods-send-icon
- ></ods-radio-button-card>
+ >
+ <ods-icon name="send" />
+ </ods-radio-button-card>
<ods-radio-button-card
label="Nur speichern"
value="MANUAL"
name="nachrichtOrManual"
variant="bescheid_save"
[fullWidthText]="true"
- >
- //TODO OZG-7707
- <ods-save-icon></ods-save-icon
- ></ods-radio-button-card>
+ >
+ <ods-icon name="save" />
+ </ods-radio-button-card>
</div>`,
}),
};
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
index 835fe41dfa..0c4b0f5f3f 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.component.ts
@@ -46,6 +46,7 @@ const iconVariants = cva('', {
neutral: 'fill-neutral-500 dark:fill-neutral-400',
bewilligt: 'fill-bewilligt',
abgelehnt: 'fill-abgelehnt',
+ destructive: 'fill-destructive',
},
},
});
diff --git a/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts b/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts
index 6f92ea55f2..9dca7ffa6b 100644
--- a/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/icon/icon.stories.ts
@@ -23,23 +23,114 @@
*/
import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { CommonModule } from '@angular/common';
import { IconComponent } from './icon.component';
const meta: Meta<IconComponent> = {
title: 'Icon',
+ parameters: {
+ docs: {
+ description: {
+ component: 'Generic icon component',
+ },
+ },
+ },
component: IconComponent,
decorators: [
moduleMetadata({
- imports: [IconComponent],
+ imports: [IconComponent, CommonModule],
}),
],
excludeStories: /.*Data$/,
tags: ['autodocs'],
};
+const ICONS_LIST: string[] = [
+ 'accessibility',
+ 'account-circle',
+ 'admin-logo',
+ 'archive',
+ 'arrow-back',
+ 'attachment',
+ 'bescheid-generate',
+ 'bescheid-upload',
+ 'check-circle',
+ 'check',
+ 'close',
+ 'delete-vorgang-finally',
+ 'delete',
+ 'discard-vorgang',
+ 'edit',
+ 'error',
+ 'exclamation',
+ 'external-unit',
+ 'forward-vorgang',
+ 'help',
+ 'info',
+ 'logout',
+ 'mailbox',
+ 'more',
+ 'office',
+ 'open-link',
+ 'orga-unit',
+ 'ozg-logo',
+ 'person',
+ 'plus',
+ 'public-administration',
+ 'request-vorgang-deletion',
+ 'save',
+ 'search',
+ 'send',
+ 'settings',
+ 'stamp',
+ 'statistic',
+ 'undo-request-vorgang-deletion',
+ 'undo',
+ 'update',
+ 'user',
+ 'users',
+];
+const stringifiedIcons: string = JSON.stringify(ICONS_LIST);
+
export default meta;
type Story = StoryObj<IconComponent>;
export const Default: Story = {
- args: {},
+ args: {
+ name: 'mailbox',
+ size: 'extra-large',
+ fill: 'primary',
+ class: '',
+ },
+ argTypes: {
+ name: { description: 'Name of the icon' },
+ size: {
+ description: 'Size of the icon. "Full" stands for 100%',
+ control: 'select',
+ options: ['small', 'medium', 'large', 'extra-large', 'xxl', 'full'],
+ table: { defaultValue: { summary: 'medium' } },
+ },
+ fill: {
+ description: 'Fill color of the icon',
+ control: 'select',
+ options: ['primary', 'text', 'whitetext', 'neutral', 'error', 'pdf', 'bewilligt', 'abgelehnt'],
+ table: { defaultValue: { summary: 'primary' } },
+ },
+ class: { description: 'Additional (tailwind) classes for the icon' },
+ },
+};
+
+export const AllIcons: Story = {
+ render: () => {
+ return {
+ template: `<div class="flex gap-6 w-full flex-wrap justify-around">
+ @for (icon of ${stringifiedIcons}; track $index) {
+ <div class="flex flex-col items-center">
+ <ods-icon [name]="icon" size="extra-large" />
+ <p class="text-pretty">{{ icon }}</p>
+ </div>
+ }
+ </div>`,
+ };
+ },
};
diff --git a/alfa-client/libs/design-system/src/lib/link/link.stories.ts b/alfa-client/libs/design-system/src/lib/link/link.stories.ts
index f4cad5258e..ebf0cb9570 100644
--- a/alfa-client/libs/design-system/src/lib/link/link.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/link/link.stories.ts
@@ -1,6 +1,6 @@
import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
-import { AccessibilityIconComponent } from '../icons/accessibility-icon/accessibility-icon.component';
+import { IconComponent } from '../icon/icon.component';
import { LinkComponent } from './link.component';
const meta: Meta<LinkComponent> = {
@@ -8,7 +8,7 @@ const meta: Meta<LinkComponent> = {
component: LinkComponent,
decorators: [
moduleMetadata({
- imports: [LinkComponent, AccessibilityIconComponent],
+ imports: [LinkComponent, IconComponent],
}),
],
excludeStories: /.*Data$/,
@@ -30,7 +30,7 @@ export const Default: Story = {
},
render: (args) => ({
props: args,
- template: `<ods-link ${argsToTemplate(args)}>
+ template: `<ods-link ${argsToTemplate(args)} class="w-fit">
Link with text
</ods-link>`,
}),
@@ -43,8 +43,8 @@ export const WithIcon: Story = {
},
render: (args) => ({
props: args,
- template: `<ods-link ${argsToTemplate(args)}>
- <ods-accessibility-icon size="large" />
+ template: `<ods-link ${argsToTemplate(args)} class="w-fit">
+ <ods-icon name="accessibility" size="large" />
</ods-link>`,
}),
};
diff --git a/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts b/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts
index 00bdcbaf4c..20911e3aa6 100644
--- a/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/navbar/navbar/navbar.stories.ts
@@ -25,6 +25,7 @@ import { APP_BASE_HREF } from '@angular/common';
import { importProvidersFrom } from '@angular/core';
import { RouterModule } from '@angular/router';
import { applicationConfig, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { IconComponent } from '../../icon/icon.component';
import { NavItemComponent } from '../nav-item/nav-item.component';
import { NavbarComponent } from './navbar.component';
@@ -38,7 +39,7 @@ const meta: Meta<NavbarComponent> = {
providers: [importProvidersFrom(RouterModule.forRoot([]))],
}),
moduleMetadata({
- imports: [NavItemComponent],
+ imports: [NavItemComponent, IconComponent],
providers: [
{
provide: APP_BASE_HREF,
@@ -56,11 +57,10 @@ export const Default: Story = {
args: {},
render: () => ({
template: `<ods-navbar>
- //TODO OZG-7077
- <ods-nav-item caption="First link" path="/"><ods-office-icon icon /></ods-nav-item>
- <ods-nav-item caption="Second link" path="/second"><ods-office-icon icon /></ods-nav-item>
+ <ods-nav-item caption="First link" path="/"><ods-icon icon name="office" /></ods-nav-item>
+ <ods-nav-item caption="Second link" path="/second"><ods-icon icon name="office" /></ods-nav-item>
<hr />
- <ods-nav-item caption="Third link" path="/third"><ods-office-icon icon /></ods-nav-item>
+ <ods-nav-item caption="Third link" path="/third"><ods-icon icon name="office" /></ods-nav-item>
</ods-navbar>`,
}),
};
--
GitLab
From fbfb3702a518ad2e724a3ba1534cbea2b6534c28 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 11 Apr 2025 15:23:33 +0200
Subject: [PATCH 33/36] OZG-7707 Add missing labels for a11y
---
.../aggregation-mapping-field-form.component.html | 2 +-
.../bescheid-wizard-container.component.html | 2 +-
.../src/lib/download-button/download-button.component.ts | 2 +-
alfa-client/libs/design-system/src/assets/person.svg | 2 +-
.../src/lib/form/button-toggle/button-toggle.component.ts | 2 +-
.../vorgang-detail-more-menu.component.html | 2 +-
.../edit-zustaendige-stelle-button.component.html | 2 +-
.../search-zustaendige-stelle-dialog.component.html | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
index acf4e94784..a0cc29c61d 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
@@ -13,7 +13,7 @@
[dataTestId]="'remove-mapping-button-' + index"
[attr.data-test-id]="'remove-mapping-' + index"
>
- <ods-icon icon name="delete" fill="error" />
+ <ods-icon icon name="delete" fill="error" label="Datenfeld entefernen" />
</ods-button>
</div>
<div class="flex flex-col gap-4">
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
index 33e0e261cd..02047d13cc 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
@@ -37,7 +37,7 @@
(clickEmitter)="cancelWizard(bescheidStateResource.resource)"
dataTestId="close-bescheid"
>
- <ods-icon icon name="close" fill="text" />
+ <ods-icon icon name="close" fill="text" label="Bescheid-Popup schließen" />
</ods-button>
<alfa-bescheid-wizard
[vorgangWithEingangResource]="vorgangWithEingangResource"
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
index c06c96a111..6def584caa 100644
--- a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
@@ -42,7 +42,7 @@ type IconVariants = VariantProps<typeof iconVariants>;
[isLoading]="isLoading"
(click)="clickEmitter.emit()"
>
- <ods-icon icon name="save" [size]="size" fill="text" />
+ <ods-icon icon name="save" [size]="size" fill="text" label="herunterladen" />
</ods-button>`,
})
export class DownloadButtonComponent {
diff --git a/alfa-client/libs/design-system/src/assets/person.svg b/alfa-client/libs/design-system/src/assets/person.svg
index 3609afd166..6f1df5c9d9 100644
--- a/alfa-client/libs/design-system/src/assets/person.svg
+++ b/alfa-client/libs/design-system/src/assets/person.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path
d="M11.38.244C8.46.544 6.201 3.055 6.201 6c0 2.167 1.254 4.2 3.191 5.176 3.313 1.669 7.33-.175 8.226-3.775a5.52 5.52 0 0 0 0-2.802 5.554 5.554 0 0 0-1.489-2.653C14.878.671 13.17.06 11.38.244m1.54 2.076c.743.18 1.564.705 2.037 1.306.312.396.615 1.008.729 1.474.125.507.125 1.293 0 1.8a4.033 4.033 0 0 1-1.31 2.058 4.528 4.528 0 0 1-1.456.729c-.488.131-1.352.131-1.84 0a4.496 4.496 0 0 1-1.463-.735C9.01 8.465 8.501 7.663 8.314 6.9c-.125-.507-.125-1.293 0-1.8.366-1.487 1.609-2.613 3.159-2.86.336-.053 1.058-.013 1.447.08M7.78 14.644c-2.403.246-4.401 1.987-5 4.355-.16.637-.186 1.031-.173 2.624l.013 1.483.121.197a.998.998 0 0 0 1.718 0l.121-.196.024-1.644c.028-1.891.046-2.011.394-2.723A3.851 3.851 0 0 1 7.5 16.711l.36-.091h8.28l.36.091a3.851 3.851 0 0 1 2.502 2.029c.348.712.366.832.394 2.723l.024 1.644.121.196a.998.998 0 0 0 1.718 0l.121-.197.013-1.483c.013-1.593-.013-1.987-.173-2.624a5.574 5.574 0 0 0-1.491-2.653 5.667 5.667 0 0 0-3.563-1.704c-.493-.05-7.899-.048-8.386.002"
fill-rule="evenodd" />
diff --git a/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts b/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts
index 5acc3f1220..6567ac0a3e 100644
--- a/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts
+++ b/alfa-client/libs/design-system/src/lib/form/button-toggle/button-toggle.component.ts
@@ -42,7 +42,7 @@ import { IconComponent } from '../../icon/icon.component';
data-test-id="button-toggle"
>
@if (isChecked) {
- <ods-icon name="check" size="small" data-test-id="toggle-check-icon" />
+ <ods-icon name="check" size="small" data-test-id="toggle-check-icon" label="ausgewählt" />
}
<p class="text-sm">{{ label }}</p>
</button>`,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
index fd46a637a0..9ada560c6e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
@@ -24,7 +24,7 @@
-->
<ods-dropdown-menu buttonTestId="more-menu-button">
- <ods-icon button-content *ngIf="buttonEnabled" name="more" data-test-id="more-menu-icon" fill="text" />
+ <ods-icon button-content *ngIf="buttonEnabled" name="more" data-test-id="more-menu-icon" fill="text" label="Menü ausklappen" />
<ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE"
data-test-id="vorgang-archive-button"
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html
index 85dd821da8..b5e93647ab 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component.html
@@ -30,5 +30,5 @@
[dataTestId]="dataTestId"
(clickEmitter)="openSearchDialog()"
>
- <ods-icon icon name="edit" />
+ <ods-icon icon name="edit" label="Zustänndige Stelle bearbeiten" />
</ods-button>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html
index d72dfccc45..d8f40eb7da 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.html
@@ -27,7 +27,7 @@
<div class="flex gap-48 py-6 lg:gap-96">
<h1 class="text-xl font-bold text-primary">{{ title }}</h1>
<ods-button variant="ghost" size="fit" (clickEmitter)="closeDialog()" dataTestId="close-search-dialog">
- <ods-icon icon name="close" />
+ <ods-icon icon name="close" label="Dialogfenster schließen" />
</ods-button>
</div>
<alfa-search-zustaendige-stelle-form-container (searchResultSelected)="searchResultSelected($event)" />
--
GitLab
From 3d41c5656919ad4bb97058c1c1998d05488a627d Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 22 Apr 2025 09:12:05 +0200
Subject: [PATCH 34/36] OZG-7707 Change angular-svg-icon version to
corresponding 18
---
alfa-client/package.json | 2 +-
alfa-client/pnpm-lock.yaml | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/alfa-client/package.json b/alfa-client/package.json
index 94a5710a8b..d394823882 100644
--- a/alfa-client/package.json
+++ b/alfa-client/package.json
@@ -73,7 +73,7 @@
"@nx/angular": "19.8.8",
"angular-oauth2-oidc": "17.0.2",
"angular-oauth2-oidc-jwks": "17.0.2",
- "angular-svg-icon": "^19.1.1",
+ "angular-svg-icon": "^18.0.2",
"class-variance-authority": "^0.7.0",
"date-fns": "^2.30.0",
"file-saver": "2.0.5",
diff --git a/alfa-client/pnpm-lock.yaml b/alfa-client/pnpm-lock.yaml
index c01bfa47f1..3493c11685 100644
--- a/alfa-client/pnpm-lock.yaml
+++ b/alfa-client/pnpm-lock.yaml
@@ -72,8 +72,8 @@ importers:
specifier: 17.0.2
version: 17.0.2
angular-svg-icon:
- specifier: ^19.1.1
- version: 19.1.1(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1)
+ specifier: ^18.0.2
+ version: 18.0.2(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1)
class-variance-authority:
specifier: ^0.7.0
version: 0.7.0
@@ -4365,11 +4365,11 @@ packages:
'@angular/common': '>=14.0.0'
'@angular/core': '>=14.0.0'
- angular-svg-icon@19.1.1:
- resolution: {integrity: sha512-4uKVdkc68ii2nadJAqJDbRfMFaD3JZ4AK2S28PjGDvXfvtE5T28lm/CFZA3MKqUesUZlneJAaOX4cpC3pvoCZQ==}
+ angular-svg-icon@18.0.2:
+ resolution: {integrity: sha512-/EBBgsY/mLv1ibNkUkurI28nl+UQh67bsRmQNBqvm+VJBLMrk/PcQQtTwOsuvmh+ZopvH1fd7RfoTx4F4hoiOQ==}
peerDependencies:
- '@angular/common': '>=19.0.0'
- '@angular/core': '>=19.0.0'
+ '@angular/common': '>=18.0.0'
+ '@angular/core': '>=18.0.0'
rxjs: '>=6.6.3'
ansi-colors@4.1.3:
@@ -16442,7 +16442,7 @@ snapshots:
'@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.14.10)
tslib: 2.8.1
- angular-svg-icon@19.1.1(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1):
+ angular-svg-icon@18.0.2(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1):
dependencies:
'@angular/common': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1)
'@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.14.10)
--
GitLab
From 64650ce10188df18dc30d53e433ba01e842951cc Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 22 Apr 2025 12:04:19 +0200
Subject: [PATCH 35/36] OZG-7707 delete unused import
---
.../collaboration.request.formservice.spec.ts | 3 ---
1 file changed, 3 deletions(-)
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts
index 75992d2f0d..d5726c7752 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts
@@ -28,12 +28,10 @@ import { Mock, mock } from '@alfa-client/test-utils';
import { SnackBarService } from '@alfa-client/ui';
import { TestBed } from '@angular/core/testing';
import { UntypedFormBuilder } from '@angular/forms';
-import { IconComponent } from '@ods/system';
import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
import { createCommandErrorResource, createCommandResource } from 'libs/command-shared/test/command';
import { singleColdCompleted } from 'libs/tech-shared/test/marbles';
-import { MockComponent } from 'ng-mocks';
import { Observable, of } from 'rxjs';
import { CollaborationRequestFormService } from './collaboration.request.formservice';
@@ -50,7 +48,6 @@ describe('CollaborationRequestFormService', () => {
snackBarService = mock(SnackBarService);
TestBed.configureTestingModule({
- imports: [MockComponent(IconComponent)],
providers: [
CollaborationRequestFormService,
UntypedFormBuilder,
--
GitLab
From 0a3def9378f826df1ebd0769989b8383682341c0 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Wed, 23 Apr 2025 11:55:28 +0200
Subject: [PATCH 36/36] OZG-7707 delete wrong tests
---
.../checkbox-editor.component.spec.ts | 45 +++++--------------
.../text-editor/text-editor.component.spec.ts | 10 -----
.../textarea-editor.component.spec.ts | 10 -----
3 files changed, 12 insertions(+), 53 deletions(-)
diff --git a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
index 079653c232..387ca46d24 100644
--- a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
@@ -21,10 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { getElementFromFixture, triggerEvent } from '@alfa-client/test-utils';
+import { triggerEvent } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
-import { ErrorMessageComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createInvalidParam } from 'libs/tech-shared/test/error';
import { MockComponent } from 'ng-mocks';
@@ -41,7 +40,7 @@ describe('CheckboxEditorComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [CheckboxEditorComponent, ValidationErrorComponent, MockComponent(ErrorMessageComponent)],
+ imports: [CheckboxEditorComponent, MockComponent(ValidationErrorComponent)],
}).compileComponents();
fixture = TestBed.createComponent(CheckboxEditorComponent);
@@ -73,40 +72,20 @@ describe('CheckboxEditorComponent', () => {
expect(result).toBe(false);
});
});
- });
-
- describe('template', () => {
- describe('error message', () => {
- it('should show', () => {
- component.fieldControl.setErrors({ 1: createInvalidParam() });
- component._updateInvalidParams();
- fixture.detectChanges();
-
- const element: HTMLElement = getElementFromFixture(fixture, errorMessageId);
-
- expect(element).not.toBeEmptyDOMElement();
- });
-
- it('should hide', () => {
- const element: HTMLElement = getElementFromFixture(fixture, errorMessageId);
- expect(element).toBeEmptyDOMElement();
- });
- });
- });
+ describe('input change', () => {
+ it('should emit input change', () => {
+ component.inputChange.emit = jest.fn();
- describe('input change', () => {
- it('should emit input change', () => {
- component.inputChange.emit = jest.fn();
+ triggerEvent({
+ fixture,
+ elementSelector: 'ods-checkbox',
+ name: 'inputChange',
+ data: true,
+ });
- triggerEvent({
- fixture,
- elementSelector: 'ods-checkbox',
- name: 'inputChange',
- data: true,
+ expect(component.inputChange.emit).toHaveBeenCalledWith(true);
});
-
- expect(component.inputChange.emit).toHaveBeenCalledWith(true);
});
});
});
diff --git a/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.spec.ts
index e6dce44b7e..63fb211bf2 100644
--- a/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.spec.ts
@@ -65,14 +65,4 @@ describe('TextEditorComponent', () => {
it('should have focus set to false by default', () => {
expect(component.focus).toBeFalsy();
});
-
- describe('errors', () => {
- it('should be hidden', () => {
- const element: HTMLElement = getElementFromFixture(fixture, errorId);
-
- expect(element).toBeEmptyDOMElement();
- });
-
- // TODO: Set error and test for 'should be visible
- });
});
diff --git a/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.spec.ts
index f406430260..b1f93f2a65 100644
--- a/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.spec.ts
@@ -59,14 +59,4 @@ describe('TextareaEditorComponent', () => {
it('should have focus set to false by default', () => {
expect(component.focus).toBeFalsy();
});
-
- describe('errors', () => {
- it('should be hidden', () => {
- const element: HTMLElement = getElementFromFixture(fixture, errorId);
-
- expect(element).toBeEmptyDOMElement();
- });
-
- // TODO: Set error and test for 'should be visible
- });
});
--
GitLab