diff --git a/config.toml b/config.toml index f9ce34498..ce84b5ba5 100644 --- a/config.toml +++ b/config.toml @@ -63,52 +63,49 @@ relativeURLs = false url = "https://docs.google.com/forms/d/e/1FAIpQLScqgT1fKZr5VWBfsaSp-DNaN03aV6EoZU4YljIzHJ1Wl_zmtg/viewform" weight = 9 -# covid19 +# epidemic-signals [[menu.main]] - identifier = "covid19" - name = "COVID-19" + identifier = "epidemic-signals" + name = "Epidemic Signals" pre = "solid/virus" - url = "/covid19/" + url = "/epidemic-signals/" weight = 2 [[menu.main]] - parent = "covid19" + parent = "epidemic-signals" name = "About COVIDcast" - url = "/covid19/" + url = "/epidemic-signals/" weight = 1 [[menu.main]] - parent = "covid19" + parent = "epidemic-signals" name = "About CTIS" - url = "/covid19/ctis" + url = "/epidemic-signals/ctis" weight = 10 [[menu.main]] - identifier = "covid19-covidcast" - parent = "covid19" + identifier = "epidemic-signals-covidcast" + parent = "epidemic-signals" name = "COVIDcast Dashboard" url = "/covidcast/" weight = 20 [[menu.main]] - parent = "covid19" + parent = "epidemic-signals" name = "CTIS Dashboard" url = "/covidcast/survey-results" weight = 30 [[menu.main]] - parent = "covid19" + parent = "epidemic-signals" name = "Export Data" url = "/covidcast/export" weight = 40 [[menu.main]] - parent = "covid19" - name = "Terms Of Use" - url = "/covid19/terms-of-use" - weight = 50 - -# flu -[[menu.main]] - identifier = "flu" + parent = "epidemic-signals" name = "Flu & Other Pathogens" - pre = "solid/disease" url = "/flu/" - weight = 3 + weight = 50 +[[menu.main]] + parent = "epidemic-signals" + name = "Terms Of Use" + url = "/epidemic-signals/terms-of-use" + weight = 60 # tools [[menu.main]] @@ -122,59 +119,125 @@ relativeURLs = false name = "Tools Overview" url = "/tools/" weight = 1 +# utils [[menu.main]] parent = "tools" - name = "COVIDcast Dashboard" + identifier = "utils" + name = "Dashboards" + url = "/tools/#dashboards" + weight = 9 +[[menu.main]] + parent = "utils" + name = "Delphi Epidata Dashboard" url = "/covidcast/" weight = 10 [[menu.main]] - parent = "tools" - name = "COVIDcast R Package" - url = "https://cmu-delphi.github.io/covidcast/covidcastR/" - weight = 11 -[[menu.main]] - parent = "tools" - name = "COVIDcast Python Package" - url = "https://cmu-delphi.github.io/covidcast/covidcast-py/html/" - weight = 12 -[[menu.main]] - parent = "tools" + parent = "utils" name = "Indicator Status" url = "/covidcast/indicator-status" weight = 20 [[menu.main]] - parent = "tools" + parent = "utils" name = "Dashboard Builder" url = "/covidcast/dashboard" weight = 30 [[menu.main]] - parent = "tools" + parent = "utils" name = "Forecast Evaluation" url = "/forecast-eval/" weight = 40 [[menu.main]] - parent = "tools" - name = "EpiVis" + parent = "utils" + name = "Epi Signal Visualization" url = "/epivis/" weight = 50 [[menu.main]] parent = "tools" - name = "Archived Tools" - url = "/tools/archive/" + name = "Archived" + url = "/tools/#archived" weight = 80 +[[menu.main]] + parent = "tools" + identifier = "forecasting" + name = "Forecasting" + url = "/tools/#forecasting" + weight = 50 [[menu.main]] - identier = "github" - pre = "brands/github" - name = "GitHub" - url = "https://github.com/cmu-delphi/" + parent = "forecasting" + name = "COVID Forecasting" + url = "https://covid19forecasthub.org/" + weight = 1 +[[menu.main]] + parent = "forecasting" + name = "Flu Forecasting" + url = "https://www.cdc.gov/flu/weekly/flusight/index.html" + weight = 2 + +[[menu.main]] + identier = "Code" + pre = "solid/code" + name = "Code" + url = "code" weight = 90 +[[menu.main]] + parent = "Code" + name = "Code Overview" + url = "code" + weight = 1 +[[menu.main]] + parent = "Code" + identifier = "APIClients" + name = "API and Clients" + url = "/code/#api-and-clients" + weight = 2 +[[menu.main]] + parent = "APIClients" + name = "Epidata" + url = "https://github.com/cmu-delphi/delphi-epidata" + weight = 7 +[[menu.main]] + parent = "APIClients" + name = "Epidatr" + url = "https://cmu-delphi.github.io/epidatr/" + weight = 8 +[[menu.main]] + parent = "APIClients" + name = "Epidatpy" + url = "https://github.com/cmu-delphi/epidatpy" + weight = 9 +[[menu.main]] + parent = "Code" + identifier = "forecastingCode" + name = "Forecasting" + url = "code#forecasting" + weight = 10 +[[menu.main]] + parent = "forecastingCode" + name = "Forecasting Manual" + weight = 1 +[[menu.main]] + parent = "forecastingCode" + name = "Epiprocess" + url = "https://cmu-delphi.github.io/epiprocess/" + weight = 7 +[[menu.main]] + parent = "forecastingCode" + name = "Epipredict" + url = "https://cmu-delphi.github.io/epipredict/" + weight = 7 +[[menu.main]] + parent = "Code" + name = "Github" + pre = "brands/github" + url = "https://github.com/cmu-delphi/" + weight = 70 [[menu.main]] identifier = "api" - name = "API" + name = "Epidata API" pre = "solid/database" url = "https://cmu-delphi.github.io/delphi-epidata/" weight = 100 @@ -183,6 +246,7 @@ relativeURLs = false description = "Developing the Theory and Practice of Epidemiological Forecasting" mission = "To develop the theory and practice of epidemic detection, tracking and forecasting, and their use in decision making, both public and private. Our vision is to make this technology as useful as weather forecasting is today." apiUrl = "https://cmu-delphi.github.io/delphi-epidata" + toolUrl = "/tools/" twitter = "CmuDelphi" contactForm = "https://docs.google.com/forms/d/e/1FAIpQLScqgT1fKZr5VWBfsaSp-DNaN03aV6EoZU4YljIzHJ1Wl_zmtg/viewform" feedbackForm = "https://docs.google.com/forms/d/e/1FAIpQLSeIeOJtrAhdOriEyiRY7LkpQX8DZBY19dl6De8l56Q9CZhmxw/viewform?usp=pp_url&entry.1245962748=" diff --git a/content/_index.md b/content/_index.md index f4fbae55d..4a05f4dad 100644 --- a/content/_index.md +++ b/content/_index.md @@ -12,7 +12,7 @@ carousel: - pre: Tools title: Real-time Indicators of Infectious Disease Activity ref: covidcast - alt: Explore the COVIDcast Dashboard + alt: Explore the Delphi Epidata Dashboard image: covidcast_v2.jpg - pre: News title: CDC Selects Delphi Research Group at CMU as Center of Innovation in Outbreak Analytics and Disease Modeling diff --git a/content/about/milestones/index.md b/content/about/milestones/index.md index c53189756..6960f108d 100644 --- a/content/about/milestones/index.md +++ b/content/about/milestones/index.md @@ -12,11 +12,11 @@ layout: milestones * **September 2022.** We launched [Epidata v4](https://delphi.cmu.edu/blog/2022/12/14/introducing-epidata-v4/), prioritizing fast access to the most up-to-date data while retaining the deep data revision history needed by researchers. -* **June 2022.** We ended data collection for the [COVID-19 Trends and Impact Survey (CTIS)](https://delphi.cmu.edu/covid19/ctis/) after more than two years, during which we received 29.5 million survey responses in the US (and [well over 100m globally](https://covidmap.umd.edu/)). +* **June 2022.** We ended data collection for the [COVID-19 Trends and Impact Survey (CTIS)](https://delphi.cmu.edu/epidemic-signals/ctis/) after more than two years, during which we received 29.5 million survey responses in the US (and [well over 100m globally](https://covidmap.umd.edu/)). * **April 2022.** We received the [Allen Newell Award for Research Excellence in SCS at CMU](https://www.cs.cmu.edu/events/newell-award), which is awarded annually and recognizes an outstanding body of work that epitomizes Allen Newell's research style. -* **April 2022.** We received [the Policy Impact Award and the Warren J. Mitofsky Innovators Award from the the American Association of Public Opinion Research (AAPOR)](https://www.cs.cmu.edu/news/2022/delphi-aapor-awards), along with our partners from the University of Maryland Social Data Science Center and Meta, for our work on the [COVID-19 Trends and Impact Survey](https://delphi.cmu.edu/covid19/ctis/) (CTIS). +* **April 2022.** We received [the Policy Impact Award and the Warren J. Mitofsky Innovators Award from the the American Association of Public Opinion Research (AAPOR)](https://www.cs.cmu.edu/news/2022/delphi-aapor-awards), along with our partners from the University of Maryland Social Data Science Center and Meta, for our work on the [COVID-19 Trends and Impact Survey](https://delphi.cmu.edu/epidemic-signals/ctis/) (CTIS). * **January 2022.** We added selected signals from the White House COVID-19 Data Strategy and Execution Workgroup’s [Community Profile Report (CPR)](https://healthdata.gov/Health/COVID-19-Community-Profile-Report/gqxm-d9w9), including hospital admission and vaccination rates. This data source was discontinued in February 2023. @@ -54,7 +54,7 @@ layout: milestones * **May 2020.** We added signals for COVID-19 Cases and Deaths, mirrored from the [Center for Systems Science and Engineering](https://systems.jhu.edu/research/public-health/ncov/) at Johns Hopkins University. -* **April 2020.** We partnered with Meta to launch the [COVID-19 Trends and Impact Survey (CTIS)](https://delphi.cmu.edu/covid19/ctis/) to monitor in real-time the spread and impact of the COVID-19 pandemic in the United States. +* **April 2020.** We partnered with Meta to launch the [COVID-19 Trends and Impact Survey (CTIS)](https://delphi.cmu.edu/epidemic-signals/ctis/) to monitor in real-time the spread and impact of the COVID-19 pandemic in the United States. * **April 2020.** We added signals from two new data sources: diff --git a/content/code/_index.md b/content/code/_index.md new file mode 100644 index 000000000..eff5844b4 --- /dev/null +++ b/content/code/_index.md @@ -0,0 +1,65 @@ +--- +title: Code Overview +linkTitle: Code +layout: single +--- + +In addition to the Delphi Epidata API server code, we have a number of user-oriented code packages, such as API clients and time-series modeling for epidemiology. +All source code is freely available on [GitHub](https://github.com/cmu-delphi/). + +## API and clients + +### [Epidata](https://github.com/cmu-delphi/delphi-epidata) + +The core server code for the [Delphi Epidata API](https://cmu-delphi.github.io/delphi-epidata/). + +### [Epidatr](https://cmu-delphi.github.io/epidatr/) + +R client for the [Delphi Epidata API](https://cmu-delphi.github.io/delphi-epidata/). +It allows you to cache queries locally to speed up data access and seamlessly integrate pulling from our API into your pipelines. + +### [Epidatpy](https://github.com/cmu-delphi/epidatpy) (WIP) + +A work-in-progress Python client for the [Delphi Epidata API](https://cmu-delphi.github.io/delphi-epidata/). +Not yet recommended for production, but we are happy to receive feedback! + +## Forecasting + +### [Introduction to Epidemiological Forecasting: Delphi Tools, Data, and Lessons](https://cmu-delphi.github.io/delphi-tooling-book/) + +An introduction to epidemiological forecasting using our tools: epiprocess and epipredict. + +### [Epiprocess](https://cmu-delphi.github.io/epiprocess/) + +A collection of data structures and methods for handling epidemiological data. +The major features are: +- The epi_df structure, which allows you track epidemiological data measured over location and time (and other potential keys). +- The epi_archive structure, which allows you to store epi_df objects in a versioned archive and to query the archive for the state of the data at any point in time. +- Support for applying generic functions across a sliding time window, building on tools like [slider](https://slider.r-lib.org/). Comes with support for + - handling gaps in time + - automatically handling grouping of keys +- Support for version aware data transformation and forecasting, which allows for simple and accurate backtesting of forecasting models (using only the actual data that was available at the time of the forecast and not the revised versions). +- Growth rate estimation, as estimated using relative rates of change, linear regression, smooth splines, or polynomial trend filtering. +- Outlier detection and correction, using rolling median or LOESS trend decomposition. +- Signal correlation over space, time and other keys. It also supports lagged correlations, automatically handles grouping by the specified keys, and handles time gaps. + +### [Epipredict](https://cmu-delphi.github.io/epipredict/) + +A framework for building epidata pipelines involving transformation and forecasting. It is designed to work smoothly with epiprocess and provides a simple interface for defining and running forecasting workflows. It supports: +- A simple interface for defining a sequence of data pre-processing, forecasting, and post-processing steps. +- A collection of data processing steps common to epidata. +- A collection of pre-packaged forecasting models commonly used by Delphi's forecasting team. + +## Deprecated Packages + +### [Covidcast](https://github.com/cmu-delphi/covidcast) + +A collection of R and Python packages for accessing and analyzing data from the Delphi COVIDcast API. + +### [Epiforecast](https://github.com/cmu-delphi/epiforecast-R) + +R package that implements several methods for epidemiological forecasting empirical bayes (EB), basis regression (BR), and time-weighted kernel density estimation (twkde). + +### [utils](https://github.com/cmu-delphi/utils) + +Python utility package for handling dates and locations. diff --git a/content/covidcast/_index.md b/content/covidcast/_index.md index a6a68e8d4..18b2288ad 100644 --- a/content/covidcast/_index.md +++ b/content/covidcast/_index.md @@ -1,6 +1,6 @@ --- -title: COVIDcast Dashboard -description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group. +title: Delphi Epidata Dashboard +description: Delphi Epidata tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group. layout: covidcast_app app_mode: landing order: 1 diff --git a/content/covid19/_index.md b/content/epidemic-signals/_index.md similarity index 90% rename from content/covid19/_index.md rename to content/epidemic-signals/_index.md index 4b8e44f51..f68d7328c 100644 --- a/content/covid19/_index.md +++ b/content/epidemic-signals/_index.md @@ -2,6 +2,9 @@ title: About COVIDcast linkTitle: COVID-19 layout: single +aliases: + - /covid19 + --- COVIDcast is the name for Delphi's project in support of the COVID-19 response @@ -13,7 +16,7 @@ in the United States. It has several parts. constitute what we believe may be the nation's largest public repository of real-time, geographically-detailed indicators of COVID activity in the U.S. -2. We make all COVID-19 indicators freely available through a +1. We make all COVID-19 indicators freely available through a [public API](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html), which is updated with new data daily. We also provide associated [R](https://cmu-delphi.github.io/covidcast/covidcastR/) and @@ -21,16 +24,16 @@ in the United States. It has several parts. and a [dashboard]({{< relref "covidcast" >}}) to visualize a core set of indicators. -3. Some of the underlying data sources (on which these indicators are built) +1. Some of the underlying data sources (on which these indicators are built) would not exist or be publicly available without Delphi's efforts. These include a massive national daily survey called the [COVID-19 Trends and - Impact Survey (CTIS)]({{< relref "covid19/ctis" >}}) that we're running in + Impact Survey (CTIS)]({{< relref "epidemic-signals/ctis" >}}) that we're running in partnership with Facebook, which has been taken by over 25 million Americans since April 2020; and an enormous database of de-identified medical insurance claims, covering more than 35% of the U.S. population, made possible through health system partners including Change Healthcare. -4. We support and advise the U.S. CDC (in collaboration with the +1. We support and advise the U.S. CDC (in collaboration with the [Reich Lab](https://reichlab.io/)) on short-term COVID forecasting, which includes creating and evaluating an ensemble forecast out of the models submitted to the [COVID-19 Forecast Hub](https://covid19forecasthub.org/), @@ -39,7 +42,7 @@ in the United States. It has several parts. ## See Also -- [COVIDcast dashboard]({{< relref "covidcast" >}}) +- [Delphi Epidata dashboard]({{< relref "covidcast" >}}) - [CTIS dashboard]({{< relref "covidcast/survey-results" >}}) - [Export data tool]({{< relref "covidcast/export" >}}) - [API documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html) diff --git a/content/covid19/ctis.md b/content/epidemic-signals/ctis.md similarity index 94% rename from content/covid19/ctis.md rename to content/epidemic-signals/ctis.md index ca7565054..36990445c 100644 --- a/content/covid19/ctis.md +++ b/content/epidemic-signals/ctis.md @@ -3,6 +3,7 @@ title: Delphi's COVID-19 Trends and Impact Surveys (CTIS) linkTitle: About CTIS aliases: - /covidcast/surveys + - /covid19/ctis --- {{< alert category="primary">}} @@ -41,7 +42,7 @@ To account for the differences between Facebook users and the United States popu ## Where can I see the results? -Our [CTIS Results Dashboard]({{< relref "covidcast/survey-results" >}}) shows aggregate survey results, ranging from rates of COVID-like symptoms over mask usage to mental health. In addition, our [COVIDcast dashboard]({{< relref "covidcast" >}}) shows basic aggregate survey results, revealing the rates of mask usage and COVID-like symptoms across the United States. The data used by both tools is also freely available for download through the [COVIDcast API]({{< apiref "api/covidcast.html">}}) and our [COVIDcast Exporter]({{< relref "covidcast/export" >}}). Facebook also publishes [a map](https://covid-survey.dataforgood.fb.com/) based on the United States and international aggregate data. +Our [CTIS Results Dashboard]({{< relref "covidcast/survey-results" >}}) shows aggregate survey results, ranging from rates of COVID-like symptoms over mask usage to mental health. In addition, our [Delphi Epidata dashboard]({{< relref "covidcast" >}}) shows basic aggregate survey results, revealing the rates of mask usage and COVID-like symptoms across the United States. The data used by both tools is also freely available for download through the [COVIDcast API]({{< apiref "api/covidcast.html">}}) and our [COVIDcast Exporter]({{< relref "covidcast/export" >}}). Facebook also publishes [a map](https://covid-survey.dataforgood.fb.com/) based on the United States and international aggregate data. The [Symptom Data Challenge](https://www.symptomchallenge.org/) challenged participants to enable earlier detection and improved situational awareness of the COVID-19 outbreak by using data from these symptom surveys. Check out the [the challenge website](https://www.symptomchallenge.org/) for more details about the Challenge and the finalists. diff --git a/content/covid19/images/severity-pyramid.svg b/content/epidemic-signals/images/severity-pyramid.svg similarity index 100% rename from content/covid19/images/severity-pyramid.svg rename to content/epidemic-signals/images/severity-pyramid.svg diff --git a/content/covid19/terms-of-use.md b/content/epidemic-signals/terms-of-use.md similarity index 100% rename from content/covid19/terms-of-use.md rename to content/epidemic-signals/terms-of-use.md diff --git a/content/people/headshots/daniel-mcdonald-photo.jpeg b/content/people/headshots/daniel-mcdonald-photo.jpeg index 99a0d62f3..6ccad17f5 100644 Binary files a/content/people/headshots/daniel-mcdonald-photo.jpeg and b/content/people/headshots/daniel-mcdonald-photo.jpeg differ diff --git a/content/tools/_index.md b/content/tools/_index.md index ed1ee74b7..672501b18 100644 --- a/content/tools/_index.md +++ b/content/tools/_index.md @@ -4,13 +4,67 @@ linkTitle: Tools layout: single --- -## Operational Systems +## [Delphi Epidata API](https://github.com/cmu-delphi/delphi-epidata) -{{}} +API for getting up-to-date epidemiological data from Delphi. Used by web dashboards and clients. +## Data Dashboards -## Publicly Available Tools +### [Delphi Epidata Dashboard](https://delphi.cmu.edu/covidcast) -{{}} +The primary dashboard to interact with Delphi Epidata. If you wish to access the results programmatically, see the API above or one of its clients. -All source code is freely available on [GitHub](https://github.com/cmu-delphi/). +### [Indicator Status](https://delphi.cmu.edu/covidcast/indicator-status/) + +A dashboard for displaying the lags for various signals in the Delphi Epidata API. + +### [Dashboard Builder](https://delphi.cmu.edu/covidcast/dashboard) + +A builder that allows you to customize the [Delphi Epidata Dashboard](/covidcast/). + +### [Epi Signal Visualization](https://delphi.cmu.edu/epivis/) + +Epidemiological time series visualizer. + +## Forecasting + +### [COVID-19 Forecasting Evaluation](https://delphi.cmu.edu/forecast-eval/) + +We host a forecast evaluation dashboard to compare the historical performance of the forecasts submitted to the [COVID-19 Forecast Hub](https://covid19forecasthub.org/). + +### [Flu Forecasting (FluSight)](https://www.cdc.gov/flu/weekly/flusight/index.html) + +We participate in the weekly Flu forecasting hub run by the CDC during the flu season. +Our current system for generating forecasts can be found [here](https://github.com/cmu-delphi/flu-hosp-forecast/). +From these dozens of individual forecasts by various groups, the CDC publishes a weekly [ensemble prediction](https://www.cdc.gov/flu/weekly/flusight/flu-forecasts.htm). + +### [COVID-19 Forecasting](https://covid19forecasthub.org/) + +We participate in weekly COVID hospital admissions forecasting at the state and national level. +Our current system for generating forecasts will be available soon [here](https://github.com/cmu-delphi/covid-hosp-forecast). +In addition to publishing the individual forecasts from the participating groups, the Reich lab makes an ensemble prediction, and hosts a [visualization of both](https://viz.covid19forecasthub.org). + +## Archived + +### [COVIDcast 1.0 ("Classic")](/covidcast/classic) + +A map-first single-page webapp for visualizing COVID-19 pandemic indicators. + +### [Crowdcast](/crowdcast) + +Delphi’s "Wisdom of crowds" forecasting system: Used for Chikungunya, flu and most recently Covid. In it's archived configuration, this system was set up to forecast ILI during the COVID-19 pandemic + +### [ILI Nearby](/nowcast) + +Flu nowcasting system. + +**Note:** This system is designed to nowcast ILI driven by seasonal +influenza and is NOT designed to nowcast ILI during the COVID-19 pandemic. + +### [Nowcast](https://github.com/cmu-delphi/nowcast) + +A sensor fusion based nowcasting system developed to predict ILI before the COVID-19 pandemic + +### [Fluscores](https://delphi.cmu.edu/misc/fluscores/) + +Visual comparison of scored submissions to CDC Flu Forecasting Challenge for 2014-16 (provide your own score files). diff --git a/content/tools/archive.md b/content/tools/archive.md deleted file mode 100644 index 1a39567c3..000000000 --- a/content/tools/archive.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Archived Tools -layout: single ---- - - -### [COVIDcast 1.0 ("Classic")]({{}}) - -A map-first single-page webapp for visualizing COVID-19 pandemic indicators. - -### [Crowdcast](/crowdcast) - -Delphi’s "Wisdom of crowds" forecasting system: Used for Chikungunya, flu and most recently Covid. In it's archived configuration, this system is set up to forecast ILI during the COVID-19 pandemic diff --git a/content/tools/systems/crowdcast.md b/content/tools/systems/crowdcast.md deleted file mode 100644 index eac1f1a55..000000000 --- a/content/tools/systems/crowdcast.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Crowdcast -externallink: https://delphi.cmu.edu/crowdcast/ -order: 20 ---- - -Delphi's “Wisdom of crowds” forecasting system: Used for Chikungunya, flu and most recently Covid. - -**Note:** This system is has been repurposed to forecast ILI during the COVID-19 pandemic. diff --git a/content/tools/systems/forecast.md b/content/tools/systems/forecast.md deleted file mode 100644 index 09cbad3b8..000000000 --- a/content/tools/systems/forecast.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: Other weekly forecasts -order: 40 ---- - -State-level weekly forecasts of ILI (influenza-like illness) - -**Note:** This system is designed to forecast ILI driven by seasonal -influenza and is NOT designed to forecast ILI during the COVID-19 pandemic. We -have temporarily shut it down to focus on COVID-19. diff --git a/content/tools/systems/index.md b/content/tools/systems/index.md deleted file mode 100644 index 441ef3a5a..000000000 --- a/content/tools/systems/index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -# flag to disable rendering individual pages -headless: true ---- diff --git a/content/tools/systems/nowcast.md b/content/tools/systems/nowcast.md deleted file mode 100644 index ec5ed6e15..000000000 --- a/content/tools/systems/nowcast.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: ILI Nearby -externallink: https://delphi.cmu.edu/nowcast/ -order: 1 ---- - -Flu nowcasting system. - -**Note:** This system is designed to nowcast ILI driven by seasonal -influenza and is NOT designed to nowcast ILI during the COVID-19 pandemic. diff --git a/content/tools/tools/epidata.md b/content/tools/tools/epidata.md deleted file mode 100644 index 990016e9a..000000000 --- a/content/tools/tools/epidata.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: EpiData -link: https://github.com/cmu-delphi/delphi-epidata -order: 2 ---- - -API for getting up-to-date epidemiological data (also available via a web interface through [EpiVis](https://delphi.cmu.edu/epivis/epivis.html)) diff --git a/content/tools/tools/epiforecast.md b/content/tools/tools/epiforecast.md deleted file mode 100644 index b683ff657..000000000 --- a/content/tools/tools/epiforecast.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Epiforecast -link: https://github.com/cmu-delphi/epiforecast-R -order: 10 ---- - -Epidemiological forecasting R package diff --git a/content/tools/tools/epivis.md b/content/tools/tools/epivis.md deleted file mode 100644 index e6990332d..000000000 --- a/content/tools/tools/epivis.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: EpiVis -link: /epivis/ -order: 1 ---- - -Epidemiological time series visualizer diff --git a/content/tools/tools/fluscores.md b/content/tools/tools/fluscores.md deleted file mode 100644 index 88cc773fe..000000000 --- a/content/tools/tools/fluscores.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: FluScores -link: https://delphi.cmu.edu/misc/fluscores/ -order: 50 ---- - -Visual comparison of scored submissions to CDC Flu Forecasting Challenge (provide your own score files) diff --git a/content/tools/tools/index.md b/content/tools/tools/index.md deleted file mode 100644 index 441ef3a5a..000000000 --- a/content/tools/tools/index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -# flag to disable rendering individual pages -headless: true ---- diff --git a/content/tools/tools/nowcast.md b/content/tools/tools/nowcast.md deleted file mode 100644 index 9782112b8..000000000 --- a/content/tools/tools/nowcast.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Nowcast -link: https://github.com/cmu-delphi/nowcast -order: 20 ---- - -Epidemiological nowcasting via sensor fusion diff --git a/content/tools/tools/utils.md b/content/tools/tools/utils.md deleted file mode 100644 index f7942e016..000000000 --- a/content/tools/tools/utils.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Utils -link: https://github.com/cmu-delphi/utils -order: 60 ---- - -Epidemiological modeling utilities (e.g., date/epi-weeks conversions) diff --git a/package-lock.json b/package-lock.json index a2aae4fd5..9aab5f442 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "www-main", - "version": "3.2.16", + "version": "3.2.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "www-main", - "version": "3.2.16", + "version": "3.2.17", "hasInstallScript": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.5.2", diff --git a/package.json b/package.json index 40dc6b125..01ce47994 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "www-main", - "version": "3.2.16", + "version": "3.2.17", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.5.2", diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 9c558aa3f..95eb694b7 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -194,3 +194,35 @@ li.nav-entry { margin-top: 3px; margin-bottom: 5px; } + +ul.nestedmenu { + margin-left: 0; +} +ul.nestedmenu li { + list-style: none; +} +ul.nestedmenu li > ul { + display: none; +} +ul.nestedmenu li > a::before { + content: "•"; + display: inline-block; + margin-right: 0.25rem; + width: 0.5rem; + text-align: center; +} +ul.nestedmenu li.haschildren > a::before { + content: "›"; +} +ul.nestedmenu li.haschildren.active > a::before { + transform: rotate(90deg); +} +ul.nestedmenu li.active > ul { + display: block; +} +ul.nestedmenu li > a { + color: #444444 !important; +} +ul.nestedmenu li.active > a { + color: rgb(247, 44, 114) !important; +} diff --git a/themes/delphi/layouts/landing.html b/themes/delphi/layouts/landing.html index 560bc46fb..0e1c7994a 100644 --- a/themes/delphi/layouts/landing.html +++ b/themes/delphi/layouts/landing.html @@ -29,9 +29,9 @@

Our Team

API Image -

Our API

+

Our Tools

Access our data and tools

- {{ partial "arrow-link.html" (dict "link" .Site.Params.apiUrl "alt" "Learn more") }} + {{ partial "arrow-link.html" (dict "link" .Site.Params.toolUrl "alt" "Learn more") }} diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index 319c85758..ba941d4a2 100644 --- a/themes/delphi/layouts/partials/footer.html +++ b/themes/delphi/layouts/partials/footer.html @@ -5,11 +5,11 @@ >
-
COVIDcast
+
Epidemic Signals
@@ -38,7 +41,9 @@
About
  • Delphi
  • Delphi Blog
  • CMU
    • -
  • Terms
    • +
  • + Terms +
  • Careers
    • diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index b2a69d2db..7ab53bd72 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -37,6 +37,22 @@ {{ end }} + {{ if .HasChildren }} +
  • + +
    • + {{ end }} {{ end }} diff --git a/themes/delphi/layouts/shortcodes/systems.html b/themes/delphi/layouts/shortcodes/systems.html deleted file mode 100644 index 32b13068e..000000000 --- a/themes/delphi/layouts/shortcodes/systems.html +++ /dev/null @@ -1,11 +0,0 @@ -{{ $tools := .Site.GetPage "/tools/systems" }} -{{ range sort ($tools.Resources.ByType "page") "Params.order" }} -

    - {{ if isset .Params "externallink" }} - {{ .Title }} - {{ else }} - {{ .Title }} - {{ end }} -

    - {{ .Content }} -{{ end }} diff --git a/themes/delphi/layouts/shortcodes/tools.html b/themes/delphi/layouts/shortcodes/tools.html deleted file mode 100644 index 3604c57a4..000000000 --- a/themes/delphi/layouts/shortcodes/tools.html +++ /dev/null @@ -1,5 +0,0 @@ -{{ $tools := .Site.GetPage "/tools/tools" }} -{{ range sort ($tools.Resources.ByType "page") "Params.order" }} -

    {{ .Title }}

    - {{ .Content }} -{{ end }}