Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(CARITAS-245): caritas theme #6

Merged
merged 10 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerImage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
echo "127.0.0.1 localhost" | sudo tee -a /etc/hosts
echo "fs.inotify.max_user_watches=524288" | sudo tee -a /etc/sysctl.conf
npm run test:build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: buildfiles
path: build/**/*
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Download buildfiles artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: buildfiles
path: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
10 changes: 5 additions & 5 deletions cypress/e2e/login.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -14,6 +15,7 @@ describe('Login', () => {
});

beforeEach(() => {
cy.willReturn('frontend.settings', config);
mockWebSocket();
});

Expand All @@ -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', () => {
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
Binary file modified public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -20,6 +20,6 @@
],
"start_url": ".",
"display": "standalone",
"theme_color": "#5a2572",
"theme_color": "#cc1e1c",
"background_color": "#ffffff"
}
26 changes: 0 additions & 26 deletions public/releases/19700101001.md

This file was deleted.

35 changes: 0 additions & 35 deletions public/releases/20220427001.md

This file was deleted.

20 changes: 0 additions & 20 deletions public/releases/20220505001.md

This file was deleted.

15 changes: 0 additions & 15 deletions public/releases/20221124001.md

This file was deleted.

3 changes: 0 additions & 3 deletions public/releases/20221212001.md

This file was deleted.

3 changes: 0 additions & 3 deletions public/releases/20230117001.md

This file was deleted.

18 changes: 1 addition & 17 deletions public/releases/releases.json
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
{
"20220427001": {
"file": "20220427001.md"
},
"20220505001": {
"file": "20220505001.md"
},
"20221124001": {
"file": "20221124001.md"
},
"20221212001": {
"file": "20221212001.md"
},
"20230117001": {
"file": "20230117001.md"
}
}
{}
Loading
Loading