Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci_fast.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
# submodules: true # Fetch Hugo themes (true OR recursive)
fetch-depth: 3 # Fetch all history for .GitInfo and .Lastmod

- uses: actions/setup-node@v1
- uses: actions/setup-node@v2.1.5
with:
node-version: "12"
node-version: "14"
- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node3-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-node3-
- run: npm ci
- name: Lint
run: npm run lint
Expand Down
34 changes: 20 additions & 14 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,22 @@ relativeURLs = false
identifier = "covidcast"
name = "COVIDcast"
pre = "solid/map"
url = "/covidcast"
url = "/covidcast/"
weight = 2
[[menu.main]]
parent = "covidcast"
name = "About"
url = "/covidcast"
name = "COVIDcast Overview"
url = "/covidcast/"
weight = 1
[[menu.main]]
parent = "covidcast"
name = "Indicator Overview"
url = "/covidcast/overview"
name = "Region Summary"
url = "/covidcast/summary"
weight = 2
[[menu.main]]
parent = "covidcast"
name = "Indicator Details"
url = "/covidcast/indicator"
weight = 3
[[menu.main]]
parent = "covidcast"
name = "Old Map Overview"
url = "/covidcast/old"
name = "Classic Map"
url = "/covidcast/classic"
weight = 4
[[menu.main]]
parent = "covidcast"
Expand Down Expand Up @@ -83,10 +78,20 @@ relativeURLs = false
weight = 90
[[menu.main]]
identifier = "flu"
name = "Flu and Other Diseases"
name = "Tools and Resources"
pre = "solid/virus"
url = "/flu"
weight = 3
[[menu.main]]
parent = "flu"
name = "Signals Dashboard"
url = "/signals-dashboard/"
weight = 10
[[menu.main]]
parent = "flu"
name = "Forecast Evaluator"
url = "/forecast-eval/"
weight = 20
[[menu.main]]
identifier = "blog"
name = "Blog"
Expand Down Expand Up @@ -116,4 +121,5 @@ relativeURLs = false
feedbackLikelihoodDesktop = 1
feedbackDelayMin = 45 # in sec
feedbackDelayMax = 180 # in sec
feedbackDuration = 60 # show it for 60sec
feedbackDuration = 60 # show it for 60sec
highlightLinks = "/covidcast/,/covidcast/summary,/signals-dashboard/,/forecast-eval/"
6 changes: 3 additions & 3 deletions content/covidcast/old.md → content/covidcast/classic.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
title: COVIDcast Map Overview
linkTitle: Old Map Overview
title: Classic COVIDcast
linkTitle: Classic COVIDcast
description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
layout: covidcast_app
app_mode: old
app_mode: classic
order: 3
heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
feedback: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
title: COVIDcast
linkTitle: About COVIDcast
title: Location Summary
linkTitle: Location Summary
description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
layout: covidcast_app
app_mode: overview
app_mode: summary
order: 3
heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
feedback: true
Expand Down
12 changes: 9 additions & 3 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,25 @@ publish = "public"
command = "npm ci && hugo --gc --minify -b $DEPLOY_PRIME_URL"

[context.production.environment]
HUGO_VERSION = "0.78.0"
HUGO_VERSION = "0.81.0"
HUGO_ENV = "production"
NODE_VERSION = "14.16.0"
NPM_VERSION = "6.14.11"

[context.deploy-preview]
command = "npm ci && hugo --gc --minify --buildDrafts --buildFuture -b $DEPLOY_PRIME_URL"

[context.deploy-preview.environment]
HUGO_VERSION = "0.78.0"
HUGO_VERSION = "0.81.0"
HUGO_ENABLEGITINFO = "true"
NODE_VERSION = "14.16.0"
NPM_VERSION = "6.14.11"

[context.branch-deploy]
command = "npm ci && hugo --gc --minify -b $DEPLOY_PRIME_URL"

[context.branch-deploy.environment]
HUGO_VERSION = "0.78.0"
HUGO_VERSION = "0.81.0"
HUGO_ENABLEGITINFO = "true"
NODE_VERSION = "14.16.0"
NPM_VERSION = "6.14.11"
Loading