cmu-delphi · sgratzl · Dec 29, 2020 · Dec 11, 2020 · Dec 28, 2020 · Dec 28, 2020
@@ -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"

@@ -1,6 +1,10 @@
 ---
 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
 heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
 ---
@@ -3,5 +3,8 @@ 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
 heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
 ---
@@ -3,5 +3,8 @@ 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
 heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
 ---
@@ -4,5 +4,8 @@ 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
 heroImage: /images/landing-page/hero-images/covidcast_survey.jpg
 ---
@@ -3,5 +3,8 @@ title: COVIDCast Timelapse
 linkTitle: Timelapse
 description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
 layout: covidcast_app
+app_mode: timelapse
+order: 2
+icon: solid/clock
 heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
 ---
@@ -3,5 +3,8 @@ title: COVIDCast Top 10
 linkTitle: Top 10
 description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group.
 layout: covidcast_app
+app_mode: top10
+order: 3
+icon: solid/list
 heroImage: /images/landing-page/hero-images/covidcast_withfill.jpg
 ---
@@ -7,7 +7,7 @@
     "highlight.js": "^10.4.1",
     "katex": "^0.12.0",
     "uikit": "^3.5.9",
-    "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v1.12.0/www-covidcast-1.12.0.tgz"
+    "www-covidcast": "github:cmu-delphi/www-covidcast#e7f0a2c6041859683649124152bf7a17654419cb"
   },
   "devDependencies": {
     "cpx": "^1.5.0",

@@ -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" . }}

@@ -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>

@@ -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 -}}
@@ -0,0 +1,18 @@
+<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>
@@ -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>