Skip to content
Closed
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
4 changes: 2 additions & 2 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ languageCode = "en-us"
title = "The Delphi Team"
theme = "delphi"
googleAnalytics = "UA-88748454-1"
ignoreFiles = ["\\.Rmd$", "\\.Rmarkdown$", "_cache$", "\\.knit\\.md$", "\\.utf8\\.md$"]
ignoreFiles = ["\\.Rmd$", "\\.Rmarkdown$", "_cache$", "\\.knit\\.md$", "\\.utf8\\.md$", "\\.rda$"]
disqusShortname = ""
relativeURLs = false

Expand All @@ -17,7 +17,7 @@ relativeURLs = false
weight = 1
[[menu.main]]
name = "COVIDcast"
url = "https://covidcast.cmu.edu"
url = "/covidcast"
weight = 2
[[menu.main]]
name = "Data"
Expand Down
14 changes: 14 additions & 0 deletions content/covidcast/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
title: COVIDCast
type: covidcast_app
scripts:
- ./covidcast/vendors.js
- ./covidcast/styles.js
- ./covidcast/bundle.js
styles:
- ./covidcast/vendors.css
- ./covidcast/styles.css
---


{{<covidcast >}}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions layouts/covidcast_app/baseof.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<!-- Default base template. Other templates define the "main" portion in this template -->
<html lang="{{ $.Site.LanguageCode | default "en" }}">
{{ partial "head.html" . }}
<body style="height: 100vh; display: flex; flex-direction: column;">
{{ partial "nav.html" . }}
{{ block "main" . }}
{{ end }}
{{ partial "footer.html" . }}
</body>
</html>
1 change: 1 addition & 0 deletions layouts/covidcast_app/list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ define "main" }} {{ .Content }} {{ end }}
8 changes: 8 additions & 0 deletions layouts/shortcodes/covidcast.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div id="vizbox">
<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>
2 changes: 1 addition & 1 deletion layouts/shortcodes/indicators.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<section>
{{ $tools := .Site.GetPage "/indicators" }}
{{ $tools := .Site.GetPage "/covidcast/indicators" }}
{{ range sort (where ($tools.Resources.ByType "page") ".Params.category" "eq" (.Get "category")) ".Params.order" }}
<article>
<h4>{{ .Title }}</h4>
Expand Down
2 changes: 1 addition & 1 deletion layouts/shortcodes/releasenotes.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

{{ $tools := .Site.GetPage "/release-notes" }}
{{ $tools := .Site.GetPage "/covidcast/release-notes" }}
{{ range sort ($tools.Resources.ByType "page") "PublishDate" "desc" }}
<h3>{{ .Title}} {{ .PublishDate.Format "Monday, January 2, 2006" }}</h3>
{{ .Content }}
Expand Down
6 changes: 3 additions & 3 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[build]
publish = "public"
command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
command = "npm ci && hugo --gc --minify -b $DEPLOY_PRIME_URL"

[context.production.environment]
HUGO_VERSION = "0.78.0"
HUGO_ENV = "production"

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

[context.deploy-preview.environment]
HUGO_VERSION = "0.78.0"
HUGO_ENABLEGITINFO = "true"

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

[context.branch-deploy.environment]
HUGO_VERSION = "0.78.0"
Expand Down
7 changes: 7 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"dependencies": {
"highlight.js": "^10.3.2",
"katex": "^0.12.0",
"uikit": "^3.5.9"
"uikit": "^3.5.9",
"www-covidcast": "github:cmu-delphi/www-covidcast#sgratzl/uikit_deploy"
},
"devDependencies": {
"hugo-bin": "^0.66.2",
Expand All @@ -12,7 +13,9 @@
"buildTags": "extended"
},
"scripts": {
"postinstall": "ncp node_modules/katex/dist/fonts themes/delphi/static/css/fonts/",
"copy_fonts": "ncp node_modules/katex/dist/fonts themes/delphi/static/css/fonts/",
"copy_covidcast": "ncp node_modules/www-covidcast/public static/covidcast/",
"postinstall": "npm run copy_fonts && npm run copy_covidcast",
"build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd=TRUE)\"",
"build": "hugo --gc --minify",
"start": "hugo server -D",
Expand Down
4 changes: 4 additions & 0 deletions static/covidcast/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.js
*.txt
*.html
*.css
6 changes: 3 additions & 3 deletions themes/delphi/assets/js/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import UIKit from 'uikit/dist/js/uikit.js';
import UIkit from 'uikit/dist/js/uikit.js';
import plugin from 'uikit/dist/js/uikit-icons.js';

UIKit.use(plugin);
UIkit.use(plugin);

window.UIKit = UIKit;
window.UIkit = UIkit;