[RELEASE] 12 April 2024 🚀🚀

apps/eo_web/dist/manifest.json

@@ -8,18 +8,14 @@
     "src": "../../packages/ui/src/assets/avatar.svg"
   },
   "src/main.css": {
-    "file": "assets/main-2eb98fae.css",
+    "file": "assets/main-201eebc0.css",
     "src": "src/main.css"
   },
   "src/main.tsx": {
-    "assets": [
-      "assets/UploadFile-694e44b5.svg"
-    ],
-    "css": [
-      "assets/main-2eb98fae.css"
-    ],
-    "file": "assets/main-55cf118c.js",
+    "assets": ["assets/UploadFile-694e44b5.svg"],
+    "css": ["assets/main-201eebc0.css"],
+    "file": "assets/main-ac945b82.js",
     "isEntry": true,
     "src": "src/main.tsx"
   }
-}
+}

apps/eo_web/src/components/JotformFrame.tsx

@@ -24,9 +24,8 @@ const Iframe = ({ formId, searchParam }: JotformFrameProps) => {
   return (
     <iframe
       ref={ref}
-      src={`https://form.jotform.com/${formId}?${
-        searchParam ? searchParam.toString() : ""
-      }`}
+      src={`https://form.jotform.com/${formId}?${searchParam ? searchParam.toString().replaceAll("+", "%20") : ""
+        }`}
       id={`JotFormIFrame-${formId}`}
       title=""
       onLoad={() => {

apps/eo_web/src/layouts/Footer.tsx

@@ -1,12 +1,71 @@
 import React from "react";
 
 import { Typography, icons } from "@eo/ui";
+import { type Flows } from "~/stores/useProfilingStore";
+type FlowsTypes = keyof typeof Flows;
 
+interface FooterProps {
+  flow: FlowsTypes;
+}
+
+const basicData = [
+  { title: 'Terms of use', url: 'https://eo.care/web/terms-of-use' },
+  { title: 'Privacy Policy', url: 'https://eo.care/web/privacy-policy' },
+  { title: 'Visit eo.care', url: 'https://eo.care/web/home' }
+]
+
+const c_org = [
+  { title: 'About EO', url: 'https://partner.eo.care/c-org/about' },
+  ...basicData
+]
+
+const cancer_pilot = [
+  { title: 'About EO', url: 'https://partner.eo.care/cancer/about' },
+  ...basicData
+]
+
+const twist_out_cancer = [
+  { title: 'About EO', url: 'https://partner.eo.care/twist-out-cancer/about' },
+  { title: 'Cannabis 101', url: 'https://partner.eo.care/twist-out-cancer/cannabis-101' },
+  ...basicData
+]
 
+const cancer_support_community = [
+  { title: 'About EO', url: 'https://partner.eo.care/cancer-support-community/about' },
+  { title: 'Cannabis 101', url: 'https://partner.eo.care/cancer-support-community/cancer-101' },
+  ...basicData
+]
 
+const employer_center = [
+  { title: 'About EO', url: 'https://partner.eo.care/employers/about' },
+  ...basicData
+];
 
+const resource_center_1 = [
+  { title: 'About EO', url: 'https://partner.eo.care/cannabis-resource-center-1/about' },
+  { title: 'Cannabis 101', url: 'https://partner.eo.care/cannabis-resource-center-1/cannabis-101' },
+  ...basicData
+];
+
+const resource_center_2 = [
+  { title: 'About EO', url: 'https://partner.eo.care/cannabis-resource-center-2/about' },
+  { title: 'Cannabis 101', url: 'https://partner.eo.care/cannabis-resource-center-2/cannabis-101' },
+  ...basicData
+];
+
+const allData = {
+  c_org,
+  cancer_pilot,
+  twist_out_cancer,
+  cancer_support_community,
+  marketing_site: basicData, // Will never happen, it's filtered outside
+  employer_center,
+  resource_center_1,
+  resource_center_2
+}
+
+export function Footer({ flow }: FooterProps) {
 
-export function Footer() {
   return (
     <footer className="flex flex-col justify-center gap-4 bg-black px-4 py-[100px] md:flex-row md:pl-[10px] lg:pl-5">
       <section>
@@ -35,30 +94,15 @@ export function Footer() {
           >
             COMPANY
           </Typography>
-          <a
-            href="https://partner.eo.care/about"
-            className="mb-0 py-2 font-new-hero font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
-          >
-            About
-          </a>
-          <a
-            href="https://www.eo.care/kit/terms-of-use"
-            className="mb-0 py-2 font-new-hero font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
-          >
-            Terms of Use
-          </a>
-          <a
-            href="https://www.eo.care/privacy-policy"
-            className="mb-0 py-2 font-new-hero font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
-          >
-            Privacy Policy
-          </a>
-          <a
-            href="https://www.eo.care"
-            className="mb-0 py-2 font-new-hero font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
-          >
-            Visit EO
-          </a>
+          {allData[flow].map(({ title, url }) => (
+            <a
+              key={url}
+              href={url}
+              className="mb-0 py-2 font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
+            >
+              {title}
+            </a>
+          ))}
         </div>
         <div className="flex flex-col md:flex-row">
           <div className="flex w-auto flex-col md:w-[100px] lg:w-[200px]">
@@ -73,18 +117,18 @@ export function Footer() {
             </Typography>
             <a
               href="tel:888-823-6143"
-              className="mb-2 pb-2 font-new-hero font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mr-2"
+              className="mb-0 py-2 font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
             >
               888-823-6143
             </a>
             <Typography className="mb-0 pt-2  font-normal leading-[22px] text-white opacity-50 md:mr-2 ">
               Email:
             </Typography>
             <a
-              href="mailto:employers@eo.care"
-              className="mb-2 pb-2 font-new-hero font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mr-2"
+              href="mailto:support@eo.care"
+              className="mb-0 py-2 font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
             >
-              employers@eo.care
+              support@eo.care
             </a>
           </div>
           <div className="flex w-auto flex-col md:w-[100px] lg:w-[180px]">
@@ -94,9 +138,15 @@ export function Footer() {
             >
               FOLLOW US
             </Typography>
+            <a
+              href="https://www.instagram.com/eo.care_/"
+              className="mb-0 py-2 font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
+            >
+              Instagram
+            </a>
             <a
               href="https://www.linkedin.com/company/eo-cannnabis-care"
-              className="mb-0 py-2 font-new-hero  font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
+              className="mb-0 py-2 font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
             >
               LinkedIn
             </a>

apps/eo_web/src/layouts/FooterFull.tsx

@@ -37,7 +37,7 @@ export function FooterFull() {
             COMPANY
           </Typography>
           <a
-            href="https://eo.care"
+            href="https://eo.care/web/home"
             className="mb-0 py-2 font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
           >
             Home
@@ -61,7 +61,7 @@ export function FooterFull() {
             For Employers
           </a>
           <a
-            href="https://eocare.myshopify.com/"
+            href="https://shop.eo.care"
             className="mb-0 py-2  font-new-hero text-[14px] font-normal leading-[22px] text-white hover:underline hover:opacity-50 md:mb-2 md:mr-2"
           >
             Shop CBD

apps/eo_web/src/screens/Cancer/CancerSurveyThankYou.tsx

@@ -16,6 +16,7 @@ import { LayoutDefault } from "~/layouts";
 import { FooterFull } from "~/layouts/FooterFull";
 import { Flows } from "~/stores/useProfilingStore";
 import { useSurveyStore } from "~/stores/useSurveyStore";
+import { Footer } from "~/layouts/Footer";
 
 
 export const CancerSurveyThankYou = () => {
@@ -88,7 +89,9 @@ export const CancerSurveyThankYou = () => {
       </AllDonePanel>
       <HowEOWorks pilot={flow === Flows.cancer_pilot} />
       <FAQs channel="cancer" flow={flow} />
-      <FooterFull />
+      {['c_org', 'cancer_pilot', 'twist_out_cancer', 'cancer_support_community', 'employer_center', 'resource_center_1', 'resource_center_2'].includes(flow)
+        ? <Footer flow={flow} />
+        : <FooterFull />}
     </LayoutDefault>
   );
 };

apps/eo_web/src/screens/ProfilingThankYou.tsx

@@ -13,9 +13,10 @@ 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 { Flows, useProfilingStore } from "~/stores/useProfilingStore";
+import { Footer } from "~/layouts/Footer";
+import { FooterFull } from "~/layouts/FooterFull";
 
 
 export const ProfilingThankYou = () => {
@@ -87,7 +88,9 @@ export const ProfilingThankYou = () => {
       </AllDonePanel>
       <HowEOWorks pilot={flow == Flows.cancer_pilot} />
       <FAQs channel={channel ?? undefined} flow={flow} />
-      <FooterFull />
+      {['c_org', 'cancer_pilot', 'twist_out_cancer', 'cancer_support_community', 'employer_center', 'resource_center_1', 'resource_center_2'].includes(flow)
+        ? <Footer flow={flow} />
+        : <FooterFull />}
     </LayoutDefault>
   );
 };