Staging (#651)

* feat(core-admin): Add bulk add extras feature

* Modified the UI of Upload CSV and added new alerts (#650)

* Staging Area (#604)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

---------

Co-authored-by: Krishnan E <[email protected]>

* removed fastMode (#606)

* build verified

* New UI (#607)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

---------

Co-authored-by: Krishnan E <[email protected]>

* build verified

* New UI (#609)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>

* Made Sidebar uniform (#611)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>

* Integrated Org Details (#613)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>

* Dashboard complete UI 1.0 (#615)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

* added inter fontFamily to calendar

* working light/dark mode - functionality

* New UI (#614)

* My event ui updated

* footer

---------

Co-authored-by: Subramani E <[email protected]>

* missing tags

* build fix

* dark/light mode completed

* few changes to border colors

* few changes to border colors

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>

* New UI (#617)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

* added inter fontFamily to calendar

* working light/dark mode - functionality

* New UI (#614)

* My event ui updated

* footer

---------

Co-authored-by: Subramani E <[email protected]>

* missing tags

* build fix

* dark/light mode completed

* few changes to border colors

* few changes to border colors

* feat: Created New UI for "Settings" page which is compatible with dark mode and is responsive (#616)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* mobile responsive changes

* added board for member details

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>

* Final Settings page (#619)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

* added inter fontFamily to calendar

* working light/dark mode - functionality

* New UI (#614)

* My event ui updated

* footer

---------

Co-authored-by: Subramani E <[email protected]>

* missing tags

* build fix

* dark/light mode completed

* few changes to border colors

* few changes to border colors

* feat: Created New UI for "Settings" page which is compatible with dark mode and is responsive (#616)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* mobile responsive changes

* added board for member details

* Updated Settings UI (#618)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* small UI changes to settings and error messages

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>

* Updated settings UI and messages (#623)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

* added inter fontFamily to calendar

* working light/dark mode - functionality

* New UI (#614)

* My event ui updated

* footer

---------

Co-authored-by: Subramani E <[email protected]>

* missing tags

* build fix

* dark/light mode completed

* few changes to border colors

* few changes to border colors

* feat: Created New UI for "Settings" page which is compatible with dark mode and is responsive (#616)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* mobile responsive changes

* added board for member details

* Updated Settings UI (#618)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* small UI changes to settings and error messages

* tried to fix sign up error

* verified sign up process

* Updated the settings UI  (#621)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* updated the UI with minor changes

* Empty Table Msg Updated (#622)

* verified build

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>
Co-authored-by: J ATULYA <[email protected]>

* feat: Added 5 modals instead of route.push

* feat: Added 5 modals instead of route.push (#628)

* New UI (#629)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

* added inter fontFamily to calendar

* working light/dark mode - functionality

* New UI (#614)

* My event ui updated

* footer

---------

Co-authored-by: Subramani E <[email protected]>

* missing tags

* build fix

* dark/light mode completed

* few changes to border colors

* few changes to border colors

* feat: Created New UI for "Settings" page which is compatible with dark mode and is responsive (#616)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* mobile responsive changes

* added board for member details

* Updated Settings UI (#618)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* small UI changes to settings and error messages

* tried to fix sign up error

* verified sign up process

* Updated the settings UI  (#621)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* updated the UI with minor changes

* Empty Table Msg Updated (#622)

* verified build

* changes to schema, state management and integrated create new event

* feat: #603 seperated registrations for events with and without shortlisting, restricted access to registration page when registration is currently unavailable and added page to viewe registrant for admin (#625)

* Calendar UI overhaul (#624)

* events section updated (#627)

* fixing ui pg1

* events section

---------

Co-authored-by: Subramani E <[email protected]>

* build verified

* Temp UI (#630)

* fixing ui pg1

* events section

---------

Co-authored-by: Subramani E <[email protected]>

* build verified

* verified functions of participant check in modals

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>
Co-authored-by: J ATULYA <[email protected]>
Co-authored-by: Aaron-53 <[email protected]>
Co-authored-by: Arjun A <[email protected]>
Co-authored-by: diya jojo <[email protected]>

* Added some files which went  missing from prev commit

* Reorganizing Modals and Updating the UI (#633)

* feat: Added 5 modals instead of route.push

* Added some files which went  missing from prev commit

* New UI (#632)

* fixed new event UI

* chakra ui sample component

* Dashboard new UI changes with custom templates

* new dashboard with verified build

* added new columns to db

* Default Email template edit check (Issue #571)  (#601)

* Default Email template edit check (Issue #571)

* email task

* Verified build

* added option to switch organizations

* added updated sidebar to mobile view drawer

* added user fetching details

* build verified

* changed fontSize theme to 14

* changed fontSize theme to 14

* minor changes to font sizes

* Done Issue #570: Back and frontend for submitting Organization Details (#608)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* made sidebar uniform

* My event ui updated (#612)

* verified build and integrated organization details page

* added inter fontFamily to calendar

* working light/dark mode - functionality

* New UI (#614)

* My event ui updated

* footer

---------

Co-authored-by: Subramani E <[email protected]>

* missing tags

* build fix

* dark/light mode completed

* few changes to border colors

* few changes to border colors

* feat: Created New UI for "Settings" page which is compatible with dark mode and is responsive (#616)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* mobile responsive changes

* added board for member details

* Updated Settings UI (#618)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* small UI changes to settings and error messages

* tried to fix sign up error

* verified sign up process

* Updated the settings UI  (#621)

* feat:added back and frontend for submitting Organisatio details

* fix: removed repeating line

* Created new Settings UI and edit modal

* Resolved some errors

* modified ui of location btn

* done some minor UI changes again

* updated the UI with minor changes

* Empty Table Msg Updated (#622)

* verified build

* changes to schema, state management and integrated create new event

* feat: #603 seperated registrations for events with and without shortlisting, restricted access to registration page when registration is currently unavailable and added page to viewe registrant for admin (#625)

* Calendar UI overhaul (#624)

* events section updated (#627)

* fixing ui pg1

* events section

---------

Co-authored-by: Subramani E <[email protected]>

* build verified

* Temp UI (#630)

* fixing ui pg1

* events section

---------

Co-authored-by: Subramani E <[email protected]>

* build verified

* verified functions of participant check in modals

* added new route for status

* new changes (#631)

* fixing ui pg1

* events section

* conditional rendered the navbar

* navbar design

* verified color mode for new page

* added registrant route lost from merge conflict

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>
Co-authored-by: J ATULYA <[email protected]>
Co-authored-by: Aaron-53 <[email protected]>
Co-authored-by: Arjun A <[email protected]>
Co-authored-by: diya jojo <[email protected]>

* build verified

* Ensured all the text is inter

* Resolved all build errors

* Ensured all text in the Modals are in 'Inter' Font (#634)

* feat: Added 5 modals instead of route.push

* Added some files which went  missing from prev commit

* Ensured all the text is inter

* Resolved all build errors

* modified the UI of upload CSV and introduced alert

* Modified the UI of Upload CSV

* resolved some errors

* resolved some more errors

* added prettier

* added missing codes arised due to some Conflicts

---------

Co-authored-by: Subramani E <[email protected]>
Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Midhun Unni <[email protected]>
Co-authored-by: Subramani E <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>
Co-authored-by: J ATULYA <[email protected]>
Co-authored-by: Aaron-53 <[email protected]>
Co-authored-by: Arjun A <[email protected]>
Co-authored-by: diya jojo <[email protected]>

---------

Co-authored-by: Allen Shibu <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Midhun Unni <[email protected]>
Co-authored-by: Amal Varghese <[email protected]>
Co-authored-by: J ATULYA <[email protected]>
Co-authored-by: Aaron-53 <[email protected]>
Co-authored-by: Arjun A <[email protected]>
Co-authored-by: diya jojo <[email protected]>

apps/core-admin/src/controllers/extras.ts

@@ -5,17 +5,51 @@ import prisma from '../utils/database';
 export const addNewExtra = async (req: Request, res: Response) => {
   try {
     const { orgId, eventId } = req?.params;
+    const { assignToAllParticipants } = req?.query;
     const { name } = req?.body;
 
-    const newExtra = await prisma.extras.create({
-      data: {
-        name,
-        organizationId: orgId,
-        eventId: eventId,
-      },
-    });
+    if(!name) {
+      return res.status(400).json({ error: 'Name is required' });
+    }
+
+    await prisma.$transaction(async (tx: typeof prisma) => {
 
-    return res.status(200).json({ newExtra });
+      const newExtra = await tx.extras.create({
+        data: {
+          name,
+          organizationId: orgId,
+          eventId: eventId,
+        },
+      });
+
+      if (!newExtra) {
+        return res.status(500).json({error: 'Something went wrong'});
+      }
+
+      if (assignToAllParticipants === 'true') {
+        const participants = await prisma.participant.findMany({
+          where: {
+            organizationId: orgId,
+            eventId: eventId,
+          }
+        });
+
+        for (let participant of participants) {
+          const participantExtra = await tx.participantExtras.create({
+            data: {
+              participantId: participant.id,
+              extraId: newExtra.id,
+            },
+          });
+
+          if (!participantExtra) {
+            return res.status(500).json({error: 'Something went wrong'});
+          }
+        }
+      }
+
+      return res.status(200).json({ newExtra });
+    });
   } catch (err: any) {
     console.error(err);
     return res.status(500).json({ error: 'Something went wrong' });

apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/index.jsx

@@ -104,40 +104,19 @@ export default function ParticipantsCheckIn() {
         eventId={eventId}
         navButton={
           <div className="flex gap-2.5">
-            <StyledButton
-              onClick={() =>
-                router.push(`/${orgId}/events/${eventId}/participants/check-in/multi-in`)
-              }
-              isLoading={loading}
-            >
+            <StyledButton onClick={onMultiScannerModalOpen} isLoading={loading}>
               <StyledText>Multi-Stage Scanner</StyledText>
             </StyledButton>
-            <StyledButton
-              onClick={() => router.push(`/${orgId}/events/${eventId}/participants/check-in/in/`)}
-              isLoading={loading}
-            >
+            <StyledButton onClick={onCheckInModalOpen} isLoading={loading}>
               <StyledText>Check-In Participant</StyledText>
             </StyledButton>
-            <StyledButton
-              onClick={() =>
-                router.push(`/${orgId}/events/${eventId}/participants/check-in/in/scanner`)
-              }
-              isLoading={loading}
-            >
+            <StyledButton onClick={onScanner1ModalOpen} isLoading={loading}>
               <StyledText>Open Scanner</StyledText>
             </StyledButton>
-            <StyledButton
-              onClick={() => router.push(`/${orgId}/events/${eventId}/participants/check-in/out/`)}
-              isLoading={loading}
-            >
+            <StyledButton onClick={onCheckOutModalOpen} isLoading={loading}>
               <StyledText>Check-Out Participant</StyledText>
             </StyledButton>
-            <StyledButton
-              onClick={() =>
-                router.push(`/${orgId}/events/${eventId}/participants/check-in/out/scanner`)
-              }
-              isLoading={loading}
-            >
+            <StyledButton onClick={onScanner2ModalOpen} isLoading={loading}>
               <StyledText>Open Scanner</StyledText>
             </StyledButton>
           </div>