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

OZG-7707 replace icons in admin app component

parent 5658fcf4
No related branches found
No related tags found
1 merge request!121OZG-7707 Replace icons
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
routerLink="/" routerLink="/"
data-test-id="logo-link" data-test-id="logo-link"
> >
<ods-admin-logo-icon /> <ods-icon name="admin-logo" size="unset" />
</a> </a>
<user-profile-button-container <user-profile-button-container
[apiRootStateResource]="apiRootStateResource$ | async" [apiRootStateResource]="apiRootStateResource$ | async"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<ods-navbar data-test-id="navigation"> <ods-navbar data-test-id="navigation">
@if (apiRoot | hasLink: apiRootLinkRel.USERS) { @if (apiRoot | hasLink: apiRootLinkRel.USERS) {
<ods-nav-item data-test-id="users-roles-navigation" caption="Benutzer & Rollen" [path]="routes.BENUTZER"> <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> </ods-nav-item>
} }
@if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) { @if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
caption="Organisationseinheiten" caption="Organisationseinheiten"
[path]="routes.ORGANISATIONSEINHEITEN" [path]="routes.ORGANISATIONSEINHEITEN"
> >
<ods-orga-unit-icon icon /> <ods-icon icon name="orga-unit" color="text" />
</ods-nav-item> </ods-nav-item>
<hr /> <hr />
} }
......
...@@ -38,7 +38,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; ...@@ -38,7 +38,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
import { AuthenticationService } from '@authentication'; import { AuthenticationService } from '@authentication';
import { import {
AdminLogoIconComponent, IconComponent,
MailboxIconComponent, MailboxIconComponent,
NavbarComponent, NavbarComponent,
NavItemComponent, NavItemComponent,
...@@ -100,7 +100,7 @@ describe('AppComponent', () => { ...@@ -100,7 +100,7 @@ describe('AppComponent', () => {
imports: [HasLinkPipe], imports: [HasLinkPipe],
declarations: [ declarations: [
AppComponent, AppComponent,
MockComponent(AdminLogoIconComponent), MockComponent(IconComponent),
MockComponent(OrgaUnitIconComponent), MockComponent(OrgaUnitIconComponent),
MockComponent(UsersIconComponent), MockComponent(UsersIconComponent),
MockComponent(MailboxIconComponent), MockComponent(MailboxIconComponent),
......
...@@ -33,7 +33,7 @@ import { Component, inject, OnInit } from '@angular/core'; ...@@ -33,7 +33,7 @@ import { Component, inject, OnInit } from '@angular/core';
import { Router, RouterLink, RouterOutlet } from '@angular/router'; import { Router, RouterLink, RouterOutlet } from '@angular/router';
import { AuthenticationService } from '@authentication'; import { AuthenticationService } from '@authentication';
import { hasLink } from '@ngxp/rest'; 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 { filter, Observable, Subscription } from 'rxjs';
import { UserProfileButtonContainerComponent } from '../../../../libs/admin/user-profile/src/lib/user-menu/user-profile.button-container.component'; 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'; import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
...@@ -47,10 +47,8 @@ import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/ ...@@ -47,10 +47,8 @@ import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/
CommonModule, CommonModule,
NavbarComponent, NavbarComponent,
NavItemComponent, NavItemComponent,
UsersIconComponent,
UserProfileButtonContainerComponent, UserProfileButtonContainerComponent,
AdminLogoIconComponent, IconComponent,
OrgaUnitIconComponent,
RouterOutlet, RouterOutlet,
UnavailablePageComponent, UnavailablePageComponent,
BuildInfoComponent, BuildInfoComponent,
......
<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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment