Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RELEASE] 18 January 🚀🚀 #84

Merged
merged 81 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
db38b83
[FEATURE][CU-865da45qm] Athletes Feedback Survey (#36)
cgarcia-lightit Nov 16, 2023
ab9b700
[FEATURE][CU-86dqk6etj] Some Basics step (#37)
cgarcia-lightit Nov 27, 2023
bc5cd1a
Feature/86dqkm09a pass state to profiling form (#38)
cgarcia-lightit Nov 27, 2023
24be9f8
feature: add origin to redirec back, to able diferents domains redire…
cgarcia-lightit Nov 28, 2023
33694e8
[FEATURE][86dqm7ndu] Add experience with cannabis (#40)
cgarcia-lightit Nov 28, 2023
f6f3cd3
feat: changes modal on header and look and fell, add new environment …
cgarcia-lightit Dec 1, 2023
8c87967
[FEATURE][86dqp22d7] Cancer Care Signup/Pilot site Updates (#42)
cgarcia-lightit Dec 6, 2023
ab371c7
[FEATURE][86dqp22d7] Cancer Care Signup/Pilot site Updates (#43)
cgarcia-lightit Dec 6, 2023
1109452
Update UI for patient/caregiver question
LeoBLightIt Dec 6, 2023
0021d41
remove unused radio
LeoBLightIt Dec 6, 2023
1bc3e4d
Update for mobile viewing
LeoBLightIt Dec 6, 2023
78af620
Merge pull request #44 from Light-it-labs/update-patient-caregiver-qu…
LeoBLightIt Dec 6, 2023
7b46275
[FEATURE][86dqnp6fy] Update Seniors Care Plan Signup (#45)
cgarcia-lightit Dec 8, 2023
48ce2a5
[FEATURE][86dqnavqf] Implement Seniors Feedback Survey (#47)
cgarcia-lightit Dec 12, 2023
9fa7918
[FEATURE][86dqqqw1h] Updates to Thank you page (#46)
cgarcia-lightit Dec 12, 2023
880af7b
feature: change copy on creation account (#48)
cgarcia-lightit Dec 12, 2023
4d529c1
[FEATURE][86dqteqh5] Update the "Which best describes you" screen tit…
cgarcia-lightit Dec 12, 2023
b487035
fix: add compiled files
cgarcia-lightit Dec 12, 2023
efcf192
[BUGFIX] Resolve bad merge conflicts. (#50)
cgarcia-lightit Dec 12, 2023
916dadb
Update steps copy
LeoBLightIt Dec 13, 2023
54461fc
Merge branch 'develop' into update-stetps-copy
LeoBLightIt Dec 13, 2023
ce6c43a
build
LeoBLightIt Dec 13, 2023
3bb49df
Merge pull request #51 from Light-it-labs/update-stetps-copy
LeoBLightIt Dec 13, 2023
75e8e7a
deploy: add builds to deploy (#53)
cgarcia-lightit Dec 18, 2023
b56121c
[FEATURE][86dqv7bbn] Cancer Caregiver Survey (#54)
cgarcia-lightit Dec 18, 2023
aaab84d
fix: resolve typo error (#55)
cgarcia-lightit Dec 20, 2023
9d2a488
bugfix: hidde the panel eo in your inbox (#56)
cgarcia-lightit Dec 20, 2023
f43a757
feature: add title to corrousel section (#57)
cgarcia-lightit Dec 20, 2023
16c28dc
feat: add new compiles files (#58)
cgarcia-lightit Dec 20, 2023
c4858fb
fix: handle various phone number formats (#59)
sgoycoechea-lightit Dec 21, 2023
fed6ee9
feature: change query string and prevent remove the query paramas pay…
cgarcia-lightit Dec 22, 2023
aa92f1e
Bugfix/86dqubvn8/error typo (#61)
cgarcia-lightit Dec 22, 2023
66de45d
fix: new assets
cgarcia-lightit Dec 22, 2023
4a7af28
chore: update thank you page emails
sgoycoechea-lightit Dec 26, 2023
a04692e
Merge pull request #62 from Light-it-labs/chore/CU-86dqvx8r6/replace-…
sgoycoechea-lightit Dec 26, 2023
2866eb7
fix: change privacy policy link
sgoycoechea-lightit Dec 28, 2023
5b459d8
chore: add bundle
sgoycoechea-lightit Dec 28, 2023
0fb3081
Merge pull request #63 from Light-it-labs/fix/change-privacy-policy-link
sgoycoechea-lightit Dec 28, 2023
c30fe8a
Merge branch 'main' into develop
Dec 28, 2023
1d37166
merge: Fixed conflicts between main and dev:
Dec 28, 2023
47b1a21
merge: Fixed conflicts between main and dev
Dec 28, 2023
58c2a05
hotfix: build again the assets
cgarcia-lightit Dec 28, 2023
cecfc8a
merge: merge hotfix into develop
cgarcia-lightit Dec 28, 2023
bb71b41
Merge branch 'main' into develop
cgarcia-lightit Dec 28, 2023
abb2ede
[FEATURE][86dr018j8] Update minor changes in Cancer Pilot (stage and …
cgarcia-lightit Dec 29, 2023
b6c8039
[FEATURE][86dr018j8] Update minor changes in Cancer Pilot (stage and …
cgarcia-lightit Jan 2, 2024
7d43375
Change email check copy
LeoBLightIt Jan 2, 2024
bdb5394
bugfix: prevent show eye icon by microsoft edge browser and user cus…
cgarcia-lightit Jan 2, 2024
8729698
Merge branch 'develop' into change-email-copy
LeoBLightIt Jan 2, 2024
a76e351
Merge pull request #70 from Light-it-labs/change-email-copy
LeoBLightIt Jan 2, 2024
6e8548e
chore: rebuild assets
cgarcia-lightit Jan 3, 2024
ca720cb
feat: update survey thank you pages
sgoycoechea-lightit Jan 3, 2024
896f580
Merge pull request #71 from Light-it-labs/feature/CU-86dqxk4fq/update…
sgoycoechea-lightit Jan 3, 2024
010938b
feature: add seniors modifications (#72)
cgarcia-lightit Jan 8, 2024
c5820e7
feature: change defualt seniors form for caregiver (#73)
cgarcia-lightit Jan 11, 2024
5248ed8
feat: update thank you pages
sgoycoechea-lightit Jan 12, 2024
8332a6f
Merge pull request #74 from Light-it-labs/feature/CU-86dr30627/update…
sgoycoechea-lightit Jan 12, 2024
06f048c
feat: update pilot carousel
sgoycoechea-lightit Jan 12, 2024
bcfffde
Merge pull request #75 from Light-it-labs/feature/CU-86dqhggcf/update…
sgoycoechea-lightit Jan 15, 2024
2533fe1
fix: caroussel copy
sgoycoechea-lightit Jan 16, 2024
918382a
Merge pull request #76 from Light-it-labs/fix/carousel-copy
sgoycoechea-lightit Jan 16, 2024
9fd197d
fix: capitalize caroussel copy
sgoycoechea-lightit Jan 16, 2024
3f83ca8
Merge pull request #77 from Light-it-labs/fix/carousel-copy
sgoycoechea-lightit Jan 16, 2024
9ec6f72
feature: resolve the following problems
cgarcia-lightit Jan 16, 2024
75cd162
feature: improve replace hidden attribute to opacity because it perfm…
cgarcia-lightit Jan 16, 2024
a3401fd
feature: implement changes from code-review
cgarcia-lightit Jan 16, 2024
63f6245
fix: start profiling previous button
sgoycoechea-lightit Jan 17, 2024
9fd06ac
Merge pull request #79 from Light-it-labs/fix/CU-86dr7xr4d/start-prof…
sgoycoechea-lightit Jan 17, 2024
8a97dbf
Merge branch 'develop' into feature/86dr2w52q/add-loading-for-jotform…
sgoycoechea-lightit Jan 17, 2024
871054e
chore: generate build
sgoycoechea-lightit Jan 17, 2024
2f5be23
Merge pull request #78 from Light-it-labs/feature/86dr2w52q/add-loadi…
sgoycoechea-lightit Jan 17, 2024
469488a
fix: thank you pages copy and ui
sgoycoechea-lightit Jan 17, 2024
4eabba2
Merge pull request #80 from Light-it-labs/fix/CU-86dr7uzgj/thank-you-…
sgoycoechea-lightit Jan 17, 2024
3735e17
fix: thank you font
sgoycoechea-lightit Jan 17, 2024
c2a9562
Merge pull request #81 from Light-it-labs/fix/CU-86dr7uzgj/thank-you-…
sgoycoechea-lightit Jan 17, 2024
c16c265
fix: faqs and caroussel copys
sgoycoechea-lightit Jan 18, 2024
93f840e
Merge pull request #82 from Light-it-labs/fix/faqs-and-caroussel-copys
sgoycoechea-lightit Jan 18, 2024
a332c55
fix: merge main into develop branch and resolve conflict (#83)
cgarcia-lightit Jan 18, 2024
0ffaf74
Merge branch 'main' into develop
cgarcia-lightit Jan 18, 2024
8895ddb
fix: copys
sgoycoechea-lightit Jan 18, 2024
8692c3e
Merge pull request #85 from Light-it-labs/fix/copys
sgoycoechea-lightit Jan 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 0 additions & 121 deletions apps/eo_web/dist/assets/main-2bb9d3aa.js

This file was deleted.

121 changes: 121 additions & 0 deletions apps/eo_web/dist/assets/main-cf66f3ed.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions apps/eo_web/dist/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
"src": "../../packages/ui/src/assets/avatar.svg"
},
"src/main.css": {
"file": "assets/main-94a1d790.css",
"file": "assets/main-d3160e96.css",
"src": "src/main.css"
},
"src/main.tsx": {
"assets": [
"assets/UploadFile-694e44b5.svg"
],
"css": [
"assets/main-94a1d790.css"
"assets/main-d3160e96.css"
],
"file": "assets/main-2bb9d3aa.js",
"file": "assets/main-cf66f3ed.js",
"isEntry": true,
"src": "src/main.tsx"
}
Expand Down
19 changes: 19 additions & 0 deletions apps/eo_web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion apps/eo_web/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ interface EnvironmentsConfigs {
SENIOR_INTRO_QUESTION_CAREGIVER_ID: string;
SENIOR_PROFILE_PATIENT_ID: string;
SENIOR_PROFILE_CAREGIVER_ID: string;
SENIOR_SURVEY_FORM: string;
SENIOR_PATIENT_SURVEY_ID: string;
SENIOR_CAREGIVER_SURVEY_ID: string;
WEB_APP_URL: string;
}

Expand Down
22 changes: 22 additions & 0 deletions apps/eo_web/src/components/AllDonePanel.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { Typography } from '@eo/ui'
import type { ReactNode } from "react";

interface AllDonePanelProps {
children?: ReactNode
}

export const AllDonePanel = ({ children }: AllDonePanelProps) => {
return (
<section className="flex h-auto flex-col items-center justify-center px-[20%] md:min-h-[479px] pb-10">
<Typography
variant="large"
className="text-[42px] font-bold leading-[55px]"
>
All done!
</Typography>

<br />
{children}
</section>
)
}
30 changes: 30 additions & 0 deletions apps/eo_web/src/components/EOInYourInbox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Button, Typography } from '@eo/ui'
import React from 'react'

export const EOInYourInbox = () => {
return (
<section className="w-full bg-white px-6 py-12 md:px-[50px] md:py-[100px]">
<div className="flex flex-col items-center">
<Typography
font="bold"
className="mb-4 text-center text-[32px] leading-[40px] text-skunk"
>
eo in your inbox
</Typography>
<Typography className="text-center text-skunk-mid">
Rollouts in new markets, new partnerships, research initiatives and
special offers are all coming soon.
</Typography>
<div className="mt-[30px] flex w-full flex-col justify-items-end gap-4 md:w-auto md:flex-row">
<input
className="h-[49px] w-full rounded-[40px] border border-solid border-black bg-white py-3 pl-4 pr-2 text-black placeholder:text-gray-300 md:w-[327px]"
placeholder="Enter your email..."
/>
<Button variant="black" font="semiBold">
Subscribe
</Button>
</div>
</div>
</section>
)
}
34 changes: 34 additions & 0 deletions apps/eo_web/src/components/FAQs.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { Typography } from '@eo/ui'
import React from 'react'
import { faqs, pilotFaqs } from '~/copy/copy'
import { Collapsible } from './Collapsible'

interface FAQsProps {
pilot?: boolean
}

export const FAQs = ({ pilot = false }: FAQsProps) => {
const faqList = pilot ? pilotFaqs : faqs
return (
<section className="px-6 py-12 md:mx-0 md:my-[100px]">
<div className="mx-auto my-0 flex max-w-[900px] flex-col">
<Typography
font="bold"
variant="large"
className="mb-[50px] text-center"
>
FAQs
</Typography>
<div className="flex flex-col gap-6">
{faqList.map(({ title, content }) => (
<Collapsible key={title} title={title} active={false}>
<Typography className="text-[18px] leading-[26px] text-gray-800">
{content}
</Typography>
</Collapsible>
))}
</div>
</div>
</section>
)
}
2 changes: 1 addition & 1 deletion apps/eo_web/src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const Header = () => {
<Button
variant="black"
onClick={() => setOpenModal(true)}
font="regular"
font="semiBold"
>
Need Help?
</Button>
Expand Down
44 changes: 44 additions & 0 deletions apps/eo_web/src/components/HowEOWorks.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React from "react";

import { Typography } from "@eo/ui";

import { CancerPilotCarrouselItems, CarrouselItems } from "~/copy/copy";
import { EoCarousel } from "./Carousel";


interface HowEOWorksProps {
pilot?: boolean
}

export const HowEOWorks = ({ pilot = false }: HowEOWorksProps) => {
const carouselItems = pilot ? CancerPilotCarrouselItems : CarrouselItems;
return (
<section className="bg-white px-6 py-12 md:px-[50px] md:py-[100px] ">
<Typography font="bold" variant="large" className="mb-20 text-center">
{pilot ? "How the eo Pilot Works" : "How eo Care Plans Work"}
</Typography>
<EoCarousel>
{carouselItems.map(({ title, content, step, icon: Icon }) => (
<article
key={step}
className="mx-auto my-0 flex h-auto w-auto max-w-[361px] flex-col items-center justify-center gap-2 md:flex-none md:items-start"
>
<div className="flex h-[70.13px] w-[70.13px] flex-row items-center justify-center rounded-full bg-electric-blue fill-gray-50">
<Icon className="h-9 w-[37px]" />
</div>

<Typography className="text-[16px] uppercase leading-4 tracking-[.8px]">
{step}
</Typography>
<Typography font="bold" className="text-xl">
{title}
</Typography>
<Typography className="text-center text-lg md:text-left">
{content}
</Typography>
</article>
))}
</EoCarousel>
</section>
);
};
69 changes: 69 additions & 0 deletions apps/eo_web/src/components/JotformFrame.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { useEffect, useRef, useState } from "react";

import { jotformScript } from "~/helpers/jotform_script";
import { useMount } from "~/hooks/useMount";

interface JotformFrameProps {
formId: string | number;
searchParam?: URLSearchParams;
}

const Iframe = ({ formId, searchParam }: JotformFrameProps) => {
const ref = useRef<HTMLIFrameElement>(null);
useMount(() => {
jotformScript(formId);
setTimeout(() => {
if (ref?.current) {
ref.current.style.opacity = "100";
}
}, 1700);
}, [formId, searchParam]);

return (
<iframe
ref={ref}
src={`https://form.jotform.com/${formId}?${
searchParam ? searchParam.toString() : ""
}`}
id={`JotFormIFrame-${formId}`}
title=""
onLoad={() => {
window.parent.scrollTo(0, 0);
}}
allow="geolocation; microphone; camera"
allowFullScreen={true}
className="h-full w-full min-w-full border-none opacity-0"
></iframe>
);
};

const Loading = () => {
const [showLoading, setShowLoading] = useState(true);
useEffect(() => {
setTimeout(() => {
setShowLoading(false);
}, 1200);
});

return (
<>
{showLoading && (
<div
className="right-[calc(50%-20px)] top-1/2 h-12 w-12 animate-spin rounded-full border-4 border-gray-200 border-t-gray-1000"
style={{
position: "absolute",
}}
/>
)}
</>
);
};

export const JotformFrame = ({ formId, searchParam }: JotformFrameProps) => {
return (
<>
<Loading />
<Iframe formId={formId} searchParam={searchParam} />
</>
);
};
8 changes: 5 additions & 3 deletions apps/eo_web/src/configs/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ export const SENIOR_INTRO_QUESTION_CAREGIVER_ID =
export const SENIOR_PROFILE_PATIENT_ID =
window.data.getEnv("SENIOR_PROFILE_PATIENT_ID") || 233245009995159;
export const SENIOR_PROFILE_CAREGIVER_ID =
window.data.getEnv("SENIOR_PROFILE_CAREGIVER_ID") || 233244799896174;
window.data.getEnv("SENIOR_PROFILE_CAREGIVER_ID") || 240105148124645;

export const SENIOR_SURVEY_ID =
window.data.getEnv("SENIOR_SURVEY_FORM") || 233441843921657;
export const SENIOR_PATIENT_SURVEY_ID =
window.data.getEnv("SENIOR_PATIENT_SURVEY_ID") || 233441843921657;
export const SENIOR_CAREGIVER_SURVEY_ID =
window.data.getEnv("SENIOR_CAREGIVER_SURVEY_ID") || 240026821042139;

export const API_ELIXIR =
window.data.getEnv("API_URL") || "http://localhost:4200";
Expand Down
Loading