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.

Sign up for GitHub

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

Jump to bottom

1419: Create card form #1648

Merged
merged 12 commits into from
Oct 9, 2024
Merged

1419: Create card form #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d6ec5c
1617: remove pipeline name
f1sh1918 Sep 18, 2024
d5fd84b
1419: add activation screen, add a controller
f1sh1918 Sep 23, 2024
a916f63
1419: make region optional in pdf, remove region from mutation return…
f1sh1918 Sep 24, 2024
7eef65d
Merge remote-tracking branch 'origin/main' into 1419-create-card-form
f1sh1918 Sep 25, 2024
da33e63
1419: implement new design
f1sh1918 Sep 25, 2024
7ae5d82
1419: add store icon, simplify cardState, add reusable components, ad…
f1sh1918 Oct 1, 2024
67340f7
Merge remote-tracking branch 'origin/main' into 1419-create-card-form
f1sh1918 Oct 1, 2024
1ef5a0f
1419: fix types
f1sh1918 Oct 1, 2024
28b349a
1419: minor refactoring, add test data to resources
f1sh1918 Oct 8, 2024
7a494e3
1419: use placeholder for birthday, remove minDate since not needed, …
f1sh1918 Oct 9, 2024
6048c3f
Merge branch 'main' into 1419-create-card-form
f1sh1918 Oct 9, 2024
959788f
Merge remote-tracking branch 'origin/main' into 1419-create-card-form
f1sh1918 Oct 9, 2024
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
4 changes: 4 additions & 0 deletions administration/resources/self-service/import_userentitlements.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
regionKey,userHash,startDate,endDate,revoked
07111,"$argon2id$v=19$m=19456,t=2,p=1$cr3lP9IMUKNz4BLfPGlAOHq1z98G5/2tTbhDIko35tY",01.01.2024,01.01.2025,false
07111,"$argon2id$v=19$m=19456,t=2,p=1$POG+rDhWlxSW7ItkP9hZRHqr46u6a6TQO1Ib2X+khMA",01.01.2024,01.01.2025,false
07111,"$argon2id$v=19$m=19456,t=2,p=1$zf7vqckgmYBPbjjW1CwqudF+OjHmo2EifgxhuuVHFs0",01.01.2024,01.01.2025,true
6 changes: 6 additions & 0 deletions administration/resources/self-service/import_userentitlements_testing.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
### DO NOT IMPORT THIS FILE.
### This file is for testing only and includes the source data that was hashed. Do not adjust this file without adjusting the import_entitlements.csv
regionKey,userHash,startDate,endDate,revoked,birthday,referenceNumber
07111,"$argon2id$v=19$m=19456,t=2,p=1$cr3lP9IMUKNz4BLfPGlAOHq1z98G5/2tTbhDIko35tY",01.01.2024,01.01.2025,false, 10.06.2003(12213),123K
07111,"$argon2id$v=19$m=19456,t=2,p=1$POG+rDhWlxSW7ItkP9hZRHqr46u6a6TQO1Ib2X+khMA",01.01.2024,01.01.2025,false, 10.06.2003(12213),5.021.025.688
07111,"$argon2id$v=19$m=19456,t=2,p=1$zf7vqckgmYBPbjjW1CwqudF+OjHmo2EifgxhuuVHFs0",01.01.2024,01.01.2025,true, 28.05.2003(12200),000D000001
2 changes: 2 additions & 0 deletions administration/src/Router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import ProjectSettingsController from './bp-modules/project-settings/ProjectSett
import RegionsController from './bp-modules/regions/RegionController'
import DataPrivacyController from './bp-modules/regions/data-privacy-policy/DataPrivacyController'
import DataPrivacyPolicy from './bp-modules/regions/data-privacy-policy/DataPrivacyPolicy'
import CardSelfServiceView from './bp-modules/self-service/CardSelfServiceView'
import StatisticsController from './bp-modules/statistics/StatisticsController'
import StoresController from './bp-modules/stores/StoresController'
import StoresImportController from './bp-modules/stores/StoresImportController'
Expand Down Expand Up @@ -61,6 +62,7 @@ const Router = (): ReactElement => {
{ path: '/antrag-einsehen/:accessKey', element: <ApplicationApplicantController /> },
]
: []),
...(projectConfig.selfServiceEnabled ? [{ path: '/erstellen', element: <CardSelfServiceView /> }] : []),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe there are some ideas for a better route name

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We currently have a mix of english and german path names 🙄

Just a general though: Maybe it would make sense to have an project id or project abbreviation in paths? so it is for us also clear this "erstellen" path only applies to koblenz. e.g. /koblenz/erstellen or /ko/erstellen or /4/erstellen.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.
The issue here is that we then have on production
koblenz.sozialpass.app/koblenz/erstellen which makes no sense

the projectId can not be hardcoded in the projectConfig since it is created by the backend, but would have to be retrieved from the api which is difficult because we need to call the api before executing the router.

But you are right, we might have to discuss this

{
path: '*',
element: !isLoggedIn ? (
Expand Down
15 changes: 15 additions & 0 deletions administration/src/assets/android_appstore_icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading