From 14846043c43ce3aaa4e117fdf3528b19f9b4facf Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 15 Apr 2024 09:42:17 +0200
Subject: [PATCH] Fix naming bugs
---
.../apps/demo/src/app/app.component.html | 45 +++----------------
.../apps/demo/src/app/app.component.ts | 8 +---
alfa-client/libs/design-system/src/index.ts | 9 +---
.../file-upload-button.component.html | 0
.../file-upload-button.component.spec.ts | 0
.../file-upload-button.component.ts | 0
.../file-upload-button.stories.ts | 0
7 files changed, 9 insertions(+), 53 deletions(-)
rename alfa-client/libs/design-system/src/lib/form/{upoad-file-button => file-upload-button}/file-upload-button.component.html (100%)
rename alfa-client/libs/design-system/src/lib/form/{upoad-file-button => file-upload-button}/file-upload-button.component.spec.ts (100%)
rename alfa-client/libs/design-system/src/lib/form/{upoad-file-button => file-upload-button}/file-upload-button.component.ts (100%)
rename alfa-client/libs/design-system/src/lib/form/{upoad-file-button => file-upload-button}/file-upload-button.stories.ts (100%)
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 6deed0aed9..38228a23ad 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -16,53 +16,18 @@
<main class="flex-auto bg-background-50 p-6">
<form id="antrag_bescheiden_form" [formGroup]="exampleForm">
<div class="my-10 flex gap-8">
- <ods-radio-button-card
- label="bewilligt"
- name="exampleName"
- value="bewilligt"
- >
- <ozgdesign-stamp-icon />
+ <ods-radio-button-card label="bewilligt" name="exampleName" value="bewilligt">
+ <ods-icon name="stamp" fillColor="green" size="30" />
+ </ods-radio-button-card>
+ <ods-radio-button-card label="abgelehnt" name="exampleName" value="abgelehnt">
+ <ods-icon name="close" fillColor="red" size="30" />
</ods-radio-button-card>
- <ods-radio-button-card
- label="abgelehnt"
- name="exampleName"
- value="abgelehnt"
- >
- <ozgdesign-close-icon
- /></ods-radio-button-card>
</div>
</form>
<app-bescheid-dialog-button></app-bescheid-dialog-button>
<ozgdesign-testbtn />
<div class="text-warning">Achtung</div>
<div class="text-primary">Achtung</div>
- <div class="mt-4 grid grid-cols-2 gap-3">
- <ods-attachment
- description="126 kB"
- documentName="Waffenschein_153481.pdf"
- [iconArgs]="{ type: 'pdf' }"
- ></ods-attachment>
- <ods-attachment
- description="126 kB"
- documentName="Waffenschein_1432178.doc"
- [iconArgs]="{ type: 'doc' }"
- ></ods-attachment>
- <ods-attachment
- description="126 kB"
- documentName="Katzenmeldung_5678.pdf"
- [iconArgs]="{ type: 'pdf', isLoading: true }"
- ></ods-attachment>
- <ods-attachment
- description="126 kB"
- documentName="Waffenschein_142321.pdf"
- [iconArgs]="{ type: 'pdf', isExclamation: true }"
- >
- <ozgdesign-download-icon
- [isButton]="true"
- (clickHandler)="onDownloadClick()"
- ></ozgdesign-download-icon>
- </ods-attachment>
- </div>
<hr class="mt-24" />
<div>CDK Stepper</div>
<app-custom-stepper>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index fd45ee9234..67fd4be2eb 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -7,9 +7,7 @@ import {
TestbtnComponent,
RadioButtonCardComponent,
AttachmentComponent,
- DownloadIconComponent,
- StampIconComponent,
- CloseIconComponent,
+ IconComponent,
} from 'design-system';
import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.component';
import { BescheidStepperComponent } from './components/bescheid-stepper/bescheid-stepper.component';
@@ -21,7 +19,6 @@ import { BescheidPaperComponent } from './components/bescheid-paper/bescheid-pap
imports: [
CommonModule,
AttachmentComponent,
- DownloadIconComponent,
TestbtnComponent,
RouterModule,
CdkStepperModule,
@@ -31,8 +28,7 @@ import { BescheidPaperComponent } from './components/bescheid-paper/bescheid-pap
BescheidPaperComponent,
RadioButtonCardComponent,
ReactiveFormsModule,
- StampIconComponent,
- CloseIconComponent,
+ IconComponent,
],
selector: 'app-root',
templateUrl: './app.component.html',
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 15b1df1002..dd470191ab 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -1,11 +1,6 @@
export * from './lib/attachment/attachment.component';
export * from './lib/testbtn/testbtn.component';
-export * from './lib/form/upoad-file-button/file-upload-button.component';
+export * from './lib/form/file-upload-button/file-upload-button.component';
export * from './lib/form/radio-button-card/radio-button-card.component';
-
-export * from './lib/icons/download-icon/download-icon.component';
-export * from './lib/icons/close-icon/close-icon.component';
-export * from './lib/icons/file-icon/file-icon.component';
-export * from './lib/icons/notice-icon/notice-icon.component';
export * from './lib/spinner/spinner.component';
-export * from './lib/icons/stamp-icon/stamp-icon.component';
+export * from './lib/icon/icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.html b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.html
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.html
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.html
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.spec.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.spec.ts
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.spec.ts
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.ts
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.ts
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.stories.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.stories.ts
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
--
GitLab