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

Changeset #177

Draft
wants to merge 383 commits into
base: release-2023-04-03
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
383 commits
Select commit Hold shift + click to select a range
ec1e591
fix: small typo OB-4961
CarlosSoares May 25, 2023
db30ce1
feat: change texts OB-5058 and OB-5057
CarlosSoares May 26, 2023
7c2a220
feat: another text changes OB-5056
CarlosSoares May 26, 2023
06d5eee
fix: stylelint issues
CarlosSoares May 26, 2023
14be003
Merge pull request #939 from Onlineberatung/fix/another-typo
CarlosSoares May 26, 2023
8139585
fix: registration direct links, postcode, concurrent agencies requests
web-mi May 27, 2023
b8e3215
Merge pull request #169 from Onlineberatung/develop
CarlosSoares May 30, 2023
c24ff6c
feat: added logging if user was redirected to any error page with the…
web-mi May 27, 2023
d9a36d0
Merge pull request #941 from Onlineberatung/OB-RegistrationFix
web-mi May 30, 2023
b58dc86
Merge branch 'develop' into OB-3716
web-mi May 30, 2023
0dd16c3
Merge pull request #942 from Onlineberatung/OB-3716
web-mi May 30, 2023
ff94651
fix: signal parameter
web-mi May 30, 2023
50e695b
fix: postcode preselection
web-mi May 30, 2023
4091c31
Merge pull request #944 from Onlineberatung/OB-5074
web-mi May 30, 2023
c837a0e
fix: login after password reset OB-5109
CarlosSoares May 31, 2023
541d0a9
fix: flaky tests
web-mi May 31, 2023
9d7f34a
Merge pull request #947 from Onlineberatung/OB-Opt
web-mi Jun 1, 2023
e5c421d
fix: browser notification redirection OB-5122
CarlosSoares Jun 1, 2023
ee78f24
Merge pull request #949 from Onlineberatung/fix/browser-notifications…
CarlosSoares Jun 1, 2023
b27170b
Merge branch 'develop' into fix/password-reset
CarlosSoares Jun 2, 2023
0b9d61e
Merge pull request #170 from Onlineberatung/develop
CarlosSoares Jun 2, 2023
60e3632
feat(i18n): switch to json translation files
RunzelRosinchen Apr 12, 2023
4ecd6f7
Merge pull request #896 from Onlineberatung/feat/json-translation-files
web-mi Jun 5, 2023
6096570
feat: initial work of the group chat OB-4623
CarlosSoares May 29, 2023
ed1e729
feat: adding the close information
CarlosSoares May 31, 2023
5de6b6c
fix: when bannerContainer is empty OB-5133
CarlosSoares Jun 2, 2023
090127f
feat: adding the release toggle OB-5146
CarlosSoares Jun 2, 2023
21a5425
feat: adding the notifications working
CarlosSoares Jun 5, 2023
5ab5274
feat: update package lock
CarlosSoares Jun 6, 2023
f6909e1
fix: header when chat not started
CarlosSoares Jun 6, 2023
75c28a2
fix: lint and prevent request with error
CarlosSoares Jun 6, 2023
0b6ee7f
Merge branch 'develop' into fix/password-reset
CarlosSoares Jun 6, 2023
719f198
Merge pull request #943 from Onlineberatung/feat/groupchat
CarlosSoares Jun 6, 2023
5b6f57d
Merge branch 'develop' into fix/password-reset
CarlosSoares Jun 7, 2023
e6268b2
Merge pull request #946 from Onlineberatung/fix/password-reset
CarlosSoares Jun 7, 2023
9a33c14
fix: prevent from showing termine in group chat
CarlosSoares Jun 9, 2023
601e585
feat: hide reject information in group chat OB-5182
CarlosSoares Jun 9, 2023
3d1b6b7
Merge pull request #953 from Onlineberatung/feat/groupchat
CarlosSoares Jun 12, 2023
ee29283
fix: when no banner container OB-5133
CarlosSoares Jun 12, 2023
1839854
Merge pull request #954 from Onlineberatung/feat/groupchat
CarlosSoares Jun 12, 2023
472610c
fix: issue when username has space OB-5197
CarlosSoares Jun 13, 2023
03979ca
Merge pull request #955 from Onlineberatung/fix/email-issue
CarlosSoares Jun 14, 2023
4fcfade
feat: when user is logged in simple join to group chat OB-5199
CarlosSoares Jun 16, 2023
cc8289b
Merge pull request #957 from Onlineberatung/feat/join-group-when-logg…
CarlosSoares Jun 16, 2023
4d9bd8e
fix: missing fields registration check, agency postcode prefill if ag…
web-mi Jun 16, 2023
a51beb5
Merge pull request #958 from Onlineberatung/OB-5196
web-mi Jun 16, 2023
c3537c0
fix: double redirect if logout fails
web-mi Jun 16, 2023
5bb37e8
fix: adding missing translations OB-5213
CarlosSoares Jun 21, 2023
33dcd60
fix: group chat joinning button OB-5218
CarlosSoares Jun 21, 2023
4127968
fix: adding the informal
CarlosSoares Jun 21, 2023
b29a4d9
fix: remove leave chat if user is banned OB-5219
CarlosSoares Jun 21, 2023
ede70b4
fix: adding the digital and live OB-5221
CarlosSoares Jun 21, 2023
9cea54e
feat: adding the missing english translation
CarlosSoares Jun 22, 2023
b7645d1
Merge pull request #961 from Onlineberatung/fix/group-chat-qrcode
CarlosSoares Jun 22, 2023
9a5ee2a
fix: ob-5227 login after blank target
CarlosSoares Jun 22, 2023
93b6fa4
feat: adding the OB-5223
CarlosSoares Jun 22, 2023
b582126
fix: when group chat is first position OB-5233
CarlosSoares Jun 26, 2023
d576729
Merge pull request #963 from Onlineberatung/fix/groupchat-autologin
CarlosSoares Jun 26, 2023
765a9a9
Merge branch 'develop' into fix/booking-group-chat-on-first-pos
CarlosSoares Jun 26, 2023
1981ecc
Merge pull request #965 from Onlineberatung/fix/booking-group-chat-on…
CarlosSoares Jun 26, 2023
abe5d5e
Merge branch 'develop' into OB-FixLogoutRedirect
web-mi Jun 27, 2023
b66b424
Merge pull request #959 from Onlineberatung/OB-FixLogoutRedirect
web-mi Jun 27, 2023
5e4da4c
fix(ban user): dont close overlay by state update
RunzelRosinchen Jul 12, 2023
f92929e
Update src/components/groupChat/GroupChatInfo.tsx
RunzelRosinchen Jul 12, 2023
7529079
Update src/components/banUser/BanUser.tsx
RunzelRosinchen Jul 12, 2023
d3e19ff
Merge pull request #970 from Onlineberatung/fix/ban-user-overlay
RunzelRosinchen Jul 12, 2023
3645a8d
Merge pull request #171 from Onlineberatung/develop
RunzelRosinchen Jul 19, 2023
06ce3d7
feat: fixed layout by using flex
web-mi Jul 25, 2023
f6f6b9f
fix: style fixes with mobile height etc
web-mi Jul 26, 2023
cff4990
fix: allow join video call with invalid/expired token as anonymous
web-mi Aug 3, 2023
27387ee
Merge pull request #973 from Onlineberatung/OB-5443
web-mi Aug 3, 2023
72906ec
Merge branch 'Onlineberatung:develop' into develop
web-mi Aug 11, 2023
c5b8852
fix: fix postcode autoselect on single agency auto selection
web-mi Aug 23, 2023
3de465b
Merge pull request #974 from Onlineberatung/OB-5707
web-mi Aug 23, 2023
91811c6
Merge branch 'Onlineberatung:develop' into develop
web-mi Aug 23, 2023
4134b45
fix: parse colors when they not set
web-mi Aug 23, 2023
71dc33a
Merge pull request #179 from virtualidentityag/OB-5707
web-mi Aug 23, 2023
3d540a0
fix: parse colors when they not set
web-mi Aug 23, 2023
a8df575
Merge pull request #181 from virtualidentityag/OB-5707
web-mi Aug 23, 2023
93c9cef
fix(live chat): remove e2ee video call block page
RunzelRosinchen Aug 28, 2023
bd6feec
Merge pull request #976 from Onlineberatung/fix/ob-5757
RunzelRosinchen Aug 28, 2023
6808cdb
Merge pull request #183 from Onlineberatung/develop
web-mi Aug 28, 2023
4fc8429
Merge branch 'develop' into OB-5203
web-mi Sep 22, 2023
6217cf5
Merge pull request #972 from Onlineberatung/OB-5203
web-mi Sep 22, 2023
25b0829
fix: save group chat repeat
web-mi Sep 24, 2023
ab64f2e
Merge pull request #977 from Onlineberatung/OB-6769
web-mi Sep 25, 2023
6a6347c
style: fixed layout for create chat view and group chat info
web-mi Sep 27, 2023
68f346e
Merge pull request #978 from Onlineberatung/OB-6801
web-mi Sep 27, 2023
9abeea0
fix: cve-2023-38545
web-mi Nov 9, 2023
4477063
Merge pull request #981 from Onlineberatung/CVE-2023-38545
web-mi Nov 9, 2023
7f1ca5f
chore: added simple check for formal language and fixes formal languge
web-mi Nov 28, 2023
6958266
Merge pull request #983 from Onlineberatung/OB-7098
web-mi Nov 30, 2023
91777d8
fix: use session status for initial appointment check
janrembold Jan 9, 2024
bfc3661
fix: test redirected to new url
janrembold Jan 10, 2024
7dfa315
docs: add comment for new url
janrembold Jan 10, 2024
68490ff
fix: update u25 json
janrembold Jan 10, 2024
8cee656
Merge pull request #985 from Onlineberatung/fix/booking-initial-appoi…
janrembold Jan 10, 2024
05e5580
Merge pull request #186 from Onlineberatung/develop
web-mi Jan 12, 2024
40d20c8
feat: added specific agency provider to provide agency specific links
web-mi Jan 15, 2024
5e6c243
Merge pull request #986 from Onlineberatung/OB-5604
web-mi Jan 16, 2024
a8e3749
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 16, 2024
1e154e1
fix: fix urls without domain
web-mi Jan 16, 2024
4cea5c2
Merge pull request #987 from Onlineberatung/OB-5604
web-mi Jan 16, 2024
1914d1c
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 16, 2024
bed9b25
chore: cleaned group chat rule logic
web-mi Jan 16, 2024
8c100d5
Merge pull request #988 from Onlineberatung/DELPHI-46
web-mi Jan 17, 2024
8975ff0
feat: update i18n, update textarea max letters position, add missing …
janrembold Jan 15, 2024
c711aa1
fix: updated review comments
janrembold Jan 23, 2024
ef7891b
Merge pull request #991 from Onlineberatung/feat/delphi-46-group-chat
web-mi Jan 23, 2024
2410642
Merge pull request #189 from Onlineberatung/develop
web-mi Jan 23, 2024
5c2bd94
chore: added frontend proxy, added translation logic for weblate to i18n
web-mi Jan 19, 2024
c25393d
chore: updated dev dependencies and raised node version
web-mi Jan 23, 2024
10fe114
Merge pull request #990 from Onlineberatung/OB-TranslationBackend
web-mi Jan 25, 2024
90519ea
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 25, 2024
4865e56
chore: update packages
web-mi Jan 25, 2024
6fcd631
Merge pull request #992 from Onlineberatung/OB-TranslationBackend
web-mi Jan 25, 2024
859891e
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 25, 2024
1d4cbcb
feat: added ablility for proxy run cli
web-mi Jan 25, 2024
ef0c75d
Merge pull request #993 from Onlineberatung/OB-TranslationBackend
web-mi Jan 25, 2024
94191c1
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 25, 2024
8544b61
feat: show group creator and date
web-mi Jan 26, 2024
9ff09a0
Merge pull request #994 from Onlineberatung/DELPHI-46
web-mi Jan 26, 2024
ce8ecf2
feat: expose interfaces
web-mi Jan 26, 2024
aa96a69
Merge pull request #995 from Onlineberatung/DELPHI-46
web-mi Jan 26, 2024
eafc842
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 27, 2024
278960b
fix: show start video call only if group chat was joined
web-mi Jan 27, 2024
84d7466
Merge pull request #998 from Onlineberatung/OB-9060
web-mi Jan 27, 2024
d52d261
feat: added fallback loader for non unique consulting type slugs
web-mi Jan 28, 2024
96a53e1
Merge pull request #999 from Onlineberatung/OB-FixRegistrationDirectLink
web-mi Jan 28, 2024
6e05dde
Merge branch 'Onlineberatung:develop' into develop
web-mi Jan 28, 2024
9685228
Add support for handling FETCH_ERRORS.FAILED_DEPENDENCY in apiPatchUs…
janrembold Jan 30, 2024
e561422
fix: merge conflict
janrembold Jan 31, 2024
980ccf0
Merge pull request #1000 from Onlineberatung/fix/api-patch-user-error
janrembold Jan 31, 2024
b77b5ad
feat: add 504 error response
janrembold Feb 1, 2024
714b73f
fix: merge conflict
janrembold Feb 1, 2024
a7783e2
Merge pull request #1001 from Onlineberatung/feat/add-504-error
web-mi Feb 1, 2024
86ffd90
fix: translation cached file structure fix
web-mi Feb 2, 2024
a43c3a2
Merge pull request #1003 from Onlineberatung/OB-9500
web-mi Feb 2, 2024
bbcee3e
Merge branch 'Onlineberatung:develop' into develop
web-mi Feb 2, 2024
7b34aa1
feat: improved extension logic to be able to import original file in …
web-mi Jan 27, 2024
c75a6da
Merge pull request #996 from Onlineberatung/OB-Theming
web-mi Feb 12, 2024
4167e44
Merge branch 'Onlineberatung:develop' into develop
web-mi Feb 12, 2024
cd948eb
feat: added extensions connecta
web-mi Jan 27, 2024
5a75919
Merge pull request #191 from virtualidentityag/OB-Theme
web-mi Feb 12, 2024
0bcf35d
chore: trigger first docker build
web-mi Feb 12, 2024
0aa9581
fix: decode logo string
janrembold Feb 20, 2024
8374653
feat: add associationLogo to types
janrembold Feb 20, 2024
c95e240
feat: add associtaionLogo to stage
janrembold Feb 20, 2024
5d753a4
feat: add agency logo type
janrembold Feb 21, 2024
4abf697
refactor: boyscout class name with clsx
janrembold Feb 21, 2024
b64edc2
feat: add optional agency logo
janrembold Feb 21, 2024
232f0ff
fix: align content in agency selection
janrembold Feb 21, 2024
a35dc89
feat: add association logo
janrembold Feb 21, 2024
44aeb2d
chore: remove log
janrembold Feb 21, 2024
6974041
refactor: create bool
janrembold Feb 21, 2024
66c3845
fix: registration consulting types, added registration tests
web-mi Feb 14, 2024
b2a8ab4
Merge pull request #192 from virtualidentityag/feat/OB-9802-associati…
janrembold Feb 23, 2024
7e808dc
fix: remove e2eeEnabled check
janrembold Feb 23, 2024
78d016e
fix: remove all flags
janrembold Feb 23, 2024
0205578
fix: remove e2eeEnabled check
janrembold Feb 23, 2024
efdfbf4
fix: remove all flags
janrembold Feb 23, 2024
22afeb7
Merge pull request #1010 from Onlineberatung/fix/OB-10087-reset-pw-fa…
web-mi Feb 23, 2024
0d92204
Merge pull request #193 from virtualidentityag/fix/OB-10087-reset-pw-…
janrembold Feb 23, 2024
abd3a46
Merge branch 'develop' into feat/OB-9486
web-mi Feb 23, 2024
5b4217a
Merge pull request #1009 from Onlineberatung/feat/OB-9486
web-mi Feb 23, 2024
5a20929
fix: decode logo string
janrembold Feb 20, 2024
4c7366c
feat: add associationLogo to types
janrembold Feb 20, 2024
f695729
feat: add agency logo type
janrembold Feb 21, 2024
55a602e
refactor: boyscout class name with clsx
janrembold Feb 21, 2024
69d9c72
feat: add optional agency logo
janrembold Feb 21, 2024
25a5921
fix: align content in agency selection
janrembold Feb 21, 2024
290d35e
feat: add association logo
janrembold Feb 21, 2024
50d3eba
chore: remove log
janrembold Feb 21, 2024
52a204f
fix: agency list update registration
web-mi Feb 28, 2024
65b8745
fix: agency list update registration
web-mi Feb 28, 2024
288df1c
fix: merge base translations deep
web-mi Feb 28, 2024
8a85a7b
fix: changed en language to deep merge logic
web-mi Feb 28, 2024
97df5dd
Merge pull request #1015 from Onlineberatung/fix/OB-10082
web-mi Feb 28, 2024
1f940e0
Merge branch 'develop' into feat/OB-9802
web-mi Feb 28, 2024
f165e35
Merge pull request #1012 from Onlineberatung/feat/OB-9802
web-mi Feb 28, 2024
6290565
Merge remote-tracking branch 'upstream/develop' into OB-Sync
web-mi Feb 28, 2024
9efef7f
Merge pull request #197 from virtualidentityag/OB-Sync
web-mi Feb 28, 2024
16a3449
Merge pull request #195 from virtualidentityag/fix/OB-10082
web-mi Feb 28, 2024
edbf3c1
Merge branch 'develop' into feat/OB-9486
web-mi Feb 28, 2024
6c4228b
fix: styles for landingpage ui and registration
janrembold Feb 28, 2024
ced189b
Merge pull request #198 from virtualidentityag/fix/OB-10090-broken-la…
janrembold Feb 28, 2024
2e02954
fix: default postcode optional, request reduction
web-mi Feb 28, 2024
623432a
feat: unique duplicate logic
web-mi Feb 28, 2024
ded217e
Merge pull request #1014 from Onlineberatung/feat/OB-9486
web-mi Feb 28, 2024
e6c9fd0
Merge branch 'Onlineberatung:develop' into develop
web-mi Feb 28, 2024
2bbae96
fix: password reset logic with otp, special chars in password
web-mi Feb 28, 2024
d7f9899
Merge pull request #1018 from Onlineberatung/fix/OB-10087
web-mi Feb 29, 2024
575c560
Merge branch 'Onlineberatung:develop' into develop
web-mi Feb 29, 2024
c1cd88c
fix: enable consulting type slug registration by default
web-mi Feb 29, 2024
b1e08d3
Merge pull request #1019 from Onlineberatung/fix/OB-9486
web-mi Feb 29, 2024
4de682b
fix: add single agency radio select component
janrembold Mar 6, 2024
cc59614
fix: cypress tests
web-mi Mar 6, 2024
d9e3ae4
fix: sonarcube issue
janrembold Mar 6, 2024
3afe123
Merge branch 'fix/agency-radio-select' of https://github.com/Onlinebe…
janrembold Mar 6, 2024
b10bae0
fix: sonarcube issues
janrembold Mar 6, 2024
5edf387
fix: remove debug code
janrembold Mar 6, 2024
96f0fc4
Merge pull request #1020 from Onlineberatung/fix/agency-radio-select
janrembold Mar 6, 2024
e0e7e9d
Merge pull request #199 from Onlineberatung/develop
janrembold Mar 6, 2024
3bd393a
fix: language dropdowns
web-mi Mar 7, 2024
f207aed
Merge pull request #1021 from Onlineberatung/OB-10872
web-mi Mar 8, 2024
a875969
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 8, 2024
417afac
feat: show agency logos in chat sessions if logo is available
janrembold Mar 8, 2024
ec9b2cd
fix: possible empty agency
janrembold Mar 8, 2024
f91e004
Merge pull request #1022 from Onlineberatung/feat/show-agency-logo-in…
web-mi Mar 8, 2024
8cb584c
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 8, 2024
d91d667
feat: added new dropdown option bottom left
web-mi Mar 13, 2024
d878a8a
Merge pull request #1023 from Onlineberatung/OB-10882
web-mi Mar 13, 2024
8b8eeb4
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 13, 2024
5d5ce80
fix: removed default consultingType overrides
web-mi Mar 13, 2024
5b52f37
Merge pull request #1024 from Onlineberatung/fix/OB-10875
web-mi Mar 13, 2024
4291d7b
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 13, 2024
4ab9717
fix: translation for consulting types and preparation for weblate
web-mi Mar 13, 2024
0fcd934
Merge pull request #206 from virtualidentityag/fix/OB-10875
web-mi Mar 13, 2024
b95f10d
fix: moved agency and consultingType to main directory to auto overwr…
web-mi Mar 13, 2024
e3ee774
Merge pull request #208 from virtualidentityag/fix/OB-10875
web-mi Mar 13, 2024
d2fab24
fix: remove caritas from default i18n
janrembold Mar 20, 2024
7668e1f
Merge pull request #1026 from Onlineberatung/fix/CONNECTA-165-cherry-…
web-mi Mar 20, 2024
2fed4f3
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 20, 2024
28c67bd
chore: release workflow fix version condition
web-mi Mar 20, 2024
f5ddfd3
Merge pull request #1027 from Onlineberatung/OB-ReleaseWorkflow
web-mi Mar 20, 2024
0b9b753
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 20, 2024
9add9ee
chore: raise version to latest tag
web-mi Mar 20, 2024
1793f10
Merge pull request #213 from virtualidentityag/VIC-FixVersion
web-mi Mar 20, 2024
e02bc0e
fix: removed dollar sign
web-mi Mar 21, 2024
0df69f5
Merge pull request #1028 from Onlineberatung/OB-FixLegalLinks
web-mi Mar 21, 2024
ab3a51f
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 21, 2024
25e3a2f
chore: removed default relase note
web-mi Mar 21, 2024
d98c0ee
Merge pull request #217 from virtualidentityag/VI-ReleaseNotes
web-mi Mar 21, 2024
15069e6
fix: remove log
janrembold Mar 27, 2024
6b9ba6f
Update AgencySelection.tsx
janrembold Mar 27, 2024
8cb37f7
Merge pull request #220 from virtualidentityag/fix/remove-debug-log
janrembold Mar 27, 2024
d7f3634
Merge pull request #1029 from Onlineberatung/fix/remove-debug-log
janrembold Mar 27, 2024
1e71ad3
Merge branch 'Onlineberatung:develop' into develop
web-mi Mar 28, 2024
9188722
feat: added videoConference statuses
pnboliveira Apr 4, 2024
fbbad0b
Merge pull request #1030 from Onlineberatung/fix/TSYSTEMS-130_differe…
pnboliveira Apr 9, 2024
7a32aa2
fix: remove legal links prefix
janrembold Apr 23, 2024
917d5e8
Merge pull request #1032 from Onlineberatung/fix/CONNECTA-186-wartera…
janrembold Apr 23, 2024
7bd5341
Merge pull request #221 from Onlineberatung/develop
janrembold Apr 23, 2024
6e0ea6f
fix(attachments): fix label color and make attachment area clickable
koepferd Jul 11, 2024
914d040
style(attachment): prettier fix
koepferd Jul 11, 2024
5c2b6de
style(prettier): whitespace fix
koepferd Jul 12, 2024
99f16a4
Merge pull request #223 from virtualidentityag/fix/CONNECTA-252-downl…
koepferd Jul 12, 2024
c36b3ad
feat(easy-language-(german)): added easy german translations to use i…
koepferd Oct 1, 2024
981dbe7
build(github-workflows): upgrade actions
koepferd Oct 1, 2024
ab44fe2
Merge pull request #225 from virtualidentityag/feat/CONNECTA-286-easy…
koepferd Oct 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
39 changes: 38 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ REACT_APP_DISABLE_ERROR_BOUNDARY=1
# API Url
REACT_APP_API_URL=example.com

# Define directory with overrides relative to app root
EXTENSION_DIR=./src/extensions/

#
CSRF_WHITELIST_HEADER_FOR_LOCAL_DEVELOPMENT=X-WHITELIST-HEADER

Expand All @@ -18,4 +21,38 @@ CSRF_WHITELIST_HEADER_FOR_LOCAL_DEVELOPMENT=X-WHITELIST-HEADER
#AUDIO_FILE_INCOMING_NOTIFICATION=/assets/audio/incomingNotification.mp3

# Disable 2FA
REACT_APP_DISABLE_2FA_DUTY=0
REACT_APP_DISABLE_2FA_DUTY=0

### Registration
# Enable fallback loader for direct link registration where slug could not be matched (0/1)
FRONTEND_REGISTRATION_USE_CONSULTINGTYPE_SLUG=

### Weblate
# Weblate host
FRONTEND_WEBLATE_HOST=
# Path to api
FRONTEND_WEBLATE_PATH=/weblate/api
# Name of weblate project
FRONTEND_WEBLATE_PROJECT=
# Weblate api key - Attention! if provided it will be used for frontend requests and is visible to everyone
FRONTEND_WEBLATE_API_KEY=
# Min percentage - percentage which must be translated in one language until it gets visible in the frontend
FRONTEND_WEBLATE_MIN_PERCENT=
# Disable localStorage caching
FRONTEND_TRANSLATION_CACHE_DISABLE=
# Time until frontend cache gets invalidated in minutes
FRONTEND_TRANSLATION_CACHE_TIME=

### NodeJS
# Storage path - if set relative to project root translation files will be stored temporary until LOCALIZATION_CACHE_TIME expired
STORAGE_PATH=./.storage

# Localize cache time - in minutes - default 120 minutes
LOCALIZATION_CACHE_TIME=

# Weblate host for proxy
LOCALIZATION_WEBLATE_HOST=https://weblate.example.com/
# If weblate is provided under subdirectory
LOCALIZATION_WEBLATE_PATH=/weblate
# Weblate api key - must be provided to skip request limits
LOCALIZATION_WEBLATE_API_KEY=
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
target-branch: 'develop'
schedule:
interval: 'daily'

- package-ecosystem: 'github-actions'
directory: '/'
target-branch: 'develop'
schedule:
interval: 'daily'
25 changes: 25 additions & 0 deletions .github/workflows/automerge-dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Dependabot auto-approve
on: pull_request_target

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/[email protected]
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Log update type
run: echo ${{ steps.metadata.outputs.update-type }}
- name: Enable auto-merge for Dependabot PRs
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
24 changes: 13 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
build:
name: Build & Release
if: "!contains(github.event.head_commit.author, '[email protected]')"
permissions:
checks: write
runs-on: ubuntu-latest
steps:
- name: set env
Expand All @@ -24,10 +26,10 @@ jobs:
else
echo ENV_NAME="prod" >> $GITHUB_ENV
fi
- uses: actions/checkout@v2.3.4
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 18
registry-url: 'https://npm.pkg.github.com'
cache: 'npm'
- name: Load .env file
Expand All @@ -36,7 +38,7 @@ jobs:
mode: ${{ env.ENV_NAME }}
- run: npm ci
- name: Run linters
uses: wearerequired/lint-action@v1
uses: wearerequired/lint-action@v2
with:
github_token: ${{ secrets.github_token }}
eslint: true
Expand All @@ -46,29 +48,29 @@ jobs:
stylelint_dir: ./src
stylelint_extensions: scss
prettier: true
- name: Run build
run: |
npm run build
- name: Run tests
run: |
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 build
run: |
npm run build
npm run test:build
- name: Bump version
if: startsWith(env.BRANCH,'release') == true
if: env.BRANCH == 'release'
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
npm run release
- name: Push changes
if: startsWith(env.BRANCH,'release') == true
if: env.BRANCH == 'release'
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
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
36 changes: 17 additions & 19 deletions .github/workflows/dockerImage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ jobs:
name: Build
if: "!contains(github.event.head_commit.author, '[email protected]')"
runs-on: ubuntu-latest
permissions:
checks: write
env:
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 @@ -30,33 +32,33 @@ jobs:
else
echo ENV_NAME="prod" >> $GITHUB_ENV
fi
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 18
cache: 'npm'
- name: Load .env file
uses: xom9ikk/dotenv@v2
with:
mode: ${{ env.ENV_NAME }}
- run: npm ci
- name: Run linters
uses: wearerequired/lint-action@v1
uses: wearerequired/lint-action@v2
with:
github_token: ${{ secrets.github_token }}
eslint: true
eslint_dir: ./src
eslint_extensions: js,ts,tsx
prettier: true
prettier_dir: ./src
- name: Run build
run: |
npm run build
- name: Run tests
run: |
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 build
run: |
npm run build
- uses: actions/upload-artifact@v2
npm run test:build
- uses: actions/upload-artifact@v4
with:
name: buildfiles
path: build/**/*
Expand All @@ -75,21 +77,19 @@ jobs:
- text: View CI
url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
push_to_registry:
strategy:
matrix:
registry: ['docker.pkg.github.com', 'ghcr.io']
needs: [build]
name: Push Docker image to GitHub Packages
runs-on: ubuntu-latest
env:
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
uses: actions/download-artifact@v4
with:
name: buildfiles
path: build
- name: Get current time
id: time
uses: nanzm/[email protected]
Expand All @@ -101,8 +101,7 @@ jobs:
raw=$(git branch -r --contains ${{ github.ref }})
branch=${raw##*/}
echo BRANCH_NAME=$(echo -n "${branch}") >> $GITHUB_ENV
echo "MATRIX_REGISTRY=$(echo "${{ matrix.registry }}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
echo "DOCKER_REGISTRY=$(echo "${{ matrix.registry }}/${{ github.repository }}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
echo "DOCKER_REGISTRY=$(echo "ghcr.io/${{ github.repository }}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
echo "DOCKER_IMAGE=$(echo "${{ github.repository }}" | awk -F / '{print tolower($2)}')" >> $GITHUB_ENV
echo "REPO_NAME_WITHOUT_PREFIX"=$(echo "${{ github.repository }}" | sed "s/.*\///" | awk -F / '{print tolower($0)}') >> $GITHUB_ENV
echo CLEAN_REF=$(echo "${GITHUB_REF_NAME#refs/heads/}") >> $GITHUB_ENV
Expand Down Expand Up @@ -142,7 +141,6 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build_args: DOCKER_MATRIX=${{ env.MATRIX_REGISTRY }}
- name: Hint about the Docker Image Tag if successfull
if: ${{ success() }}
run: |
Expand All @@ -157,7 +155,7 @@ jobs:
echo "" >> $GITHUB_STEP_SUMMARY
echo "- It seems that something has gone wrong" >> $GITHUB_STEP_SUMMARY
- name: Microsoft Teams Fail Card
if: ${{ (env.FAIL_WEBHOOK_SECRET != null) && (env.FAIL_WEBHOOK_SECRET != '') && (matrix.registry == 'ghcr.io') && (failure() || cancelled()) }}
if: ${{ (env.FAIL_WEBHOOK_SECRET != null) && (env.FAIL_WEBHOOK_SECRET != '') && (failure() || cancelled()) }}
uses: toko-bifrost/[email protected]
with:
github-token: ${{ github.token }}
Expand All @@ -171,7 +169,7 @@ jobs:
- text: View CI
url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
- name: Microsoft Teams Image Card
if: ${{ (env.IMAGE_WEBHOOK_SECRET != null) && (env.IMAGE_WEBHOOK_SECRET != '') && (matrix.registry == 'ghcr.io') && success() }}
if: ${{ (env.IMAGE_WEBHOOK_SECRET != null) && (env.IMAGE_WEBHOOK_SECRET != '') && success() }}
uses: toko-bifrost/[email protected]
with:
github-token: ${{ github.token }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# dependencies
/node_modules
/proxy/node_modules
/.pnp
.pnp.js

Expand All @@ -12,6 +13,7 @@

# production
/build
/dist

# misc
.DS_Store
Expand All @@ -22,6 +24,7 @@
.env.test.local
.env.production.local
.idea
.storage

# cypress
browserstack.json
Expand Down
40 changes: 16 additions & 24 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-single-line',
'scss/dollar-variable-colon-space-before': 'never',
'plugin/no-unsupported-browser-features': [
true,
{
Expand All @@ -35,18 +27,13 @@ module.exports = {
'outline',
'css3-cursors',
'css-resize',
'intrinsic-width'
'intrinsic-width',
'css-nesting',
'css-when-else',
'css-selection'
]
}
],

// From admin app
'max-empty-lines': [
2,
{
ignore: ['comments']
}
],
'rule-empty-line-before': [
'always-multi-line',
{
Expand All @@ -56,7 +43,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 Expand Up @@ -87,6 +73,12 @@ module.exports = {
'selector-no-vendor-prefix': null,
'value-no-vendor-prefix': null,
'shorthand-property-no-redundant-values': null,
'declaration-block-no-duplicate-properties': null
'declaration-block-no-duplicate-properties': null,
'selector-pseudo-class-no-unknown': [
true,
{
ignorePseudoClasses: ['global']
}
]
}
};
Loading
Loading