👨🏾‍⚖️ Freddy branch (#1068)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 👈🏻 Apply login partner changes (#528)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* 🚣🏻‍♀️ Apply partner login changes (#529)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* 🚣🏽 Apply partner login changes (#530)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 🐜 Apply partner login changes (#532)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 👷🏿‍♀️ Apply partner login changes (#533)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* changes

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🤷🏾 Master update wordings (#535)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 👎🏾 Apply partner login changes (#531)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Test forget pass

* modified wording

* changes

* solve conflict

* 🧸 Apply partner login changes (#534)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* 👈🏻 Apply login partner changes (#528)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* 🚣🏻‍♀️ Apply partner login changes (#529)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 🚣🏽 Apply partner login changes (#530)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* 🐜 Apply partner login changes (#532)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* changes

* 👷🏿‍♀️ Apply partner login changes (#533)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* changes

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* solve conflict

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Fixed some wordings

Co-authored-by: leundai <[email protected]>
Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* 🐂 Fix reset password link and wordings (#538)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 👎🏾 Apply partner login changes (#531)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Test forget pass

* modified wording

* changes

* wording fixes

* solve conflict

* 🧸 Apply partner login changes (#534)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* 👈🏻 Apply login partner changes (#528)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* 🚣🏻‍♀️ Apply partner login changes (#529)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 🚣🏽 Apply partner login changes (#530)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* 🐜 Apply partner login changes (#532)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* changes

* 👷🏿‍♀️ Apply partner login changes (#533)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* changes

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* solve conflict

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Fixed some wordings

* 🧜🏼‍♀️ Master update wordings (#536)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* 👈🏻 Apply login partner changes (#528)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* 🚣🏻‍♀️ Apply partner login changes (#529)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 🚣🏽 Apply partner login changes (#530)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* 🐜 Apply partner login changes (#532)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* changes

* 👷🏿‍♀️ Apply partner login changes (#533)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* changes

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* solve conflict

* Fixed some wordings

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* add profile image to build profile && change home page

Co-authored-by: leundai <[email protected]>
Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* 🤸🏼‍♂️ Fix reset password link and wordings (#539)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 👎🏾 Apply partner login changes (#531)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Test forget pass

* modified wording

* changes

* wording fixes

* solve conflict

* 🧸 Apply partner login changes (#534)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* 👈🏻 Apply login partner changes (#528)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* 🚣🏻‍♀️ Apply partner login changes (#529)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 🚣🏽 Apply partner login changes (#530)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* 🐜 Apply partner login changes (#532)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* changes

* 👷🏿‍♀️ Apply partner login changes (#533)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* changes

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* solve conflict

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Fixed some wordings

* 🧜🏼‍♀️ Master update wordings (#536)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* 👈🏻 Apply login partner changes (#528)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* 🚣🏻‍♀️ Apply partner login changes (#529)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 🚣🏽 Apply partner login changes (#530)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* 🐜 Apply partner login changes (#532)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* changes

* 👷🏿‍♀️ Apply partner login changes (#533)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* Test forget pass

* modified wording

* changes

Co-authored-by: leundai <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* solve conflict

* Fixed some wordings

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* add profile image to build profile && change home page

* Decrease mentor mentee partner card

* Decrease mentor mentee partner card 2.

Co-authored-by: leundai <[email protected]>
Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* 🌥️ Fix reset password link and wordings (#540)

* update url consts for vercel/heroku frontend

* fix vercel env caal

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

* 👎🏾 Apply partner login changes (#531)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve conflict2

* solve conflict2

* stage3 solve issues3

* 🛍️ Apply login partner changes (#516)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* 🚶🏼 Apply login partner changes (#524)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* 💁🏿‍♀️ Apply login partner changes (#526)

* solve conflict2

* solve conflict2

* stage3 solve issues3

* fix issues3 stage3

* solved

* solved

* solved2

* change color

* change color 2

* change color 2

* latest code

* change partner admin message

* Add scroll

Co-authored-by: RavishingRitesh <[email protected]>
Co-authored-by: leundai <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>
Co-authored-by: robert-dm <[email protected]>

* Test forget pass

* modified wording

* changes

* wording fixes

* solve conflict

* 🧸 Apply partner login changes (#534)

* ✌🏽 Calender booking feature (#470)

* adding socket events to chart area.

* Update messages.py

added socket for invitation.

* Update MessagesChatArea.js

added booking calendar functionality.

* Update Messages.js

added booking calendar required properties.

* Update MessagesChatArea.js

Changes for changing button position and layout.

* formatting

* Update MessagesChatArea.js

Changes for disabling button and sending message.

Co-authored-by: leundai <[email protected]>

* 🎪 Book appointment from chat issues (#478)

* Update MenteeAppointmentModal.js

Setting booking response message to show in chat.

* Update MessagesChatArea.js

Sending booking appointment response in chat.

* Updated message for Send Invite

* Update Appointments.js

Changes for showing number of pending items on All Pending button.

* Update admin.py

Changes for saving verified emails

* Update api.js

Adding const for saving verified emails.

* Update UploadEmails.js

Changes for saving verified emails in bulk.

* fixed typo

* Update UploadEmails.js

Changes done for validating email format.

* Update admin.py

Changing param name.

* Update api.js

Changing param name.

* Update UploadEmails.js

Code commit for email bulk upload

* Update admin.py

Code commit for email bulk upload.

* Update requirements.txt

Dev version.

* Update requirements.txt

Dev version

Co-authored-by: Robert <[email protected]>
Co-authored-by: Robertdm <[email protected]>

* 🔧 Calendar mentor fixes (#485)

* Changes for removing Book Appointment Button.

* Changes for fixing error while mentor loading.

* Changes for showing booked slots in calendar

* Changes for adding timeslot in response.

* Change frontend back to Heroku based instead of Vercel

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* 🍐 Apply login partner changes (#506)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

* 🤾🏾‍♂️ Apply login partner changes (#507)

* change login and apply logic

* Add mentor application work in front and back end

* add apply process back and front end for 3 roles

* stage 1 ready for test

* :

* enhance UI finish stage 1

* stage 1

* stage 1.

* stage 1..

* ehance UI stage1

* fix login and apply UI

* fix login and apply UI

* fix login and apply UI.

* fix mentee button

* stage 2 ready for test

* fix stage2 issues

* stage2 fixes

* stage2 changes add Training CMS && new Emails

* Add node ccfi

Co-authored-by: robert-dm <[email protected]>

* stage 3

* stage3 solve issues

* solve …

backend/api/views/apply.py

@@ -635,5 +635,6 @@ def create_application():
         logger.info(msg)
 
     return create_response(
-        message=f"Successfully created application with name {new_application.email}"
+        status=200,
+        message=f"Successfully created application with name {new_application.email}",
     )

frontend/src/components/pages/ApplicationForm.js

@@ -26,8 +26,12 @@ const ApplicationForm = ({ location, history }) => {
     setSuccessfulSubmit(true);
   };
 
-  const onSubmitFailure = () => {
-    messageApi.error(t("apply.errorConnection"));
+  const onSubmitFailure = (message = null) => {
+    if (message) {
+      messageApi.error(message);
+    } else {
+      messageApi.error(t("apply.errorConnection"));
+    }
   };
 
   const getApplicationForm = () => {

frontend/src/components/pages/MenteeApplication.js

@@ -178,11 +178,20 @@ function MenteeApplication({ email, role, onSubmitSuccess, onSubmitFailure }) {
 
     const res = await createApplication(data);
     setLoading(false);
-
-    if (res) {
+    console.log("res", res);
+    if (res && res.status === 200) {
       onSubmitSuccess();
     } else {
-      onSubmitFailure();
+      if (
+        res &&
+        res.response &&
+        res.response.data &&
+        res.response.data.message
+      ) {
+        onSubmitFailure(res.response.data.message);
+      } else {
+        onSubmitFailure();
+      }
     }
   };
 

frontend/src/utils/api.js

@@ -167,6 +167,7 @@ export const createApplication = (application) => {
     (response) => response,
     (err) => {
       console.error(err);
+      return err;
     }
   );
 };