Release v2.9.1

.github/workflows/blog.yaml

@@ -63,7 +63,7 @@ jobs:
             ./content/blog
             ./static/blog
 
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.2.0
         with:
           node-version: "12"
       - uses: actions/cache@v2.1.6

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
           # submodules: true  # Fetch Hugo themes (true OR recursive)
           fetch-depth: 3 # Fetch all history for .GitInfo and .Lastmod
 
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.2.0
         with:
           node-version: "14"
       - uses: actions/cache@v2.1.6

.github/workflows/release_main.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.2.0
         with:
           node-version: "14"
       - name: Extract version
@@ -43,7 +43,7 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.2.0
         with:
           node-version: "14"
       - name: Cache Node.js modules

config.toml

@@ -93,7 +93,7 @@ relativeURLs = false
     weight = 50
 [[menu.main]]
     parent = "covidcast"
-    name = "Survey Results"
+    name = "CTIS Results Dashboard"
     url = "/covidcast/survey-results"
     weight = 51
 [[menu.main]]

content/_index.md

@@ -20,9 +20,9 @@ carousel:
     alt: Explore the new COVID-19 forecast evaluation dashboard
     image: forecast_evaluation_dashboard.jpg
   - pre: Our Tools
-    title: National COVID Survey Dashboard
+    title: CTIS Results Dashboard
     ref: covidcast/survey-results
-    alt: Explore the Survey Results
+    alt: Explore the COVID-19 Trends and Impact Survey Results
     image: covidcast_survey.jpg
   - pre: Our Blog Post
     title: New and improved COVID Symptom Survey Tracks Testing and Mask-Wearing

content/covidcast/classic.md

@@ -2,8 +2,7 @@
 title: COVIDcast | Classic Map
 linkTitle: Classic Map
 description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
-layout: covidcast_app
-app_mode: classic
+layout: covidcast_classic_app
 order: 3
 heroImage: images/landing-page/hero-images/covidcast_v2.jpg
 feedback: true

content/covidcast/surveys.md

@@ -1,12 +1,12 @@
 ---
-title: Delphi's COVID-19 Surveys
+title: Delphi's COVID-19 Trends and Impact Surveys (CTIS)
 ---
 
 {{< alert category="primary">}}
   Summary results for the survey are now available. [Click here to explore]({{< relref "covidcast/survey-results" >}})
 {{< /alert >}}
 
-In collaboration with Facebook, along with a consortium of universities and public health officials, the [Delphi group]({{< relref "/" >}}) at [Carnegie Mellon University](https://www.cmu.edu/) conducts research surveys to monitor the spread and impact of the COVID-19 pandemic in the United States. This survey is advertised through Facebook. It has run continuously since early April 2020, and about 50,000 people in the United States participate **every day**. Survey results are publicly available on our [National COVID Survey Dashboard]({{< relref "covidcast/survey-results" >}}), [COVIDcast Map]({{< relref "covidcast" >}}), [COVIDcast Exporter]({{< relref "covidcast/export" >}}), and in our [COVIDcast API]({{< apiref "api/covidcast.html" >}}).
+In collaboration with Facebook, along with a consortium of universities and public health officials, the [Delphi group]({{< relref "/" >}}) at [Carnegie Mellon University](https://www.cmu.edu/) conducts the COVID-19 Trends and Impact Survey to monitor the spread and impact of the COVID-19 pandemic in the United States. This survey is advertised through Facebook. It has run continuously since early April 2020, and about 50,000 people in the United States participate **every day**. Survey results are publicly available on our [CTIS Results Dashboard]({{< relref "covidcast/survey-results" >}}), [COVIDcast Map]({{< relref "covidcast" >}}), [COVIDcast Exporter]({{< relref "covidcast/export" >}}), and in our [COVIDcast API]({{< apiref "api/covidcast.html" >}}).
 
 Such detailed data has never before been available during a public health emergency, and it will help public health officials understand how to save lives and how to safely reopen public life. The data will also help researchers understand the social, economic, and health effects of the COVID-19 pandemic.
 
@@ -38,7 +38,7 @@ To account for the differences between Facebook users and the United States popu
 
 ## Where can I see the results?
 
-Our [National COVID Survey 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 [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.
 
 ### Blog posts and reports
 

package.json

@@ -1,21 +1,22 @@
 {
   "name": "www-main",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.3",
     "highlight.js": "^11.0.1",
     "katex": "^0.13.11",
-    "uikit": "^3.6.22",
-    "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz",
+    "uikit": "^3.7.0",
+    "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.3/www-covidcast-2.5.3.tgz",
+    "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz",
     "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz"
   },
   "devDependencies": {
-    "hugo-bin": "^0.71.1",
-    "husky": "^6.0.0",
+    "hugo-bin": "^0.72.5",
+    "husky": "^7.0.0",
     "lint-staged": "^11.0.0",
-    "prettier": "~2.2.1",
-    "prettier-plugin-go-template": "^0.0.10",
+    "prettier": "^2.3.2",
+    "prettier-plugin-go-template": "^0.0.11",
     "rimraf": "^3.0.2",
     "shx": "^0.3.3"
   },
@@ -26,8 +27,9 @@
     "clean": "rimraf \"*.tgz\" public",
     "copy_fonts": "shx cp -r \"node_modules/katex/dist/fonts/*\" themes/delphi/static/css/fonts/",
     "copy_covidcast": "shx rm -rf \"static/covidcast/*\" && shx cp \"node_modules/www-covidcast/public/**/*.{js,txt,css,map}\" static/covidcast/",
+    "copy_covidcast_classic": "shx rm -rf \"static/covidcast/classic/*\" && shx mkdir -p static/covidcast/classic/ && shx cp \"node_modules/www-covidcast-classic/public/**/*.{js,txt,css,map}\" static/covidcast/classic/",
     "copy_epivis": "shx rm -rf \"static/epivis/*\" && shx cp \"node_modules/www-epivis/public/**/*.{js,txt,css,map}\" static/epivis/",
-    "postinstall": "npm run copy_fonts && npm run copy_covidcast && npm run copy_epivis",
+    "postinstall": "npm run copy_fonts && npm run copy_covidcast && npm run copy_epivis && npm run copy_covidcast_classic",
     "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"",
     "prebuild": "npm run clean",
     "build": "hugo --gc --minify",

themes/delphi/assets/js/main.js

@@ -8,4 +8,6 @@ window.UIkit = UIkit;
 // define for covidcast at which base url it is embedded
 window.DELPHI_COVIDCAST_PAGE = "/covidcast/";
 // define for covidcast at which base url it is embedded
+window.DELPHI_COVIDCAST_CLASSIC_PAGE = "/covidcast/classic/";
+// define for covidcast at which base url it is embedded
 window.DELPHI_EPIVIS_PAGE = "/epivis/";

themes/delphi/layouts/_default/baseof.html

@@ -4,14 +4,14 @@
   <head>
     {{ partial "head/meta.html" . }}
     {{ partial "head/styles.html" . }}
-    {{ block "styles" . }} {{ end }}
+    {{ block "styles" . }}{{ end }}
   </head>
   <body class="{{ block "body_class" . }}{{ end }}">
     {{ partial "nav.html" . }}
     {{ block "breadcrumb" . }}{{ partial "menu/breadcrumb.html" . }}{{ end }}
-    {{ block "main" . }} {{ end }}
+    {{ block "main" . }}{{ end }}
     {{ partial "footer.html" . }}
     {{ partial "scripts.html" . }}
-    {{ block "scripts" . }} {{ end }}
+    {{ block "scripts" . }}{{ end }}
   </body>
 </html>

themes/delphi/layouts/_default/coe.html

@@ -22,6 +22,7 @@ <h2>We work closely with</h2>
 
   {{ partial "coe/research-papers.html" . }}
 
+
   <div class="about-collaborators coe-section about-collaborators-v2">
     <div class="uk-container">
       <h2>Supporters</h2>
@@ -38,7 +39,7 @@ <h2>Supporters</h2>
         </ul>
       </div>
       <div class="about-collaborator-special">
-        <h3>Special thank to</h3>
+        <h3>Special thanks to</h3>
         <ul>
           <li>U.S. Centers for Disease Control and Prevention (US CDC)</li>
         </ul>

themes/delphi/layouts/_default/covidcast_classic_app.html

@@ -0,0 +1,18 @@
+{{ define "styles" }}
+  <link rel="stylesheet" href="{{ (partial "covidcast_classic/find-file.html" "styles.*\\.css$")| relURL }}" />
+{{ end }}
+{{ define "scripts" }}
+  <script src="{{ (partial "covidcast_classic/find-file.html" "bundle.*\\.js$")| relURL }}"></script>
+{{ end }}
+{{ define "breadcrumb" }}<!-- no breadcrumb -->{{ end }}
+{{ define "body_class" }}{{ if eq .Params.footer false }}covidcast_wrapper{{ end }}{{ end }}
+{{ define "main" }}
+  <div id="covidcast-classic">
+    <div class="ie-banner" style="display: none">
+      <div>
+        Internet Explorer 11 is no longer supported. We encourage you to use a more modern web browser, such as Firefox,
+        Chrome, or Safari.
+      </div>
+    </div>
+  </div>
+{{ end }}

themes/delphi/layouts/_default/team.html

@@ -20,6 +20,7 @@ <h1 class="team-header">
 
     {{ .Content }}
 
+
     <hr />
 
     <strong>Abbreviations</strong>

themes/delphi/layouts/_internal/pagination.html

@@ -1,10 +1,10 @@
 {{ $pag := $.Paginator }}
 {{ if gt $pag.TotalPages 1 -}}
   <ul class="uk-pagination uk-flex-center">
-    <li class="{{ if not $pag.HasPrev }} uk-disabled{{ end }}">
+    <li class="{{ if not $pag.HasPrev }}uk-disabled{{ end }}">
       {{ if $pag.HasPrev }}
         <a href="{{ $pag.Prev.URL }}" aria-label="Previous"><span uk-pagination-previous></span></a>
-        {{ else }}
+      {{ else }}
         <a aria-label="Previous"><span uk-pagination-previous></span></a>
       {{ end }}
     </li>
@@ -18,24 +18,24 @@
       {{- if $showNumber -}}
         {{- $ellipsed = false -}}
         {{- $shouldEllipse = false -}}
-        {{- else -}}
+      {{- else -}}
         {{- $shouldEllipse = not $ellipsed -}}
         {{- $ellipsed = true -}}
       {{- end -}}
       {{- if $showNumber }}
-        <li class="{{ if eq . $pag }} uk-active{{ end }}">
+        <li class="{{ if eq . $pag }}uk-active{{ end }}">
           <a href="{{ .URL }}">{{ .PageNumber }}</a>
         </li>
-        {{- else if $shouldEllipse }}
+      {{- else if $shouldEllipse }}
         <li class="uk-disabled">
           <span aria-hidden="true">&nbsp;&hellip;&nbsp;</span>
         </li>
       {{- end -}}
     {{- end }}
-    <li class="{{ if not $pag.HasNext }} uk-disabled{{ end }}">
+    <li class="{{ if not $pag.HasNext }}uk-disabled{{ end }}">
       {{ if $pag.HasNext }}
         <a href="{{ $pag.Next.URL }}" aria-label="Next"><span uk-pagination-next></span></a>
-        {{ else }}
+      {{ else }}
         <a aria-label="Next"><span uk-pagination-next></span></a>
       {{ end }}
     </li>