From c53b347c0392e9193142c81763070dc25eefedd4 Mon Sep 17 00:00:00 2001 From: Katie Mazaitis Date: Mon, 28 Jun 2021 09:17:38 -0400 Subject: [PATCH 01/24] Fix thank typo in coe --- themes/delphi/layouts/_default/coe.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/delphi/layouts/_default/coe.html b/themes/delphi/layouts/_default/coe.html index fe5bde5bd..c7d958b60 100644 --- a/themes/delphi/layouts/_default/coe.html +++ b/themes/delphi/layouts/_default/coe.html @@ -38,7 +38,7 @@

Supporters

-

Special thank to

+

Special thanks to

From 5522e4339ecbdb3eaa12343f0d9223cf09d6b466 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 21:03:18 +0000 Subject: [PATCH 02/24] build(deps-dev): bump hugo-bin from 0.71.1 to 0.72.3 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.71.1 to 0.72.3. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.71.1...v0.72.3) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27cf6f624..91ce30279 100644 --- a/package-lock.json +++ b/package-lock.json @@ -401,9 +401,9 @@ "dev": true }, "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "dev": true, "requires": { "ini": "^1.3.4", @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.71.1", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.71.1.tgz", - "integrity": "sha512-H+aBkwtR6oSMcu1kCyzQlan+lcQ45k70JGX4v72h8mb0e4AbvaF58kAy6EDRK/U+/hD6ghTf0a6eLr5sENjaAg==", + "version": "0.72.3", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.3.tgz", + "integrity": "sha512-xMbaX5Wb4eDvHOOERdyRnuhyjzXOr+zv+9CHIcgRV0pK0vKcolCqP7OGhbpGgFHU20fzSfHf/uKOahEK62rBhQ==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", @@ -1626,9 +1626,9 @@ } }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "dev": true }, "mimic-fn": { diff --git a/package.json b/package.json index 32f918a53..97b768be5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "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", + "hugo-bin": "^0.72.3", "husky": "^6.0.0", "lint-staged": "^11.0.0", "prettier": "~2.2.1", From c733e3a5ec8f238b87491d680e497c67a00c1c29 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 09:12:59 +0200 Subject: [PATCH 03/24] feat: apply new survey name --- config.toml | 2 +- content/_index.md | 4 ++-- content/covidcast/surveys.md | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config.toml b/config.toml index 9c69f44ea..4c94637a1 100644 --- a/config.toml +++ b/config.toml @@ -93,7 +93,7 @@ relativeURLs = false weight = 50 [[menu.main]] parent = "covidcast" - name = "Survey Results" + name = "CTIS Survey Results" url = "/covidcast/survey-results" weight = 51 [[menu.main]] diff --git a/content/_index.md b/content/_index.md index 343fe4408..0462c89a6 100644 --- a/content/_index.md +++ b/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 Survey Dashboard ref: covidcast/survey-results - alt: Explore the Survey Results + alt: Explore the COVID 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 diff --git a/content/covidcast/surveys.md b/content/covidcast/surveys.md index e9b71f931..94bebee86 100644 --- a/content/covidcast/surveys.md +++ b/content/covidcast/surveys.md @@ -1,12 +1,12 @@ --- -title: Delphi's COVID-19 Surveys +title: Delphi's COVID 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 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 [CTIS Survey 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 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. ### Blog posts and reports @@ -80,14 +80,14 @@ Getting access to survey data for research: [complete this form](https://datafor ### Media inquiries: -[Stacy Kish](mailto:skish@andrew.cmu.edu) -Associate Director, Research Communications -Dietrich College +[Stacy Kish](mailto:skish@andrew.cmu.edu) +Associate Director, Research Communications +Dietrich College Carnegie Mellon University ### All other questions: -[Alex Reinhart](mailto:areinhar@stat.cmu.edu) -Assistant Teaching Professor -Department of Statistics & Data Science +[Alex Reinhart](mailto:areinhar@stat.cmu.edu) +Assistant Teaching Professor +Department of Statistics & Data Science Carnegie Mellon University From da3cba0af8b45fe8a6c42af681c46a731422a441 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 09:14:24 +0200 Subject: [PATCH 04/24] fix: restore line breaks --- content/covidcast/surveys.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/covidcast/surveys.md b/content/covidcast/surveys.md index 94bebee86..f1299ab85 100644 --- a/content/covidcast/surveys.md +++ b/content/covidcast/surveys.md @@ -80,14 +80,14 @@ Getting access to survey data for research: [complete this form](https://datafor ### Media inquiries: -[Stacy Kish](mailto:skish@andrew.cmu.edu) -Associate Director, Research Communications -Dietrich College -Carnegie Mellon University +[Stacy Kish](mailto:skish@andrew.cmu.edu) +Associate Director, Research Communications +Dietrich College +Carnegie Mellon University ### All other questions: -[Alex Reinhart](mailto:areinhar@stat.cmu.edu) -Assistant Teaching Professor -Department of Statistics & Data Science -Carnegie Mellon University +[Alex Reinhart](mailto:areinhar@stat.cmu.edu) +Assistant Teaching Professor +Department of Statistics & Data Science +Carnegie Mellon University From 8b9d0c29460b9881b297af45c87d96196df2f60f Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 09:33:00 +0200 Subject: [PATCH 05/24] fix: also rename footer --- themes/delphi/layouts/partials/footer.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index 8f2b1a516..1bfb1d550 100644 --- a/themes/delphi/layouts/partials/footer.html +++ b/themes/delphi/layouts/partials/footer.html @@ -11,7 +11,9 @@
COVIDcast
  • Forecast Evaluation
  • Surveys
  • - Survey Results + CTIS Survey Results
    • From 225c19d5f36e8147631c0ade3f7a4acfccd67c43 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 13:47:35 +0200 Subject: [PATCH 06/24] feat: add covidcast-classic --- content/covidcast/classic.md | 3 +-- package.json | 6 ++++-- static/covidcast/classic/.gitignore | 5 +++++ themes/delphi/assets/js/main.js | 2 ++ .../_default/covidcast_classic_app.html | 18 ++++++++++++++++++ .../partials/covidcast_classic/find-file.html | 10 ++++++++++ 6 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 static/covidcast/classic/.gitignore create mode 100644 themes/delphi/layouts/_default/covidcast_classic_app.html create mode 100644 themes/delphi/layouts/partials/covidcast_classic/find-file.html diff --git a/content/covidcast/classic.md b/content/covidcast/classic.md index 1556ed04c..3e5e55ce1 100644 --- a/content/covidcast/classic.md +++ b/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 diff --git a/package.json b/package.json index 32f918a53..832c10f46 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "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", - "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz" + "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz", + "www-covidcast-classic": "github:cmu-delphi/www-covidcast-classic#dev" }, "devDependencies": { "hugo-bin": "^0.71.1", @@ -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 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", diff --git a/static/covidcast/classic/.gitignore b/static/covidcast/classic/.gitignore new file mode 100644 index 000000000..7cc47d84a --- /dev/null +++ b/static/covidcast/classic/.gitignore @@ -0,0 +1,5 @@ +*.js +*.txt +*.html +*.css +*.map \ No newline at end of file diff --git a/themes/delphi/assets/js/main.js b/themes/delphi/assets/js/main.js index 958fa67c3..c20f64e01 100644 --- a/themes/delphi/assets/js/main.js +++ b/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/"; diff --git a/themes/delphi/layouts/_default/covidcast_classic_app.html b/themes/delphi/layouts/_default/covidcast_classic_app.html new file mode 100644 index 000000000..89ce80bc8 --- /dev/null +++ b/themes/delphi/layouts/_default/covidcast_classic_app.html @@ -0,0 +1,18 @@ +{{ define "styles" }} + +{{ end }} +{{ define "scripts" }} + +{{ end }} +{{ define "breadcrumb" }}{{ end }} +{{ define "body_class" }}{{ if eq .Params.footer false }}covidcast_wrapper{{ end }}{{ end }} +{{ define "main" }} +
    + +
    +{{ end }} diff --git a/themes/delphi/layouts/partials/covidcast_classic/find-file.html b/themes/delphi/layouts/partials/covidcast_classic/find-file.html new file mode 100644 index 000000000..ef4749223 --- /dev/null +++ b/themes/delphi/layouts/partials/covidcast_classic/find-file.html @@ -0,0 +1,10 @@ + +{{ $pattern := . }} +{{ $matchedFile := false }} +{{ range (readDir "./static/covidcast/classic") }} + {{ $testFile := . }} + {{ with (index (findRE $pattern .Name 1) 0) }} + {{ $matchedFile = path.Join "./covidcast/classic" $testFile.Name }} + {{ end }} +{{ end }} +{{ return $matchedFile }} From 99924275cf250a3b7242b6199414fd9c5e8aec4a Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 13:52:42 +0200 Subject: [PATCH 07/24] build: fix package resolution --- package-lock.json | 14 ++++++++++++++ package.json | 2 +- static/covidcast/classic/.gitignore | 5 ----- 3 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 static/covidcast/classic/.gitignore diff --git a/package-lock.json b/package-lock.json index 27cf6f624..145383989 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2565,6 +2565,20 @@ "uikit": "^3.6.22" } }, + "www-covidcast-classic": { + "version": "github:cmu-delphi/www-covidcast-classic#6835774e8d74040deb3f87749ebdae244ef49173", + "from": "github:cmu-delphi/www-covidcast-classic#dev", + "requires": { + "uikit": "^3.7.0" + }, + "dependencies": { + "uikit": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + } + } + }, "www-epivis": { "version": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz", "integrity": "sha512-sREuzprNbuXnDY4aCWldkus2wrS1y/n0YZzmoB8afW3yQZifFMgN5BC45Pqjugm20SJ86kYuD1XtzXCfkmhNCw==", diff --git a/package.json b/package.json index 832c10f46..f86b562c7 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "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 cp \"node_modules/www-covidcast-classic/public/**/*.{js,txt,css,map}\" static/covidcast/classic/", + "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 && npm run copy_covidcast_classic", "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"", diff --git a/static/covidcast/classic/.gitignore b/static/covidcast/classic/.gitignore deleted file mode 100644 index 7cc47d84a..000000000 --- a/static/covidcast/classic/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.js -*.txt -*.html -*.css -*.map \ No newline at end of file From 153a266297258a4367bb6ea0449c89b1e78ea6d7 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 14:04:21 +0200 Subject: [PATCH 08/24] build: update dependencies --- package-lock.json | 41 +++++++++++-------- package.json | 10 ++--- themes/delphi/layouts/_default/baseof.html | 6 +-- themes/delphi/layouts/_default/coe.html | 1 + themes/delphi/layouts/_default/team.html | 1 + .../delphi/layouts/_internal/pagination.html | 14 +++---- themes/delphi/layouts/blog/single.html | 7 ++-- .../layouts/partials/about/collaborators.html | 2 +- .../delphi/layouts/partials/blog/license.html | 3 +- .../delphi/layouts/partials/font-awesome.html | 2 +- themes/delphi/layouts/partials/head/meta.html | 1 + .../layouts/partials/head/socialmedia.html | 30 ++++++++++---- .../layouts/partials/landing/carousel.html | 2 +- .../layouts/partials/landing/latest-news.html | 1 + themes/delphi/layouts/partials/nav.html | 10 +++-- themes/delphi/layouts/partials/scripts.html | 3 +- .../layouts/shortcodes/bibliography.html | 5 ++- themes/delphi/layouts/shortcodes/systems.html | 2 +- themes/delphi/layouts/shortcodes/team.html | 8 +++- 19 files changed, 92 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91ce30279..3bc9ff9c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.72.3", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.3.tgz", - "integrity": "sha512-xMbaX5Wb4eDvHOOERdyRnuhyjzXOr+zv+9CHIcgRV0pK0vKcolCqP7OGhbpGgFHU20fzSfHf/uKOahEK62rBhQ==", + "version": "0.72.4", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.4.tgz", + "integrity": "sha512-PKsS3JAf7U88XCkVGU+hlUU/MIwsOmk/vH2f7hHGBJ4I8OF/Qvi4aPLdxiAtSaiu6rbd0It0h69ekYua5kXHcA==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", @@ -974,9 +974,9 @@ "dev": true }, "husky": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", - "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz", + "integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==", "dev": true }, "ieee754": { @@ -1935,16 +1935,19 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.10.tgz", - "integrity": "sha512-TaHPqiMK/zfk+YhvKRf/1WZDgQ6ffnlxJZX5rwphqfxBOVEezZQtYistTB348MKrKnnwKpyXZWpMRo0/KCVB+A==", - "dev": true + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.11.tgz", + "integrity": "sha512-qtgoEjvbgmcDp9TOqYNgrPrA41s6S1UMyzMqjcxdxQahTX0webWfbamyA/x3XeBFEEJmgXrRAirzJrIVzImsMg==", + "dev": true, + "requires": { + "ulid": "^2.3.0" + } }, "process-nextick-args": { "version": "2.0.1", @@ -2471,9 +2474,15 @@ "dev": true }, "uikit": { - "version": "3.6.22", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.6.22.tgz", - "integrity": "sha512-c8jz0lzvGPrPbOG4K5HvOCgUe7i9A6blZmMq2M/EYqoY7FT9dBayGFZYbBeio2s9WCpADIcCAj2QX/5L3EByOQ==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + }, + "ulid": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz", + "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==", + "dev": true }, "unbzip2-stream": { "version": "1.4.3", diff --git a/package.json b/package.json index 97b768be5..6bffae074 100644 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "@fortawesome/fontawesome-free": "^5.15.3", "highlight.js": "^11.0.1", "katex": "^0.13.11", - "uikit": "^3.6.22", + "uikit": "^3.7.0", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.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.72.3", - "husky": "^6.0.0", + "hugo-bin": "^0.72.4", + "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" }, diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index f2389b0a8..1d5a9a1eb 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -4,14 +4,14 @@ {{ partial "head/meta.html" . }} {{ partial "head/styles.html" . }} - {{ block "styles" . }} {{ end }} + {{ block "styles" . }}{{ 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 }} diff --git a/themes/delphi/layouts/_default/coe.html b/themes/delphi/layouts/_default/coe.html index c7d958b60..af81b7c36 100644 --- a/themes/delphi/layouts/_default/coe.html +++ b/themes/delphi/layouts/_default/coe.html @@ -22,6 +22,7 @@

    We work closely with

    {{ partial "coe/research-papers.html" . }} +

    Supporters

    diff --git a/themes/delphi/layouts/_default/team.html b/themes/delphi/layouts/_default/team.html index 1a83b675b..b04900f87 100644 --- a/themes/delphi/layouts/_default/team.html +++ b/themes/delphi/layouts/_default/team.html @@ -20,6 +20,7 @@

    {{ .Content }} +
    Abbreviations diff --git a/themes/delphi/layouts/_internal/pagination.html b/themes/delphi/layouts/_internal/pagination.html index 3d5dfb0a3..aefff961a 100644 --- a/themes/delphi/layouts/_internal/pagination.html +++ b/themes/delphi/layouts/_internal/pagination.html @@ -1,10 +1,10 @@ {{ $pag := $.Paginator }} {{ if gt $pag.TotalPages 1 -}}
      -
    • +
    • {{ if $pag.HasPrev }} - {{ else }} + {{ else }} {{ end }}
      • @@ -18,24 +18,24 @@ {{- if $showNumber -}} {{- $ellipsed = false -}} {{- $shouldEllipse = false -}} - {{- else -}} + {{- else -}} {{- $shouldEllipse = not $ellipsed -}} {{- $ellipsed = true -}} {{- end -}} {{- if $showNumber }} -
    • +
    • {{ .PageNumber }}
      • - {{- else if $shouldEllipse }} + {{- else if $shouldEllipse }}
      • {{- end -}} {{- end }} -
    • +
    • {{ if $pag.HasNext }} - {{ else }} + {{ else }} {{ end }}
      • diff --git a/themes/delphi/layouts/blog/single.html b/themes/delphi/layouts/blog/single.html index e9d96cf99..9512219d8 100644 --- a/themes/delphi/layouts/blog/single.html +++ b/themes/delphi/layouts/blog/single.html @@ -3,8 +3,7 @@ {{ end }} {{ define "scripts" }} - {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} - + {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} {{ end }} {{ define "main" }} {{ $currentPage := . }} @@ -33,7 +32,7 @@

      {{ .Title }}

      {{ if gt (len .Params.authors) 1 }} {{ partial "font-awesome.html" "solid/users" }} - {{ else }} + {{ else }} {{ partial "font-awesome.html" "solid/user" }} {{ end }} @@ -78,7 +77,7 @@
      Outline
      {{ with (partial "get-person.html" (dict "Site" $currentPage.Site "key" .)) }} {{ if isset . "link" }} {{ .name | safeHTML }} - {{ else }} + {{ else }} {{ .name | safeHTML }} {{ end }} {{ .description }} diff --git a/themes/delphi/layouts/partials/about/collaborators.html b/themes/delphi/layouts/partials/about/collaborators.html index 8e30e6151..6a4b0c5f2 100644 --- a/themes/delphi/layouts/partials/about/collaborators.html +++ b/themes/delphi/layouts/partials/about/collaborators.html @@ -6,7 +6,7 @@

      Collaborators

        {{ range .Params.collaborators }}
      • - {{ if eq .group "sponsor" }}With support from {{ end }} + {{ if eq .group "sponsor" }}With support from{{ end }} {{ .name }}
        • diff --git a/themes/delphi/layouts/partials/blog/license.html b/themes/delphi/layouts/partials/blog/license.html index c94c31847..29ad6d1e6 100644 --- a/themes/delphi/layouts/partials/blog/license.html +++ b/themes/delphi/layouts/partials/blog/license.html @@ -1,7 +1,8 @@
        © {{ now.Format "2006" }} Delphi group authors. Text and figures released under - CC BY 4.0 {{ partial "font-awesome.html" "brands/creative-commons" }} + CC BY 4.0 + {{ partial "font-awesome.html" "brands/creative-commons" }} {{ partial "font-awesome.html" "brands/creative-commons-by" }} ; code under the MIT license.
        diff --git a/themes/delphi/layouts/partials/font-awesome.html b/themes/delphi/layouts/partials/font-awesome.html index e79719aa5..ecf915735 100644 --- a/themes/delphi/layouts/partials/font-awesome.html +++ b/themes/delphi/layouts/partials/font-awesome.html @@ -4,7 +4,7 @@ {{- $localPath := path.Join "./themes/delphi/assets/" $fileName -}} {{- if fileExists $localPath -}} {{ readFile $localPath | safeHTML }} - {{- else -}} + {{- else -}} {{ readFile $faPath | safeHTML }} {{- end -}} diff --git a/themes/delphi/layouts/partials/head/meta.html b/themes/delphi/layouts/partials/head/meta.html index 98f3408d4..98f752da0 100644 --- a/themes/delphi/layouts/partials/head/meta.html +++ b/themes/delphi/layouts/partials/head/meta.html @@ -5,6 +5,7 @@ {{ partial "head/socialmedia.html" . }} + diff --git a/themes/delphi/layouts/partials/head/socialmedia.html b/themes/delphi/layouts/partials/head/socialmedia.html index 5c898d391..697b5a4b5 100644 --- a/themes/delphi/layouts/partials/head/socialmedia.html +++ b/themes/delphi/layouts/partials/head/socialmedia.html @@ -4,15 +4,27 @@ @@ -26,6 +38,7 @@ {{- end -}} {{- end -}} + @@ -46,7 +59,7 @@ - {{- else -}} +{{- else -}} {{- end -}} @@ -54,12 +67,13 @@ {{- if .IsPage }} {{- if not .PublishDate.IsZero }} - {{ else if not .Date.IsZero }} + {{ else if not .Date.IsZero }} + {{ end }} {{- if not .Lastmod.IsZero }} - {{ end }} - {{- else }} + + {{ end }} +{{- else }} {{- if not .Date.IsZero }} {{- end }} diff --git a/themes/delphi/layouts/partials/landing/carousel.html b/themes/delphi/layouts/partials/landing/carousel.html index 7240454e4..9f645f19f 100644 --- a/themes/delphi/layouts/partials/landing/carousel.html +++ b/themes/delphi/layouts/partials/landing/carousel.html @@ -19,7 +19,7 @@

        {{ .pre }}

        {{ .title }}

        {{ if isset . "ref" }} {{ partial "arrow-link.html" (dict "link" (relref $currentPage .ref) "alt" .alt) }} - {{ else }} + {{ else }} {{ partial "arrow-link.html" (dict "link" .link "alt" .alt) }} {{ end }}

    diff --git a/themes/delphi/layouts/partials/landing/latest-news.html b/themes/delphi/layouts/partials/landing/latest-news.html index 200553297..a62edba56 100644 --- a/themes/delphi/layouts/partials/landing/latest-news.html +++ b/themes/delphi/layouts/partials/landing/latest-news.html @@ -15,6 +15,7 @@

    Latest News

    {{ $top := 10 }} +
      diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 57e4746c5..8ae73c994 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -11,14 +11,16 @@
        {{ range .Site.Menus.main.ByWeight }}
      • {{ if .HasChildren }} {{ partial "menu/item.html" . }} {{ partial "font-awesome.html" "solid/angle-down" }} - {{ else }} + {{ else }} {{ partial "menu/item.html" . }} @@ -50,7 +52,9 @@
          {{ range .Site.Menus.main.ByWeight }}
        • {{ partial "menu/item.html" . }} diff --git a/themes/delphi/layouts/partials/scripts.html b/themes/delphi/layouts/partials/scripts.html index 559fd48ab..99b663ec5 100644 --- a/themes/delphi/layouts/partials/scripts.html +++ b/themes/delphi/layouts/partials/scripts.html @@ -1,2 +1 @@ -{{ $script := resources.Get "js/main.js" | js.Build | minify | fingerprint -}} - +{{ $script := resources.Get "js/main.js" | js.Build | minify | fingerprint -}} diff --git a/themes/delphi/layouts/shortcodes/bibliography.html b/themes/delphi/layouts/shortcodes/bibliography.html index 46b7a387e..788fc0ae9 100644 --- a/themes/delphi/layouts/shortcodes/bibliography.html +++ b/themes/delphi/layouts/shortcodes/bibliography.html @@ -6,8 +6,9 @@ {{ .title }}
          {{ .authors }}
          - {{ .journal }} {{ .issue }} {{ if isset . "year" }} ({{ .year }}) {{ end }} - {{ if isset . "doi" }} DOI: {{ .doi }}{{ end }} + {{ .journal }} {{ .issue }} + {{ if isset . "year" }}({{ .year }}){{ end }} + {{ if isset . "doi" }}DOI: {{ .doi }}{{ end }}

          • {{ end }} diff --git a/themes/delphi/layouts/shortcodes/systems.html b/themes/delphi/layouts/shortcodes/systems.html index e2ba8d50d..eb638bd62 100644 --- a/themes/delphi/layouts/shortcodes/systems.html +++ b/themes/delphi/layouts/shortcodes/systems.html @@ -3,7 +3,7 @@

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

          diff --git a/themes/delphi/layouts/shortcodes/team.html b/themes/delphi/layouts/shortcodes/team.html index bcdd28ab5..bbf49ee4b 100644 --- a/themes/delphi/layouts/shortcodes/team.html +++ b/themes/delphi/layouts/shortcodes/team.html @@ -1,6 +1,10 @@
          {{ $team := where (partial "get-persons.html" .) ".team" "intersect" (slice (.Get "team")) }} {{ range $team }} @@ -18,7 +22,7 @@ {{ .name | safeHTML }} - {{ else }} + {{ else }} {{ .name }} From db9dd65e345093018095cbbdbe21a4d4fd30394b Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 16:02:20 +0200 Subject: [PATCH 09/24] build: use published version of covidcast-classic --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14a5888dd..58494011b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2566,8 +2566,8 @@ } }, "www-covidcast-classic": { - "version": "github:cmu-delphi/www-covidcast-classic#6835774e8d74040deb3f87749ebdae244ef49173", - "from": "github:cmu-delphi/www-covidcast-classic#dev", + "version": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz", + "integrity": "sha512-uiIqXzt3gY/HMTBnw1ocgSupioYX+hgHWkF7+NjKgeADSqDYfOjmIMZkKHCMAKQjU/KibLvkxEglqiKCjBkLmg==", "requires": { "uikit": "^3.7.0" }, diff --git a/package.json b/package.json index cf1524d9d..02762bf05 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "uikit": "^3.6.22", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz", - "www-covidcast-classic": "github:cmu-delphi/www-covidcast-classic#dev" + "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz" }, "devDependencies": { "hugo-bin": "^0.72.3", From 9a806c540281095df211350f15d7e759153ad8ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 21:02:26 +0000 Subject: [PATCH 10/24] build(deps-dev): bump hugo-bin from 0.72.4 to 0.72.5 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.72.4 to 0.72.5. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.72.4...v0.72.5) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b03dd381..f1f9aefa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.72.4", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.4.tgz", - "integrity": "sha512-PKsS3JAf7U88XCkVGU+hlUU/MIwsOmk/vH2f7hHGBJ4I8OF/Qvi4aPLdxiAtSaiu6rbd0It0h69ekYua5kXHcA==", + "version": "0.72.5", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.5.tgz", + "integrity": "sha512-fxjt9yTnhS5gFlmsxJ4xYCtE2RgeSysmIgnrwjcS6HlZ6Zm/2FU9n7V8m5+uvIA7qPE/BZGsIgA9Pv9D1MbYlw==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", diff --git a/package.json b/package.json index 69c353a2a..a1a02491e 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz" }, "devDependencies": { - "hugo-bin": "^0.72.4", + "hugo-bin": "^0.72.5", "husky": "^7.0.0", "lint-staged": "^11.0.0", "prettier": "^2.3.2", From baa9ee08398feb62b7f66b40c119de0599d542aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 21:04:17 +0000 Subject: [PATCH 11/24] build(deps): bump actions/setup-node from 2.1.5 to 2.2.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/blog.yaml | 2 +- .github/workflows/ci.yaml | 2 +- .github/workflows/release_main.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index a9b55a12b..902bfe6d4 100644 --- a/.github/workflows/blog.yaml +++ b/.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 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98d31a83c..b17c6fba0 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index bc02bf29a..a13c8e319 100644 --- a/.github/workflows/release_main.yml +++ b/.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 From 9d6b13b6f490e467b614871e388c990b0236b2d8 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Wed, 7 Jul 2021 10:01:24 +0200 Subject: [PATCH 12/24] fix: Apply suggestions from code review Co-authored-by: Alex Reinhart --- content/_index.md | 2 +- content/covidcast/surveys.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/_index.md b/content/_index.md index 0462c89a6..a140c7f92 100644 --- a/content/_index.md +++ b/content/_index.md @@ -22,7 +22,7 @@ carousel: - pre: Our Tools title: CTIS Survey Dashboard ref: covidcast/survey-results - alt: Explore the COVID Trends and Impact 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 diff --git a/content/covidcast/surveys.md b/content/covidcast/surveys.md index f1299ab85..44f682575 100644 --- a/content/covidcast/surveys.md +++ b/content/covidcast/surveys.md @@ -1,12 +1,12 @@ --- -title: Delphi's COVID Trends and Impact Surveys (CTIS) +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 [CTIS 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 Survey 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. From 87cb092d6cc62f08487895407ddac10182a45fe6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 21:03:18 +0000 Subject: [PATCH 13/24] build(deps-dev): bump hugo-bin from 0.71.1 to 0.72.3 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.71.1 to 0.72.3. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.71.1...v0.72.3) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27cf6f624..91ce30279 100644 --- a/package-lock.json +++ b/package-lock.json @@ -401,9 +401,9 @@ "dev": true }, "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "dev": true, "requires": { "ini": "^1.3.4", @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.71.1", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.71.1.tgz", - "integrity": "sha512-H+aBkwtR6oSMcu1kCyzQlan+lcQ45k70JGX4v72h8mb0e4AbvaF58kAy6EDRK/U+/hD6ghTf0a6eLr5sENjaAg==", + "version": "0.72.3", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.3.tgz", + "integrity": "sha512-xMbaX5Wb4eDvHOOERdyRnuhyjzXOr+zv+9CHIcgRV0pK0vKcolCqP7OGhbpGgFHU20fzSfHf/uKOahEK62rBhQ==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", @@ -1626,9 +1626,9 @@ } }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "dev": true }, "mimic-fn": { diff --git a/package.json b/package.json index 32f918a53..97b768be5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "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", + "hugo-bin": "^0.72.3", "husky": "^6.0.0", "lint-staged": "^11.0.0", "prettier": "~2.2.1", From 3c74e4c6cfb99f06675c3a752a43b072fe40aeb0 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 14:04:21 +0200 Subject: [PATCH 14/24] build: update dependencies --- package-lock.json | 41 +++++++++++-------- package.json | 10 ++--- themes/delphi/layouts/_default/baseof.html | 6 +-- themes/delphi/layouts/_default/coe.html | 1 + themes/delphi/layouts/_default/team.html | 1 + .../delphi/layouts/_internal/pagination.html | 14 +++---- themes/delphi/layouts/blog/single.html | 7 ++-- .../layouts/partials/about/collaborators.html | 2 +- .../delphi/layouts/partials/blog/license.html | 3 +- .../delphi/layouts/partials/font-awesome.html | 2 +- themes/delphi/layouts/partials/head/meta.html | 1 + .../layouts/partials/head/socialmedia.html | 30 ++++++++++---- .../layouts/partials/landing/carousel.html | 2 +- .../layouts/partials/landing/latest-news.html | 1 + themes/delphi/layouts/partials/nav.html | 10 +++-- themes/delphi/layouts/partials/scripts.html | 3 +- .../layouts/shortcodes/bibliography.html | 5 ++- themes/delphi/layouts/shortcodes/systems.html | 2 +- themes/delphi/layouts/shortcodes/team.html | 8 +++- 19 files changed, 92 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91ce30279..3bc9ff9c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.72.3", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.3.tgz", - "integrity": "sha512-xMbaX5Wb4eDvHOOERdyRnuhyjzXOr+zv+9CHIcgRV0pK0vKcolCqP7OGhbpGgFHU20fzSfHf/uKOahEK62rBhQ==", + "version": "0.72.4", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.4.tgz", + "integrity": "sha512-PKsS3JAf7U88XCkVGU+hlUU/MIwsOmk/vH2f7hHGBJ4I8OF/Qvi4aPLdxiAtSaiu6rbd0It0h69ekYua5kXHcA==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", @@ -974,9 +974,9 @@ "dev": true }, "husky": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", - "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz", + "integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==", "dev": true }, "ieee754": { @@ -1935,16 +1935,19 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.10.tgz", - "integrity": "sha512-TaHPqiMK/zfk+YhvKRf/1WZDgQ6ffnlxJZX5rwphqfxBOVEezZQtYistTB348MKrKnnwKpyXZWpMRo0/KCVB+A==", - "dev": true + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.11.tgz", + "integrity": "sha512-qtgoEjvbgmcDp9TOqYNgrPrA41s6S1UMyzMqjcxdxQahTX0webWfbamyA/x3XeBFEEJmgXrRAirzJrIVzImsMg==", + "dev": true, + "requires": { + "ulid": "^2.3.0" + } }, "process-nextick-args": { "version": "2.0.1", @@ -2471,9 +2474,15 @@ "dev": true }, "uikit": { - "version": "3.6.22", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.6.22.tgz", - "integrity": "sha512-c8jz0lzvGPrPbOG4K5HvOCgUe7i9A6blZmMq2M/EYqoY7FT9dBayGFZYbBeio2s9WCpADIcCAj2QX/5L3EByOQ==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + }, + "ulid": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz", + "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==", + "dev": true }, "unbzip2-stream": { "version": "1.4.3", diff --git a/package.json b/package.json index 97b768be5..6bffae074 100644 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "@fortawesome/fontawesome-free": "^5.15.3", "highlight.js": "^11.0.1", "katex": "^0.13.11", - "uikit": "^3.6.22", + "uikit": "^3.7.0", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.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.72.3", - "husky": "^6.0.0", + "hugo-bin": "^0.72.4", + "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" }, diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index f2389b0a8..1d5a9a1eb 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -4,14 +4,14 @@ {{ partial "head/meta.html" . }} {{ partial "head/styles.html" . }} - {{ block "styles" . }} {{ end }} + {{ block "styles" . }}{{ 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 }} diff --git a/themes/delphi/layouts/_default/coe.html b/themes/delphi/layouts/_default/coe.html index c7d958b60..af81b7c36 100644 --- a/themes/delphi/layouts/_default/coe.html +++ b/themes/delphi/layouts/_default/coe.html @@ -22,6 +22,7 @@

          We work closely with

          {{ partial "coe/research-papers.html" . }} +

          Supporters

          diff --git a/themes/delphi/layouts/_default/team.html b/themes/delphi/layouts/_default/team.html index 1a83b675b..b04900f87 100644 --- a/themes/delphi/layouts/_default/team.html +++ b/themes/delphi/layouts/_default/team.html @@ -20,6 +20,7 @@

          {{ .Content }} +
          Abbreviations diff --git a/themes/delphi/layouts/_internal/pagination.html b/themes/delphi/layouts/_internal/pagination.html index 3d5dfb0a3..aefff961a 100644 --- a/themes/delphi/layouts/_internal/pagination.html +++ b/themes/delphi/layouts/_internal/pagination.html @@ -1,10 +1,10 @@ {{ $pag := $.Paginator }} {{ if gt $pag.TotalPages 1 -}}
            -
          • +
          • {{ if $pag.HasPrev }} - {{ else }} + {{ else }} {{ end }}
            • @@ -18,24 +18,24 @@ {{- if $showNumber -}} {{- $ellipsed = false -}} {{- $shouldEllipse = false -}} - {{- else -}} + {{- else -}} {{- $shouldEllipse = not $ellipsed -}} {{- $ellipsed = true -}} {{- end -}} {{- if $showNumber }} -
          • +
          • {{ .PageNumber }}
            • - {{- else if $shouldEllipse }} + {{- else if $shouldEllipse }}
            • {{- end -}} {{- end }} -
          • +
          • {{ if $pag.HasNext }} - {{ else }} + {{ else }} {{ end }}
            • diff --git a/themes/delphi/layouts/blog/single.html b/themes/delphi/layouts/blog/single.html index e9d96cf99..9512219d8 100644 --- a/themes/delphi/layouts/blog/single.html +++ b/themes/delphi/layouts/blog/single.html @@ -3,8 +3,7 @@ {{ end }} {{ define "scripts" }} - {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} - + {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} {{ end }} {{ define "main" }} {{ $currentPage := . }} @@ -33,7 +32,7 @@

            {{ .Title }}

            {{ if gt (len .Params.authors) 1 }} {{ partial "font-awesome.html" "solid/users" }} - {{ else }} + {{ else }} {{ partial "font-awesome.html" "solid/user" }} {{ end }} @@ -78,7 +77,7 @@
            Outline
            {{ with (partial "get-person.html" (dict "Site" $currentPage.Site "key" .)) }} {{ if isset . "link" }} {{ .name | safeHTML }} - {{ else }} + {{ else }} {{ .name | safeHTML }} {{ end }} {{ .description }} diff --git a/themes/delphi/layouts/partials/about/collaborators.html b/themes/delphi/layouts/partials/about/collaborators.html index 8e30e6151..6a4b0c5f2 100644 --- a/themes/delphi/layouts/partials/about/collaborators.html +++ b/themes/delphi/layouts/partials/about/collaborators.html @@ -6,7 +6,7 @@

            Collaborators

              {{ range .Params.collaborators }}
            • - {{ if eq .group "sponsor" }}With support from {{ end }} + {{ if eq .group "sponsor" }}With support from{{ end }} {{ .name }}
              • diff --git a/themes/delphi/layouts/partials/blog/license.html b/themes/delphi/layouts/partials/blog/license.html index c94c31847..29ad6d1e6 100644 --- a/themes/delphi/layouts/partials/blog/license.html +++ b/themes/delphi/layouts/partials/blog/license.html @@ -1,7 +1,8 @@
              © {{ now.Format "2006" }} Delphi group authors. Text and figures released under - CC BY 4.0 {{ partial "font-awesome.html" "brands/creative-commons" }} + CC BY 4.0 + {{ partial "font-awesome.html" "brands/creative-commons" }} {{ partial "font-awesome.html" "brands/creative-commons-by" }} ; code under the MIT license.
              diff --git a/themes/delphi/layouts/partials/font-awesome.html b/themes/delphi/layouts/partials/font-awesome.html index e79719aa5..ecf915735 100644 --- a/themes/delphi/layouts/partials/font-awesome.html +++ b/themes/delphi/layouts/partials/font-awesome.html @@ -4,7 +4,7 @@ {{- $localPath := path.Join "./themes/delphi/assets/" $fileName -}} {{- if fileExists $localPath -}} {{ readFile $localPath | safeHTML }} - {{- else -}} + {{- else -}} {{ readFile $faPath | safeHTML }} {{- end -}} diff --git a/themes/delphi/layouts/partials/head/meta.html b/themes/delphi/layouts/partials/head/meta.html index 98f3408d4..98f752da0 100644 --- a/themes/delphi/layouts/partials/head/meta.html +++ b/themes/delphi/layouts/partials/head/meta.html @@ -5,6 +5,7 @@ {{ partial "head/socialmedia.html" . }} + diff --git a/themes/delphi/layouts/partials/head/socialmedia.html b/themes/delphi/layouts/partials/head/socialmedia.html index 5c898d391..697b5a4b5 100644 --- a/themes/delphi/layouts/partials/head/socialmedia.html +++ b/themes/delphi/layouts/partials/head/socialmedia.html @@ -4,15 +4,27 @@ @@ -26,6 +38,7 @@ {{- end -}} {{- end -}} + @@ -46,7 +59,7 @@ - {{- else -}} +{{- else -}} {{- end -}} @@ -54,12 +67,13 @@ {{- if .IsPage }} {{- if not .PublishDate.IsZero }} - {{ else if not .Date.IsZero }} + {{ else if not .Date.IsZero }} + {{ end }} {{- if not .Lastmod.IsZero }} - {{ end }} - {{- else }} + + {{ end }} +{{- else }} {{- if not .Date.IsZero }} {{- end }} diff --git a/themes/delphi/layouts/partials/landing/carousel.html b/themes/delphi/layouts/partials/landing/carousel.html index 7240454e4..9f645f19f 100644 --- a/themes/delphi/layouts/partials/landing/carousel.html +++ b/themes/delphi/layouts/partials/landing/carousel.html @@ -19,7 +19,7 @@

              {{ .pre }}

              {{ .title }}

              {{ if isset . "ref" }} {{ partial "arrow-link.html" (dict "link" (relref $currentPage .ref) "alt" .alt) }} - {{ else }} + {{ else }} {{ partial "arrow-link.html" (dict "link" .link "alt" .alt) }} {{ end }}

          diff --git a/themes/delphi/layouts/partials/landing/latest-news.html b/themes/delphi/layouts/partials/landing/latest-news.html index 200553297..a62edba56 100644 --- a/themes/delphi/layouts/partials/landing/latest-news.html +++ b/themes/delphi/layouts/partials/landing/latest-news.html @@ -15,6 +15,7 @@

          Latest News

          {{ $top := 10 }} +
            diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 57e4746c5..8ae73c994 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -11,14 +11,16 @@
              {{ range .Site.Menus.main.ByWeight }}
            • {{ if .HasChildren }} {{ partial "menu/item.html" . }} {{ partial "font-awesome.html" "solid/angle-down" }} - {{ else }} + {{ else }} {{ partial "menu/item.html" . }} @@ -50,7 +52,9 @@
                {{ range .Site.Menus.main.ByWeight }}
              • {{ partial "menu/item.html" . }} diff --git a/themes/delphi/layouts/partials/scripts.html b/themes/delphi/layouts/partials/scripts.html index 559fd48ab..99b663ec5 100644 --- a/themes/delphi/layouts/partials/scripts.html +++ b/themes/delphi/layouts/partials/scripts.html @@ -1,2 +1 @@ -{{ $script := resources.Get "js/main.js" | js.Build | minify | fingerprint -}} - +{{ $script := resources.Get "js/main.js" | js.Build | minify | fingerprint -}} diff --git a/themes/delphi/layouts/shortcodes/bibliography.html b/themes/delphi/layouts/shortcodes/bibliography.html index 46b7a387e..788fc0ae9 100644 --- a/themes/delphi/layouts/shortcodes/bibliography.html +++ b/themes/delphi/layouts/shortcodes/bibliography.html @@ -6,8 +6,9 @@ {{ .title }}
                {{ .authors }}
                - {{ .journal }} {{ .issue }} {{ if isset . "year" }} ({{ .year }}) {{ end }} - {{ if isset . "doi" }} DOI: {{ .doi }}{{ end }} + {{ .journal }} {{ .issue }} + {{ if isset . "year" }}({{ .year }}){{ end }} + {{ if isset . "doi" }}DOI: {{ .doi }}{{ end }}

                • {{ end }} diff --git a/themes/delphi/layouts/shortcodes/systems.html b/themes/delphi/layouts/shortcodes/systems.html index e2ba8d50d..eb638bd62 100644 --- a/themes/delphi/layouts/shortcodes/systems.html +++ b/themes/delphi/layouts/shortcodes/systems.html @@ -3,7 +3,7 @@

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

                diff --git a/themes/delphi/layouts/shortcodes/team.html b/themes/delphi/layouts/shortcodes/team.html index bcdd28ab5..bbf49ee4b 100644 --- a/themes/delphi/layouts/shortcodes/team.html +++ b/themes/delphi/layouts/shortcodes/team.html @@ -1,6 +1,10 @@
                {{ $team := where (partial "get-persons.html" .) ".team" "intersect" (slice (.Get "team")) }} {{ range $team }} @@ -18,7 +22,7 @@ {{ .name | safeHTML }} - {{ else }} + {{ else }} {{ .name }} From 5c523f24f2e581f258aba4ce0c1dab86078058c5 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 13:47:35 +0200 Subject: [PATCH 15/24] feat: add covidcast-classic --- content/covidcast/classic.md | 3 +-- package.json | 6 ++++-- static/covidcast/classic/.gitignore | 5 +++++ themes/delphi/assets/js/main.js | 2 ++ .../_default/covidcast_classic_app.html | 18 ++++++++++++++++++ .../partials/covidcast_classic/find-file.html | 10 ++++++++++ 6 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 static/covidcast/classic/.gitignore create mode 100644 themes/delphi/layouts/_default/covidcast_classic_app.html create mode 100644 themes/delphi/layouts/partials/covidcast_classic/find-file.html diff --git a/content/covidcast/classic.md b/content/covidcast/classic.md index 1556ed04c..3e5e55ce1 100644 --- a/content/covidcast/classic.md +++ b/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 diff --git a/package.json b/package.json index 6bffae074..33a47bbce 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "katex": "^0.13.11", "uikit": "^3.7.0", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", - "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz" + "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz", + "www-covidcast-classic": "github:cmu-delphi/www-covidcast-classic#dev" }, "devDependencies": { "hugo-bin": "^0.72.4", @@ -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 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", diff --git a/static/covidcast/classic/.gitignore b/static/covidcast/classic/.gitignore new file mode 100644 index 000000000..7cc47d84a --- /dev/null +++ b/static/covidcast/classic/.gitignore @@ -0,0 +1,5 @@ +*.js +*.txt +*.html +*.css +*.map \ No newline at end of file diff --git a/themes/delphi/assets/js/main.js b/themes/delphi/assets/js/main.js index 958fa67c3..c20f64e01 100644 --- a/themes/delphi/assets/js/main.js +++ b/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/"; diff --git a/themes/delphi/layouts/_default/covidcast_classic_app.html b/themes/delphi/layouts/_default/covidcast_classic_app.html new file mode 100644 index 000000000..89ce80bc8 --- /dev/null +++ b/themes/delphi/layouts/_default/covidcast_classic_app.html @@ -0,0 +1,18 @@ +{{ define "styles" }} + +{{ end }} +{{ define "scripts" }} + +{{ end }} +{{ define "breadcrumb" }}{{ end }} +{{ define "body_class" }}{{ if eq .Params.footer false }}covidcast_wrapper{{ end }}{{ end }} +{{ define "main" }} +
                + +
                +{{ end }} diff --git a/themes/delphi/layouts/partials/covidcast_classic/find-file.html b/themes/delphi/layouts/partials/covidcast_classic/find-file.html new file mode 100644 index 000000000..ef4749223 --- /dev/null +++ b/themes/delphi/layouts/partials/covidcast_classic/find-file.html @@ -0,0 +1,10 @@ + +{{ $pattern := . }} +{{ $matchedFile := false }} +{{ range (readDir "./static/covidcast/classic") }} + {{ $testFile := . }} + {{ with (index (findRE $pattern .Name 1) 0) }} + {{ $matchedFile = path.Join "./covidcast/classic" $testFile.Name }} + {{ end }} +{{ end }} +{{ return $matchedFile }} From 40277b52de01b039d28fe0c4b3ca80aea8195ce5 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 13:52:42 +0200 Subject: [PATCH 16/24] build: fix package resolution --- package-lock.json | 14 ++++++++++++++ package.json | 2 +- static/covidcast/classic/.gitignore | 5 ----- 3 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 static/covidcast/classic/.gitignore diff --git a/package-lock.json b/package-lock.json index 3bc9ff9c8..b5ff486f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2574,6 +2574,20 @@ "uikit": "^3.6.22" } }, + "www-covidcast-classic": { + "version": "github:cmu-delphi/www-covidcast-classic#6835774e8d74040deb3f87749ebdae244ef49173", + "from": "github:cmu-delphi/www-covidcast-classic#dev", + "requires": { + "uikit": "^3.7.0" + }, + "dependencies": { + "uikit": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + } + } + }, "www-epivis": { "version": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz", "integrity": "sha512-sREuzprNbuXnDY4aCWldkus2wrS1y/n0YZzmoB8afW3yQZifFMgN5BC45Pqjugm20SJ86kYuD1XtzXCfkmhNCw==", diff --git a/package.json b/package.json index 33a47bbce..4557bc953 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "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 cp \"node_modules/www-covidcast-classic/public/**/*.{js,txt,css,map}\" static/covidcast/classic/", + "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 && npm run copy_covidcast_classic", "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"", diff --git a/static/covidcast/classic/.gitignore b/static/covidcast/classic/.gitignore deleted file mode 100644 index 7cc47d84a..000000000 --- a/static/covidcast/classic/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.js -*.txt -*.html -*.css -*.map \ No newline at end of file From 53f2aec7eb18b2cc4515b80d9b21d0dc01bb74d6 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 16:02:20 +0200 Subject: [PATCH 17/24] build: use published version of covidcast-classic --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5ff486f0..5b03dd381 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2575,8 +2575,8 @@ } }, "www-covidcast-classic": { - "version": "github:cmu-delphi/www-covidcast-classic#6835774e8d74040deb3f87749ebdae244ef49173", - "from": "github:cmu-delphi/www-covidcast-classic#dev", + "version": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz", + "integrity": "sha512-uiIqXzt3gY/HMTBnw1ocgSupioYX+hgHWkF7+NjKgeADSqDYfOjmIMZkKHCMAKQjU/KibLvkxEglqiKCjBkLmg==", "requires": { "uikit": "^3.7.0" }, diff --git a/package.json b/package.json index 4557bc953..69c353a2a 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "uikit": "^3.7.0", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz", - "www-covidcast-classic": "github:cmu-delphi/www-covidcast-classic#dev" + "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz" }, "devDependencies": { "hugo-bin": "^0.72.4", From de251195047f4dc1cc8fb043ffd3ccaf857f1467 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 21:02:26 +0000 Subject: [PATCH 18/24] build(deps-dev): bump hugo-bin from 0.72.4 to 0.72.5 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.72.4 to 0.72.5. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.72.4...v0.72.5) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b03dd381..f1f9aefa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.72.4", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.4.tgz", - "integrity": "sha512-PKsS3JAf7U88XCkVGU+hlUU/MIwsOmk/vH2f7hHGBJ4I8OF/Qvi4aPLdxiAtSaiu6rbd0It0h69ekYua5kXHcA==", + "version": "0.72.5", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.5.tgz", + "integrity": "sha512-fxjt9yTnhS5gFlmsxJ4xYCtE2RgeSysmIgnrwjcS6HlZ6Zm/2FU9n7V8m5+uvIA7qPE/BZGsIgA9Pv9D1MbYlw==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", diff --git a/package.json b/package.json index 69c353a2a..a1a02491e 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz" }, "devDependencies": { - "hugo-bin": "^0.72.4", + "hugo-bin": "^0.72.5", "husky": "^7.0.0", "lint-staged": "^11.0.0", "prettier": "^2.3.2", From 6eabdeb96e396f10d78d5ece77ae1b60297730c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 21:04:17 +0000 Subject: [PATCH 19/24] build(deps): bump actions/setup-node from 2.1.5 to 2.2.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/blog.yaml | 2 +- .github/workflows/ci.yaml | 2 +- .github/workflows/release_main.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index a9b55a12b..902bfe6d4 100644 --- a/.github/workflows/blog.yaml +++ b/.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 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98d31a83c..b17c6fba0 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index bc02bf29a..a13c8e319 100644 --- a/.github/workflows/release_main.yml +++ b/.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 From 9c4db712faf5a852c38acf3e8f7d8ef3e9e57fa4 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Wed, 7 Jul 2021 10:02:48 +0200 Subject: [PATCH 20/24] fix: avoid CTIS survey --- config.toml | 2 +- content/_index.md | 2 +- themes/delphi/layouts/partials/footer.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.toml b/config.toml index 4c94637a1..0dbee3ec1 100644 --- a/config.toml +++ b/config.toml @@ -93,7 +93,7 @@ relativeURLs = false weight = 50 [[menu.main]] parent = "covidcast" - name = "CTIS Survey Results" + name = "CTIS Results Dashboard" url = "/covidcast/survey-results" weight = 51 [[menu.main]] diff --git a/content/_index.md b/content/_index.md index a140c7f92..4fe7c7e7f 100644 --- a/content/_index.md +++ b/content/_index.md @@ -20,7 +20,7 @@ carousel: alt: Explore the new COVID-19 forecast evaluation dashboard image: forecast_evaluation_dashboard.jpg - pre: Our Tools - title: CTIS Survey Dashboard + title: CTIS Results Dashboard ref: covidcast/survey-results alt: Explore the COVID-19 Trends and Impact Survey Results image: covidcast_survey.jpg diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index 1bfb1d550..cce7fe3c0 100644 --- a/themes/delphi/layouts/partials/footer.html +++ b/themes/delphi/layouts/partials/footer.html @@ -12,7 +12,7 @@
                COVIDcast
              • Surveys
              • CTIS Survey ResultsCTIS Results Dashboard
              From c9e4b30276c295bc816d8be1adcbce2696199d56 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Wed, 7 Jul 2021 10:04:24 +0200 Subject: [PATCH 21/24] fix: avoid CTIS survey --- content/covidcast/surveys.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/content/covidcast/surveys.md b/content/covidcast/surveys.md index 44f682575..233d57d13 100644 --- a/content/covidcast/surveys.md +++ b/content/covidcast/surveys.md @@ -6,7 +6,7 @@ title: Delphi's COVID-19 Trends and Impact Surveys (CTIS) 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 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 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 [CTIS 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 @@ -80,14 +80,14 @@ Getting access to survey data for research: [complete this form](https://datafor ### Media inquiries: -[Stacy Kish](mailto:skish@andrew.cmu.edu) -Associate Director, Research Communications -Dietrich College -Carnegie Mellon University +[Stacy Kish](mailto:skish@andrew.cmu.edu) +Associate Director, Research Communications +Dietrich College +Carnegie Mellon University ### All other questions: -[Alex Reinhart](mailto:areinhar@stat.cmu.edu) -Assistant Teaching Professor -Department of Statistics & Data Science -Carnegie Mellon University +[Alex Reinhart](mailto:areinhar@stat.cmu.edu) +Assistant Teaching Professor +Department of Statistics & Data Science +Carnegie Mellon University From e326ff7d0f317e14cd3dfe505907fdab607bee2b Mon Sep 17 00:00:00 2001 From: Katie Mazaitis Date: Fri, 9 Jul 2021 17:41:38 -0400 Subject: [PATCH 22/24] Apply suggestions from code review --- content/covidcast/surveys.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/covidcast/surveys.md b/content/covidcast/surveys.md index 233d57d13..379a13987 100644 --- a/content/covidcast/surveys.md +++ b/content/covidcast/surveys.md @@ -80,14 +80,14 @@ Getting access to survey data for research: [complete this form](https://datafor ### Media inquiries: -[Stacy Kish](mailto:skish@andrew.cmu.edu) -Associate Director, Research Communications -Dietrich College +[Stacy Kish](mailto:skish@andrew.cmu.edu) +Associate Director, Research Communications +Dietrich College Carnegie Mellon University ### All other questions: -[Alex Reinhart](mailto:areinhar@stat.cmu.edu) -Assistant Teaching Professor -Department of Statistics & Data Science +[Alex Reinhart](mailto:areinhar@stat.cmu.edu) +Assistant Teaching Professor +Department of Statistics & Data Science Carnegie Mellon University From 40eb57ac7ce8c6197a68dfe1cea9f08f20005b03 Mon Sep 17 00:00:00 2001 From: krivard Date: Fri, 9 Jul 2021 21:48:11 +0000 Subject: [PATCH 23/24] feat: update to COVIDcast v2.5.3 --- package-lock.json | 6 +++--- package.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1f9aefa8..7eb2e07ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2568,10 +2568,10 @@ "dev": true }, "www-covidcast": { - "version": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", - "integrity": "sha512-AgWueUWfWuND8mbVOLdyqhft/tV9c7LeKq9PJA/DeNZNKp7azDYjmMMqh0IgzcilOlm5fqB4ecJ1OGOeHTruXQ==", + "version": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.3/www-covidcast-2.5.3.tgz", + "integrity": "sha512-TxiapT12gAgSjogiEUfR+Eivtr1MWRI9iIAtK6mVWRRN2RFu8d8OjQwx+kg9Oqpl8+ETcECjOT/2qMQN3wJawA==", "requires": { - "uikit": "^3.6.22" + "uikit": "^3.7.0" } }, "www-covidcast-classic": { diff --git a/package.json b/package.json index a1a02491e..c2a00d5d6 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "highlight.js": "^11.0.1", "katex": "^0.13.11", "uikit": "^3.7.0", - "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", - "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.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-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.72.5", From cf3eb8ab075d2daa41349ce334feebda67e2fb88 Mon Sep 17 00:00:00 2001 From: krivard Date: Fri, 9 Jul 2021 21:51:46 +0000 Subject: [PATCH 24/24] chore: release v2.9.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7eb2e07ec..086b05977 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "www-main", - "version": "2.9.0", + "version": "2.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c2a00d5d6..e8b48c20b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "www-main", - "version": "2.9.0", + "version": "2.9.1", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.3",