Merge pull request #6 from virtualidentityag/feat/CARITAS-245-caritas…

…-theme feat(CARITAS-245): caritas theme
virtualidentityag · Sep 20, 2024 · 3508e1a · 3508e1a
2 parents 5c3295c + 2669a66
commit 3508e1a
Show file tree

Hide file tree

Showing 105 changed files with 1,656 additions and 4,695 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
                   branch: ${{env.BRANCH}}
                   force: true
                   tags: true
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-videos

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -31,7 +31,7 @@ jobs:
             - run: npm ci
             - name: set env
               run: |
-                  echo REACT_APP_API_URL=https://dev.diakonie.dev.virtual-identity.com >> $GITHUB_ENV
+                  echo REACT_APP_API_URL=https://dev.caritas-rework.dev.virtual-identity.net >> $GITHUB_ENV
             - name: Run build
               run: npm run build-storybook
             - name: Setup Pages

diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -4,7 +4,7 @@ import i18n from 'i18next';
 import { ThemeProvider } from '@mui/material';
 import { Preview } from '@storybook/react';
 import * as React from 'react';
-import theme from '../src/extensions/theme';
+import theme from '../src/resources/scripts/theme';
 import { config } from '../src/resources/scripts/config';
 import { LegalLinksProvider } from '../src/globalState/provider/LegalLinksProvider';
 import { init, FALLBACK_LNG } from '../src/i18n';

diff --git a/cypress/e2e/login.cy.ts b/cypress/e2e/login.cy.ts
@@ -2,7 +2,8 @@ import {
 	closeWebSocketServer,
 	mockWebSocket,
 	startWebSocketServer
-} from '../support/websocket';
+} from '../../cypress/support/websocket';
+import { config } from '../../src/resources/scripts/config';
 
 describe('Login', () => {
 	before(() => {
@@ -14,6 +15,7 @@ describe('Login', () => {
 	});
 
 	beforeEach(() => {
+		cy.willReturn('frontend.settings', config);
 		mockWebSocket();
 	});
 
@@ -23,11 +25,9 @@ describe('Login', () => {
 		cy.get('#appRoot').should('exist');
 	});
 
-	it('displays the login at the root', () => {
+	it('displays the consultingtype page at the root', () => {
 		cy.visit('/');
-		cy.contains('Login');
-		cy.contains('Impressum');
-		cy.contains('Datenschutzerklärung');
+		cy.contains('Willkommen bei der Online-Beratung');
 	});
 
 	it('displays the login for resorts', () => {

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
@@ -1,6 +1,6 @@
 {
-	"short_name": "Diakonie Online-Beratung",
-	"name": "Diakonie Online-Beratung – Online. Anonym. Sicher.",
+	"short_name": "Online-Beratung",
+	"name": "Caritas Online-Beratung – Online. Anonym. Sicher.",
 	"icons": [
 		{
 			"src": "favicon.ico",
@@ -20,6 +20,6 @@
 	],
 	"start_url": ".",
 	"display": "standalone",
-	"theme_color": "#5a2572",
+	"theme_color": "#cc1e1c",
 	"background_color": "#ffffff"
 }
diff --git a/public/releases/19700101001.md b/public/releases/19700101001.md
diff --git a/public/releases/20220427001.md b/public/releases/20220427001.md
diff --git a/public/releases/20220505001.md b/public/releases/20220505001.md
diff --git a/public/releases/20221124001.md b/public/releases/20221124001.md
diff --git a/public/releases/20221212001.md b/public/releases/20221212001.md
diff --git a/public/releases/20230117001.md b/public/releases/20230117001.md
diff --git a/public/releases/releases.json b/public/releases/releases.json
@@ -1,17 +1 @@
-{
-	"20220427001": {
-		"file": "20220427001.md"
-	},
-	"20220505001": {
-		"file": "20220505001.md"
-	},
-	"20221124001": {
-		"file": "20221124001.md"
-	},
-	"20221212001": {
-		"file": "20221212001.md"
-	},
-	"20230117001": {
-		"file": "20230117001.md"
-	}
-}
+{}