From 139f6905b313a06d3464c68ffac27a416580dfa9 Mon Sep 17 00:00:00 2001 From: Carolyn Au Date: Tue, 18 Jan 2022 16:47:41 -0800 Subject: [PATCH 1/2] move sheets tutorials to api/sheets/tutorials --- Gemfile.lock | 141 ++++++++++-------- _layouts/default.html | 18 ++- api/sheets/index.md | 5 +- api/sheets/tutorials/index.md | 16 ++ .../sheets/tutorials}/sheets_covid.md | 21 +-- .../sheets/tutorials}/sheets_latitude.md | 17 ++- .../sheets/tutorials}/sheets_sleep.md | 17 ++- .../tutorials/sheets_covid_tutorial_1.png | Bin .../tutorials/sheets_covid_tutorial_2.png | Bin .../tutorials/sheets_covid_tutorial_3.png | Bin .../tutorials/sheets_covid_tutorial_4.png | Bin .../tutorials/sheets_covid_tutorial_5.png | Bin .../tutorials/sheets_covid_tutorial_6.png | Bin .../tutorials/sheets_covid_tutorial_7.png | Bin .../tutorials/sheets_covid_tutorial_8.png | Bin .../tutorials/sheets_covid_tutorial_9.png | Bin .../tutorials/sheets_latitude_tutorial_1.png | Bin .../tutorials/sheets_latitude_tutorial_2.png | Bin .../tutorials/sheets_latitude_tutorial_3.png | Bin .../tutorials/sheets_latitude_tutorial_4.png | Bin .../tutorials/sheets_latitude_tutorial_5.png | Bin .../tutorials/sheets_latitude_tutorial_6.png | Bin .../tutorials/sheets_latitude_tutorial_7.png | Bin .../tutorials/sheets_sleep_tutorial_1.png | Bin .../tutorials/sheets_sleep_tutorial_2.png | Bin .../tutorials/sheets_sleep_tutorial_3.png | Bin .../tutorials/sheets_sleep_tutorial_4.png | Bin .../tutorials/sheets_sleep_tutorial_5.png | Bin .../tutorials/sheets_sleep_tutorial_6.png | Bin .../tutorials/sheets_sleep_tutorial_7.png | Bin statistical_variables.md | 2 +- tutorials/index.md | 17 +-- 32 files changed, 147 insertions(+), 107 deletions(-) create mode 100644 api/sheets/tutorials/index.md rename {tutorials => api/sheets/tutorials}/sheets_covid.md (83%) rename {tutorials => api/sheets/tutorials}/sheets_latitude.md (83%) rename {tutorials => api/sheets/tutorials}/sheets_sleep.md (84%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_1.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_2.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_3.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_4.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_5.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_6.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_7.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_8.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_covid_tutorial_9.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_1.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_2.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_3.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_4.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_5.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_6.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_latitude_tutorial_7.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_1.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_2.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_3.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_4.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_5.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_6.png (100%) rename assets/images/{ => sheets}/tutorials/sheets_sleep_tutorial_7.png (100%) diff --git a/Gemfile.lock b/Gemfile.lock index 53d68114a..1d79f206a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.4) + activesupport (6.0.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -17,37 +17,43 @@ GEM commonmarker (0.17.13) ruby-enum (~> 0.5) concurrent-ruby (1.1.9) - dnsruby (1.61.7) + dnsruby (1.61.9) simpleidn (~> 0.1) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.14.0) + http_parser.rb (~> 0) + ethon (0.15.0) ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (1.5.0) + faraday (1.9.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) - ffi (1.15.3) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (215) - github-pages-health-check (= 1.17.2) + github-pages (223) + github-pages-health-check (= 1.17.9) jekyll (= 3.9.0) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) @@ -56,6 +62,7 @@ GEM jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.13.0) + jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) @@ -67,19 +74,19 @@ GEM jekyll-seo-tag (= 2.7.1) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.2) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) jemoji (= 0.12.0) kramdown (= 2.3.1) @@ -87,19 +94,19 @@ GEM liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) + nokogiri (>= 1.12.5, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.2) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (>= 2.0.2, < 5.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.9.0) @@ -136,6 +143,8 @@ GEM jekyll-github-metadata (2.13.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -162,45 +171,45 @@ GEM jekyll-swiss (1.0.0) jekyll-tabs (1.1.0) jekyll (>= 3.0, < 5.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.2) + jekyll-theme-hacker (0.2.0) jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.4) + jekyll-theme-primer (0.6.0) jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) @@ -215,27 +224,27 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.6.1) + mini_portile2 (2.7.1) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.4) + minitest (5.15.0) multipart-post (2.1.1) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) - octokit (4.21.0) + octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) - racc (1.5.2) + racc (1.6.0) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -243,7 +252,7 @@ GEM rouge (3.26.0) ruby-enum (0.9.0) i18n - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) @@ -265,9 +274,9 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - zeitwerk (2.4.2) + unf_ext (0.0.8) + unicode-display_width (1.8.0) + zeitwerk (2.5.3) PLATFORMS ruby @@ -279,4 +288,4 @@ DEPENDENCIES jekyll-tabs BUNDLED WITH - 2.2.15 + 1.17.2 diff --git a/_layouts/default.html b/_layouts/default.html index 10b7423b0..7df20e2e7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -96,10 +96,22 @@