Skip to content

Commit

Permalink
👭🏼 Freddy branch (#1050)
Browse files Browse the repository at this point in the history 
* ✌🏽 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 con…
  • Loading branch information
@WebMon9099 @RavishingRitesh
@Leundai @robert-dm @eslamzaaki @git-translate @HamzaAnis @Humayun0008 @binary-exe
14 people authored Jun 4, 2024
1 parent d88dc29 commit 6ecb468
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 17 deletions.
9 changes: 7 additions & 2 deletions backend/api/views/training.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ def new_train(role):

# TODO: Remove this so that it is a job in the background
new_train_id = train.id
hub_url = ""
if int(role) == Account.MENTOR:
recipients = MentorProfile.objects.only("email", "preferred_language")
elif int(role) == Account.MENTEE:
Expand All @@ -219,18 +220,22 @@ def new_train(role):
recipients = PartnerProfile.objects.only("email", "preferred_language")
else:
hub_users = Hub.objects.filter(id=hub_id).only(
"email", "preferred_language"
"email", "preferred_language", "url"
)
partners = PartnerProfile.objects.filter(hub_id=hub_id).only(
"email", "preferred_language"
)
recipients = []
for hub_user in hub_users:
recipients.append(hub_user)
if hub_url == "":
hub_url = hub_user.url + "/"
for partner_user in partners:
recipients.append(partner_user)
front_url = request.form["front_url"]
target_url = front_url + "new_training/" + role + "/" + str(new_train_id)
target_url = (
front_url + hub_url + "new_training/" + role + "/" + str(new_train_id)
)

for recipient in recipients:
res, res_msg = send_email(
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/app/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ function App() {
{role && <NavigationSider />}
<Content>
{role && <NavigationHeader />}
{role == ACCOUNT_TYPE.HUB && <HubFooter />}
<HomeLayout ignoreHomeLayout={role} allHubData={allHubData}>
<PublicRoute exact path="/">
<Home />
Expand Down Expand Up @@ -356,6 +355,9 @@ function App() {
>
<GroupMessages />
</PrivateRoute>
<PrivateRoute path={hub_url + "/new_training/:type/:id"}>
<NewTrainingConfirm />
</PrivateRoute>
</>
);
})}
Expand Down Expand Up @@ -567,6 +569,7 @@ function App() {
<PrivateRoute path="/createmeetinglink">
<CreateMeetingLink />
</PrivateRoute>
{role == ACCOUNT_TYPE.HUB && <HubFooter />}
</Content>
<MeetingPanel />
</Layout>
Expand Down
15 changes: 9 additions & 6 deletions frontend/src/components/CreateMeetingLink.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@ function Meeting() {

const copyToClipboard = async () => {
try {
if (AppID===""){
if (AppID === "") {
const response = await getToken();
setTimeout(() => {
navigator.clipboard.writeText('https://8x8.vc/' + response.appID + '/' + RoomName);
navigator.clipboard.writeText(
"https://8x8.vc/" + response.appID + "/" + RoomName
);
}, 100);
}
else{
navigator.clipboard.writeText('https://8x8.vc/' + AppID + '/' + RoomName);
} else {
navigator.clipboard.writeText(
"https://8x8.vc/" + AppID + "/" + RoomName
);
}
message.success(t("meeting.copyMessage"));
} catch (error) {
Expand Down Expand Up @@ -172,4 +175,4 @@ function Meeting() {
);
}

export default Meeting;
export default Meeting;
2 changes: 1 addition & 1 deletion frontend/src/components/GroupMessageChatArea.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function GroupMessageChatArea(props) {
) : (
<div></div>
)}
<div className="conversation-content">
<div className="conversation-content group-conversation-content">
<Spin spinning={loading}>
{messages &&
messages.map((block) => {
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/components/PrivateRoute.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { Route, Redirect } from "react-router-dom";
import { getRole } from "utils/auth.service";

function PrivateRoute({ children, ...rest }) {
var path = rest.path;
var login_url = "/login";
if (path.indexOf("/new_training") > 0) {
login_url = "/" + path.split("/")[1];
}

return (
<Route
{...rest}
Expand All @@ -12,7 +18,7 @@ function PrivateRoute({ children, ...rest }) {
) : (
<Redirect
to={{
pathname: "/login",
pathname: login_url,
state: { from: location },
}}
/>
Expand Down
10 changes: 6 additions & 4 deletions frontend/src/components/css/Messages.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
margin-left: auto;
margin-right: auto;
max-height: 100%;
// height: calc(100% - 50px);
}

.messages-sidebar-background {
Expand All @@ -16,7 +17,7 @@
.messages-sidebar {
overflow: auto;
width: 100%;
height: 80%;
height: calc(100vh - 113px - 90px);
padding-bottom: 2%;
}

Expand Down Expand Up @@ -122,9 +123,10 @@
overflow-y: auto;
flex: 1;
padding: 12px;
max-height: calc(
100vh - #{($nav-header-height + $footer-gap)} - var(--chat-header-height)
);
max-height: calc(100vh - #{($nav-header-height + $footer-gap)} - 90px);
}
.group-conversation-content {
max-height: calc(100vh - #{($nav-header-height + $footer-gap)});
}

.no-messages {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/css/Navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
.navigation-footer {
display: flex;
justify-content: end;
position: absolute;
// position: absolute;
bottom: 0;
right: 0;
padding: 5px;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/css/_app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $appointments-tab-item-selected-color: #fff7e2;

// Navigation constants
$nav-header-height: 88px;
$footer-gap: 16px;
$footer-gap: 25px;
$nav-header-color: #fbecc1;
$nav-menu-item-color: White;
$nav-menu-item-hover-background-color: #fcf6ea;
Expand Down

0 comments on commit 6ecb468

Please sign in to comment.