Merge pull request #213 from Light-it-labs/develop

[Release] 🚀 - 02/08/2024

apps/eo_web/.env.example

@@ -7,7 +7,5 @@ ZUKO_SLUG_ID_PROCESS_START=
 CANCER_PROFILE_PATIENT_ID=
 CANCER_PROFILE_CAREGIVER_ID=
 CANCER_SURVEY_FORM=
-ATHLETE_PROFILE_FORM=
-ATHLETE_SURVEY_FORM=
 API_URL=
 API_LARAVEL=

apps/eo_web/src/App.tsx

@@ -29,8 +29,6 @@ interface EnvironmentsConfigs {
   CANCER_PROFILE_CAREGIVER_ID: string;
   CANCER_PATIENT_SURVEY_ID: string;
   CANCER_CAREGIVER_SURVEY_ID: string;
-  ATHLETE_PROFILE_FORM: string;
-  ATHLETE_SURVEY_FORM: string;
   SENIOR_INTRO_QUESTION_PATIENT_ID: string;
   SENIOR_INTRO_QUESTION_CAREGIVER_ID: string;
   SENIOR_PROFILE_PATIENT_ID: string;

apps/eo_web/src/api/useApi.ts

@@ -1,4 +1,3 @@
-import { apiElixir, apiLaravel } from "~/api/axios";
 import {
   type AvoidPresentation,
   type Maladies,
@@ -7,6 +6,7 @@ import {
   type ThcProductPreferences,
   type WorseSymptomsMoment,
 } from "~/api/PrePlanTypes";
+import { apiElixir, apiLaravel } from "~/api/axios";
 import { useProfileStore, type Profile } from "~/stores/useProfileStore";
 import { type FlowType } from "~/stores/useProfilingStore";
 
@@ -80,6 +80,7 @@ interface CreatePreProfileParams {
   email: string;
   phone_number: string;
   origin: string;
+  referred_by: string;
 }
 
 export const useApi = () => {
@@ -154,11 +155,6 @@ export const useApi = () => {
       data,
     );
 
-  const postAthleteSurveyFormSubmission = async (data: object) =>
-    await apiLaravel.post<
-      LaravelSuccessBase<ProfileCreationResult> | LaravelErrorValidation
-    >("/api/athletes/survey", data);
-
   const postSeniorFormSubmission = async (data: object) =>
     await apiLaravel.post<
       LaravelSuccessBase<ProfileCreationResult> | LaravelErrorValidation
@@ -190,7 +186,6 @@ export const useApi = () => {
     eligibleEmail,
     postCancerFormSubmission,
     postCancerSurveyFormSubmission,
-    postAthleteSurveyFormSubmission,
     postSeniorFormSubmission,
     postSeniorSurveyFormSubmission,
     surveyStatus,

apps/eo_web/src/configs/env.ts

@@ -18,11 +18,6 @@ export const CANCER_PATIENT_SURVEY_ID =
 export const CANCER_CAREGIVER_SURVEY_ID =
   window.data.getEnv("CANCER_CAREGIVER_SURVEY_ID") || 233415093176152;
 
-export const ATHLETE_PROFILE_FORM =
-  window.data.getEnv("ATHLETE_PROFILE_FORM") || 233115151709146;
-export const ATHLETE_SURVEY_FORM =
-  window.data.getEnv("ATHLETE_SURVEY_FORM") || 233164188186664;
-
 export const SENIOR_INTRO_QUESTION_PATIENT_ID =
   window.data.getEnv("SENIOR_INTRO_QUESTION_PATIENT_ID") || 233233204641040;
 export const SENIOR_INTRO_QUESTION_CAREGIVER_ID =

apps/eo_web/src/router/Router.tsx

@@ -3,8 +3,6 @@ import { Route, Routes } from "react-router-dom";
 
 import { ROUTES } from "~/router/routes";
 import { AccountCreation } from "~/screens/AccountCreation";
-import { AthleteSurveyForm } from "~/screens/Athlete/AthleteSurveyForm";
-import { AthleteSurveyThankYou } from "~/screens/Athlete/AthleteSurveyThankYou";
 import { CancerSurveyThankYou } from "~/screens/Cancer/CancerSurveyThankYou";
 import { Profiling } from "~/screens/Cancer/Profiling";
 import { SurveyForm } from "~/screens/Cancer/SurveyForm";
@@ -113,13 +111,6 @@ export const Router = () => {
         path={ROUTES.cancerSurveyThankYou}
       />
 
-      {/* ATHLETES */}
-      <Route element={<AthleteSurveyForm />} path={ROUTES.athleteSurvey} />
-      <Route
-        element={<AthleteSurveyThankYou />}
-        path={ROUTES.athleteSurveyThankYou}
-      />
-
       {/* SENIOR */}
       <Route element={<SeniorProfiling />} path={ROUTES.seniorForm} />
       <Route element={<SeniorSurveyForm />} path={ROUTES.seniorSurvey} />

apps/eo_web/src/router/routes.tsx

@@ -30,10 +30,6 @@ export const ROUTES = {
   cancerSurvey: "/cancer/survey",
   cancerSurveyThankYou: "/cancer/survey-thank-you",
 
-  // Athletes PATH
-  athleteSurvey: "/athletes/survey",
-  athleteSurveyThankYou: "athletes/survey-thank-you",
-
   // Senior PATH
   seniorForm: "/senior/profiling",
   seniorSurvey: "/senior/survey",

apps/eo_web/src/screens/AccountCreation.tsx

@@ -20,6 +20,30 @@ import {
   type FlowType,
 } from "~/stores/useProfilingStore";
 
+export const ReferralOptions = {
+  "Twist Out Cancer": Flows.twist_out_cancer,
+  "Unite for Her": Flows.unite_for_her,
+  "Imerman Angels": Flows.imerman,
+  "Stupid Cancer": Flows.stupid_cancer,
+  "Cancer Support Community": Flows.cancer_support_community,
+  "UVA Health": Flows.uva,
+  "Inova Schar Cancer Institute": Flows.inova,
+} as const;
+
+export type ReferralOptionsType = keyof typeof ReferralOptions;
+
+const getFlowFromReferral = (value: string) => {
+  const keys = Object.keys(ReferralOptions) as ReferralOptionsType[]
+  const key = keys.find(key => key === value)
+  return key ? ReferralOptions[key] : undefined
+}
+
+const getReferredBy = (searchParams: URLSearchParams) => {
+  const encodedReferredBy = searchParams.get("referred_by") ?? undefined
+  return encodedReferredBy ? decodeURIComponent(encodedReferredBy) : undefined
+}
+
+
 export const signUpSchema = z.object({
   // Profiling
   firstName: z.string().min(1, { message: "First name is required" }),
@@ -66,6 +90,7 @@ export type SignUpFormSchema = z.infer<typeof signUpSchema>;
 
 export const AccountCreation = () => {
   const navigate = useNavigate();
+
   const [useParams] = useSearchParams();
   const {
     account,
@@ -75,8 +100,13 @@ export const AccountCreation = () => {
     setState,
     setExperience,
     flow,
+    setFlow,
+    setReferredBy,
   } = useProfilingStore((state) => state);
 
+  const referredBy = getReferredBy(useParams)
+  const referredFlow = referredBy ? getFlowFromReferral(referredBy) : undefined
+
   const [validatingForm, setValidatingForm] = useState(false);
   const { mutate: createPreProfile } = usePreProfile().preProfileMutation;
   const {
@@ -110,6 +140,7 @@ export const AccountCreation = () => {
         email: data.email,
         phone_number: data.phoneNumber.replace(/\D/g, ""),
         origin: getIndex(flow),
+        referred_by: referredBy ?? "",
       });
       switch (channel) {
         case "cancer":
@@ -166,6 +197,7 @@ export const AccountCreation = () => {
     const submissionId = useParams.get("submission_id");
     const state = useParams.get("state");
     const experience = useParams.get("experience") ?? "";
+    const referredBy = getReferredBy(useParams) ?? "";
 
     if (!submissionId) {
       toast.error(
@@ -178,6 +210,8 @@ export const AccountCreation = () => {
       setState(state);
       setIntroQuestionSubmissionId(submissionId);
       setExperience(experience);
+      setReferredBy(referredBy);
+      if (referredFlow) setFlow(referredFlow);
     }
   });
 
@@ -260,7 +294,7 @@ export const AccountCreation = () => {
                       className={tw(
                         "font-nunito text-[11px] font-light ",
                         errors.agreeReceiveNotifications?.message &&
-                          "text-red-500",
+                        "text-red-500",
                       )}
                     >
                       I agree to receive emails and text messages related to my
@@ -282,7 +316,7 @@ export const AccountCreation = () => {
                       className={tw(
                         "font-nunito text-[11px] font-light !leading-4",
                         errors.agreeTermsAndConditions?.message &&
-                          "text-red-500",
+                        "text-red-500",
                       )}
                     >
                       I have read and agree to the{" "}

apps/eo_web/src/screens/Checkout.tsx

@@ -18,7 +18,7 @@ export const Checkout = () => {
   const { usePayment } = useProfilingStore();
   const [searchParams] = useSearchParams();
 
-  const { account, introQuestionSubmissionId, channel, flow, origin } =
+  const { account, introQuestionSubmissionId, channel, flow, origin, referredBy } =
     useProfilingStore();
 
   const formParams = new URLSearchParams({
@@ -80,6 +80,7 @@ export const Checkout = () => {
       agree_terms_and_conditions: account.agreeTermsAndConditions,
       channel,
       flow,
+      referred_by: referredBy,
     }),
   );
 

apps/eo_web/src/screens/ProfilingIntroQuestions.tsx

@@ -13,9 +13,10 @@ import { useProfilingStore } from "~/stores/useProfilingStore";
 
 export const ProfilingIntroQuestions = () => {
   const navigate = useNavigate();
-  const { channel, type, origin } = useProfilingStore((state) => state);
+  const { channel, type, origin, flow } = useProfilingStore((state) => state);
   const searchParams = new URLSearchParams({
     origin,
+    flow
   });
 
   let introQuestionsId: string | number | null = null;

apps/eo_web/src/stores/useProfilingStore.ts

@@ -49,6 +49,7 @@ export interface ProfilingStore {
   experience: string;
   account: Account;
   flow: FlowType;
+  referredBy: string;
   setAccountData: (account: Account) => void;
   setChannel: (channel: Channel) => void;
   setType: (type: Type) => void;
@@ -60,6 +61,7 @@ export interface ProfilingStore {
   setOrigin: (origin: string) => void;
   setExperience: (experience: string) => void;
   setFlow: (flow: FlowType) => void;
+  setReferredBy: (referredBy: string) => void;
 }
 
 const defaultState = {
@@ -81,6 +83,7 @@ const defaultState = {
   },
   usePayment: true,
   flow: Flows.marketing_site,
+  referredBy: "",
 };
 
 export const useProfilingStore = create<ProfilingStore>()(
@@ -119,6 +122,9 @@ export const useProfilingStore = create<ProfilingStore>()(
       setFlow: (flow: FlowType) => {
         set({ flow });
       },
+      setReferredBy: (referredBy: string) => {
+        set({ referredBy });
+      },
       ...defaultState,
     }),
     {

cspell.json

@@ -31,11 +31,13 @@
     "iconify",
     "imerman",
     "inova",
+    "intoxi",
     "jotform",
     "LARAVEL",
     "manypkg",
     "medtech",
     "middlewares",
+    "nonworkday",
     "NEXTAUTH",
     "pnpm",
     "rgba",