Skip to content

Commit

Permalink
Staging (#654)
Browse files Browse the repository at this point in the history
* 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]>

* tried to fix signup process error

* Add payment status attribute temporary routes

* tried to fix sign up error

* Rephrased the helping sentence in Upload CSV (#652)

* 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

* refraced the informative sentences

---------

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

* feat: toggle payment status (#655)

* feat: toggle payment status

* payment status updates

* verified build

---------

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]>
Co-authored-by: Subramani E <[email protected]>
Co-authored-by: Vasanth R <[email protected]>
  • Loading branch information
12 people authored Jan 20, 2025
1 parent 90895fe commit bb681c6
Show file tree
Hide file tree
Showing 9 changed files with 343 additions and 23 deletions.
72 changes: 72 additions & 0 deletions apps/core-admin/src/controllers/attributes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,75 @@ export const getAttributeParticipants = async (req: Request, res: Response) => {
return res.status(500).json({ error: 'Something went wrong' });
}
};

// Temporary controllers

export const setPaymentStatus = async (req: Request, res: Response) => {
try {
const { orgId, eventId } = req?.params;
const { participantId, paymentStatus } = req?.body;

if (paymentStatus !== 'yes' && paymentStatus !== 'no') {
return res.status(400).json({ error: 'Invalid payment status' });
}

const attribute = await prisma.attributes.findFirst({
where: {
organizationId: orgId,
eventId: eventId,
name: 'Paid',
},
});

if (!attribute) {
return res.status(404).json({ error: 'No attribute for payment status found' });
}

const participant = await prisma.participant.findFirst({
where: {
id: participantId,
eventId,
organizationId: orgId,
},
});

if (!participant) {
return res.status(404).json({ error: 'Participant not found' });
}

const participantAttribute = await prisma.participantAttributes.findFirst({
where: {
participantId,
attributeId: attribute.id,
},
});

if (!participantAttribute) {
return res.status(400).json({ error: 'Payment attribute not assigned to participant' });
}

if (participantAttribute.value === paymentStatus) {
return res
.status(400)
.json({ error: `Participant already payment status set as ${paymentStatus}` });
}

const updatedParticipantAttribute = await prisma.participantAttributes.update({
where: {
id: participantAttribute.id,
},
data: {
value: paymentStatus,
},
});

if (!updatedParticipantAttribute) {
return res.status(500).json({ error: 'Failed to update payment status' });
}

return res.status(200).json({ updatedParticipantAttribute });
} catch (err: any) {
console.error(err);
return res.status(500).json({ error: 'Something went wrong' });
}
};
70 changes: 54 additions & 16 deletions apps/core-admin/src/controllers/organizations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,64 @@ import prisma from '../utils/database';
export const createNewOrganization = async (req: Request, res: Response) => {
try {
const userId = req?.auth?.payload?.sub;
const { id, name } = req.body;
//console.log(id, name);
const newOrganization = await prisma.organization.create({
data: {
id,
name,
OrganizationUser: {
create: {
userId,
role: 'ADMIN',
const { id, name, email } = req.body;
console.log(id, name);
console.log(userId);

const existingUser = await prisma.user.findUnique({
where: { id: userId },
});

if (!existingUser) {
// throw new Error(`User with ID ${userId} not found`);

const newUser = await prisma.user.create({
data: {
email: email,
id: userId,
},
});
if (!newUser) {
return res.status(500).json({ error: 'Something went wrong' });
}
const newOrganization = await prisma.organization.create({
data: {
id,
name,
OrganizationUser: {
create: {
userId: userId,
role: 'ADMIN',
},
},
},
},
});
});

if (!newOrganization) {
return res.status(500).json({ error: 'Something went wrong' });
}
if (!newOrganization) {
return res.status(500).json({ error: 'Something went wrong' });
}

return res.status(200).json(newOrganization);
return res.status(200).json(newOrganization);
} else {
const newOrganization = await prisma.organization.create({
data: {
id,
name,
OrganizationUser: {
create: {
userId: userId,
role: 'ADMIN',
},
},
},
});

if (!newOrganization) {
return res.status(500).json({ error: 'Something went wrong' });
}

return res.status(200).json(newOrganization);
}
} catch (err: any) {
console.error(err);
if (err.code === 'P2002') {
Expand Down
4 changes: 4 additions & 0 deletions apps/core-admin/src/controllers/participants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ export const getAllParticipantsCheckInDetails = async (req: Request, res: Respon
eventId,
},
include: {
participantAttributes: true,
participantCheckIn: {
select: {
id: true,
Expand All @@ -322,6 +323,9 @@ export const getAllParticipantsCheckInDetails = async (req: Request, res: Respon
phone: participant.phone,
email: participant.email,
checkInKey: participant.checkInKey,
paymentStatus: participant.participantAttributes.filter(
(attr: any) => attr.value === 'yes' || attr.value === 'no',
)[0].value,
checkIn: {
status: participant.participantCheckIn.length > 0 ? true : false,
checkedInAt:
Expand Down
4 changes: 4 additions & 0 deletions apps/core-admin/src/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
getAllAttributes,
getAttributeById,
getAttributeParticipants,
setPaymentStatus,
} from './controllers/attributes';
import { fetchAccountDetails, myCredential, updateAccountDetails } from './controllers/users';
import { validateOrganizationUser, validateOrganizationAdmin } from './middlewares/authorization';
Expand Down Expand Up @@ -111,6 +112,9 @@ router.put(
updateParticipantAttribute,
);

// Temp routes
router.post('/organizations/:orgId/events/:eventId/participants/payment-status', setPaymentStatus);

router.post('/organizations/update', updateOrganizationDetails); //ajay

router.get('/organizations/:orgId/events/:eventId/attributes', getAllAttributes); // done
Expand Down
11 changes: 11 additions & 0 deletions apps/web-admin/src/components/DataDisplay.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,17 @@ export default function DataDisplay({
<StyledText>
<GoDotFill color="green" /> Open
</StyledText>
) : column.field == 'paymentStatus' ? (
<HStack align="center" position="relative" zIndex={2}>
<StyledText>{row[column.field]}</StyledText>
<Checkbox
isChecked={row[column.field] === 'yes'}
onChange={(e) => {
e.stopPropagation();
column.togglePaymentStatus(row.id, e.target.checked ? 'yes' : 'no');
}}
/>
</HStack>
) : (
// </StyledBox>
<StyledText>{row[column.field]}</StyledText>
Expand Down
12 changes: 9 additions & 3 deletions apps/web-admin/src/components/ProtectedRoute.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export const ProtectedRoute = ({ children }) => {
async function postOrg() {
const id = user.sub.substring(6);
const name = user.nickname;
const response = await post(`/core/organizations`, {}, { id, name });
const email = user.email;
const response = await post(`/core/organizations`, {}, { id, name, email });
if (response) {
const { data, mystatus } = response;
//console.log('created');
Expand All @@ -77,7 +78,12 @@ export const ProtectedRoute = ({ children }) => {
async function checkOrg() {
let myResponse = await get('/core/users/mycreds');
// //console.log(myResponse.data.data);
if (myResponse && myResponse.status === 200) {
if (
myResponse &&
myResponse.status === 200 &&
myResponse.data.data &&
myResponse.data.data.length !== 0
) {
console.log('Hello world');
setAllAccounts(
myResponse.data.data.map((value) => ({
Expand All @@ -95,7 +101,7 @@ export const ProtectedRoute = ({ children }) => {
});
//console.log('final: ', data);
setAccountDetails(data[0]);
router.replace(`/${data[0].orgId}/events`);
// router.replace(`/${data[0].orgId}/events`);
return data;
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const NavigationMenu = ({ orgId, eventId, navButton }) => {
name: 'Participants Check-in Details',
path: `/${orgId}/events/${eventId}/participants/check-in`,
},
{
name: 'Participants Payment Status',
path: `/${orgId}/events/${eventId}/paymentstatus`,
},
{
name: 'Attributes Details',
path: `/${orgId}/events/${eventId}/attributes`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ export default function NewParticipantByCSVUpload() {
if (extraColumns.length > 0) {
showAlert({
title: 'Info',
description:
'Extra columns detected. Using _ for attributes and & for check-in extras.',
description: 'Extra columns detected. Using _ for attributes and & for extras.',
status: 'info',
duration: 5000,
});
Expand Down Expand Up @@ -267,8 +266,7 @@ export default function NewParticipantByCSVUpload() {
fontSize="lg"
color={colorMode === 'light' ? 'gray.600' : 'gray.100'}
>
Prefix extra attributes with underscore (_) and check-in attributes with ampersand
(&)
Prefix Attributes with underscore ( _ ) and Extra Details with ampersand ( & )
</Text>
</Box>
</Box>
Expand Down
Loading

0 comments on commit bb681c6

Please sign in to comment.