New UI overhaul (#610)

* 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 (#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]>

* 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 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

---------

Co-authored-by: Krishnan E <[email protected]>
Co-authored-by: Midhun Unni <[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]>

apps/core-admin/package.json

@@ -7,7 +7,7 @@
     "build": "npm run clean & webpack --config webpack.config.js",
     "clean": "rimraf dist & rimraf build",
     "dev": "concurrently \"npx tsc --watch\" \"nodemon -q build/index.js\"",
-    "setup": "node -e \"require('fs').copyFile('.env.example', '.env', (err) => {if (err) {console.log(err);} else {console.log('Environment variables set up successfully');}});\"",
+    "setup": "node -e \"require('fs').copyFile('.env.example', '.env', (err) => {if (err) {//console.log(err);} else {//console.log('Environment variables set up successfully');}});\"",
     "start": "node dist/app.js",
     "test": "mocha -r ts-node/register 'tests/**/*.ts' --timeout 10000 --exit",
     "lint": "eslint --ext .ts src"

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

@@ -1,6 +1,7 @@
 import { Request, Response } from 'express';
 
 import prisma from '../utils/database';
+import { count } from 'console';
 
 export const getEvents = async (req: Request, res: Response) => {
   try {
@@ -30,6 +31,7 @@ export const getEvents = async (req: Request, res: Response) => {
         attributes: true,
         extras: true,
         ParticipantCheckin: true,
+        address: true,
       },
     });
 
@@ -39,6 +41,12 @@ export const getEvents = async (req: Request, res: Response) => {
         name: event.name,
         description: event.description,
         createdAt: event.createdAt,
+        addressDetails: event.address,
+        startTime: event.startTime,
+        endTime: event.endTime,
+        type: event.type,
+        isShortlisting: event.isShortlisting,
+        isRegistrationClosed: event.isRegistrationClosed,
         numberOfParticipants: event.Participant.length,
         numberOfAttributes: event.attributes.length,
         numberOfExtras: event.extras.length,
@@ -81,13 +89,32 @@ export const getEventStats = async (req: Request, res: Response) => {
         attributes: true,
         extras: true,
         ParticipantCheckin: true,
+        address: true,
       },
     });
-
     if (!event) {
       return res.status(404).json({ error: 'Event not found' });
     }
+    if (event.venueId) {
+      let address = await prisma.address.findUnique({
+        where: {
+          venueId: event.venueId,
+        },
+      });
+      event = {
+        id: event.id,
+        name: event.name,
+        description: event.description,
+        createdAt: event.createdAt,
+        numberOfParticipants: event.Participant.length,
+        numberOfAttributes: event.attributes.length,
+        numberOfExtras: event.extras.length,
+        numberOfParticipantsCheckedIn: event.ParticipantCheckin.length,
+        venueDetails: address,
+      };
 
+      return res.status(200).json({ event });
+    }
     event = {
       id: event.id,
       name: event.name,
@@ -109,9 +136,24 @@ export const getEventStats = async (req: Request, res: Response) => {
 export const createNewEvent = async (req: Request, res: Response) => {
   try {
     const userId = req?.auth?.payload?.sub;
-    const { id, name } = req.body;
+    const {
+      id,
+      name,
+      startDate,
+      endDate,
+      desc,
+      type,
+      venue,
+      street,
+      city,
+      state,
+      country,
+      pincode,
+      locationUrl,
+    } = req.body;
     const { orgId } = req?.params;
-
+    console.log(req.body, orgId, id);
+    // return res.status(400).send({ message: 'debugging' });
     const organization = await prisma.organization.findUnique({
       where: {
         id: orgId,
@@ -125,19 +167,38 @@ export const createNewEvent = async (req: Request, res: Response) => {
     if (organization?.organizationUsers?.some((ou: any) => ou.userId === userId)) {
       return res.status(403).json({ error: 'Forbidden' });
     }
-
-    const newEvent = await prisma.event.create({
+    const newAddress = await prisma.address.create({
       data: {
-        name,
-        organizationId: orgId,
+        name: venue,
+        street: street,
+        city: city,
+        state: state,
+        country: country,
+        pinCode: parseInt(pincode),
+        locationUrl: locationUrl,
       },
     });
-
-    if (!newEvent) {
-      return res.status(500).json({ error: 'Something went wrong' });
+    if (newAddress) {
+      const newEvent = await prisma.event.create({
+        data: {
+          name: name,
+          organizationId: orgId,
+          startTime: new Date(startDate),
+          endTime: new Date(endDate),
+          description: desc,
+          type: type,
+          venueId: newAddress.id,
+        },
+      });
+
+      if (!newEvent) {
+        return res.status(500).json({ error: 'Something went wrong' });
+      }
+
+      return res.status(200).json(newEvent);
+    } else {
+      return res.status(400).json({ error: 'Error creating event address' });
     }
-
-    return res.status(200).json(newEvent);
   } catch (err: any) {
     console.error(err);
 

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

@@ -41,7 +41,7 @@ export const getAllExtras = async (req: Request, res: Response) => {
       return res.status(404).json({ error: 'No extras found' });
     }
 
-    console.log(extras);
+    //console.log(extras);
 
     extras = extras.map((extra: any) => {
       return {