[RELEASE] 31 January 🚀🚀 (#89)

* [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 <[email protected]>
Co-authored-by: LeoBLightIt <[email protected]>
Co-authored-by: sgoycoechea-lightit <[email protected]>
Co-authored-by: sgoycoechea-lightit <[email protected]>
Co-authored-by: Lucas Lois <[email protected]>

apps/eo_web/dist/manifest.json

@@ -8,17 +8,17 @@
     "src": "../../packages/ui/src/assets/avatar.svg"
   },
   "src/main.css": {
-    "file": "assets/main-d3160e96.css",
+    "file": "assets/main-ddf6ac53.css",
     "src": "src/main.css"
   },
   "src/main.tsx": {
     "assets": [
       "assets/UploadFile-694e44b5.svg"
     ],
     "css": [
-      "assets/main-d3160e96.css"
+      "assets/main-ddf6ac53.css"
     ],
-    "file": "assets/main-cf66f3ed.js",
+    "file": "assets/main-26785659.js",
     "isEntry": true,
     "src": "src/main.tsx"
   }

apps/eo_web/src/App.tsx

@@ -34,6 +34,7 @@ interface EnvironmentsConfigs {
   SENIOR_PROFILE_CAREGIVER_ID: string;
   SENIOR_PATIENT_SURVEY_ID: string;
   SENIOR_CAREGIVER_SURVEY_ID: string;
+  ROI_CALCULATOR_FORM: string;
   WEB_APP_URL: string;
 }
 

apps/eo_web/src/api/useApi.ts

@@ -129,7 +129,6 @@ export const useApi = () => {
     await apiElixir.post<LaravelSuccessBase<unknown> | LaravelErrorValidation>(
       "/v2/profiles/eligible",
       { email },
-      authHeader,
     );
 
   const postCancerFormSubmission = async (data: object) =>

apps/eo_web/src/configs/env.ts

@@ -37,6 +37,9 @@ export const SENIOR_PATIENT_SURVEY_ID =
 export const SENIOR_CAREGIVER_SURVEY_ID =
   window.data.getEnv("SENIOR_CAREGIVER_SURVEY_ID") || 240026821042139;
 
+export const ROI_CALCULATOR_FORM =
+  window.data.getEnv("ROI_CALCULATOR_FORM") || 233484508737162;
+
 export const API_ELIXIR =
   window.data.getEnv("API_URL") || "http://localhost:4200";
 export const API_LARAVEL =

apps/eo_web/src/copy/copy.tsx

@@ -61,21 +61,21 @@ export const CarrouselItems = [
     step: "STEP 1",
     title: "Profile & subscribe",
     content:
-      "In 5-10 minutes, you can share the key information our clinical team needs to create your initial plan.",
+      "In about 5 minutes, you can create your eo account and provide the information our clinical team needs to create your initial plan.",
     icon: icons.ProfileIconWhite,
   },
   {
     step: "STEP 2",
     title: "Get your care plan",
     content:
-      "In under 24 hours, you’ll receive an email with a link to your personalized, clinician-approved care plan.",
+      "In under 24 hours, you’ll receive an email with a link to your personalized, clinician-approved care plan and your recommended products.",
     icon: icons.HandHeartWhite,
   },
   {
     step: "STEP 3",
     title: "Get your products",
     content:
-      "Review your plan and schedule a time to pick-up your products at dispensary near you. We’ll order your products for you. You just pick-up and pay.",
+      "Review your plan and schedule a time to pick-up your products at a dispensary near you. We’ll order your products for you. You just pick-up and pay.",
     icon: icons.PillsWhite,
   },
   {
@@ -195,17 +195,17 @@ export const faqs: Copy[] = [
     title:
       "Do I order the products that are included in my care plan or do you do it for me?",
     content:
-      "After you’ve approved your recommended products, we’ll order your THC products for you and let you know when they’re ready for pick-up. You can order any non-THC products (e.g. CBD, CBN or CBG products) direct from our recommended retail partners for home delivery.",
+      "After you’ve approved your recommended products, we’ll order your THC products for you and let you know when they’re ready for pick-up. You can order any non-THC products (e.g. CBD, CBN or CBG products) directly from our recommended retail partners for home delivery.",
   },
   {
-    title: "What should I bring with me when I pick-up my products?",
+    title: "Do I need a medical card to use eo?",
     content:
-      "Bring your valid medical card, a state I.D. or driver’s license and a debit card or enough cash to pay for products.",
+      "No. You can use eo without a medical card. We’ll ask you about your medical card status when you’re sharing your profile information.",
   },
   {
-    title: "What if I don’t yet have a physical medical card?",
+    title: "What should I bring with me when I pick-up my products?",
     content:
-      "Your care team can provide you with a valid state patient ID number to provide when you purchase and pick-up your products.",
+      "Bring your valid medical card (if you have one), a state I.D. or driver’s license and a debit card or enough cash to pay for products.",
   },
   {
     title:
@@ -237,13 +237,13 @@ export const faqs: Copy[] = [
     ),
   },
   {
-    title: "What happens if I miss a use session entirely?",
-    content: "Just begin the next session as scheduled!",
+    title: "What happens if I miss a dose?",
+    content: "Just take your next dose as scheduled!",
   },
   {
-    title: "What happens if I’m late starting a use session?",
+    title: "What happens if I’m late taking a dose?",
     content:
-      "If you’re less than 30 minutes late, go ahead and begin the session (also be sure to begin the next session at the originally scheduled time). If you’re more than 30 minutes late just wait for the next session to begin.",
+      "If you’re less than 30 minutes late, go ahead and take your scheduled dose (also be sure to take the next dose at the originally scheduled time). If you’re more than 30 minutes late just wait for your next scheduled dose.",
   },
   {
     title: "What happens if I miss an opportunity to provide feedback?",

apps/eo_web/src/router/Router.tsx

@@ -31,6 +31,7 @@ import { ProfilingTwo } from "~/screens/profiling/ProfilingTwo";
 import { ProfilingTwoRedirect } from "~/screens/profiling/ProfilingTwoRedirect";
 import { ProtectedRoute } from "./ProtectedRoute";
 import { CancerSurveyThankYou } from "~/screens/Cancer/CancerSurveyThankYou";
+import { ROICalculator } from "~/screens/ROICalculator";
 
 
 export const Router = () => {
@@ -88,6 +89,7 @@ export const Router = () => {
       />
 
       <Route element={<UserRolSelector />} path={ROUTES.userRolSelector} />
+      <Route element={<ROICalculator />} path={ROUTES.roiCalculator} />
       <Route
         element={<ProfilingIntroQuestions />}
         path={ROUTES.introQuestions}

apps/eo_web/src/router/routes.tsx

@@ -21,6 +21,8 @@ export const ROUTES = {
   introQuestions: "/profiling-intro-questions",
   profilingThankYou: "/profiling-thank-you",
   accountSetup: "/account-setup",
+  roiCalculator: "/roi-calculator",
+
   // Cancer PATH
   cancerForm: "/cancer/profiling",
   cancerSurvey: "/cancer/survey",

apps/eo_web/src/screens/ProfilingThankYou.tsx

@@ -7,23 +7,22 @@ import { toast } from "react-toastify";
 import { Typography } from "@eo/ui";
 
 import { useApi } from "~/api/useApi";
+import { AllDonePanel } from "~/components/AllDonePanel";
+import { FAQs } from "~/components/FAQs";
+import { HowEOWorks } from "~/components/HowEOWorks";
+import { WEB_APP_URL } from "~/configs/env";
 import { useMount } from "~/hooks/useMount";
 import { LayoutDefault } from "~/layouts";
 import { FooterFull } from "~/layouts/FooterFull";
 import { ROUTES } from "~/router";
 import { useProfilingStore } from "~/stores/useProfilingStore";
-import { FAQs } from "~/components/FAQs";
-import { HowEOWorks } from "~/components/HowEOWorks";
-import { AllDonePanel } from "~/components/AllDonePanel";
-import { WEB_APP_URL } from "~/configs/env";
 
 
 export const ProfilingThankYou = () => {
   const [searchParams] = useSearchParams();
 
-  const { account, introQuestionSubmissionId, channel, usePayment } = useProfilingStore(
-    (state) => state,
-  );
+  const { account, introQuestionSubmissionId, channel, usePayment, flow } =
+    useProfilingStore((state) => state);
   const submissionId = searchParams.get("submission_id") || "";
 
   const navigate = useNavigate();
@@ -63,6 +62,7 @@ export const ProfilingThankYou = () => {
       agree_receive_notifications: account.agreeReceiveNotifications,
       agree_terms_and_conditions: account.agreeTermsAndConditions,
       channel,
+      flow,
     }),
   );
 
@@ -76,19 +76,20 @@ export const ProfilingThankYou = () => {
         <Typography
           variant="base"
           font="regular"
-          className="text-center text-[22px] font-normal leading-[36px] max-w-3xl"
+          className="max-w-3xl text-center text-[22px] font-normal leading-[36px]"
         >
           You’ll be able to review your initial, personalized,
-          clinician-approved care plan within 24 hours. When your care plan is ready, we
-          will send you an email with a link to{" "}
+          clinician-approved care plan within 24 hours. When your care plan is
+          ready, we will send you an email with a link to{" "}
           <span className="cursor-pointer underline" onClick={goToWebApp}>
             log into your account.
           </span>
           <br />
           <br />
-          Have questions? We’re here. Email [email protected], call <a href="tel:+1-877-707-0706">877-707-0706</a>, or {" "}
+          Have questions? We’re here. Email [email protected], call{" "}
+          <a href="tel:+1-877-707-0706">877-707-0706</a>, or{" "}
           <a
-            className="cursor-pointer underline font-new-hero text-[22px]"
+            className="cursor-pointer font-new-hero text-[22px] underline"
             href="https://eo-care-telemed.as.me/schedule.php"
             target="_blank"
           >

apps/eo_web/src/screens/ROICalculator.tsx

@@ -0,0 +1,12 @@
+import { JotformFrame } from "~/components/JotformFrame";
+
+import { ROI_CALCULATOR_FORM } from "~/configs/env";
+import { LayoutDefault } from "~/layouts";
+
+export const ROICalculator = () => {
+  return (
+    <LayoutDefault >
+      <JotformFrame formId={ROI_CALCULATOR_FORM} />
+    </LayoutDefault>
+  );
+};

apps/eo_web/src/screens/UserRolSelector.tsx

@@ -10,6 +10,7 @@ import { ROUTES } from "~/router";
 import {
   useProfilingStore,
   type Channel,
+  type Flows,
   type Type,
 } from "~/stores/useProfilingStore";
 
@@ -21,6 +22,7 @@ export const UserRolSelector = () => {
   const origin = searchParams.get("origin") ?? "localhost:5173";
   const channel = searchParams.get("channel") as Channel;
   const symptoms = searchParams.get("symptoms") ?? "";
+  const flow: Flows = (searchParams.get("flow") as Flows) ?? "marketing_site";
 
   const {
     setChannel,
@@ -29,10 +31,12 @@ export const UserRolSelector = () => {
     setUsePayment,
     resetProfilingStore,
     setOrigin,
+    setFlow,
   } = useProfilingStore((state) => state);
 
   const redirectForm = (type: Type) => {
     setOrigin(origin);
+    setFlow(flow);
     setSymptoms(symptoms.split(","));
     setChannel(channel);
     setType(type);
@@ -62,7 +66,7 @@ export const UserRolSelector = () => {
                 className={tw(
                   "flex h-12 items-center justify-start gap-2 rounded border border-solid border-gray-800 px-[15px] py-[9px] font-nunito text-gray-800 lg:w-1/2",
                   selectedValue === "Patient" &&
-                  "border-[#5AADFD] bg-[#5AADFD] bg-opacity-20",
+                    "border-[#5AADFD] bg-[#5AADFD] bg-opacity-20",
                 )}
                 onClick={() => setSelectedValue("Patient")}
               >
@@ -94,7 +98,7 @@ export const UserRolSelector = () => {
                 className={tw(
                   "flex h-12 items-center justify-start gap-2 rounded border border-solid border-gray-800 px-[15px] py-[9px] font-nunito text-gray-800 lg:w-1/2",
                   selectedValue === "Caregiver" &&
-                  "border-[#5AADFD] bg-[#5AADFD] bg-opacity-20",
+                    "border-[#5AADFD] bg-[#5AADFD] bg-opacity-20",
                 )}
                 onClick={() => setSelectedValue("Caregiver")}
               >

apps/eo_web/src/stores/useProfilingStore.ts

@@ -19,6 +19,12 @@ export interface Account {
 
 export type Type = "Patient" | "Caregiver" | null;
 
+export type Flows =
+  | "c_org"
+  | "marketing_site"
+  | "cancer_pilot"
+  | "employer_center";
+
 export interface ProfilingStore {
   symptoms: string[];
   channel: Channel | null;
@@ -29,6 +35,7 @@ export interface ProfilingStore {
   origin: string;
   experience: string;
   account: Account;
+  flow: Flows;
   setAccountData: (account: Account) => void;
   setChannel: (channel: Channel) => void;
   setType: (type: Type) => void;
@@ -39,6 +46,7 @@ export interface ProfilingStore {
   resetProfilingStore: () => void;
   setOrigin: (origin: string) => void;
   setExperience: (experience: string) => void;
+  setFlow: (flow: Flows) => void;
 }
 
 const defaultState = {
@@ -59,6 +67,7 @@ const defaultState = {
     agreeTermsAndConditions: false,
   },
   usePayment: true,
+  flow: "marketing-site" as Flows,
 };
 
 export const useProfilingStore = create<ProfilingStore>()(
@@ -94,6 +103,9 @@ export const useProfilingStore = create<ProfilingStore>()(
       setExperience: (experience: string) => {
         set({ experience });
       },
+      setFlow: (flow: Flows) => {
+        set({ flow });
+      },
       ...defaultState,
     }),
     {