Merge branch 'master' into ozg-6647-network-policy-for-scraper

alfa-client/apps/admin/src/app/app.component.html

@@ -18,9 +18,9 @@
   <div class="flex h-screen w-full justify-center overflow-y-auto">
     <ods-navbar data-test-id="navigation">
       <ng-container *ngIf="apiRoot | hasLink: ApiRootLinkRel.CONFIGURATION">
-        <ods-nav-item caption="Organisationseinheiten" to="/organisationseinheiten">
-          <ods-orga-unit-icon icon />
-        </ods-nav-item>
+        <!--        <ods-nav-item caption="Organisationseinheiten" to="/organisationseinheiten">-->
+        <!--          <ods-orga-unit-icon icon />-->
+        <!--        </ods-nav-item>-->
         <ods-nav-item caption="Postfach" to="/postfach">
           <ods-mailbox-icon icon />
         </ods-nav-item>

alfa-client/apps/admin/src/app/app.component.spec.ts

@@ -22,7 +22,7 @@ import {
   OrgaUnitIconComponent,
 } from '@ods/system';
 import { AuthenticationService } from 'authentication';
-import { NavigationComponent } from 'libs/admin-settings/src/lib/navigation/navigation.component';
+import { NavigationComponent } from 'libs/admin/settings/src/lib/navigation/navigation.component';
 import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent, MockDirective } from 'ng-mocks';

alfa-client/apps/admin/src/app/app.routes.ts

 import { Route } from '@angular/router';
-import { OrganisationseinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
 import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
 
 export const appRoutes: Route[] = [
@@ -13,9 +12,9 @@ export const appRoutes: Route[] = [
     component: PostfachPageComponent,
     title: 'Admin | Postfach',
   },
-  {
-    path: 'organisationseinheiten',
-    component: OrganisationseinheitPageComponent,
-    title: 'Admin | Organisationseinheiten',
-  },
+  // {
+  //   path: 'organisationseinheiten',
+  //   component: OrganisationseinheitPageComponent,
+  //   title: 'Admin | Organisationseinheiten',
+  // },
 ];

alfa-client/apps/admin/src/styles.scss

+@use '@angular/material' as mat;
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
 @import 'libs/design-system/src/lib/tailwind-preset/root.css';
+@import 'libs/ui/src/lib/font/font_material';
+
+@include mat.all-component-typographies();
+@include mat.core();
+
+.heading-1 {
+  @apply text-3xl font-medium text-text;
+}
+
+.heading-2 {
+  @apply py-4 text-2xl font-medium text-text;
+}

alfa-client/libs/admin-settings/.eslintrc.json → alfa-client/libs/admin/settings/.eslintrc.json

 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

alfa-client/libs/admin-settings/jest.config.ts → alfa-client/libs/admin/settings/jest.config.ts

@@ -3,10 +3,10 @@
 const esModules = ['@keycloak/keycloak-admin-client', 'url-join', 'url-template', 'camelize-ts'];
 export default {
   displayName: 'admin-settings',
-  preset: '../../jest.preset.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
-  coverageDirectory: '../../coverage/libs/admin-settings',
+  coverageDirectory: '../../coverage/libs/admin/settings',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',

alfa-client/libs/admin-settings/project.json → alfa-client/libs/admin/settings/project.json

 {
   "name": "admin-settings",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/admin-settings/src",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/admin/settings/src",
   "projectType": "library",
   "prefix": "admin",
   "tags": [],
@@ -14,8 +14,8 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "tsConfig": "libs/admin-settings/tsconfig.spec.json",
-        "jestConfig": "libs/admin-settings/jest.config.ts"
+        "tsConfig": "libs/admin/settings/tsconfig.spec.json",
+        "jestConfig": "libs/admin/settings/jest.config.ts"
       }
     }
   }

alfa-client/libs/admin-settings/src/lib/admin-settings.module.ts → alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts

@@ -6,6 +6,8 @@ import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import KcAdminClient from '@keycloak/keycloak-admin-client';
+import { ButtonWithSpinnerComponent, TextareaEditorComponent } from '@ods/component';
+import { TextInputComponent } from '@ods/system';
 import {
   createSettingListResourceService,
   SettingListResourceService,
@@ -23,6 +25,7 @@ import { OrganisationseinheitListComponent } from './organisationseinheit/organi
 import { OrganisationseinheitNavigationItemComponent } from './organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component';
 import { PostfachContainerComponent } from './postfach/postfach-container/postfach-container.component';
 import { PostfachFormComponent } from './postfach/postfach-container/postfach-form/postfach-form.component';
+import { PostfachSignaturComponent } from './postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component';
 import { PostfachNavigationItemComponent } from './postfach/postfach-navigation-item/postfach-navigation-item.component';
 import {
   createPostfachResourceService,
@@ -41,6 +44,7 @@ import { TextFieldComponent } from './shared/text-field/text-field.component';
   declarations: [
     PostfachContainerComponent,
     PostfachFormComponent,
+    PostfachSignaturComponent,
     NavigationItemComponent,
     TextFieldComponent,
     PostfachNavigationItemComponent,
@@ -55,7 +59,15 @@ import { TextFieldComponent } from './shared/text-field/text-field.component';
     MoreItemButtonComponent,
     SpinnerComponent,
   ],
-  imports: [CommonModule, TechSharedModule, RouterModule, ReactiveFormsModule],
+  imports: [
+    CommonModule,
+    TechSharedModule,
+    RouterModule,
+    ReactiveFormsModule,
+    TextInputComponent,
+    ButtonWithSpinnerComponent,
+    TextareaEditorComponent,
+  ],
   exports: [
     PostfachContainerComponent,
     OrganisationseinheitContainerComponent,

alfa-client/libs/admin-settings/src/lib/admin-settings.service.spec.ts → alfa-client/libs/admin/settings/src/lib/admin-settings.service.spec.ts

@@ -4,8 +4,8 @@ import {
   createStateResource,
 } from '@alfa-client/tech-shared';
 import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { singleCold } from 'libs/tech-shared/test/marbles';
 import { Observable, of } from 'rxjs';
-import { singleCold } from '../../../tech-shared/test/marbles';
 import { createSettingsListResource } from '../../test/admin-settings';
 import { createPostfachResource, createSettingItemResource } from '../../test/postfach/postfach';
 import { SettingListResourceService } from './admin-settings-resource.service';