Skip to content

Commit

Permalink
Merge pull request #152 from Light-it-labs/develop
Browse files Browse the repository at this point in the history
[RELEASE] 24 May 2024 🚀
  • Loading branch information
cgarcia-lightit authored May 24, 2024
2 parents 080318a + e7399ae commit dd8900b
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 52 deletions.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/eo_web/dist/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"css": [
"assets/main-5bde4681.css"
],
"file": "assets/main-b5909d75.js",
"file": "assets/main-0aaa9b52.js",
"isEntry": true,
"src": "src/main.tsx"
}
Expand Down
6 changes: 6 additions & 0 deletions apps/eo_web/src/layouts/FooterFull.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ export function FooterFull() {
>
For Employers
</a>
<a
href="https://eo.care/web/for-clinicians"
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"
>
For Clinicians
</a>
<a
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"
Expand Down
3 changes: 2 additions & 1 deletion apps/eo_web/src/screens/Cancer/SurveyForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { LayoutDefault } from "~/layouts";
import { Flows } from "~/stores/useProfilingStore";
import { useSurveyStore } from "~/stores/useSurveyStore";


export const SurveyForm = () => {
const [searchParams] = useSearchParams();
const { setPhase, setEmail, setFlow } = useSurveyStore();
Expand All @@ -25,6 +24,7 @@ export const SurveyForm = () => {
const profiled = searchParams.get("profiled") ?? "patient";
const symptoms = searchParams.get("symptoms") ?? "";
const phase = searchParams.get("phase") ?? "";
const uid = searchParams.get("uid") ?? phase;

if (!email) {
window.location.href = "https://eo.care";
Expand Down Expand Up @@ -58,6 +58,7 @@ export const SurveyForm = () => {
email: email as string,
symptoms,
origin: getUrlFromHost(),
uid,
});

return (
Expand Down
2 changes: 2 additions & 0 deletions apps/eo_web/src/screens/Senior/SeniorSurveyForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const SeniorSurveyForm = () => {
const symptoms = searchParams.get("symptoms") || "";
const profiled = searchParams.get("profiled") ?? "patient";
const phase = searchParams.get("phase") ?? "";
const uid = searchParams.get("uid") ?? phase;

if (!email) {
window.location.href = "https://eo.care";
Expand All @@ -42,6 +43,7 @@ export const SeniorSurveyForm = () => {
email: email as string,
symptoms,
origin: getUrlFromHost(),
uid,
});

const formId =
Expand Down
57 changes: 28 additions & 29 deletions apps/eo_web/src/screens/UserRolSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import { useMount } from "~/hooks/useMount";
import { LayoutDefault } from "~/layouts";
import { ROUTES } from "~/router";
import {
Flows,
useProfilingStore,
type Channel,
type FlowType,
type Type,
Flows,
} from "~/stores/useProfilingStore";


Expand All @@ -26,6 +26,8 @@ export const UserRolSelector = () => {
const flow: FlowType =
(searchParams.get("flow") as FlowType) ?? Flows.marketing_site;

const URL = localStorage.getItem("redirect_back_origin");

const {
setChannel,
setType,
Expand Down Expand Up @@ -53,6 +55,10 @@ export const UserRolSelector = () => {
: setUsePayment(true);
});

const redirectBack = () => {
if (URL) window.location.href = URL;
};

return (
<LayoutDefault>
<div className="flex h-full w-full items-center justify-center bg-opacity-50 ">
Expand All @@ -68,7 +74,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")}
>
Expand Down Expand Up @@ -100,7 +106,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")}
>
Expand Down Expand Up @@ -132,33 +138,26 @@ export const UserRolSelector = () => {
</button>
</div>
</div>
<section className="flex h-[53px] items-center justify-between rounded-b-md bg-black pb-[19px] pt-4 md:w-full ">
<Button
className="click:border-0 focus:ring-outline-0 rounded-none hover:outline-0 focus:ring-0"
variant="black"
size="lg"
onClick={() => {
if (window.data.isMarketingSite(origin)) {
if (channel === "senior") {
window.location.href = `https://${window.location.host}/you/seniors-careplan#seniors-panel`;
} else if (channel === "cancer") {
window.location.href = `https://${window.location.host}/you/cancer-careplan#cancer-panel`;
} else {
history.back();
}
} else if (window.data.isPartnerSite(origin)) {
window.location.href = `https://${window.location.host}/pilot#how-eo-care-plans-works`;
} else {
history.back();
<section
className={tw(
"flex h-[53px] items-center justify-between rounded-b-md bg-black pb-[19px] pt-4 md:w-full",
!URL && "justify-end",
)}
>
{URL && (
<Button
className="click:border-0 focus:ring-outline-0 rounded-none hover:outline-0 focus:ring-0"
variant="black"
size="lg"
onClick={redirectBack}
disabled={!URL}
left={
<icons.RightArrow className="h-6 w-6 rotate-180 text-gray-300" />
}
}}
left={
<icons.RightArrow className="h-6 w-6 rotate-180 text-gray-300" />
}
>
<span className="hidden text-gray-300 lg:flex">PREVIOUS</span>
</Button>

>
<span className="hidden text-gray-300 lg:flex">PREVIOUS</span>
</Button>
)}
<Button
className="click:border-0 focus:ring-outline-0 hidden rounded-none hover:outline-0 focus:ring-0 lg:flex"
variant="black"
Expand Down

0 comments on commit dd8900b

Please sign in to comment.