Merge branch 'master' into OZG-6300-OZG-6417-Zusammarbeit-E2E

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

@@ -3,3 +3,11 @@
 @tailwind utilities;
 
 @import 'libs/design-system/src/lib/tailwind-preset/root.css';
+
+.heading-1 {
+  @apply text-3xl font-medium text-text;
+}
+
+.heading-2 {
+  @apply py-4 text-2xl font-medium text-text;
+}

alfa-client/apps/alfa-e2e/docker-compose.yml

@@ -33,8 +33,6 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
-    networks:
-      - ozgcloud
 
   vorgang-manager:
     image: docker.ozg-sh.de/vorgang-manager:${VORGANG_MANAGER_DOCKER_IMAGE:-snapshot-latest}
@@ -81,8 +79,6 @@ services:
         condition: service_healthy
       user-manager:
         condition: service_started
-    networks:
-      - ozgcloud
 
   alfa:
     image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
@@ -119,8 +115,6 @@ services:
       - vorgang-manager
       - user-manager
       - zufi-manager-server
-    networks:
-      - ozgcloud
 
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.3.2
@@ -151,8 +145,6 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
-    networks:
-      - ozgcloud
 
   user-manager:
     image: docker.ozg-sh.de/user-manager:${USER_MANAGER_DOCKER_IMAGE:-snapshot-latest}
@@ -183,8 +175,6 @@ services:
     depends_on:
       mongodb:
         condition: service_healthy
-    networks:
-      - ozgcloud
 
   zufi-manager-pvog:
     image: docker.ozg-sh.de/zufi-manager:snapshot-latest
@@ -199,8 +189,6 @@ services:
         condition: service_healthy
       smocker-init:
         condition: service_completed_successfully
-    networks:
-      - ozgcloud
 
   zufi-manager-server:
     image: docker.ozg-sh.de/zufi-server:snapshot-latest
@@ -216,8 +204,6 @@ services:
         condition: service_healthy
       zufi-manager-pvog:
         condition: service_completed_successfully
-    networks:
-      - ozgcloud
 
   smocker:
     image: thiht/smocker
@@ -229,8 +215,6 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-    networks:
-      - ozgcloud
 
   smocker-init:
     image: alpine/curl
@@ -242,9 +226,3 @@ services:
     depends_on:
       smocker:
         condition: service_healthy
-    networks:
-      - ozgcloud
-
-networks:
-  ozgcloud:
-    driver: bridge

alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.html

-<h1 class="text-2xl font-bold">Organisationseinheiten</h1>
+<h1 class="heading-1 pb-4">Organisationseinheiten</h1>
 <p id="absender-desc" class="p-1">Hinterlegen Sie Name und ID der Organisationseinheiten.</p>
 
 <admin-organisationseinheit-form

alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html

 <form class="form flex-col" [formGroup]="formService.form">
-  <h1 class="text-2xl font-bold">Absender</h1>
+  <h1 class="heading-1">Postfach</h1>
+  <h2 class="heading-2">Absender</h2>
   <p id="absender-desc" class="p-1">Hinterlegen Sie Absenderinformationen zu Ihrem Postfach.</p>
   <div
     [formGroupName]="PostfachFormService.ASBSENDER_GROUP"
@@ -33,7 +34,7 @@
     ></text-field>
   </div>
   <div class="h-20"></div>
-  <h1 class="text-2xl font-bold">Signatur</h1>
+  <h2 class="heading-2">Signatur</h2>
   <p id="signatur-desc">Erstellen oder ändern Sie die Signatur für Nachrichten.</p>
   <textarea
     data-test-id="signatur-text"

alfa-client/libs/design-system/.storybook/styles.scss

 @import '../src/lib/tailwind-preset/root.css';
+@import '../../../apps/admin/src/styles.scss';

alfa-client/libs/design-system/nginx.conf

@@ -32,8 +32,11 @@ http {
        
 
         location / {
-            root   /usr/share/nginx/html/design-system;
+            root   /usr/share/nginx/html/design-system/;
             index  index.html index.htm;
+
+            #add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+            #add_header Expires "0";
         }
         
 

alfa-client/libs/design-system/src/lib/heading/heading.stories.ts

+import { type Meta, type StoryObj } from '@storybook/angular';
+
+const meta: Meta = {
+  title: 'Typography/Heading',
+  excludeStories: /.*Data$/,
+  tags: ['autodocs'],
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'The headings are native HTML h-elements, styled with additional classes (see code)',
+      },
+    },
+  },
+};
+
+export default meta;
+type Story = StoryObj;
+
+export const Default: Story = {
+  render: () => ({
+    template: '<h1 class="heading-1">Heading 1</h1><h2 class="heading-2">Heading 2</h2>',
+  }),
+};