Skip to content
Snippets Groups Projects
Commit 513530c4 authored by Alexander Reifschneider's avatar Alexander Reifschneider
Browse files

OZG-7707 Replace one icon from admin client

parent 392f16ca
No related branches found
No related tags found
1 merge request!121OZG-7707 Replace icons
Showing
with 93 additions and 6 deletions
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
"input": "apps/admin/src/favicon", "input": "apps/admin/src/favicon",
"glob": "**/*", "glob": "**/*",
"output": "" "output": ""
},
{
"input": "libs/design-system/src/assets",
"glob": "**/*",
"output": "assets/icons"
} }
], ],
"styles": ["apps/admin/src/styles.scss"], "styles": ["apps/admin/src/styles.scss"],
......
...@@ -44,6 +44,7 @@ import { StoreRouterConnectingModule } from '@ngrx/router-store'; ...@@ -44,6 +44,7 @@ import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store'; import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { OAuthModule } from 'angular-oauth2-oidc'; import { OAuthModule } from 'angular-oauth2-oidc';
import { provideAngularSvgIcon } from 'angular-svg-icon';
import { ConfigurationsProviders } from 'libs/admin/configuration-shared/src/lib/configuration.providers'; import { ConfigurationsProviders } from 'libs/admin/configuration-shared/src/lib/configuration.providers';
import { PostfachProviders } from 'libs/admin/postfach-shared/src/lib/postfach.providers'; import { PostfachProviders } from 'libs/admin/postfach-shared/src/lib/postfach.providers';
import { SettingsProviders } from 'libs/admin/settings-shared/src/lib/settings.providers'; import { SettingsProviders } from 'libs/admin/settings-shared/src/lib/settings.providers';
...@@ -113,6 +114,7 @@ loadEnvironment(environment.environmentUrl).then((env) => { ...@@ -113,6 +114,7 @@ loadEnvironment(environment.environmentUrl).then((env) => {
}, },
}), }),
), ),
provideAngularSvgIcon(),
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: HttpUnauthorizedInterceptor, useClass: HttpUnauthorizedInterceptor,
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<ods-icon name="accessibility" size="large" color="error" /> <ods-icon name="accessibility" size="large" color="error" />
<ods-icon name="accessibility" class="fill-red-500" /> <ods-icon name="accessibility" class="fill-red-500" />
<ods-icon name="accessibility" size="small" /> <ods-icon name="accessibility" size="small" />
<ods-icon name="admin-logo" size="unset" />
</div> </div>
<h1 class="mb-6 text-2xl font-semibold text-text">Auswertungen</h1> <h1 class="mb-6 text-2xl font-semibold text-text">Auswertungen</h1>
<ods-button text="Auswertung hinzufügen" /> <ods-button text="Auswertung hinzufügen" />
......
...@@ -22,13 +22,15 @@ ...@@ -22,13 +22,15 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { IconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { AppComponent } from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [AppComponent, RouterTestingModule], imports: [AppComponent, RouterTestingModule, MockComponent(IconComponent)],
}).compileComponents(); }).compileComponents();
}); });
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
data-test-id="delete-organisations-einheit-dialog-button" data-test-id="delete-organisations-einheit-dialog-button"
[dialogData]="{ organisationsEinheitName: organisationsEinheit.name, organisationsEinheitId: organisationsEinheit.id }" [dialogData]="{ organisationsEinheitName: organisationsEinheit.name, organisationsEinheitId: organisationsEinheit.id }"
> >
<ods-delete-icon icon /> <ods-icon icon name="delete" color="error" />
</ods-open-dialog-button> </ods-open-dialog-button>
</div> </div>
</ods-list-item> </ods-list-item>
......
...@@ -28,7 +28,7 @@ import { CommonModule } from '@angular/common'; ...@@ -28,7 +28,7 @@ import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { OpenDialogButtonComponent } from '@ods/component'; 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 { getConvertedDataTestIdOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { createAdminOrganisationsEinheit } from '../../../../../organisations-einheit-shared/src/test/organisations-einheit'; import { createAdminOrganisationsEinheit } from '../../../../../organisations-einheit-shared/src/test/organisations-einheit';
...@@ -56,6 +56,7 @@ describe('OrganisationsEinheitListComponent', () => { ...@@ -56,6 +56,7 @@ describe('OrganisationsEinheitListComponent', () => {
MockComponent(ListComponent), MockComponent(ListComponent),
MockComponent(ListItemComponent), MockComponent(ListItemComponent),
MockComponent(ExclamationIconComponent), MockComponent(ExclamationIconComponent),
MockComponent(IconComponent),
], ],
}).compileComponents(); }).compileComponents();
......
...@@ -27,7 +27,7 @@ import { DIALOG_COMPONENT } from '@alfa-client/ui'; ...@@ -27,7 +27,7 @@ import { DIALOG_COMPONENT } from '@alfa-client/ui';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { OpenDialogButtonComponent } from '@ods/component'; 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'; import { OrganisationsEinheitDeleteDialogContainerComponent } from './organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog-container.component';
@Component({ @Component({
...@@ -42,7 +42,7 @@ import { OrganisationsEinheitDeleteDialogContainerComponent } from './organisati ...@@ -42,7 +42,7 @@ import { OrganisationsEinheitDeleteDialogContainerComponent } from './organisati
ConvertForDataTestPipe, ConvertForDataTestPipe,
OpenDialogButtonComponent, OpenDialogButtonComponent,
TooltipDirective, TooltipDirective,
DeleteIconComponent, IconComponent,
], ],
}) })
export class OrganisationsEinheitListComponent { export class OrganisationsEinheitListComponent {
......
This diff is collapsed.
<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
...@@ -21,7 +21,10 @@ ...@@ -21,7 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * 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 { ComponentFixture, TestBed } from '@angular/core/testing';
import { provideAngularSvgIcon } from 'angular-svg-icon';
import { IconComponent } from './icon.component'; import { IconComponent } from './icon.component';
describe('IconComponent', () => { describe('IconComponent', () => {
...@@ -31,6 +34,7 @@ describe('IconComponent', () => { ...@@ -31,6 +34,7 @@ describe('IconComponent', () => {
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [IconComponent], imports: [IconComponent],
providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideHttpClient(), provideAngularSvgIcon()],
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(IconComponent); fixture = TestBed.createComponent(IconComponent);
......
...@@ -36,6 +36,7 @@ const iconVariants = cva('', { ...@@ -36,6 +36,7 @@ const iconVariants = cva('', {
large: 'size-8', large: 'size-8',
'extra-large': 'size-10', 'extra-large': 'size-10',
xxl: 'size-12', xxl: 'size-12',
unset: '',
}, },
color: { color: {
primary: 'fill-primary', primary: 'fill-primary',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment