Skip to content

Commit

Permalink
Staging (#658)
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

* ci: Remove dependabot

* fix(core-mailer): FIx invalid JSON string and related issues

* added searchbar

* fixed scrollbar for page display HStack

* fixed payment status integration error with other events

* prevention of empty participant insertion

* multiform email updates (#657)

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

* multiform email updates

---------

Co-authored-by: Allen Shibu <[email protected]>
Co-authored-by: Ajay Krishna D <[email protected]>
Co-authored-by: Subramani E <[email protected]>
Co-authored-by: Krishnan E <[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]>

* build verified

* fixed add participant

---------

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]>
  • Loading branch information
10 people authored Jan 21, 2025
1 parent 9d5ce0b commit 234a572
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 41 deletions.
33 changes: 13 additions & 20 deletions apps/web-admin/src/components/DataDisplay.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default function DataDisplay({
height = 'auto',
state = null,
setState = null,
isCheckBox = false,
}) {
const [selectedRows, setSelectedRows] = useState([]);
// console.log(state);
Expand Down Expand Up @@ -103,10 +104,10 @@ export default function DataDisplay({
: '3px solid rgba(251, 251, 254, 0.20)'
}
>
{/* <Th> */}
{/*
{isCheckBox && (
<Th>
<Checkbox
isChecked=
isChecked={
state === null || setState === null
? selectedRows.length === rows.length
: state.length === rows.length
Expand All @@ -126,8 +127,8 @@ export default function DataDisplay({
}
}}
/>
*/}
{/* </Th> */}
</Th>
)}
{columns.map((column) => (
<Th key={column.field} color={'rgba(4, 5, 11, 0.4)'}>
<StyledText variant="16Regular.black" textTransform="none">
Expand Down Expand Up @@ -155,20 +156,23 @@ export default function DataDisplay({
borderBottom: '1px solid #efeef3',
}}
>
{/* <Td borderTopLeftRadius={'8px'} borderBottomLeftRadius={'8px'}> */}
{/*
{isCheckBox && (
<Td borderTopLeftRadius={'8px'} borderBottomLeftRadius={'8px'}>
<Checkbox
// colorPalette="blue"
variant="solid"
isChecked={
state === null || setState === null
? selectedRows.includes(row.id)
: state.includes(row.email)
}
onChange={() => {
handleCheckboxChange(row);
console.log('checkbox change', state);
}}
/>
*/}
{/* </Td> */}
</Td>
)}
{columns.map((column) => (
<Td
key={column.field}
Expand All @@ -189,17 +193,6 @@ 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
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@ const AddParticipant = ({ isOpen, onClose, formData, handleInputChange, handleSu
<StyledText color="black">Add Participant</StyledText>
</ModalHeader>
<ModalCloseButton />
<form
onSubmit={(e) => {
e.preventDefault();
handleSubmit();
}}
>
<form onSubmit={handleSubmit}>
<ModalBody backgroundColor={colorMode === 'light' ? '#EEEFFF' : '#101116'}>
<FormControl mb={4} isRequired>
<FormLabel fontFamily={inter.style.fontFamily}>First Name</FormLabel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ const MultiStepModal = ({ isOpen, onClose, emailContent, setEmailContent }) => {
const [selectedProject, setSelectedProject] = useState({});
const [recipients, setRecipients] = useState([]);
const [mailStatus, setMailStatus] = useState(null);
const [flag, setFlag] = useState(false);
let flag1 = false;
let flag2 = false;
useEffect(() => {
const fetchText = async () => {
const response = await fetch('/QrTemplate.txt');
Expand Down Expand Up @@ -203,19 +204,15 @@ const MultiStepModal = ({ isOpen, onClose, emailContent, setEmailContent }) => {
},
);
const updateEmailTemplate = async (e) => {
e.preventDefault();
e?.preventDefault();
////console.log(emailContent);
if (accountDetails.orgId) {
let flag1 = false;
let flag2 = false;
if (/<\s+[^>]+\s+>/.test(emailContent)) {
flag1 = true;
flag1 = false; //make this true
}
if (!(/{{name}}/.test(emailContent) && /{{payload}}/.test(emailContent))) {
flag2 = true;
}
const flag3 = flag1 || flag2;
setFlag(flag3);
////console.log(flag3);
updateEmailMutation({
projectId: selectedProject.id,
Expand Down Expand Up @@ -558,6 +555,7 @@ const MultiStepModal = ({ isOpen, onClose, emailContent, setEmailContent }) => {
onRowClick={(value) => {
////console.log(value);
}}
isCheckBox={true}
state={recipients.map((value) => value.email)}
// state={recipients}
setState={(selectedValue) => {
Expand Down Expand Up @@ -682,16 +680,20 @@ const MultiStepModal = ({ isOpen, onClose, emailContent, setEmailContent }) => {
{step < 4 && (
<Button
onClick={() => {
if (!flag) {
nextStep();
if (step === 2) {
updateEmailTemplate();
if (!(flag1 || flag2)) {
nextStep();
} else {
showAlert({
title: 'Failure...make sure',
description: 'Check whether {{}} is present and < something > is not',
status: 'success',
});
}
} else {
showAlert({
title: 'Failure...make sure',
description: 'Check whether {{}} is present and < something > is not',
status: 'success',
});
nextStep();
}

// ////console.log(step);
}}
width={'20%'}
Expand Down

0 comments on commit 234a572

Please sign in to comment.