diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html index 8fef349aa6bea31dfb841c6a07597871affb55cc..9199c89e54efeaaf506434008f0d5247d25bf526 100644 --- a/alfa-client/apps/admin/src/app/app.component.html +++ b/alfa-client/apps/admin/src/app/app.component.html @@ -1,6 +1,6 @@ <ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot"> <header - class="flex h-16 items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2" + class="z-50 flex h-16 items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2" data-test-id="admin-header" > <a 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 818658ddd7ad7ec20ab2e1e48086d50628123f3e..ea31dd492f621f9e87b99f9ebee7d26f26014677 100644 --- a/alfa-client/apps/admin/src/app/app.component.spec.ts +++ b/alfa-client/apps/admin/src/app/app.component.spec.ts @@ -1,5 +1,5 @@ import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared'; -import { BuildInfoComponent } from '@alfa-client/common-lib'; +import { BuildInfoComponent } from '@alfa-client/common'; import { HasLinkPipe, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared'; import { Mock, diff --git a/alfa-client/apps/admin/src/app/app.module.ts b/alfa-client/apps/admin/src/app/app.module.ts index 05eb114fe4b711dbcf2f993a4f7cddf41e0d2d11..8758a051d1c6f6ef28a9ec6be4620cb3eb3dec5e 100644 --- a/alfa-client/apps/admin/src/app/app.module.ts +++ b/alfa-client/apps/admin/src/app/app.module.ts @@ -1,6 +1,6 @@ import { AdminSettingsModule } from '@admin-client/admin-settings'; import { ApiRootModule } from '@alfa-client/api-root-shared'; -import { BuildInfoComponent } from '@alfa-client/common-lib'; +import { BuildInfoComponent } from '@alfa-client/common'; import { EnvironmentModule } from '@alfa-client/environment-shared'; import { TechSharedModule } from '@alfa-client/tech-shared'; import { CommonModule, registerLocaleData } from '@angular/common'; diff --git a/alfa-client/apps/admin/src/favicon.ico b/alfa-client/apps/admin/src/favicon.ico deleted file mode 100644 index 317ebcb2336e0833a22dddf0ab287849f26fda57..0000000000000000000000000000000000000000 Binary files a/alfa-client/apps/admin/src/favicon.ico and /dev/null differ diff --git a/alfa-client/apps/admin/src/styles.scss b/alfa-client/apps/admin/src/styles.scss index 4e5a7a5c68a63422c4523a58efe6f664c0a6e13e..f3ad3e7e325ea8827c9128b64e18eeb5ec083c9b 100644 --- a/alfa-client/apps/admin/src/styles.scss +++ b/alfa-client/apps/admin/src/styles.scss @@ -7,12 +7,17 @@ @import 'libs/design-system/src/lib/tailwind-preset/root.css'; @import 'libs/ui/src/lib/font/font_material'; @import 'variables'; +@import 'typeface-roboto/index.css'; @include mat.all-component-typographies(); @include mat.core(); @include mat.all-component-themes($alfaTheme); +body { + font-family: Roboto, 'Helvetica Neue', sans-serif; +} + body.dark { @include mat.all-component-colors($alfaDarkTheme); } diff --git a/alfa-client/apps/alfa/src/app/app.component.spec.ts b/alfa-client/apps/alfa/src/app/app.component.spec.ts index f20f5bc5f23bd56572d7b5d78c8117f5f83341e6..8824da3647969782aab53105663e18e44105a01a 100644 --- a/alfa-client/apps/alfa/src/app/app.component.spec.ts +++ b/alfa-client/apps/alfa/src/app/app.component.spec.ts @@ -22,7 +22,7 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { ApiRootFacade } from '@alfa-client/api-root-shared'; -import { BuildInfoComponent } from '@alfa-client/common-lib'; +import { BuildInfoComponent } from '@alfa-client/common'; import { ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared'; import { NavigationService } from '@alfa-client/navigation-shared'; import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared'; diff --git a/alfa-client/apps/alfa/src/app/app.module.ts b/alfa-client/apps/alfa/src/app/app.module.ts index d9adaece899487f8d6d584d8ea20ff641578c7e9..8e35a1cb4ea3831bccdbb142b68d8844cb53582d 100644 --- a/alfa-client/apps/alfa/src/app/app.module.ts +++ b/alfa-client/apps/alfa/src/app/app.module.ts @@ -23,7 +23,7 @@ */ import { ApiRootModule } from '@alfa-client/api-root-shared'; import { AppSharedModule } from '@alfa-client/app-shared'; -import { BuildInfoComponent } from '@alfa-client/common-lib'; +import { BuildInfoComponent } from '@alfa-client/common'; import { EnvironmentModule } from '@alfa-client/environment-shared'; import { HintSharedModule } from '@alfa-client/hint-shared'; import { NavigationModule } from '@alfa-client/navigation'; diff --git a/alfa-client/libs/common-lib/.eslintrc.json b/alfa-client/libs/common/.eslintrc.json similarity index 100% rename from alfa-client/libs/common-lib/.eslintrc.json rename to alfa-client/libs/common/.eslintrc.json diff --git a/alfa-client/libs/common-lib/README.md b/alfa-client/libs/common/README.md similarity index 54% rename from alfa-client/libs/common-lib/README.md rename to alfa-client/libs/common/README.md index f56ea72f2a6f3e405f04f090fb7d2670a8913dcf..dd1a64c606a0de52c0f174b2239362bd9ea5a717 100644 --- a/alfa-client/libs/common-lib/README.md +++ b/alfa-client/libs/common/README.md @@ -1,7 +1,7 @@ -# common-lib +# common This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test common-lib` to execute the unit tests. +Run `nx test common` to execute the unit tests. diff --git a/alfa-client/libs/common-lib/jest.config.ts b/alfa-client/libs/common/jest.config.ts similarity index 87% rename from alfa-client/libs/common-lib/jest.config.ts rename to alfa-client/libs/common/jest.config.ts index 5126e9a7275f05132fe089f9560dd29e561a732e..cc270a9a40a45f60ca8b165405c609383b92ebc6 100644 --- a/alfa-client/libs/common-lib/jest.config.ts +++ b/alfa-client/libs/common/jest.config.ts @@ -1,8 +1,8 @@ export default { - displayName: 'common-lib', + displayName: 'common', preset: '../../jest.preset.js', setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'], - coverageDirectory: '../../coverage/libs/common-lib', + coverageDirectory: '../../coverage/libs/common', transform: { '^.+\\.(ts|mjs|js|html)$': [ 'jest-preset-angular', diff --git a/alfa-client/libs/common-lib/project.json b/alfa-client/libs/common/project.json similarity index 74% rename from alfa-client/libs/common-lib/project.json rename to alfa-client/libs/common/project.json index 8a477e97d512ef3eac6cfe8ff272ed0754b5991c..75ea075f15e55a052c0cc5e7f02564ae3748e547 100644 --- a/alfa-client/libs/common-lib/project.json +++ b/alfa-client/libs/common/project.json @@ -1,7 +1,7 @@ { - "name": "common-lib", + "name": "common", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/common-lib/src", + "sourceRoot": "libs/common/src", "prefix": "lib", "projectType": "library", "tags": [], @@ -10,7 +10,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/common-lib/jest.config.ts" + "jestConfig": "libs/common/jest.config.ts" } }, "lint": { diff --git a/alfa-client/libs/common-lib/src/index.ts b/alfa-client/libs/common/src/index.ts similarity index 100% rename from alfa-client/libs/common-lib/src/index.ts rename to alfa-client/libs/common/src/index.ts diff --git a/alfa-client/libs/common-lib/src/lib/build-info/build-info.component.html b/alfa-client/libs/common/src/lib/build-info/build-info.component.html similarity index 100% rename from alfa-client/libs/common-lib/src/lib/build-info/build-info.component.html rename to alfa-client/libs/common/src/lib/build-info/build-info.component.html diff --git a/alfa-client/libs/common-lib/src/lib/build-info/build-info.component.scss b/alfa-client/libs/common/src/lib/build-info/build-info.component.scss similarity index 96% rename from alfa-client/libs/common-lib/src/lib/build-info/build-info.component.scss rename to alfa-client/libs/common/src/lib/build-info/build-info.component.scss index 1d3adee3ebaa45eb315e04c8fca52fd70950e855..2764bb91702a4060dda18b98c81fae6ad74b90c7 100644 --- a/alfa-client/libs/common-lib/src/lib/build-info/build-info.component.scss +++ b/alfa-client/libs/common/src/lib/build-info/build-info.component.scss @@ -36,10 +36,6 @@ transform-origin: right bottom; } -:host-context(.dark) { - color: #ccc; -} - p { margin: 0; line-height: 1; @@ -47,7 +43,7 @@ p { font-style: normal; font-weight: 400; font-size: 0.6875rem; - color: #999; + color: theme('colors.text/70'); &.version { span { diff --git a/alfa-client/libs/common-lib/src/lib/build-info/build-info.component.spec.ts b/alfa-client/libs/common/src/lib/build-info/build-info.component.spec.ts similarity index 100% rename from alfa-client/libs/common-lib/src/lib/build-info/build-info.component.spec.ts rename to alfa-client/libs/common/src/lib/build-info/build-info.component.spec.ts diff --git a/alfa-client/libs/common-lib/src/lib/build-info/build-info.component.ts b/alfa-client/libs/common/src/lib/build-info/build-info.component.ts similarity index 100% rename from alfa-client/libs/common-lib/src/lib/build-info/build-info.component.ts rename to alfa-client/libs/common/src/lib/build-info/build-info.component.ts diff --git a/alfa-client/libs/common-lib/src/test-setup.ts b/alfa-client/libs/common/src/test-setup.ts similarity index 100% rename from alfa-client/libs/common-lib/src/test-setup.ts rename to alfa-client/libs/common/src/test-setup.ts diff --git a/alfa-client/libs/common-lib/tailwind.config.js b/alfa-client/libs/common/tailwind.config.js similarity index 100% rename from alfa-client/libs/common-lib/tailwind.config.js rename to alfa-client/libs/common/tailwind.config.js diff --git a/alfa-client/libs/common-lib/tsconfig.json b/alfa-client/libs/common/tsconfig.json similarity index 100% rename from alfa-client/libs/common-lib/tsconfig.json rename to alfa-client/libs/common/tsconfig.json diff --git a/alfa-client/libs/common-lib/tsconfig.lib.json b/alfa-client/libs/common/tsconfig.lib.json similarity index 100% rename from alfa-client/libs/common-lib/tsconfig.lib.json rename to alfa-client/libs/common/tsconfig.lib.json diff --git a/alfa-client/libs/common-lib/tsconfig.lib.prod.json b/alfa-client/libs/common/tsconfig.lib.prod.json similarity index 100% rename from alfa-client/libs/common-lib/tsconfig.lib.prod.json rename to alfa-client/libs/common/tsconfig.lib.prod.json diff --git a/alfa-client/libs/common-lib/tsconfig.spec.json b/alfa-client/libs/common/tsconfig.spec.json similarity index 100% rename from alfa-client/libs/common-lib/tsconfig.spec.json rename to alfa-client/libs/common/tsconfig.spec.json diff --git a/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts index 0aef13978f11b606c0be0d6e0dbb6c297e8149e0..04eeffba56f4a341b60d448202972da84925cf35 100644 --- a/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts +++ b/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts @@ -27,7 +27,7 @@ describe('ListItemComponent', () => { describe('input', () => { describe('routerLink', () => { it('should set href attribute', () => { - component.path = faker.system.filePath(); + component.path = encodeURI(faker.system.filePath()); const resultingLink: string = 'http://localhost' + component.path; const linkElement: HTMLLinkElement = getElementFromFixture(fixture, getDataTestClassOf('list-item-link')); diff --git a/alfa-client/tsconfig.base.json b/alfa-client/tsconfig.base.json index 1123019a134bc3716bf6280a1115b72261f6a2db..5fa256e28ccf0dd8ac93135af48e7e0180ed359d 100644 --- a/alfa-client/tsconfig.base.json +++ b/alfa-client/tsconfig.base.json @@ -62,7 +62,7 @@ "@ods/component": ["libs/design-component/src/index.ts"], "@ods/system": ["libs/design-system/src/index.ts"], "authentication": ["libs/authentication/src/index.ts"], - "@alfa-client/common-lib": ["libs/common-lib/src/index.ts"] + "@alfa-client/common": ["libs/common/src/index.ts"] } }, "exclude": ["node_modules", "tmp"]