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

625: Application end screen #648

Merged
merged 9 commits into from
Dec 14, 2022
Merged

625: Application end screen #648

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3e70e1
625: add success screen and clean form
f1sh1918 Nov 30, 2022
385f840
625: update successText
f1sh1918 Dec 7, 2022
df61408
Merge remote-tracking branch 'origin/whitelabel' into 625_Application…
f1sh1918 Dec 7, 2022
1df6048
625: add end screen, add fkt to detect mobile operating system
f1sh1918 Dec 7, 2022
a906b3a
625: adjust styling
f1sh1918 Dec 7, 2022
1db06cd
625: remove back to app button
f1sh1918 Dec 9, 2022
c8886cb
625: call setSubmitted after clearForm
f1sh1918 Dec 12, 2022
8542472
625: add onError and onComplete for addBlueEakApplication
f1sh1918 Dec 13, 2022
acb33a7
625: use snackbar from notistack
f1sh1918 Dec 14, 2022
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
28 changes: 24 additions & 4 deletions administration/src/application/components/ApplyController.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import useVersionedLocallyStoredState from '../useVersionedLocallyStoredState'
import DiscardAllInputsButton from './DiscardAllInputsButton'
import { useGarbageCollectArrayBuffers, useInitializeGlobalArrayBuffersManager } from '../globalArrayBuffersManager'
import ApplicationForm from './forms/ApplicationForm'
import { useCallback, useMemo } from 'react'
import { useCallback, useMemo, useState } from 'react'
import { SnackbarProvider, useSnackbar } from 'notistack'
import styled from 'styled-components'
import ApplicationErrorBoundary from '../ApplicationErrorBoundary'

// This env variable is determined by '../../../application_commit.sh'. It holds the hash of the last commit to the
Expand All @@ -19,7 +20,15 @@ const lastCommitForApplicationForm = process.env.REACT_APP_APPLICATION_COMMIT as

export const applicationStorageKey = 'applicationState'

const SuccessContent = styled.div`
white-space: pre-line;
display: flex;
justify-content: center;
margin-bottom: 1rem;
`

const ApplyController = () => {
const [formSubmitted, setFormSubmitted] = useState<boolean>(false)
const [addBlueEakApplication, { loading }] = useAddBlueEakApplicationMutation()
const { status, state, setState } = useVersionedLocallyStoredState(
ApplicationForm.initialState,
Expand Down Expand Up @@ -57,14 +66,25 @@ const ApplyController = () => {
application: applicationInput,
},
})

setFormSubmitted(true)
setState(() => ApplicationForm.initialState)
michael-markl marked this conversation as resolved.
Show resolved Hide resolved
}
const successText = `Ihr Antrag für die Ehrenamtskarte wurde erfolgreich übermittelt.
Sie können das Fenster schließen.`
f1sh1918 marked this conversation as resolved.
Show resolved Hide resolved

return (
<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'start', margin: '16px' }}>
<div style={{ maxWidth: '1000px', width: '100%' }}>
<h2 style={{ textAlign: 'center' }}>Blaue Ehrenamtskarte beantragen</h2>
<ApplicationForm.Component state={state} setState={setState} onSubmit={submit} loading={loading} />
<DialogActions>{loading ? null : <DiscardAllInputsButton discardAll={discardAll} />}</DialogActions>
<h2 style={{ textAlign: 'center' }}>{formSubmitted ? 'Erfolgreich gesendet' : 'Ehrenamtskarte beantragen'}</h2>
{formSubmitted ? (
<SuccessContent>{successText}</SuccessContent>
) : (
<ApplicationForm.Component state={state} setState={setState} onSubmit={submit} loading={loading} />
)}
<DialogActions>
{loading || formSubmitted ? null : <DiscardAllInputsButton discardAll={discardAll} />}
</DialogActions>
</div>
</div>
)
Expand Down