🧒🏿 Fix Emoji Container (#1166)

* 🔧  fix edit&delete module of skill& language (#632)

* update url consts for vercel/heroku frontend

* fix vercel env caal

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

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

* 🧜🏼‍♀️ 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]>

* 🎫 Fix reset password link and wordings (#537)

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

* wording fixes

* solve conflict

* Fixed some wordings

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

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

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

* Decrease mentor mentee partner card

* Decrease mentor mentee partner card 2.

* 🤸🏼‍♂️ 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 log…

frontend/src/components/GroupMessageChatArea.js

@@ -28,6 +28,7 @@ function GroupMessageChatArea(props) {
   const [replyInputFlags, setReplyInputFlags] = useState({});
   const [refreshFlag, setRefreshFlag] = useState(false);
   const [showEmojiPicker, setShowEmojiPicker] = useState(false);
+  const [emojiUp, setEmojiUp] = useState(false);
   const [showReplyEmojiPicker, setShowReplyEmojiPicker] = useState(false);
 
   const scrollToBottom = () => {
@@ -196,6 +197,7 @@ function GroupMessageChatArea(props) {
             setDotMenuFlags(dot_temp);
             setRefreshFlag(!refreshFlag);
             setReplyMessageText("");
+            setShowEmojiPicker(false);
           }}
         >
           {t("messages.reply")}
@@ -329,10 +331,32 @@ function GroupMessageChatArea(props) {
                       alt=""
                       className="emoji-icon"
                       src="https://icons.getbootstrap.com/assets/icons/emoji-smile.svg"
-                      onClick={() => setShowEmojiPicker((val) => !val)}
+                      onClick={(e) => {
+                        console.log(
+                          "eee",
+                          e,
+                          e.target.getBoundingClientRect(),
+                          window.innerHeight
+                        );
+                        if (
+                          e.target.getBoundingClientRect().y <
+                          window.innerHeight / 2
+                        ) {
+                          setEmojiUp(false);
+                        } else {
+                          setEmojiUp(true);
+                        }
+                        setShowEmojiPicker((val) => !val);
+                      }}
                     />
                     {showEmojiPicker && (
-                      <div className="emoji-container">
+                      <div
+                        className={
+                          emojiUp
+                            ? "up emoji-container"
+                            : "down emoji-container"
+                        }
+                      >
                         <EmojiPicker
                           onEmojiClick={(e) => onEmojiClick(e, "reply")}
                         />

frontend/src/components/css/AdminAccountData.scss

@@ -137,5 +137,3 @@
     width: 100% !important;
   }
 }
-
-

frontend/src/components/css/Appointments.scss

@@ -291,7 +291,7 @@
   flex-direction: row;
   margin-bottom: 5%;
   margin-left: 1%;
-  height: 100%
+  height: 100%;
 }
 
 .appointment-card {

frontend/src/components/css/Home.scss

@@ -141,8 +141,8 @@
 
 @media (max-width: 600px) {
   .btn-d {
-  width: 100%;
-  margin: 10px 0;
+    width: 100%;
+    margin: 10px 0;
   }
   .btn-dc {
     flex-direction: column;

frontend/src/components/css/Messages.scss

@@ -128,7 +128,7 @@
   min-height: calc(100vh - #{($nav-header-height + $footer-gap)} - 90px);
 }
 .group-conversation-content {
-  max-height: calc(100vh - #{($nav-header-height + $footer-gap)});
+  max-height: calc(100vh - #{($nav-header-height + $footer-gap)} - 40px);
 }
 
 .no-messages {
@@ -251,10 +251,15 @@
 }
 .emoji-container {
   position: absolute;
-  bottom: 50px;
   right: 30px;
   max-width: 450px;
 }
+.emoji-container.down {
+  top: 50px;
+}
+.emoji-container.up {
+  bottom: 50px;
+}
 .conversation-footer {
   .emoji-icon {
     height: 20px;

frontend/src/components/css/Profile.scss

@@ -37,7 +37,7 @@
   }
 
   .mentor-profile-heading {
-    margin: 0
+    margin: 0;
   }
 }