Merge pull request #398 from cmu-delphi/sgratzl/covidcast-classic

integrate www-covidcast-classic

Author: sgratzl

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

package-lock.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": "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",
@@ -26,8 +27,9 @@
     "clean": "rimraf \"*.tgz\" public",
     "copy_fonts": "shx cp -r \"node_modules/katex/dist/fonts/*\" themes/delphi/static/css/fonts/",
     "copy_covidcast": "shx rm -rf \"static/covidcast/*\" && shx cp \"node_modules/www-covidcast/public/**/*.{js,txt,css,map}\" static/covidcast/",
+    "copy_covidcast_classic": "shx rm -rf \"static/covidcast/classic/*\" && shx mkdir -p static/covidcast/classic/ && shx cp \"node_modules/www-covidcast-classic/public/**/*.{js,txt,css,map}\" static/covidcast/classic/",
     "copy_epivis": "shx rm -rf \"static/epivis/*\" && shx cp \"node_modules/www-epivis/public/**/*.{js,txt,css,map}\" static/epivis/",
-    "postinstall": "npm run copy_fonts && npm run copy_covidcast && npm run copy_epivis",
+    "postinstall": "npm run copy_fonts && npm run copy_covidcast && npm run copy_epivis && npm run copy_covidcast_classic",
     "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"",
     "prebuild": "npm run clean",
     "build": "hugo --gc --minify",

package.json

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

themes/delphi/assets/js/main.js

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

themes/delphi/layouts/_default/covidcast_classic_app.html

@@ -0,0 +1,10 @@
+<!--find a file given a prefix and directory -->
+{{ $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 }}