Merge main into develop branch and resolve conflict #83
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
cgarcia-lightit
changed the title
cgarcia-lightit
added a commit
that referenced
this pull request
Jan 18, 2024
* [FEATURE][CU-865da45qm] Athletes Feedback Survey (#36) * feat: add new form to save athletes feedback survey and refactor some stuff * review: modify by code review * [FEATURE][CU-86dqk6etj] Some Basics step (#37) * feature: do the following changes * Refactor navbar * Do the foother * configure scaffolding for seniors and cancer profile * remove unnecesary logic * Change some styles. * fix: change param name. * feat: add senior profiling * feature: add senior profiling page, and thank you page * review: do some changes from code review * Feature/86dqkm09a pass state to profiling form (#38) * feature: do the following changes * Refactor navbar * Do the foother * configure scaffolding for seniors and cancer profile * remove unnecesary logic * Change some styles. * fix: change param name. * feat: add senior profiling * feature: add senior profiling page, and thank you page * change base components * feat: some improvements and change email validation endpoint, add also the state, add symptoms from website to populate profiling form. and add payment state to show payment on profiling * feat: add the following changes * add interfaces to useApi * reset store when start a new flow and when end a flow * add payment variable to jotforms * improvent: add enum to reuse it in the code * change right arrow ti icons files * review: add changes for code review * remove spaces and change prettier config * review: do changes from code review * fix: resolve some problems * fix: add dist folder * feature: add origin to redirec back, to able diferents domains redirections. (#39) * [FEATURE][86dqm7ndu] Add experience with cannabis (#40) * feature: add experience with cannabis and pass it to profiling form * feat: add dist files * feat: fix styles in staging and production environment * feat: changes modal on header and look and fell, add new environment to web app url and fix some redirections back (#41) * [FEATURE][86dqp22d7] Cancer Care Signup/Pilot site Updates (#42) * feat: implement all the changes for thank you page. * fix: some styles changes * feat: add changes from code review * [FEATURE][86dqp22d7] Cancer Care Signup/Pilot site Updates (#43) * feat: implement all the changes for thank you page. * fix: some styles changes * feat: add changes from code review * fix: fixin some stiles for webflow classes * Update UI for patient/caregiver question * remove unused radio * Update for mobile viewing * [FEATURE][86dqnp6fy] Update Seniors Care Plan Signup (#45) * feature: add senior endpoint and connect to profiling thank you page. * review: add return type from laravel api * feature: add email value to cancer/senior profilings to identify the jotforms submission on jotforms admin panel * [FEATURE][86dqnavqf] Implement Seniors Feedback Survey (#47) * feature: add pages for senior survey * feature: change return type on success case on post senior survey * [FEATURE][86dqqqw1h] Updates to Thank you page (#46) * feature: change icons from carrousel on thank you page, remove unused route, add new color to tailwind and rename some icons * feat: modify subscribe section * feature: change copy on creation account (#48) * [FEATURE][86dqteqh5] Update the "Which best describes you" screen title and option labels (#49) * feature: change some copies * review: change some clases for tailwind * feature: make rounded panel white as figma design reference * feature: add shadow to the card * fix: add compiled files * [BUGFIX] Resolve bad merge conflicts. (#50) * feature: change icons from carrousel on thank you page, remove unused route, add new color to tailwind and rename some icons * feat: modify subscribe section * feature: add new icons for carrousel * Update steps copy * build * deploy: add builds to deploy (#53) * [FEATURE][86dqv7bbn] Cancer Caregiver Survey (#54) * feature: add caregiver survey for profiled caregivers * feature: implement code-review * feature: implement code-review * fix: resolve typo error (#55) * bugfix: hidde the panel eo in your inbox (#56) * feature: add title to corrousel section (#57) * feat: add new compiles files (#58) * fix: handle various phone number formats (#59) * feature: change query string and prevent remove the query paramas payment to lost the reference of flow (#60) * Bugfix/86dqubvn8/error typo (#61) * fix: resolve typo error * bugfix: remove double your * fix: new assets * chore: update thank you page emails * fix: change privacy policy link * chore: add bundle * merge: Fixed conflicts between main and dev: * merge: Fixed conflicts between main and dev * hotfix: build again the assets * [FEATURE][86dr018j8] Update minor changes in Cancer Pilot (stage and prod) (#67) * feature: change the copy * feature: modify text copy. * feature: add margin top to separate the icon and text * [FEATURE][86dr018j8] Update minor changes in Cancer Pilot (stage and prod) #67 (#69) * feature: change the copy * feature: modify text copy. * feature: add margin top to separate the icon and text * review: add auto-code reivew * chore: add compiled files * Change email check copy * bugfix: prevent show eye icon by microsoft edge browser and user custom icom. (#66) * chore: rebuild assets * feat: update survey thank you pages * feature: add seniors modifications (#72) * feature: change defualt seniors form for caregiver (#73) * feat: update thank you pages * feat: update pilot carousel * fix: caroussel copy * fix: capitalize caroussel copy * feature: resolve the following problems * RadioGroup error using forwardRef when isn't necessary * Make Jotform iframe as component and adding a loading to prevent weird behavios while jotform load the form * fix jotform undefined variable * add package.lock file pending * new color for tailwind * feature: improve replace hidden attribute to opacity because it perfm better * feature: implement changes from code-review * fix: start profiling previous button * chore: generate build * fix: thank you pages copy and ui * fix: thank you font * fix: faqs and caroussel copys * fix: merge main into develop branch and resolve conflict (#83) * fix: copys --------- Co-authored-by: LeoBLightIt <leonardo.benveniste@lightit.io> Co-authored-by: LeoBLightIt <140422382+LeoBLightIt@users.noreply.github.com> Co-authored-by: sgoycoechea-lightit <131689591+sgoycoechea-lightit@users.noreply.github.com> Co-authored-by: sgoycoechea-lightit <santiago.goycoechea@lightit.io> Co-authored-by: Lucas Lois <lucaslois@Lucass-MacBook-Pro.local>
cgarcia-lightit
added a commit
that referenced
this pull request
Jan 31, 2024
* [FEATURE][CU-865da45qm] Athletes Feedback Survey (#36) * feat: add new form to save athletes feedback survey and refactor some stuff * review: modify by code review * [FEATURE][CU-86dqk6etj] Some Basics step (#37) * feature: do the following changes * Refactor navbar * Do the foother * configure scaffolding for seniors and cancer profile * remove unnecesary logic * Change some styles. * fix: change param name. * feat: add senior profiling * feature: add senior profiling page, and thank you page * review: do some changes from code review * Feature/86dqkm09a pass state to profiling form (#38) * feature: do the following changes * Refactor navbar * Do the foother * configure scaffolding for seniors and cancer profile * remove unnecesary logic * Change some styles. * fix: change param name. * feat: add senior profiling * feature: add senior profiling page, and thank you page * change base components * feat: some improvements and change email validation endpoint, add also the state, add symptoms from website to populate profiling form. and add payment state to show payment on profiling * feat: add the following changes * add interfaces to useApi * reset store when start a new flow and when end a flow * add payment variable to jotforms * improvent: add enum to reuse it in the code * change right arrow ti icons files * review: add changes for code review * remove spaces and change prettier config * review: do changes from code review * fix: resolve some problems * fix: add dist folder * feature: add origin to redirec back, to able diferents domains redirections. (#39) * [FEATURE][86dqm7ndu] Add experience with cannabis (#40) * feature: add experience with cannabis and pass it to profiling form * feat: add dist files * feat: fix styles in staging and production environment * feat: changes modal on header and look and fell, add new environment to web app url and fix some redirections back (#41) * [FEATURE][86dqp22d7] Cancer Care Signup/Pilot site Updates (#42) * feat: implement all the changes for thank you page. * fix: some styles changes * feat: add changes from code review * [FEATURE][86dqp22d7] Cancer Care Signup/Pilot site Updates (#43) * feat: implement all the changes for thank you page. * fix: some styles changes * feat: add changes from code review * fix: fixin some stiles for webflow classes * Update UI for patient/caregiver question * remove unused radio * Update for mobile viewing * [FEATURE][86dqnp6fy] Update Seniors Care Plan Signup (#45) * feature: add senior endpoint and connect to profiling thank you page. * review: add return type from laravel api * feature: add email value to cancer/senior profilings to identify the jotforms submission on jotforms admin panel * [FEATURE][86dqnavqf] Implement Seniors Feedback Survey (#47) * feature: add pages for senior survey * feature: change return type on success case on post senior survey * [FEATURE][86dqqqw1h] Updates to Thank you page (#46) * feature: change icons from carrousel on thank you page, remove unused route, add new color to tailwind and rename some icons * feat: modify subscribe section * feature: change copy on creation account (#48) * [FEATURE][86dqteqh5] Update the "Which best describes you" screen title and option labels (#49) * feature: change some copies * review: change some clases for tailwind * feature: make rounded panel white as figma design reference * feature: add shadow to the card * fix: add compiled files * [BUGFIX] Resolve bad merge conflicts. (#50) * feature: change icons from carrousel on thank you page, remove unused route, add new color to tailwind and rename some icons * feat: modify subscribe section * feature: add new icons for carrousel * Update steps copy * build * deploy: add builds to deploy (#53) * [FEATURE][86dqv7bbn] Cancer Caregiver Survey (#54) * feature: add caregiver survey for profiled caregivers * feature: implement code-review * feature: implement code-review * fix: resolve typo error (#55) * bugfix: hidde the panel eo in your inbox (#56) * feature: add title to corrousel section (#57) * feat: add new compiles files (#58) * fix: handle various phone number formats (#59) * feature: change query string and prevent remove the query paramas payment to lost the reference of flow (#60) * Bugfix/86dqubvn8/error typo (#61) * fix: resolve typo error * bugfix: remove double your * fix: new assets * chore: update thank you page emails * fix: change privacy policy link * chore: add bundle * merge: Fixed conflicts between main and dev: * merge: Fixed conflicts between main and dev * hotfix: build again the assets * [FEATURE][86dr018j8] Update minor changes in Cancer Pilot (stage and prod) (#67) * feature: change the copy * feature: modify text copy. * feature: add margin top to separate the icon and text * [FEATURE][86dr018j8] Update minor changes in Cancer Pilot (stage and prod) #67 (#69) * feature: change the copy * feature: modify text copy. * feature: add margin top to separate the icon and text * review: add auto-code reivew * chore: add compiled files * Change email check copy * bugfix: prevent show eye icon by microsoft edge browser and user custom icom. (#66) * chore: rebuild assets * feat: update survey thank you pages * feature: add seniors modifications (#72) * feature: change defualt seniors form for caregiver (#73) * feat: update thank you pages * feat: update pilot carousel * fix: caroussel copy * fix: capitalize caroussel copy * feature: resolve the following problems * RadioGroup error using forwardRef when isn't necessary * Make Jotform iframe as component and adding a loading to prevent weird behavios while jotform load the form * fix jotform undefined variable * add package.lock file pending * new color for tailwind * feature: improve replace hidden attribute to opacity because it perfm better * feature: implement changes from code-review * fix: start profiling previous button * chore: generate build * fix: thank you pages copy and ui * fix: thank you font * fix: faqs and caroussel copys * fix: merge main into develop branch and resolve conflict (#83) * fix: copys * fix: update paid faqs and carousel copys * feat: ROI Calculator screen * [FEATURE][CU-86drct9ww] Differentiate/Identify users who came in via /pilot and via /c-org (#88) * feat: add new flow to identify the origin of the users * feature: add employer_center as new option --------- Co-authored-by: LeoBLightIt <leonardo.benveniste@lightit.io> Co-authored-by: LeoBLightIt <140422382+LeoBLightIt@users.noreply.github.com> Co-authored-by: sgoycoechea-lightit <131689591+sgoycoechea-lightit@users.noreply.github.com> Co-authored-by: sgoycoechea-lightit <santiago.goycoechea@lightit.io> Co-authored-by: Lucas Lois <lucaslois@Lucass-MacBook-Pro.local>
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.
No description provided.