Merge pull request #962 from cmu-delphi/OKRS24-24

OKRS24-24

Author: dshemetov

config.toml

@@ -63,47 +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]]
-    identifier = "covid19-covidcast"
-    parent = "covid19"
-    name = "Delphi Epidata Dashboard"
+    parent = "epidemic-signals"
+    name = "About CTIS"
+    url = "/epidemic-signals/ctis"
+    weight = 10
+[[menu.main]]
+    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]]

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:
 

content/covid19/_index.md renamed to 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,24 +16,24 @@ 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
   [Python](https://cmu-delphi.github.io/covidcast/covidcast-py/html/) packages, 
   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/),

content/covid19/ctis.md renamed to 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">}}

content/covid19/images/severity-pyramid.svg renamed to content/epidemic-signals/images/severity-pyramid.svg

@@ -5,11 +5,11 @@
     >
     <div class="footer-footer uk-child-width-1-2@s uk-child-width-1-4@m uk-grid-column-small" uk-grid>
       <div>
-        <h5 class="uk-text-bold">COVIDcast</h5>
+        <h5 class="uk-text-bold">Epidemic Signals</h5>
         <ul class="uk-list">
           <li><a class="uk-link-text uk-text-small" href="{{ relref . "/covidcast" }}">Overview</a></li>
           <li><a class="uk-link-text uk-text-small" href="/forecast-eval/">Forecast Evaluation</a></li>
-          <li><a class="uk-link-text uk-text-small" href="{{ relref . "/covid19/ctis" }}">CTIS</a></li>
+          <li><a class="uk-link-text uk-text-small" href="{{ relref . "/epidemic-signals/ctis" }}">CTIS</a></li>
           <li>
             <a class="uk-link-text uk-text-small" href="{{ relref . "/covidcast/survey-results" }}"
               >CTIS Results Dashboard</a
@@ -41,7 +41,9 @@ <h5 class="uk-text-bold">About</h5>
           <li><a class="uk-link-text uk-text-small" href="{{ relref . "/about" }}">Delphi</a></li>
           <li><a class="uk-link-text uk-text-small" href="{{ relref . "/blog" }}">Delphi Blog</a></li>
           <li><a class="uk-link-text uk-text-small" href="https://www.cmu.edu/">CMU</a></li>
-          <li><a class="uk-link-text uk-text-small" href="{{ relref . "/covid19/terms-of-use" }}">Terms</a></li>
+          <li>
+            <a class="uk-link-text uk-text-small" href="{{ relref . "/epidemic-signals/terms-of-use" }}">Terms</a>
+          </li>
           <li><a class="uk-link-text uk-text-small" href="{{ relref . "/about/careers" }}">Careers</a></li>
         </ul>
       </div>