fix: DOB parsing and some spacing

Signed-off-by: Tomas Coufal <[email protected]>
tumido · Jun 1, 2022 · 06a0199 · 06a0199
1 parent 07125a9
commit 06a0199
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 10 deletions.
diff --git a/components/ListRegistration.tsx b/components/ListRegistration.tsx
@@ -118,7 +118,10 @@ const Row = ({ row, onDeleteEntry }: RowProps) => {
                         Datum narození
                       </TableCell>
                       <TableCell>
-                        {(row.dob.toDate() as Date).toLocaleDateString()}
+                        {(row.dob.toDate() as Date).toLocaleDateString(
+                          'cs-CZ',
+                          { timeZone: 'UTC' }
+                        )}
                       </TableCell>
                     </TableRow>
                     <TableRow>

diff --git a/components/Wizard.tsx b/components/Wizard.tsx
@@ -37,7 +37,6 @@ export const Wizard = ({ children, initialValues, onSubmit }: WizardProps) => {
 
   const handleSubmit = async (values: object, bag: FormikHelpers<object>) => {
     if (isLastStep) {
-      console.log('here')
       return onSubmit(values, bag)
     } else {
       bag.setTouched({})

diff --git a/containers/Co.tsx b/containers/Co.tsx
@@ -9,7 +9,7 @@ const Co = () => {
       <Typography variant="h2" textAlign="center" color="primary" gutterBottom>
         C<Logo size="uppercase" />?
       </Typography>
-      <Grid container>
+      <Grid container spacing={2}>
         <Grid item xs={12} lg={6}>
           <OrderedList>
             <li>
@@ -68,7 +68,7 @@ const Co = () => {
           <Image src="/smr_zakladna.jpg" />
         </Grid>
       </Grid>
-      <Typography variant="body1" gutterBottom>
+      <Typography variant="body1" gutterBottom sx={{ mt: 2 }}>
         Letošní tábor se bude konat v trochu jiném středisku než jste zvyklí.
         Základna se nachází u lesa u obce Křekov, v malebné přírodě v srdci
         Valašska. Na základně je tekoucí pitná voda, sprcha, splachovací WC.

diff --git a/containers/Jak.tsx b/containers/Jak.tsx
@@ -29,6 +29,22 @@ type Step = {
   note?: string
 }
 
+type Registration = {
+  address: string
+  allergies?: string
+  dob: Date
+  email?: string
+  insurance: string
+  name: string
+  nick?: string
+  parent_address?: string
+  parent_email: string
+  parent_name: string
+  parent_phone: string
+  phone?: string
+  terms: boolean
+}
+
 type Layout = {
   sizing: {
     xs: number
@@ -46,6 +62,7 @@ type Layout = {
     formControl?: object
     textField?: object
     mask?: string
+    disableFuture?: boolean
   }
   inputVariant?: string
   options?: {
@@ -77,7 +94,13 @@ const steps: Step[] = [
         excludeEmptyString: true,
       }),
       insurance: Yup.string().required('Povinný údaj'),
-      dob: Yup.date().typeError('Toto není datum').required('Povinný údaj'),
+      dob: Yup.date()
+        .typeError('Toto není datum')
+        .required('Povinný údaj')
+        .max(
+          new Date(new Date().setFullYear(new Date().getFullYear() - 12)),
+          'Účastník musí být starší 12let'
+        ),
       allergies: Yup.string(),
     }),
     layout: [
@@ -168,6 +191,7 @@ const steps: Step[] = [
           mask: '__.__.____',
           openTo: 'year',
           views: ['year', 'month', 'day'],
+          disableFuture: true,
         },
       },
       {
@@ -255,7 +279,6 @@ const steps: Step[] = [
         component: CheckboxWithLabel,
         props: {
           id: 'terms',
-          fullWidth: true,
           type: 'checkbox',
           Label: {
             label:
@@ -289,7 +312,7 @@ const FieldValue = ({ id, label }: { id: string; label: string }) => {
 
   const value =
     field.value instanceof Date
-      ? field.value.toLocaleDateString()
+      ? field.value.toLocaleDateString('cs-CZ')
       : typeof field.value === 'string'
       ? field.value
       : undefined
@@ -303,6 +326,9 @@ const FieldValue = ({ id, label }: { id: string; label: string }) => {
   return null
 }
 
+const localeDateToUtc = (date: Date) =>
+  new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()))
+
 const Form = ({ onSubmit }: { onSubmit: Function }) => (
   <LocalizationProvider dateAdapter={AdapterDateFns} locale={csLocale}>
     <Wizard initialValues={initialValues} onSubmit={onSubmit}>
@@ -405,10 +431,15 @@ const Jak = () => {
 
   const handleSubmit = (data: object) => {
     setShowWizard(false)
-    const sanitizedData = Object.entries(data).reduce(
+    const dataWithoutUndefined = Object.entries(data).reduce(
       (acc, [k, v]) => (v !== undefined ? { ...acc, [k]: v } : acc),
       {}
-    )
+    ) as Registration
+
+    const sanitizedData = {
+      ...dataWithoutUndefined,
+      dob: localeDateToUtc(dataWithoutUndefined.dob),
+    }
     addDoc(collection(getFirestore(), 'registrations'), sanitizedData)
   }
 

diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -50,7 +50,7 @@ exports.onRegistration = functions.firestore
 
     data.dob = (data.dob as admin.firestore.Timestamp)
       .toDate()
-      .toLocaleDateString('cs-CZ')
+      .toLocaleDateString('cs-CZ', { timeZone: 'UTC' })
 
     const messages = [
       {