Merge pull request #64 from AndyOooh/ED1-46-feature-start-end-date-co…

…ntract Ed1 46 feature start end date contract
AndyOooh · Jan 16, 2024 · 376a4d4 · 376a4d4 · vercel · Jan 16, 2024
2 parents 1fdf67e + 3dbf119
commit 376a4d4
Show file tree

Hide file tree

Showing 16 changed files with 168 additions and 258 deletions.
diff --git a/apps/app/src/app/(protected)/components/Providers/CurrentUserProvider.tsx b/apps/app/src/app/(protected)/components/Providers/CurrentUserProvider.tsx
@@ -29,7 +29,7 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
 
   useEffect(() => {
     if (userDoc) {
-      console.log('user detected..........');
+      console.log('currentUser detected..........');
       setCurrentUser(userDoc.data());
     }
   }, [userDoc]);

diff --git a/apps/app/src/app/(protected)/components/Providers/PrivateRoutes.tsx b/apps/app/src/app/(protected)/components/Providers/PrivateRoutes.tsx
@@ -13,7 +13,6 @@ export const PrivateRoutes = ({ children }: { children: React.ReactNode }) => {
   useEffect(() => {
     const fetchToken = async () => {
       const token = await user?.getIdTokenResult(true);
-      console.log('🚀  PrivateRoutes, token:', token);
       !loading && !token?.claims.basic_info_done && router.push('/login');
     };
 

diff --git a/apps/app/src/app/(protected)/events/Events.tsx b/apps/app/src/app/(protected)/events/Events.tsx
@@ -80,8 +80,6 @@ export const EventsLala = ({ events }: Props) => {
                   <p>{location.address}</p>
                   <a
                     className='link link-secondary'
-                    // href={`https://maps.google.com/?ll=${location.coords.lat},${location.coords.lng}`}
-                    // href={`https://www.google.com/maps/search/?api=1&query_place_id=${location.place_id}`}
                     href={`https://www.google.com/maps/search/?api=1&query=${location.coords.lat}%2C-${location.coords.lng}&query_place_id=${location.place_id}`}
                     target='_blank'
                     rel='noreferrer'>
@@ -145,9 +143,6 @@ export const EventsLala = ({ events }: Props) => {
                                 {field.name === 'number_workers'
                                   ? `${role.accepted || 0}/${field.value}`
                                   : field.value}
-                                {/* {field.name === 'number_workers' ? 'lalalal' : 'sdfsdfds'} */}
-                                {/* {field_name === 'number_workers' ? 'lalalal' : field_name} */}
-                                {/* {role[field_name]} */}
                               </th>
                             );
                           })}

diff --git a/apps/app/src/app/(protected)/events/create/form/event-info/form-data.ts b/apps/app/src/app/(protected)/events/create/form/event-info/form-data.ts
@@ -40,9 +40,14 @@ export const formArrayEventDetails: FormInput[] = [
     ],
   },
   {
-    title: 'date',
+    title: 'start_date',
     type: 'date',
-    tooltip: 'Enter date of the event',
+    tooltip: 'Enter start date of the event',
+  },
+  {
+    title: 'end_date',
+    type: 'date',
+    tooltip: 'Enter end date of the event',
   },
   {
     title: 'description',

diff --git a/apps/app/src/app/(protected)/events/create/form/event-info/index.tsx b/apps/app/src/app/(protected)/events/create/form/event-info/index.tsx
@@ -16,11 +16,14 @@ type Props = {
 
 export const EventInfo = ({ register, errors }: Props) => {
   const { currentUser } = useContext(CurrUserContext);
+  const dateIndex = 3;
+  const descriptionIndex = 5;
+  const descriptionFormData = formArrayEventDetails[descriptionIndex];
 
   return currentUser ? (
     <div className={styles.form}>
       <div className='w-full grid grid-cols-2 gap-6'>
-        {formArrayEventDetails.slice(0, 4).map(info => (
+        {formArrayEventDetails.slice(0, dateIndex).map(info => (
           <div key={info.title}>
             {info.type === 'select' ? (
               <Select
@@ -30,15 +33,7 @@ export const EventInfo = ({ register, errors }: Props) => {
                 register={register}
                 label={true}
                 maxW='max-w-md'
-              />
-            ) : info.type === 'date' ? (
-              <DatePicker
-                name={info.title}
-                defaultValue={currentUser && formatDate(currentUser[info.title], true)}
-                register={register}
-                label={true}
-                maxW='max-w-md'
-                extraProps={info.extraProps}
+                tooltip={info.tooltip}
               />
             ) : (
               <TextInput
@@ -48,20 +43,37 @@ export const EventInfo = ({ register, errors }: Props) => {
                 label={true}
                 maxW='max-w-md'
                 prepend={info.prepend}
+                tooltip={info.tooltip}
               />
             )}
             <FormError formError={errors?.[info.title]?.message as string} />
             {/* <FormError formError={errors?.[info.title]?.message} /> */}
           </div>
         ))}
+        <div className='w-full flex gap-4'>
+          {formArrayEventDetails.slice(dateIndex, descriptionIndex).map(info => (
+            <div key={info.title} className='w-full'>
+              <DatePicker
+                name={info.title}
+                defaultValue={currentUser && formatDate(currentUser[info.title], true)}
+                register={register}
+                label={true}
+                maxW='max-w-[75%]'
+                extraProps={info.extraProps}
+                tooltip={info.tooltip}
+              />
+            </div>
+          ))}
+        </div>
       </div>
       <div className='w-1/2 mx-auto'>
         <TextInput
-          name={formArrayEventDetails[4].title}
-          defaultValue={currentUser && currentUser[formArrayEventDetails[4].title]}
+          name={descriptionFormData.title}
+          defaultValue={currentUser && currentUser[descriptionFormData.title]}
           register={register}
           label={true}
           maxW='max-w-md'
+          tooltip={descriptionFormData.tooltip}
         />
       </div>
     </div>

diff --git a/apps/app/src/app/(protected)/events/create/form/event-info/validation.ts b/apps/app/src/app/(protected)/events/create/form/event-info/validation.ts
@@ -40,7 +40,8 @@ export const eventDetailsSchema = yup.object().shape({
   event_name: stringNullable(yup.string().min(2)),
   event_type: yup.string().oneOf(Object.values(EventType)),
   // location: yup.string().min(3),
-  date: yup.date().min(new Date()),
+  start_date: yup.date().min(new Date()),
+  end_date: yup.date().min(new Date()),
   description: yup.string().min(3),
   // roles: yup.array().of(yup.string().min(2)),
 });

diff --git a/apps/app/src/app/(protected)/events/create/form/event-location/index.tsx b/apps/app/src/app/(protected)/events/create/form/event-location/index.tsx
@@ -35,6 +35,7 @@ export const EventLocation = ({ register, errors, setValue, address }: Props) =>
           register={register}
           label={true}
           maxW='max-w-md'
+          tooltip='Describe the location of the event.'
           // prepend={info.prepend}
         />