🧒 Freddy branch #1080
Merged
🧒 Freddy branch #1080
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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]>
* 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]>
* 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 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
* 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]>
…entee into Freddy_branch
…entee into Freddy_branch
* 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 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]> * change…
add event link to email template after login, redirect automatically from email fix error message to avoid disappear create admin profile and update avatar
…entee into Freddy_branch
* 🚣🏽 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 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 <robertmure…
robert-dm
approved these changes
Jun 25, 2024
robert-dm
approved these changes
Jun 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status:
Description 🌟
profile picture link in the events page
TODOs ⭐