From 86bfc93e52adc19e719e1a7b5ca563638913af35 Mon Sep 17 00:00:00 2001
From: raphael hyde <raphaelhyd@gmail.com>
Date: Fri, 11 Dec 2020 11:53:39 -0800
Subject: [PATCH 1/6] location-solild_icon

---
 themes/delphi/assets/location-solid.svg | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 themes/delphi/assets/location-solid.svg

diff --git a/themes/delphi/assets/location-solid.svg b/themes/delphi/assets/location-solid.svg
new file mode 100644
index 000000000..e8f31f53c
--- /dev/null
+++ b/themes/delphi/assets/location-solid.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="white"/>
+<path d="M19.5 11H17.9062C17.4688 8.5 15.5 6.53125 13 6.09375V4.5C13 4.25 12.75 4 12.5 4H11.5C11.2188 4 11 4.25 11 4.5V6.09375C8.46875 6.53125 6.5 8.5 6.0625 11H4.5C4.21875 11 4 11.25 4 11.5V12.5C4 12.7812 4.21875 13 4.5 13H6.0625C6.5 15.5312 8.46875 17.5 11 17.9375V19.5C11 19.7812 11.2188 20 11.5 20H12.5C12.75 20 13 19.7812 13 19.5V17.9375C15.5 17.5 17.4688 15.5312 17.9062 13H19.5C19.75 13 20 12.7812 20 12.5V11.5C20 11.25 19.75 11 19.5 11ZM12 16C9.78125 16 8 14.2188 8 12C8 9.8125 9.78125 8 12 8C14.1875 8 16 9.8125 16 12C16 14.2188 14.1875 16 12 16ZM12 9.25C10.4688 9.25 9.25 10.5 9.25 12C9.25 13.5312 10.4688 14.75 12 14.75C13.5 14.75 14.75 13.5312 14.75 12C14.75 10.5 13.5 9.25 12 9.25Z" fill="black"/>
+</svg>

From a4f2aeedf7ce3af0bc207b785f2f1b469c7bfe28 Mon Sep 17 00:00:00 2001
From: Samuel Gratzl <sam@sgratzl.com>
Date: Mon, 28 Dec 2020 13:31:28 -0500
Subject: [PATCH 2/6] refactor: website mode menu

---
 content/covidcast/_index.md                       |  6 +++++-
 content/covidcast/export.md                       |  3 +++
 content/covidcast/single.md                       |  3 +++
 content/covidcast/survey-results.md               |  3 +++
 content/covidcast/timelapse.md                    |  3 +++
 content/covidcast/top10.md                        |  3 +++
 themes/delphi/layouts/_default/baseof.html        |  2 +-
 themes/delphi/layouts/_default/covidcast_app.html |  2 +-
 .../layouts/partials/covidcast/get-modes.html     |  5 +++++
 .../delphi/layouts/partials/covidcast/modes.html  | 15 +++++++++++++++
 themes/delphi/layouts/partials/font-awesome.html  |  9 ++++++++-
 11 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 themes/delphi/layouts/partials/covidcast/get-modes.html
 create mode 100644 themes/delphi/layouts/partials/covidcast/modes.html

diff --git a/content/covidcast/_index.md b/content/covidcast/_index.md
index b3dffc6cc..653b02f38 100644
--- a/content/covidcast/_index.md
+++ b/content/covidcast/_index.md
@@ -1,5 +1,9 @@
 ---
 title: COVIDcast
-layout: covidcast_app
 description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
+layout: covidcast_app
+app_mode: overview
+order: 1
+modeTitle: Map Overview
+icon: solid/map
 ---
diff --git a/content/covidcast/export.md b/content/covidcast/export.md
index c46ba78d1..cd8fb04c5 100644
--- a/content/covidcast/export.md
+++ b/content/covidcast/export.md
@@ -3,4 +3,7 @@ title: COVIDCast Export Data
 linkTitle: Export Data
 description: Use COVIDcast data in your own analysis
 layout: covidcast_app
+app_mode: export
+order: 6
+icon: solid/download
 ---
diff --git a/content/covidcast/single.md b/content/covidcast/single.md
index bd92dbcfb..03b6e525e 100644
--- a/content/covidcast/single.md
+++ b/content/covidcast/single.md
@@ -3,4 +3,7 @@ title: COVIDCast Region Details
 linkTitle: Region Details
 description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
 layout: covidcast_app
+app_mode: single
+order: 4
+icon: location-solid
 ---
diff --git a/content/covidcast/survey-results.md b/content/covidcast/survey-results.md
index 84c2c1840..3474a1ccb 100644
--- a/content/covidcast/survey-results.md
+++ b/content/covidcast/survey-results.md
@@ -4,4 +4,7 @@ linkTitle: Survey Results
 description: |
   In collaboration with Facebook Data for Good, along with a consortium of universities and public health officials, the Delphi Group at Carnegie Mellon University 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.
 layout: covidcast_app
+app_mode: survey-results
+order: 5
+icon: solid/poll
 ---
diff --git a/content/covidcast/timelapse.md b/content/covidcast/timelapse.md
index e63535034..ce2af8b26 100644
--- a/content/covidcast/timelapse.md
+++ b/content/covidcast/timelapse.md
@@ -2,4 +2,7 @@
 title: COVIDCast Timelapse
 linkTitle: Timelapse
 layout: covidcast_app
+app_mode: timelapse
+order: 2
+icon: solid/clock
 ---
diff --git a/content/covidcast/top10.md b/content/covidcast/top10.md
index e94682409..515946dee 100644
--- a/content/covidcast/top10.md
+++ b/content/covidcast/top10.md
@@ -2,4 +2,7 @@
 title: COVIDCast Top 10
 linkTitle: Top 10
 layout: covidcast_app
+app_mode: top10
+order: 3
+icon: solid/list
 ---
diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html
index f2389b0a8..f70a407fa 100644
--- a/themes/delphi/layouts/_default/baseof.html
+++ b/themes/delphi/layouts/_default/baseof.html
@@ -8,7 +8,7 @@
   </head>
   <body class="{{ block "body_class" . }}{{ end }}">
     {{ partial "nav.html" . }}
-    {{ block "breadcrumb" . }}{{ partial "menu/breadcrumb.html" . }}{{ end }}
+    {{ partial "menu/breadcrumb.html" . }}
     {{ block "main" . }} {{ end }}
     {{ partial "footer.html" . }}
     {{ partial "scripts.html" . }}
diff --git a/themes/delphi/layouts/_default/covidcast_app.html b/themes/delphi/layouts/_default/covidcast_app.html
index 1e4cbfd4b..bebdcceb4 100644
--- a/themes/delphi/layouts/_default/covidcast_app.html
+++ b/themes/delphi/layouts/_default/covidcast_app.html
@@ -7,9 +7,9 @@
   <script src="{{ "./covidcast/styles.js" | relURL }}"></script>
   <script src="{{ "./covidcast/bundle.js" | relURL }}"></script>
 {{ end }}
-{{ define "breadcrumb" }}<!--no breadcrumb -->{{ end }}
 {{ define "body_class" }}covidcast_wrapper{{ end }}
 {{ define "main" }}
+  {{partial "covidcast/modes.html" . }}
   <div id="vizbox">
     <div class="ie-banner" style="display: none">
       <div>
diff --git a/themes/delphi/layouts/partials/covidcast/get-modes.html b/themes/delphi/layouts/partials/covidcast/get-modes.html
new file mode 100644
index 000000000..8026bdd11
--- /dev/null
+++ b/themes/delphi/layouts/partials/covidcast/get-modes.html
@@ -0,0 +1,5 @@
+{{- $mainPage := $.GetPage "/covidcast" -}}
+{{- $pages := where $mainPage.Pages ".Params.layout" "eq" "covidcast_app" -}}
+{{- $pages = append (slice $mainPage) $pages -}}
+{{- $pages = sort $pages ".Params.order" -}}
+{{- return $pages -}}
\ No newline at end of file
diff --git a/themes/delphi/layouts/partials/covidcast/modes.html b/themes/delphi/layouts/partials/covidcast/modes.html
new file mode 100644
index 000000000..fb5c53502
--- /dev/null
+++ b/themes/delphi/layouts/partials/covidcast/modes.html
@@ -0,0 +1,15 @@
+<div class="uk-visible@s covidcast-modes">
+  <div class="uk-container uk-margin-remove-vertical">
+      {{$currentPage := .}}
+    <ul class="uk-tab">
+        {{range (partial "covidcast/get-modes.html" .)}}
+        <li data-mode="{{.Params.app_mode}}" class="covidcast-mode {{if eq $currentPage.Permalink .Permalink}}uk-active{{end}}">
+            <a href="{{.RelPermalink}}">
+                {{partial "font-awesome.html" .Params.icon }}
+                {{.Params.modeTitle | default .LinkTitle}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+  </div>
+</div>
diff --git a/themes/delphi/layouts/partials/font-awesome.html b/themes/delphi/layouts/partials/font-awesome.html
index ca31eb1fa..ecf915735 100644
--- a/themes/delphi/layouts/partials/font-awesome.html
+++ b/themes/delphi/layouts/partials/font-awesome.html
@@ -1,3 +1,10 @@
 <span class="inline-svg-icon">
-  {{ readFile (print "./node_modules/@fortawesome/fontawesome-free/svgs/" . ".svg" ) | safeHTML }}
+  {{- $fileName := (print . ".svg" ) -}}
+  {{- $faPath := path.Join "./node_modules/@fortawesome/fontawesome-free/svgs/" $fileName -}}
+  {{- $localPath := path.Join "./themes/delphi/assets/" $fileName -}}
+  {{- if fileExists $localPath -}}
+    {{ readFile $localPath | safeHTML }}
+  {{- else -}}
+    {{ readFile $faPath | safeHTML }}
+  {{- end -}}
 </span>

From 10ca63a1978c0bfe092ad1d87879f4a8daf606ec Mon Sep 17 00:00:00 2001
From: Samuel Gratzl <sam@sgratzl.com>
Date: Mon, 28 Dec 2020 14:06:14 -0500
Subject: [PATCH 3/6] feat: add modes to menu

---
 config.toml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/config.toml b/config.toml
index 91cf26117..c63b3f4cd 100644
--- a/config.toml
+++ b/config.toml
@@ -38,29 +38,49 @@ relativeURLs = false
     weight = 2
 [[menu.main]]
     parent = "covidcast"
-    name = "Map"
+    name = "Map Overview"
     url = "/covidcast"
     weight = 1
+[[menu.main]]
+    parent = "covidcast"
+    name = "Timelapse"
+    url = "/covidcast/timelapse"
+    weight = 2
+[[menu.main]]
+    parent = "covidcast"
+    name = "Top 10"
+    url = "/covidcast/top10"
+    weight = 3
+[[menu.main]]
+    parent = "covidcast"
+    name = "Single Region"
+    url = "/covidcast/single"
+    weight = 4
 [[menu.main]]
     parent = "covidcast"
     name = "Surveys"
     url = "/covidcast/surveys"
-    weight = 2
+    weight = 5
 [[menu.main]]
     parent = "covidcast"
     name = "Survey Results"
     url = "/covidcast/survey-results"
-    weight = 3
+    weight = 6
+[[menu.main]]
+    parent = "covidcast"
+    name = "Export Data"
+    url = "/covidcast/export"
+    weight = 7
 [[menu.main]]
     parent = "covidcast"
     name = "Release Log"
     url = "/covidcast/release-log"
-    weight = 4
+    weight = 8
 [[menu.main]]
     parent = "covidcast"
     name = "Terms Of Use"
     url = "/covidcast/terms-of-use"
-    weight = 5
+    weight = 9
 [[menu.main]]
     identifier = "flu"
     name = "Flu and Other Diseases"

From 919ce8e058b6ffdd089fb26b50b0b48ae608e7a7 Mon Sep 17 00:00:00 2001
From: Samuel Gratzl <sam@sgratzl.com>
Date: Mon, 28 Dec 2020 14:12:22 -0500
Subject: [PATCH 4/6] fix: format

---
 .../layouts/_default/covidcast_app.html       |  2 +-
 .../layouts/partials/covidcast/get-modes.html |  2 +-
 .../layouts/partials/covidcast/modes.html     | 19 +++++++++++--------
 .../delphi/layouts/partials/font-awesome.html |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/themes/delphi/layouts/_default/covidcast_app.html b/themes/delphi/layouts/_default/covidcast_app.html
index bebdcceb4..a11b96586 100644
--- a/themes/delphi/layouts/_default/covidcast_app.html
+++ b/themes/delphi/layouts/_default/covidcast_app.html
@@ -9,7 +9,7 @@
 {{ end }}
 {{ define "body_class" }}covidcast_wrapper{{ end }}
 {{ define "main" }}
-  {{partial "covidcast/modes.html" . }}
+  {{ partial "covidcast/modes.html" . }}
   <div id="vizbox">
     <div class="ie-banner" style="display: none">
       <div>
diff --git a/themes/delphi/layouts/partials/covidcast/get-modes.html b/themes/delphi/layouts/partials/covidcast/get-modes.html
index 8026bdd11..ce34f294f 100644
--- a/themes/delphi/layouts/partials/covidcast/get-modes.html
+++ b/themes/delphi/layouts/partials/covidcast/get-modes.html
@@ -2,4 +2,4 @@
 {{- $pages := where $mainPage.Pages ".Params.layout" "eq" "covidcast_app" -}}
 {{- $pages = append (slice $mainPage) $pages -}}
 {{- $pages = sort $pages ".Params.order" -}}
-{{- return $pages -}}
\ No newline at end of file
+{{- return $pages -}}
diff --git a/themes/delphi/layouts/partials/covidcast/modes.html b/themes/delphi/layouts/partials/covidcast/modes.html
index fb5c53502..75d4ed6b5 100644
--- a/themes/delphi/layouts/partials/covidcast/modes.html
+++ b/themes/delphi/layouts/partials/covidcast/modes.html
@@ -1,15 +1,18 @@
 <div class="uk-visible@s covidcast-modes">
   <div class="uk-container uk-margin-remove-vertical">
-      {{$currentPage := .}}
+    {{ $currentPage := . }}
     <ul class="uk-tab">
-        {{range (partial "covidcast/get-modes.html" .)}}
-        <li data-mode="{{.Params.app_mode}}" class="covidcast-mode {{if eq $currentPage.Permalink .Permalink}}uk-active{{end}}">
-            <a href="{{.RelPermalink}}">
-                {{partial "font-awesome.html" .Params.icon }}
-                {{.Params.modeTitle | default .LinkTitle}}
-            </a>
+      {{ range (partial "covidcast/get-modes.html" .) }}
+        <li
+          data-mode="{{ .Params.app_mode }}"
+          class="covidcast-mode {{ if eq $currentPage.Permalink .Permalink }}uk-active{{ end }}"
+        >
+          <a href="{{ .RelPermalink }}">
+            {{ partial "font-awesome.html" .Params.icon }}
+            {{ .Params.modeTitle | default .LinkTitle }}
+          </a>
         </li>
-        {{end}}
+      {{ end }}
     </ul>
   </div>
 </div>
diff --git a/themes/delphi/layouts/partials/font-awesome.html b/themes/delphi/layouts/partials/font-awesome.html
index ecf915735..e79719aa5 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 -}}
 </span>

From 2e60f0ce369583f5266d7ed1e23595149cbb4dcc Mon Sep 17 00:00:00 2001
From: Samuel Gratzl <sam@sgratzl.com>
Date: Mon, 28 Dec 2020 14:12:31 -0500
Subject: [PATCH 5/6] feat: use new covidcast branch

---
 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 d0c12d7f6..cf531d5cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4267,8 +4267,8 @@
    "dev": true
   },
   "www-covidcast": {
-   "version": "github:cmu-delphi/www-covidcast#40034c7e0f4996fdabbc15692148571aed41e3dc",
-   "from": "github:cmu-delphi/www-covidcast#40034c7e0f4996fdabbc15692148571aed41e3dc",
+   "version": "github:cmu-delphi/www-covidcast#62f085de193a4f1e5b817d3ba20b680860b6a24d",
+   "from": "github:cmu-delphi/www-covidcast#62f085de193a4f1e5b817d3ba20b680860b6a24d",
    "requires": {
     "uikit": "^3.5.10"
    },
diff --git a/package.json b/package.json
index a1b8e55b0..f6e2bbd16 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "highlight.js": "^10.4.1",
     "katex": "^0.12.0",
     "uikit": "^3.5.9",
-    "www-covidcast": "github:cmu-delphi/www-covidcast#40034c7e0f4996fdabbc15692148571aed41e3dc"
+    "www-covidcast": "github:cmu-delphi/www-covidcast#62f085de193a4f1e5b817d3ba20b680860b6a24d"
   },
   "devDependencies": {
     "cpx": "^1.5.0",

From 34182820745c37ee0e1539c0286a9f0509e4b0e1 Mon Sep 17 00:00:00 2001
From: Samuel Gratzl <sam@sgratzl.com>
Date: Tue, 29 Dec 2020 10:23:54 -0500
Subject: [PATCH 6/6] feat: update covidcast

---
 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 e4e75bfdc..1d7086cb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4267,8 +4267,8 @@
    "dev": true
   },
   "www-covidcast": {
-   "version": "github:cmu-delphi/www-covidcast#62f085de193a4f1e5b817d3ba20b680860b6a24d",
-   "from": "github:cmu-delphi/www-covidcast#62f085de193a4f1e5b817d3ba20b680860b6a24d",
+   "version": "github:cmu-delphi/www-covidcast#e7f0a2c6041859683649124152bf7a17654419cb",
+   "from": "github:cmu-delphi/www-covidcast#e7f0a2c6041859683649124152bf7a17654419cb",
    "requires": {
     "uikit": "^3.5.10"
    },
diff --git a/package.json b/package.json
index ca4e2c1cf..bed3708b6 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "highlight.js": "^10.4.1",
     "katex": "^0.12.0",
     "uikit": "^3.5.9",
-    "www-covidcast": "github:cmu-delphi/www-covidcast#62f085de193a4f1e5b817d3ba20b680860b6a24d"
+    "www-covidcast": "github:cmu-delphi/www-covidcast#e7f0a2c6041859683649124152bf7a17654419cb"
   },
   "devDependencies": {
     "cpx": "^1.5.0",