From 75b01026bbf98c52e29383712c4010271cdd371e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 27 Aug 2024 13:31:42 +0200
Subject: [PATCH] OZG-6102 OZG-6521 Use logo icon in header
---
alfa-client/apps/admin/src/app/app.component.html | 12 ++++++++++--
alfa-client/apps/admin/src/app/app.module.ts | 6 +++---
alfa-client/apps/admin/src/styles.scss | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index 87dbc4de9c..391909c5e8 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -1,6 +1,14 @@
<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
- <header class="flex items-center justify-between bg-white p-6" data-test-id="admin-header">
- <div class="font-extrabold text-ozgblue">OZG-Cloud Administration</div>
+ <header
+ class="flex h-16 items-center justify-between bg-white px-9 py-2"
+ data-test-id="admin-header"
+ >
+ <a
+ class="rounded border-2 border-transparent p-1 outline-2 outline-offset-2 hover:border-primary focus-visible:border-gray-200 focus-visible:outline-focus"
+ aria-label="OZG-Cloud Administration"
+ routerLink="/"
+ ><ods-admin-logo-icon
+ /></a>
<div>
<user-profile-button-container
data-test-id="user-profile-button"
diff --git a/alfa-client/apps/admin/src/app/app.module.ts b/alfa-client/apps/admin/src/app/app.module.ts
index 9f9934a367..b5444792c8 100644
--- a/alfa-client/apps/admin/src/app/app.module.ts
+++ b/alfa-client/apps/admin/src/app/app.module.ts
@@ -13,7 +13,7 @@ import { EffectsModule } from '@ngrx/effects';
import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-import { TestbtnComponent } from '@ods/system';
+import { AdminLogoIconComponent } from '@ods/system';
import { OAuthModule } from 'angular-oauth2-oidc';
import { HttpUnauthorizedInterceptor } from 'libs/authentication/src/lib/http-unauthorized.interceptor';
import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
@@ -34,14 +34,14 @@ import { appRoutes } from './app.routes';
],
imports: [
CommonModule,
- TestbtnComponent,
+ AdminLogoIconComponent,
RouterModule.forRoot(appRoutes),
BrowserModule,
BrowserAnimationsModule,
HttpClientModule,
ApiRootModule,
EnvironmentModule,
- environment.production ? [] : StoreDevtoolsModule.instrument({connectInZone: true}),
+ environment.production ? [] : StoreDevtoolsModule.instrument({ connectInZone: true }),
StoreModule.forRoot({}),
EffectsModule.forRoot(),
StoreRouterConnectingModule.forRoot(),
diff --git a/alfa-client/apps/admin/src/styles.scss b/alfa-client/apps/admin/src/styles.scss
index 77e408aa8b..e9a497ed35 100644
--- a/alfa-client/apps/admin/src/styles.scss
+++ b/alfa-client/apps/admin/src/styles.scss
@@ -2,4 +2,4 @@
@tailwind components;
@tailwind utilities;
-/* You can add global styles to this file, and also import other style files */
+@import 'libs/design-system/src/lib/tailwind-preset/root.css';
--
GitLab