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

chore(deps): bump actions/checkout from 2 to 4 #58

Open
wants to merge 113 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
8cac5e3
feat: Dia theming
web-mi Dec 19, 2022
23dd225
chore: updated to latest theming version
web-mi May 15, 2023
f4ca697
Merge pull request #3 from virtualidentityag/OB-4594
web-mi Jun 1, 2023
351c43c
Merge branch 'Onlineberatung:develop' into develop
web-mi Jun 5, 2023
a761bbb
fix: languages to be not overwritten
web-mi Jun 5, 2023
afcae46
feat(registration): add storybook, stepbar and zipcode input
RunzelRosinchen May 24, 2023
58b5dd4
feat(registration): translations
RunzelRosinchen May 24, 2023
aa502ab
feat(cypress): add component tests
RunzelRosinchen May 24, 2023
2d6e2a0
feat(component tests): add testing to github actions
RunzelRosinchen May 24, 2023
e76fbd8
feat(registration): add new agency selection
RunzelRosinchen May 24, 2023
a52ccb3
fix(agency selection): radio group naming
RunzelRosinchen May 25, 2023
cfb6c46
feat(registration): add topic selection component
RunzelRosinchen May 25, 2023
6ec6c3f
feat(topic selection): sort alphabetically
RunzelRosinchen May 25, 2023
1e6f6c9
feat(registration): add account data component
RunzelRosinchen Jun 1, 2023
227745b
feat(registration): add welcome screen
RunzelRosinchen Jun 1, 2023
ae1cd7c
feat(welcome screen): margin
RunzelRosinchen Jun 2, 2023
f0a00b5
feat: rework storybook and component tests
web-mi Jun 7, 2023
ce0f934
fix: added missing stylelint plugin
web-mi Jun 7, 2023
8edcb78
fix: plugin sort
web-mi Jun 7, 2023
73378c4
fix: stylelint
web-mi Jun 10, 2023
3e29c23
fix: prettier
web-mi Jun 10, 2023
064af95
fix: replaced node-sass by sass
web-mi Jun 12, 2023
ab1477e
feat(registration): add registration wrapper
web-mi Jun 12, 2023
0700ba2
feat(registration): prefill step values if available
web-mi Jun 12, 2023
4445558
feat(helmet): add noindex meta tag for registration subroutes
web-mi Jun 12, 2023
9ce0c71
chore: rebase with cherry picks
web-mi Jun 12, 2023
8dd9595
fix: test
web-mi Jun 12, 2023
171608d
Merge pull request #8 from virtualidentityag/feat/registration-rework
web-mi Jun 12, 2023
ce0259c
fix(registration): mui colors
RunzelRosinchen Jun 12, 2023
39296ff
fix(welcome screen): add router to storybook
RunzelRosinchen Jun 12, 2023
94eb2ed
Merge pull request #13 from virtualidentityag/feat/registration-rework-2
RunzelRosinchen Jun 12, 2023
785ad7b
Update agencySelectionResults.tsx
RunzelRosinchen Jun 12, 2023
79ec554
Merge branch 'develop' into feat/new-registration-logic-2
RunzelRosinchen Jun 12, 2023
f60f516
Update agencySelectionResults.tsx
RunzelRosinchen Jun 14, 2023
a7045c0
fix(registration): styling
RunzelRosinchen Jun 14, 2023
f138f75
fix(registration): styling
RunzelRosinchen Jun 14, 2023
a525494
Merge pull request #14 from virtualidentityag/fix/design-registration
RunzelRosinchen Jun 14, 2023
bae5bb1
feat(registration): logic adaptions
RunzelRosinchen Jun 15, 2023
1decd41
fix: storybook svg loader
web-mi Jun 16, 2023
722574a
Merge pull request #16 from virtualidentityag/fix/storybook-svg
web-mi Jun 16, 2023
d35c8e1
Merge branch 'develop' into feat/new-registration-logic-2
RunzelRosinchen Jun 19, 2023
958b03b
fix(registration): tests
RunzelRosinchen Jun 19, 2023
5f3ff08
revert(package): component test script
RunzelRosinchen Jun 20, 2023
8de3a20
fix(registration): use effect deps
RunzelRosinchen Jun 20, 2023
345bc35
fix(registration): remove unused var
RunzelRosinchen Jun 20, 2023
158548e
feat(registration): overlay auto close
RunzelRosinchen Jun 20, 2023
b7baa95
feat(registration): max width
RunzelRosinchen Jun 20, 2023
e082597
feat(meta info): mobile overlay
RunzelRosinchen Jun 20, 2023
a220c29
fix(registration): zipcode inputs
RunzelRosinchen Jun 20, 2023
2e5924a
feat(registration): add meta info overlay
RunzelRosinchen Jun 26, 2023
3864b61
Merge branch 'feat/new-registration-logic-2' into feat/mobile-adjustm…
RunzelRosinchen Jun 26, 2023
14c9736
feat(registration): mobile welcome screen adaptions
RunzelRosinchen Jun 26, 2023
1ebb98f
refactor(registration): remove unused imports
RunzelRosinchen Jun 26, 2023
1910f55
feat(registration): mobile header and drawer
RunzelRosinchen Jun 26, 2023
17f6425
Merge pull request #17 from virtualidentityag/fix/components-regitration
web-mi Jun 27, 2023
de717a2
Merge branch 'develop' into feat/new-registration-logic-2
RunzelRosinchen Jun 27, 2023
d3df953
feat(registration): direct links and adaptions
RunzelRosinchen Jul 3, 2023
ec03691
feat(registration): adaptions
RunzelRosinchen Jul 3, 2023
d107057
Merge branch 'feat/new-registration-logic-2' into feat/mobile-adaptio…
RunzelRosinchen Jul 3, 2023
7dfd740
feat(registration): adaptions
RunzelRosinchen Jul 5, 2023
090051a
test(login): adapt to new home page
RunzelRosinchen Jul 5, 2023
11d842e
test(registration): adapt tests to component adaption
RunzelRosinchen Jul 5, 2023
3ed9674
Merge pull request #18 from virtualidentityag/feat/mobile-adaptions-r…
RunzelRosinchen Jul 6, 2023
1756f83
chore(deps-dev): bump storybook-react-i18next from 2.0.4 to 2.0.6
dependabot[bot] Jul 7, 2023
07e40f9
Merge pull request #26 from virtualidentityag/dependabot/npm_and_yarn…
github-actions[bot] Jul 7, 2023
e76a1bb
chore(deps-dev): bump @storybook/react from 7.0.18 to 7.0.26
dependabot[bot] Jul 7, 2023
0d61975
Merge pull request #27 from virtualidentityag/dependabot/npm_and_yarn…
github-actions[bot] Jul 7, 2023
618c2f2
chore(deps): bump webpack-dev-server from 4.15.0 to 4.15.1
dependabot[bot] Jul 7, 2023
3798751
Merge pull request #29 from virtualidentityag/dependabot/npm_and_yarn…
github-actions[bot] Jul 7, 2023
ea7554e
chore(deps): bump @mui/material from 5.13.4 to 5.13.7
dependabot[bot] Jul 7, 2023
ecf27a2
Merge pull request #30 from virtualidentityag/dependabot/npm_and_yarn…
github-actions[bot] Jul 7, 2023
02ca3be
chore(deps): bump sass-loader from 13.3.1 to 13.3.2
dependabot[bot] Jul 7, 2023
49566f3
Merge pull request #31 from virtualidentityag/dependabot/npm_and_yarn…
github-actions[bot] Jul 7, 2023
00767c8
Update src/components/registration_new/agencySelection/agencySelectio…
RunzelRosinchen Jul 12, 2023
d6014c4
Update src/components/registration_new/agencySelection/agencySelectio…
RunzelRosinchen Jul 12, 2023
749f241
Update src/components/registration_new/infoDrawer/infoDrawer.tsx
RunzelRosinchen Jul 12, 2023
8a0b0eb
Update src/components/registration_new/agencySelection/agencySelectio…
RunzelRosinchen Jul 12, 2023
d2a93b9
feat(registration): direct links
RunzelRosinchen Jul 12, 2023
c64dfc0
style(registration): add comments
RunzelRosinchen Jul 17, 2023
b608f85
refactor(registration): restructure folders
RunzelRosinchen Jul 17, 2023
58f2467
feat(registration): preselection error
RunzelRosinchen Jul 17, 2023
4fda4de
Merge branch 'develop' into feat/new-registration-logic-2
RunzelRosinchen Jul 17, 2023
74a6563
feat(registration): lazy load
RunzelRosinchen Jul 17, 2023
ab0e2f4
fix: package-lock.json
web-mi Jul 17, 2023
f9a5642
fix: package-lock.json
web-mi Jul 17, 2023
abcf94d
fix: rem duplicate files
web-mi Jul 17, 2023
79b0957
Merge pull request #15 from virtualidentityag/feat/new-registration-l…
RunzelRosinchen Jul 17, 2023
61b8b17
feat(preselected topic): check if agency matches topic
RunzelRosinchen Jul 18, 2023
7068467
fix(agency selection): select agency on click
RunzelRosinchen Jul 18, 2023
a5c0213
Merge pull request #36 from virtualidentityag/fix/preselected-topic
RunzelRosinchen Jul 18, 2023
92058de
feat(preselection box): only show on welcome page for consultant
RunzelRosinchen Jul 18, 2023
d096a6e
Merge pull request #37 from virtualidentityag/fix/consultant-box
RunzelRosinchen Jul 18, 2023
f9494b9
fix(agency selection): only one agency
RunzelRosinchen Jul 18, 2023
0b52f6a
Merge pull request #38 from virtualidentityag/fix/consultant-box
RunzelRosinchen Jul 18, 2023
d24da3f
chore(deps): bump @cypress/webpack-dev-server from 3.5.0 to 3.5.1
dependabot[bot] Jul 18, 2023
f675435
Merge pull request #39 from virtualidentityag/dependabot/npm_and_yarn…
github-actions[bot] Jul 18, 2023
ee976d4
fix(registration): overflow hidden only if drawer is visible
RunzelRosinchen Jul 19, 2023
371de6d
fix(preselection): dont show info box if aid or tid are not preselected
RunzelRosinchen Jul 19, 2023
5a0ad1d
fix(registration): meta info overlay adaptions
RunzelRosinchen Jul 19, 2023
473f136
fix(password): min length
RunzelRosinchen Jul 19, 2023
fe3b8ce
refactor(meta info): remove unused import
RunzelRosinchen Jul 19, 2023
b919cfe
feat: show backdrop for info drawer
RunzelRosinchen Jul 19, 2023
333d4cb
style(info drawer): formatting
RunzelRosinchen Jul 19, 2023
b7970c6
fix(meta info): drawer side effects
RunzelRosinchen Aug 1, 2023
33a0692
fix(registration): next button not hidden behind toolbar
RunzelRosinchen Aug 1, 2023
1fe0d00
fix(registration): rework
RunzelRosinchen Aug 8, 2023
c224b6b
fix(registration): direct link
RunzelRosinchen Aug 8, 2023
639dd58
refactor(registration): remove consolelog
RunzelRosinchen Aug 8, 2023
f2d7b4d
Merge pull request #47 from virtualidentityag/fix/registration-rework
RunzelRosinchen Aug 9, 2023
465bf23
fix: make QR code foreground opaque
Aug 15, 2023
c5a3fe7
fix: remove download QR code variation
Aug 17, 2023
01751b1
Merge pull request #51 from virtualidentityag/OB-630_OBI-447-grey-qr-…
Aug 17, 2023
213729b
chore(deps): bump actions/checkout from 2 to 4
dependabot[bot] Sep 4, 2023
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
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
else
echo ENV_NAME="prod" >> $GITHUB_ENV
fi
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
registry-url: 'https://npm.pkg.github.com'
cache: 'npm'
- name: Load .env file
Expand All @@ -53,6 +53,9 @@ 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
- name: Run component tests
run: |
npm run test:components
- name: Run build
run: |
npm run build
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/dockerImage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
FAIL_WEBHOOK_SECRET: ${{ secrets.MS_TEAMS_FAIL_WEBHOOK_URI }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: set env
run: |
RAW=$(git branch -r --contains ${{ github.ref }})
Expand All @@ -34,7 +34,7 @@ jobs:
fi
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
cache: 'npm'
- name: Load .env file
uses: xom9ikk/dotenv@v2
Expand All @@ -55,6 +55,9 @@ 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
- name: Run component tests
run: |
npm run test:components
- name: Run build
run: |
npm run build
Expand Down Expand Up @@ -87,7 +90,7 @@ jobs:
IMAGE_WEBHOOK_SECRET: ${{ secrets.MS_TEAMS_IMAGE_WEBHOOK_URI }}
FAIL_WEBHOOK_SECRET: ${{ secrets.MS_TEAMS_FAIL_WEBHOOK_URI }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Download buildfiles artifact
uses: actions/download-artifact@v2
with:
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Deploy storybook to Pages

on:
push:
branches: ['develop']

workflow_dispatch:

permissions:
contents: read
pages: write
id-token: write

concurrency:
group: 'pages'
cancel-in-progress: false

jobs:
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
- run: npm ci
- name: set env
run: |
echo REACT_APP_API_URL=https://dev.diakonie.dev.virtual-identity.com >> $GITHUB_ENV
- name: Run build
run: npm run build-storybook
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: './storybook-static'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
.env.test.local
.env.production.local
.idea
storybook-static

# cypress
browserstack.json
Expand Down
73 changes: 73 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import type { StorybookConfig } from '@storybook/react-webpack5';
import * as webpackConfigFactory from '../config/webpack.config';
import { Configuration } from 'webpack';

const config: StorybookConfig = {
stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'storybook-react-i18next'
],
framework: {
name: '@storybook/react-webpack5',
options: {}
},
webpackFinal: async (config, { configType }) => {
// @ts-ignore
const webpackConfig = webpackConfigFactory.default(
configType.toLowerCase()
);

return {
...config,
resolve: {
...config.resolve,
modules: [
...webpackConfig.resolve.modules,
...config.resolve.modules
],
extensions: [
...webpackConfig.resolve.extensions,
...config.resolve.extensions
],
alias: {
...webpackConfig.resolve.alias,
...config.resolve.alias
},
plugins: [...webpackConfig.resolve.plugins]
},
plugins: [...webpackConfig.plugins, ...config.plugins],
module: {
...config.module,
rules: [
// Exclude svg from storybook file-loader
...config.module.rules.map((r: any) => {
if (r.test && /svg/.test(r.test)) {
// Silence the Storybook loaders for SVG files
return { ...r, exclude: /\.svg$/i };
}
return r;
}),
// Filter the last catch all because storybook needs to handle mjs files
...webpackConfig.module.rules.map((r) => {
if (!r.oneOf) {
return r;
}
return {
...r,
oneOf: r.oneOf.filter(
(o) => o.type !== 'asset/resource'
)
};
})
]
}
} as Configuration;
},
docs: {
autodocs: 'tag'
}
};
export default config;
54 changes: 54 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import '../src/resources/styles/styles.scss';
import '../src/resources/styles/mui-variables-mapping.scss';
import i18n from 'i18next';
import { ThemeProvider } from '@mui/material';
import type { Preview } from '@storybook/react';
import * as React from 'react';
import theme from '../src/theme';
//import i18n from './i18next';
import { config } from '../src/resources/scripts/config';
import { LegalLinksProvider } from '../src/globalState/provider/LegalLinksProvider';
import { init, FALLBACK_LNG } from '../src/i18n';
import { BrowserRouter as Router } from 'react-router-dom';
init(config.i18n);

export const withMuiTheme = (Story) => (
<Router>
<ThemeProvider theme={theme}>
<LegalLinksProvider legalLinks={config.legalLinks}>
<Story />
</LegalLinksProvider>
</ThemeProvider>
</Router>
);

export const decorators = [withMuiTheme];

const locales = {};
(config.i18n.supportedLngs || []).forEach((supportLng) => {
const lng = supportLng.split('_informal')[0];
locales[supportLng] = i18n.getResource(FALLBACK_LNG, 'languages', lng);
if (supportLng.indexOf('_informal') >= 0) {
locales[supportLng] += ' (informal)';
}
});

const preview: Preview = {
parameters: {
i18n,
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/
}
}
},
globals: {
locale: FALLBACK_LNG,
locales
},
decorators: [withMuiTheme]
};

export default preview;
27 changes: 5 additions & 22 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
const defaultConfig = require('@biotope/quality-gate/config/.stylelintrc');

module.exports = {
...defaultConfig,
extends: [
// TODO: From the admin app. Probably a good idea to enable.
// 'stylelint-config-idiomatic-order',

// The config from quality-gate isn't compatible with stylelint@^14,
// therefore merge it with working alternatives.
'stylelint-config-standard-scss',
'stylelint-config-prettier'
],
plugins: ['stylelint-scss', 'stylelint-no-unsupported-browser-features'],
extends: ['stylelint-config-standard', 'stylelint-config-standard-scss'],
rules: {
...defaultConfig.rules,
'selector-max-id': 0,
'scss/dollar-variable-colon-space-after': 'always',
'scss/dollar-variable-colon-space-before': 'never',
'plugin/no-unsupported-browser-features': [
true,
{
Expand All @@ -39,14 +31,6 @@ module.exports = {
]
}
],

// From admin app
'max-empty-lines': [
2,
{
ignore: ['comments']
}
],
'rule-empty-line-before': [
'always-multi-line',
{
Expand All @@ -56,7 +40,6 @@ module.exports = {

// Defaults are not good
'alpha-value-notation': 'number',
'number-leading-zero': 'always',
'color-function-notation': 'legacy',
'value-keyword-case': null, // Requires e.g. "robotoslab" instead of "RobotoSlab"
'scss/operator-no-unspaced': null, // Has false positives
Expand Down
14 changes: 11 additions & 3 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { defineConfig } = require('cypress');
const webpackConfig = require('./config/webpack.config')('development');

// @ts-ignore
const wp = require('@cypress/webpack-preprocessor');
Expand All @@ -22,19 +23,26 @@ const options = {

module.exports = defineConfig({
e2e: {
testIsolation: true,
baseUrl: 'http://localhost:9001',
supportFile: 'cypress/support/e2e.{js,jsx,ts,tsx}',
setupNodeEvents(on, config) {
on('file:preprocessor', wp(options));
}
},
component: {
devServer: {
framework: 'react',
bundler: 'webpack',
webpackConfig
}
},
env: {
CYPRESS_WS_URL:
process.env.CYPRESS_WS_URL || process.env.REACT_APP_API_URL
},
retries: {
runMode: 2
},
experimentalMemoryManagement: true,
numTestsKeptInMemory: 20,
video: false,
chromeWebSecurity: false,
viewportWidth: 1200,
Expand Down
Loading
Loading