From 9afb8ec307b6024424467a53ccdfde04b77a3b01 Mon Sep 17 00:00:00 2001
From: Bhuvnesh Sharma <bhuvneshsharma@Bhuvneshs-MacBook-Air.local>
Date: Wed, 2 Oct 2024 17:34:12 +0530
Subject: [PATCH 1/4] added flag in backend

---
 backend/djangoindia/db/models/event.py        |  1 +
 .../RegisterEvent/RegisterEvent.config.ts     |  8 ++++++
 .../RegisterEvent/RegisterEvent.tsx           | 26 ++++++++++++-------
 .../RegisterEvent/RegisterEvent.types.ts      |  8 +++++-
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/backend/djangoindia/db/models/event.py b/backend/djangoindia/db/models/event.py
index 63e2b0f6..f21691a0 100644
--- a/backend/djangoindia/db/models/event.py
+++ b/backend/djangoindia/db/models/event.py
@@ -85,6 +85,7 @@ class Gender(models.TextChoices):
     github = models.URLField(null=True, blank=True)
     twitter = models.URLField(null=True, blank=True)
     other_links = models.URLField(null=True, blank=True)
+    include_in_attendee_list = models.BooleanField(default=False)
     # TODO: imnplement this (RSVP mailing + RSVP submission link)
     rsvp = models.BooleanField(default=False)
 
diff --git a/frontend/src/containers/RegisterEvent/RegisterEvent.config.ts b/frontend/src/containers/RegisterEvent/RegisterEvent.config.ts
index 41e09fc3..4858a9cc 100644
--- a/frontend/src/containers/RegisterEvent/RegisterEvent.config.ts
+++ b/frontend/src/containers/RegisterEvent/RegisterEvent.config.ts
@@ -80,4 +80,12 @@ export const REGISTER_FORM_FIELDS: (FieldType | Array<FieldType>)[] = [
       type: 'text',
     },
   ],
+  [
+    {
+      name: 'include_in_attendee_list',
+      label: 'I would like to be included in the attendee list',
+      placeholder: '',
+      type: 'checkbox',
+    },
+  ],
 ]
diff --git a/frontend/src/containers/RegisterEvent/RegisterEvent.tsx b/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
index 57f83cb7..15805872 100644
--- a/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
+++ b/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
@@ -79,19 +79,27 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
   }
 
   const currentDate = dayjs();
+  const registrationEndDate = dayjs(registration_end_date);
+  const isRegistrationOpen = seats_left > 0 && currentDate.isBefore(registrationEndDate);
+  const isFull = seats_left === 0;
+
+  let buttonText = 'Registration closed';
+  if (isRegistrationOpen) {
+    buttonText = 'Register';
+  } else if (isFull) {
+    buttonText = 'Housefull!';
+  }
 
   return (
     <Drawer open={isOpen} onOpenChange={setIsOpen}>
       <DrawerTrigger asChild>
-        {seats_left !== 0 && seats_left != null && currentDate.isBefore(dayjs(registration_end_date)) ? (
-            <Button className="w-fit bg-blue-900 z-50" onClick={() => setIsOpen(true)}>
-                Register
-            </Button>
-        ) : ( seats_left != null &&
-            <Button className="w-fit bg-blue-900 z-50" disabled>
-                {seats_left < 1 ? 'Housefull !' : 'Registration closed'}
-            </Button>
-        )}
+      {seats_left && registration_end_date&& <Button 
+          className="w-fit bg-blue-900 z-50"
+          onClick={() => isRegistrationOpen && setIsOpen(true)}
+          disabled={!isRegistrationOpen}
+        >
+          {buttonText}
+        </Button>}
       </DrawerTrigger>
       <DrawerContent className="bg-orange-50 bg-[url('/sprinkle.svg')] bg-cover h-full pb-8 z-50">
       <div className="overflow-auto no-scrollbar">
diff --git a/frontend/src/containers/RegisterEvent/RegisterEvent.types.ts b/frontend/src/containers/RegisterEvent/RegisterEvent.types.ts
index 1c8f8001..307cfa00 100644
--- a/frontend/src/containers/RegisterEvent/RegisterEvent.types.ts
+++ b/frontend/src/containers/RegisterEvent/RegisterEvent.types.ts
@@ -13,6 +13,7 @@ export type RegisterEventForm = {
   linkedin: string
   github?: string
   twitter?: string
+  include_in_attendee_list?: boolean
 }
 
 type SelectField = {
@@ -25,8 +26,13 @@ type InputField = {
   options?: never
 }
 
+type Checkbox = {
+  type: 'checkbox'
+  options?: never
+}
+
 export type FieldType = {
   label: string
   placeholder: string
   name: keyof RegisterEventForm
-} & (SelectField | InputField)
+} & (SelectField | InputField | Checkbox)

From a7300bd11c5131fc48283e77863faf140eb78732 Mon Sep 17 00:00:00 2001
From: Bhuvnesh Sharma <bhuvneshsharma@Bhuvneshs-MacBook-Air.local>
Date: Wed, 2 Oct 2024 17:36:11 +0530
Subject: [PATCH 2/4] minor

---
 frontend/src/sections/EventSection/EventCard.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/sections/EventSection/EventCard.tsx b/frontend/src/sections/EventSection/EventCard.tsx
index 23204323..764c3c8a 100644
--- a/frontend/src/sections/EventSection/EventCard.tsx
+++ b/frontend/src/sections/EventSection/EventCard.tsx
@@ -21,7 +21,6 @@ interface EventProps {
 }
 
 const EventCard: React.FC<EventProps> = ({
-  eventId,
   slug,
   title,
   date,

From 6bb3cd6f6f5d95e1fe3113c66fe3f7f0694955cc Mon Sep 17 00:00:00 2001
From: dhruv ranjan <dhruv18ranjan@gmail.com>
Date: Fri, 4 Oct 2024 21:53:16 +0530
Subject: [PATCH 3/4] checkbox issue fix

---
 frontend/src/components/Input/Input.tsx       |  3 +-
 .../RegisterEvent/RegisterEvent.tsx           | 34 +++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Input/Input.tsx b/frontend/src/components/Input/Input.tsx
index ba7729f7..6bffc46b 100644
--- a/frontend/src/components/Input/Input.tsx
+++ b/frontend/src/components/Input/Input.tsx
@@ -11,7 +11,8 @@ export const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <input
         type={type}
         className={cn(
-          'flex w-full rounded-md bg-background px-5 py-4 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+          'flex rounded-md bg-background px-5 py-4 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+          type == 'checkbox' ?' w-8': 'w-full',
           className,
         )}
         ref={ref}
diff --git a/frontend/src/containers/RegisterEvent/RegisterEvent.tsx b/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
index 15805872..8e48b9de 100644
--- a/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
+++ b/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
@@ -78,7 +78,7 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
     setIsOpen(false)
   }
 
-  const currentDate = dayjs();
+  const currentDate = dayjs();  
   const registrationEndDate = dayjs(registration_end_date);
   const isRegistrationOpen = seats_left > 0 && currentDate.isBefore(registrationEndDate);
   const isFull = seats_left === 0;
@@ -89,17 +89,19 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
   } else if (isFull) {
     buttonText = 'Housefull!';
   }
-
+  
   return (
     <Drawer open={isOpen} onOpenChange={setIsOpen}>
       <DrawerTrigger asChild>
-      {seats_left && registration_end_date&& <Button 
-          className="w-fit bg-blue-900 z-50"
-          onClick={() => isRegistrationOpen && setIsOpen(true)}
-          disabled={!isRegistrationOpen}
-        >
-          {buttonText}
-        </Button>}
+        {seats_left !== 0 && seats_left != null && currentDate.isBefore(dayjs(registration_end_date)) ? (
+            <Button className="w-fit bg-blue-900 z-50" onClick={() => setIsOpen(true)}>
+                Register
+            </Button>
+        ) : ( seats_left != null &&
+            <Button className="w-fit bg-blue-900 z-50" disabled>
+                {seats_left < 1 ? 'Housefull !' : 'Registration closed'}
+            </Button>
+        )}
       </DrawerTrigger>
       <DrawerContent className="bg-orange-50 bg-[url('/sprinkle.svg')] bg-cover h-full pb-8 z-50">
       <div className="overflow-auto no-scrollbar">
@@ -144,7 +146,17 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
                         name={name}
                         render={({ field }) => (
                           <FormItem>
-                            <FormLabel>{label}</FormLabel>
+                            {type === 'checkbox' ? (
+                              <div className='flex items-center gap-2'>
+                                <FormLabel>{label}</FormLabel>
+                                <FormControl>
+                                  <Input type='checkbox' {...field} />
+                                </FormControl>
+                              </div>
+                              ):(
+                                <>
+                                 <FormLabel>{label}</FormLabel>
+
                             {type === 'select' ? (
                               <Select
                                 onValueChange={field.onChange}
@@ -172,6 +184,8 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
                                 />
                               </FormControl>
                             )}
+                            </>
+                            )}
                             <FormMessage>
                               {errors[name]?.message ?? ' '}
                             </FormMessage>

From fdeecc43add6f475185d6f978d8804eae2aeeb3a Mon Sep 17 00:00:00 2001
From: Bhuvnesh Sharma <bhuvneshsharma@Bhuvneshs-MacBook-Air.local>
Date: Fri, 4 Oct 2024 23:41:46 +0530
Subject: [PATCH 4/4] final cleanup

---
 backend/djangoindia/api/serializers/event.py  |  1 +
 ...ation_include_in_attendee_list_and_more.py | 24 +++++++++++++++++++
 frontend/src/constants/schema.tsx             |  5 +++-
 .../RegisterEvent/RegisterEvent.tsx           | 20 +++++++---------
 4 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 backend/djangoindia/db/migrations/0014_eventregistration_include_in_attendee_list_and_more.py

diff --git a/backend/djangoindia/api/serializers/event.py b/backend/djangoindia/api/serializers/event.py
index 2b613e11..34d12d5c 100644
--- a/backend/djangoindia/api/serializers/event.py
+++ b/backend/djangoindia/api/serializers/event.py
@@ -52,6 +52,7 @@ class EventRegistrationSerializer(serializers.Serializer):
     twitter = serializers.URLField(required=False, allow_blank=True)
     other_links = serializers.URLField(required=False, allow_blank=True)
     rsvp = serializers.BooleanField(default=False)
+    include_in_attendee_list = serializers.BooleanField(default=False)
 
     def create(self, validated_data):
         return EventRegistration.objects.create(**validated_data)
diff --git a/backend/djangoindia/db/migrations/0014_eventregistration_include_in_attendee_list_and_more.py b/backend/djangoindia/db/migrations/0014_eventregistration_include_in_attendee_list_and_more.py
new file mode 100644
index 00000000..038b8eed
--- /dev/null
+++ b/backend/djangoindia/db/migrations/0014_eventregistration_include_in_attendee_list_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.5 on 2024-10-04 17:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0013_volunteer'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='eventregistration',
+            name='include_in_attendee_list',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='volunteer',
+            name='event',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='volunteers', to='db.event'),
+        ),
+    ]
diff --git a/frontend/src/constants/schema.tsx b/frontend/src/constants/schema.tsx
index 834f1039..bcc05939 100644
--- a/frontend/src/constants/schema.tsx
+++ b/frontend/src/constants/schema.tsx
@@ -91,5 +91,8 @@ export const REGISTER_EVENT_FORM_SCHEMA = yup.object({
     .matches(
       /^https?:\/\/(www\.)?twitter\.com\/.*$/,
       'Please enter a valid Twitter URL',
-    ),
+  ),
+  include_in_attendee_list: yup
+    .bool()
+    .optional()
 })
diff --git a/frontend/src/containers/RegisterEvent/RegisterEvent.tsx b/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
index 8e48b9de..a3d65d49 100644
--- a/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
+++ b/frontend/src/containers/RegisterEvent/RegisterEvent.tsx
@@ -53,6 +53,7 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
       linkedin: '',
       organization: '',
       description: '',
+      include_in_attendee_list: false,
     },
   })
 
@@ -78,7 +79,7 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
     setIsOpen(false)
   }
 
-  const currentDate = dayjs();  
+  const currentDate = dayjs();
   const registrationEndDate = dayjs(registration_end_date);
   const isRegistrationOpen = seats_left > 0 && currentDate.isBefore(registrationEndDate);
   const isFull = seats_left === 0;
@@ -93,15 +94,13 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
   return (
     <Drawer open={isOpen} onOpenChange={setIsOpen}>
       <DrawerTrigger asChild>
-        {seats_left !== 0 && seats_left != null && currentDate.isBefore(dayjs(registration_end_date)) ? (
-            <Button className="w-fit bg-blue-900 z-50" onClick={() => setIsOpen(true)}>
-                Register
-            </Button>
-        ) : ( seats_left != null &&
-            <Button className="w-fit bg-blue-900 z-50" disabled>
-                {seats_left < 1 ? 'Housefull !' : 'Registration closed'}
-            </Button>
-        )}
+      {seats_left && registration_end_date&& <Button 
+          className="w-fit bg-blue-900 z-50"
+          onClick={() => isRegistrationOpen && setIsOpen(true)}
+          disabled={!isRegistrationOpen}
+        >
+          {buttonText}
+        </Button>}
       </DrawerTrigger>
       <DrawerContent className="bg-orange-50 bg-[url('/sprinkle.svg')] bg-cover h-full pb-8 z-50">
       <div className="overflow-auto no-scrollbar">
@@ -156,7 +155,6 @@ export const RegisterEvent = ({ eventId, seats_left, registration_end_date }: {
                               ):(
                                 <>
                                  <FormLabel>{label}</FormLabel>
-
                             {type === 'select' ? (
                               <Select
                                 onValueChange={field.onChange}