Skip to content

Commit 52089db

Browse files
authored
Merge branch 'develop' into feature/fcp-tracking
2 parents 9054b54 + 73fc0d9 commit 52089db

31 files changed

+304
-716
lines changed

public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
rel="stylesheet">
6262

6363
<!-- Google Optimize for A/B testing-->
64-
<script src="https://www.googleoptimize.com/optimize.js?id=OPT-WT27VPR"></script>
64+
<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-WT27VPR"></script>
6565

6666
<!-- Twitter universal website tag code -->
6767
<script async>

scripts/alert_emails/summaries/1564.json

+1
Large diffs are not rendered by default.

scripts/alert_emails/summaries/1566.json

+1
Large diffs are not rendered by default.

scripts/alert_emails/summaries/1568.json

+1
Large diffs are not rendered by default.

src/App.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import PageviewTracker, {
2727
} from 'components/Analytics';
2828
import { COVID_RESPONSE_SIMULATOR_URL } from 'screens/Tools/Tools';
2929
import { SuspenseFallback, ErrorBoundary } from 'components/LazyLoading';
30-
import HomepageExperiment from 'screens/HomePage/HomepageExperiment/HomepageExperiment';
30+
import HomePage from 'screens/HomePage/HomePage';
3131

3232
/* We dynamically import the following components on initial visit to their respective routes: */
3333
const About = lazy(() => import('screens/About/About'));
@@ -60,22 +60,18 @@ export default function App() {
6060
<ErrorBoundary>
6161
<Suspense fallback={<SuspenseFallback />}>
6262
<Switch>
63-
<Route exact path="/" component={HomepageExperiment} />
63+
<Route exact path="/" component={HomePage} />
6464

65-
<Route
66-
exact
67-
path="/alert_signup"
68-
component={HomepageExperiment}
69-
/>
65+
<Route exact path="/alert_signup" component={HomePage} />
7066
<Route
7167
exact
7268
path="/compare/:sharedComponentId?"
73-
component={HomepageExperiment}
69+
component={HomePage}
7470
/>
7571
<Route
7672
exact
7773
path="/explore/:sharedComponentId?"
78-
component={HomepageExperiment}
74+
component={HomePage}
7975
/>
8076

8177
<Route

src/assets/data/aggregations.json

+1-1
Large diffs are not rendered by default.

src/assets/data/data_url.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"data_url": "https://data.covidactnow.org/snapshot/1563/v2/"
2+
"data_url": "https://data.covidactnow.org/snapshot/1568/v2/"
33
}

src/assets/data/share_images_url.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"share_image_url": "https://covidactnow-prod.web.app/share/1563-503/"
2+
"share_image_url": "https://covidactnow-prod.web.app/share/1568-508/"
33
}

src/assets/data/summaries.json

+1-1
Large diffs are not rendered by default.

src/cms-content/learn/learn-glossary.json

+13-7
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
{
9696
"term": "Crisis standards of care (CSC)",
9797
"termId": "crisis-standards-of-care",
98-
"definition": "Crisis standards of care (CSC) refers to when a hospital or health care system is so overwhelmed that it is impossible to provide the standard level of care. \n\nCrisis standards of care often coincide with a shift from patient-centered practice, which focuses on providing the best care for a patient, to public-focused practice, which involves making decisions on patient care within a larger understanding of limited resources and collective good. An example of this is the reallocation or in some cases [sharing](https://www.nytimes.com/2020/03/26/health/coronavirus-ventilator-sharing.html) of ventilators among severely ill COVID patients. [Guidelines](https://www.nursingworld.org/~496044/globalassets/practiceandpolicy/work-environment/health--safety/coronavirus/crisis-standards-of-care.pdf) have been published to help health workers and institutions navigate crisis standards of care as ethically as possible.\n\n“[Flattening the Curve](#flattening-the-curve)” is a method of slowing the spread of COVID to prevent hospitals from having to invoke crisis standards of care.",
98+
"definition": "Crisis standards of care (CSC) refers to when a hospital or health care system is so overwhelmed that it is impossible to provide the standard level of care. \n\nCrisis standards of care often coincide with a shift from patient-centered practice, which focuses on providing the best care for a patient, to public-focused practice, which involves making decisions on patient care within a larger understanding of limited resources and collective good. An example of this is the reallocation or in some cases [sharing of ventilators](http://rc.rcjournal.com/content/early/2020/05/06/respcare.07919) among severely ill COVID patients. [Guidelines](https://www.nursingworld.org/~496044/globalassets/practiceandpolicy/work-environment/health--safety/coronavirus/crisis-standards-of-care.pdf) have been published to help health workers and institutions navigate crisis standards of care as ethically as possible.\n\n“[Flattening the Curve](#flattening-the-curve)” is a method of slowing the spread of COVID to prevent hospitals from having to invoke crisis standards of care.",
9999
"category": "Treatment"
100100
},
101101
{
@@ -179,11 +179,11 @@
179179
{
180180
"term": "Forecasting",
181181
"termId": "forecasting",
182-
"definition": "Forecasting predicts the future of COVID. Like weather forecasts, COVID forecasts predict the evolution and impact of disease down the line, and are very important to ensure timely and accurate public health disease response. Covid Act Now’s Covid Response Simulator, an SEIR model, is a forecasting tool that attempts to model how COVID will evolve in a population, given certain intervention scenarios such as no interventions, [social distancing](https://covidactnow.org/glossary#social-distancing), or [mask wearing](https://covidactnow.org/glossary#face-mask).",
182+
"definition": "Forecasting predicts the future of COVID. Like weather forecasts, COVID forecasts predict the evolution and impact of disease down the line, and are very important to ensure timely and accurate public health disease response. Covid Act Now’s Covid Response Simulator, an [SEIR](#seir) model, is a forecasting tool that attempts to model how COVID will evolve in a population, given certain intervention scenarios such as no interventions, [social distancing](https://covidactnow.org/glossary#social-distancing), or [mask wearing](https://covidactnow.org/glossary#face-mask).",
183183
"category": "Disease science"
184184
},
185185
{
186-
"definition": "Herd immunity is achieved when a large portion of a community (the herd) becomes immune to a disease, making the spread of disease from person to person unlikely. There are a lot of challenges in relying on natural herd immunity as a method of COVID disease eradication.\n\n* Generally, the percentage of the population that would need to be immune to a disease to achieve herd immunity is estimated to be [at least 60 percent](https://www.nytimes.com/interactive/2020/05/28/upshot/coronavirus-herd-immunity.html).\n* It is [not yet known](https://www.who.int/news-room/commentaries/detail/immunity-passports-in-the-context-of-covid-19) if COVID antibodies protect people from getting reinfected. It is also incredibly difficult to protect vulnerable people, such as people who are [immunocompromised](#immunocompromised) or elderly, and would require continued isolation for these people.\n* No countries have even come close to achieving the percentage of infections necessary to achieve herd immunity for COVID.\n\nThe concept of herd immunity is also used when [talking about vaccination](https://www.who.int/news-room/q-a-detail/herd-immunity-lockdowns-and-covid-19). With successful vaccination, herd immunity may be achieved by protecting people from COVID without needing vast amounts of people to get sick with COVID. The overall amount of virus that can spread in a population is lowered if the majority of that population gets vaccinated.",
186+
"definition": "Herd immunity is achieved when a large portion of a community (the herd) becomes immune to a disease, making the spread of disease from person to person unlikely. There are a lot of challenges in relying on natural herd immunity as a method of COVID disease eradication.\n\n* Generally, the percentage of the population that would need to be immune to a disease to achieve herd immunity is estimated to be [at least 60 percent](https://www.thelancet.com/article/S0140-6736(20)32318-7/fulltext).\n* It is [not yet known](https://www.who.int/news-room/commentaries/detail/immunity-passports-in-the-context-of-covid-19) if COVID antibodies protect people from getting reinfected. It is also incredibly difficult to protect vulnerable people, such as people who are [immunocompromised](#immunocompromised) or elderly, and would require continued isolation for these people.\n* No countries have even come close to achieving the percentage of infections necessary to achieve herd immunity for COVID.\n\nThe concept of herd immunity is also used when [talking about vaccination](https://www.who.int/news-room/q-a-detail/herd-immunity-lockdowns-and-covid-19). With successful vaccination, herd immunity may be achieved by protecting people from COVID without needing vast amounts of people to get sick with COVID. The overall amount of virus that can spread in a population is lowered if the majority of that population gets vaccinated.",
187187
"term": "Herd immunity",
188188
"termId": "herd-immunity",
189189
"category": "Disease science"
@@ -261,9 +261,9 @@
261261
"category": "Metrics"
262262
},
263263
{
264-
"term": "Non-pharmaceutical intervention (NPI)",
264+
"term": "Nonpharmaceutical intervention (NPI)",
265265
"termId": "npi",
266-
"definition": "Non-pharmaceutical interventions (NPIs) are actions outside of pharmaceutical interventions, such as vaccines and medicine, that help slow the spread of illness. \n\nAlso known as community [mitigation](#mitigation) strategies, NPIs are vital in slowing COVID spread. These include wearing masks, washing your hands, staying home when you do not feel well, [social distancing](#social-distancing), and avoiding crowded indoor spaces.",
266+
"definition": "Nonpharmaceutical interventions (NPIs) are actions outside of pharmaceutical interventions, such as vaccines and medicine, that help slow the spread of illness. \n\nAlso known as community [mitigation](#mitigation) strategies, NPIs are vital in slowing COVID spread. These include wearing masks, washing your hands, staying home when you do not feel well, [social distancing](#social-distancing), and avoiding crowded indoor spaces.",
267267
"category": "Prevention and mitigation"
268268
},
269269
{
@@ -299,7 +299,7 @@
299299
{
300300
"term": "Peak",
301301
"termId": "peak",
302-
"definition": "A peak is the highest number of COVID cases in a country, state, or county, after which the rate of infection begins to slow. Peaks can be a prolonged period of time rather than a single day, and are best understood as the worst period of an [epidemic](#epidemic) or [pandemic](#pandemic).\n\n[Data suggests](https://www.nytimes.com/interactive/2020/10/15/us/coronavirus-cases-us-surge.html) that the U.S. experienced its first peak in mid-April, and entered its third [wave](#wave) in the late fall of 2020. There is no official definition of when one wave ends and another begins, but waves can generally be identified by a peak in daily new cases followed by a substantial, sustained reduction in that metric.",
302+
"definition": "A peak is the highest number of COVID cases in a country, state, or county, after which the rate of infection begins to slow. Peaks can be a prolonged period of time rather than a single day, and are best understood as the worst period of an [epidemic](#epidemic) or [pandemic](#pandemic).\n\n[Data suggests](https://www.covidactnow.org/covid-explained/us-third-wave) that the U.S. experienced its first peak in mid-April, and entered its third [wave](#wave) in the late fall of 2020. There is no official definition of when one wave ends and another begins, but waves can generally be identified by a peak in daily new cases followed by a substantial, sustained reduction in that metric.",
303303
"category": "Disease science"
304304
},
305305
{
@@ -368,6 +368,12 @@
368368
"termId": "sars-cov-2",
369369
"category": "Health and symptoms"
370370
},
371+
{
372+
"term": "SEIR",
373+
"termId": "seir",
374+
"definition": "An SEIR model is a specific kind of model that [epidemiologists](#epidemiologist) use to understand how a disease will evolve in a population over time. Covid Act Now’s [Covid Response Simulator](https://www.covidactnow.org/tools) is an SEIR model which [forecasts](#forecasting) COVID by categorizing how the conditions of people across a population will evolve across various states. These states include “susceptible,” “[exposed](#exposed),” “[infected](#infection),” “recovered,” and “deceased.” \n\nThe model forecasts people’s progression through those states using many different data inputs – including cases, hospitalizations, deaths, and demographics – in conjunction with assumptions based on, for example, how the disease has evolved over time in other countries and how much of an impact certain interventions like social distancing could have. Simply put, the SEIR model can help us predict the trend in COVID hospitalizations within certain scenarios. This predictive ability allows states and counties to prepare for when their hospitals may become overwhelmed by COVID patients.",
375+
"category": "Disease science"
376+
},
371377
{
372378
"term": "Sensitivity (testing)",
373379
"termId": "sensitivity",
@@ -491,7 +497,7 @@
491497
{
492498
"term": "Wave",
493499
"termId": "wave",
494-
"definition": "During a [pandemic](#pandemic), a “wave” is a phenomenon in which there is a period of increased case growth which [peaks](#peak) and is followed by a substantial, sustained reduction in cases. COVID cases seem to come in waves: first wave, second wave, and so on. There is no official definition of when one wave ends and another begins, and COVID has peaked in different states at different times.\n\n[Data suggests](https://www.nytimes.com/interactive/2020/10/15/us/coronavirus-cases-us-surge.html) the U.S. on the whole experienced its first peak mid April, second peak in mid July, and entered its third wave of cases in the late fall of 2020. The term wave is often used alongside or interchangeably with [surge](#surge), which describes the increase in cases seen before and during the peak of a wave.",
500+
"definition": "During a [pandemic](#pandemic), a “wave” is a phenomenon in which there is a period of increased case growth which [peaks](#peak) and is followed by a substantial, sustained reduction in cases. COVID cases seem to come in waves: first wave, second wave, and so on. There is no official definition of when one wave ends and another begins, and COVID has peaked in different states at different times.\n\n[Data suggests](https://www.covidactnow.org/covid-explained/us-third-wave) the U.S. on the whole experienced its first peak mid April, second peak in mid July, and entered its third wave of cases in the late fall of 2020. The term wave is often used alongside or interchangeably with [surge](#surge), which describes the increase in cases seen before and during the peak of a wave.",
495501
"category": "Disease science"
496502
}
497503
],

src/cms-content/learn/products-landing.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"productName": "COVID Response Simulator",
1414
"productId": "covid-response-simulator",
1515
"productSubtitle": "Allows you to forecast scenarios",
16-
"productDescription": "Try it [here](https://covidactnow.org/covid-response-simulator-redirect).\n\nThe COVID Response Simulator is a localized, spreadsheet version of the public Covid Act Now (CAN) model. With it, you can take a powerful [SEIR epidemiology model](https://en.wikipedia.org/wiki/Compartmental_models_in_epidemiology#The_SEIR_model) and customize it for your county to help plan your response to COVID. The inputs and assumptions in the simulator are modifiable and can be changed to reflect your local realities.\n\nIn addition, you can project the impact of specific Non-Pharmaceutical Interventions (NPIs) by adjusting customizable levels of public compliance and closure for:\n\n* Schools and universities\n* Large events\n* Bars and restaurants\n* Offices and factories\n* Houses of worship\n* Personal care\n* Nonessential retail\n* Essential retail\n* Entertainment\n* Outdoor recreation\n\nYou’ll also be able to simulate the impact of different levels of compliance with mask mandates and shelter-in-place orders, as well as modify the demographic distribution of your county’s population. Based on your inputs, the simulator generates data and graphs illustrating COVID forecasts with and without these NPIs, including estimated case numbers and hospitalizations.\n\n![Example view of the COVID Response Simulator](/images_cms/crs-screenshot.png)\n\n> ### Get started\n>\n> 1. Before you begin, you can watch a full tutorial (30 minutes) on the simulator [here](https://youtu.be/6lYf9ry1DWE) or a shorter tutorial (10 minutes) on how to use the simulator specifically for modeling NPIs [here](https://youtu.be/xiI_kC8hGTA).\n> 2. Click on [this link](https://docs.google.com/spreadsheets/u/1/d/1iUQvuY-DGbuxGBDrj1fvaDjk-peunHm89sMJe0z24U8/copy?usp=sharing) to create a copy of the simulator for your use. You’ll be prompted to make a copy so that you can work in your own document.\n> 3. Review the information in the first tab in Orange labeled “About”. Then continue onward to the second tab in Green labeled “Location and Inputs Setup”.\n\n*If you have any questions about our model or the data we use, reach out to us at [[email protected]](mailto:[email protected]). You can also learn more on our [YouTube channel](https://www.youtube.com/channel/UChs298932BKWanjwWLVUO4w).*"
16+
"productDescription": "Try it [here](https://covidactnow.org/covid-response-simulator-redirect).\n\nThe COVID Response Simulator is a localized, spreadsheet version of the public Covid Act Now (CAN) model. With it, you can take a powerful [SEIR epidemiology model](https://covidactnow.org/glossary#seir) and customize it for your county to help plan your response to COVID. The inputs and assumptions in the simulator are modifiable and can be changed to reflect your local realities.\n\nIn addition, you can project the impact of specific Non-Pharmaceutical Interventions (NPIs) by adjusting customizable levels of public compliance and closure for:\n\n* Schools and universities\n* Large events\n* Bars and restaurants\n* Offices and factories\n* Houses of worship\n* Personal care\n* Nonessential retail\n* Essential retail\n* Entertainment\n* Outdoor recreation\n\nYou’ll also be able to simulate the impact of different levels of compliance with mask mandates and shelter-in-place orders, as well as modify the demographic distribution of your county’s population. Based on your inputs, the simulator generates data and graphs illustrating COVID forecasts with and without these NPIs, including estimated case numbers and hospitalizations.\n\n![Example view of the COVID Response Simulator](/images_cms/crs-screenshot.png)\n\n> ### Get started\n>\n> 1. Before you begin, you can watch a full tutorial (30 minutes) on the simulator [here](https://youtu.be/6lYf9ry1DWE) or a shorter tutorial (10 minutes) on how to use the simulator specifically for modeling NPIs [here](https://youtu.be/xiI_kC8hGTA).\n> 2. Click on [this link](https://docs.google.com/spreadsheets/u/1/d/1iUQvuY-DGbuxGBDrj1fvaDjk-peunHm89sMJe0z24U8/copy?usp=sharing) to create a copy of the simulator for your use. You’ll be prompted to make a copy so that you can work in your own document.\n> 3. Review the information in the first tab in Orange labeled “About”. Then continue onward to the second tab in Green labeled “Location and Inputs Setup”.\n\n*If you have any questions about our model or the data we use, reach out to us at [[email protected]](mailto:[email protected]). You can also learn more on our [YouTube channel](https://www.youtube.com/channel/UChs298932BKWanjwWLVUO4w).*"
1717
},
1818
{
1919
"productName": "Embed",

src/components/Analytics/utils.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export enum EventCategory {
4545
SEARCH = 'search',
4646
VACCINATION = 'vaccination',
4747
WEB_VITALS = 'web vitals',
48+
NONE = 'none', // use NONE for development
4849
}
4950

5051
/**
@@ -84,7 +85,9 @@ export function trackEvent(
8485
nonInteraction?: boolean,
8586
transport?: 'beacon' | 'xhr' | 'image',
8687
) {
87-
ReactGA.event({ category, action, label, value, nonInteraction, transport });
88+
if (category !== EventCategory.NONE) {
89+
ReactGA.event({ category, action, label, value, nonInteraction, transport });
90+
}
8891
}
8992

9093
export function trackSaveImage(category: EventCategory, label: string) {

0 commit comments

Comments
 (0)