diff --git a/.DS_Store b/.DS_Store index 0b486d62..a609d7be 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.bundle/config b/.bundle/config index 23692288..57d4641d 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,2 +1,3 @@ --- -BUNDLE_PATH: "vendor/bundle" +BUNDLE_PATH: vendor/bundle +BUNDLE_DISABLE_SHARED_GEMS: '1' diff --git a/Gemfile.lock b/Gemfile.lock index f0e55305..ac257d42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,7 @@ -GIT - remote: https://github.com/flori/json.git - revision: 7f4cfd853f2c919d854fb95548a19980feff17e8 - branch: v1.8 - specs: - json (1.8.6) - GEM remote: https://rubygems.org/ specs: - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -19,11 +12,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - chunky_png (1.3.4) + chunky_png (1.4.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) + coffee-script-source (1.12.2) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) @@ -36,38 +29,38 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - em-websocket (0.5.1) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.8) - execjs (2.6.0) - ffi (1.12.2) - ffi (1.12.2-x86-mingw32) - haml (4.0.7) + eventmachine (1.2.7) + execjs (2.7.0) + ffi (1.15.0) + haml (5.2.1) + temple (>= 0.8.0) tilt hike (1.2.3) hooks (0.4.1) uber (~> 0.0.14) http_parser.rb (0.6.0) i18n (0.7.0) - json (1.8.6) - kramdown (1.9.0) + json (2.5.1) + kramdown (1.17.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - middleman (3.4.0) + middleman (3.4.1) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.4.0) + middleman-core (= 3.4.1) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.4.0) + middleman-core (3.4.1) activesupport (~> 4.1) bundler (~> 1.1) capybara (~> 2.4.4) @@ -84,37 +77,37 @@ GEM middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-sprockets (3.4.2) + middleman-sprockets (3.5.0) middleman-core (>= 3.3) sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) sprockets-sass (~> 1.3.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) - mini_portile2 (2.4.0) - minitest (5.14.0) - multi_json (1.11.2) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) - nokogiri (1.10.8-x86-mingw32) - mini_portile2 (~> 2.4.0) + mime-types-data (3.2021.0225) + mini_portile2 (2.5.0) + minitest (5.14.4) + multi_json (1.15.0) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) padrino-helpers (0.12.9) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.9) tilt (>= 1.4.1, < 3) padrino-support (0.12.9) activesupport (>= 3.1) + racc (1.5.2) rack (1.6.13) - rack-livereload (0.3.16) + rack-livereload (0.3.17) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rb-fsevent (0.10.3) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - sass (3.4.19) - sprockets (2.12.4) + sass (3.4.25) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -124,24 +117,21 @@ GEM sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) - thor (1.0.1) + temple (0.8.2) + thor (1.1.0) thread_safe (0.3.6) tilt (1.4.1) - tzinfo (1.2.6) + tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2016.6) - tzinfo (>= 1.0.0) uber (0.0.15) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - wdm (0.1.1) xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS ruby - x86-mingw32 DEPENDENCIES json (>= 1.8) @@ -151,4 +141,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 2.0.1 + 1.17.3 diff --git a/data/.DS_Store b/data/.DS_Store index 4c6fc005..3e45b3e5 100644 Binary files a/data/.DS_Store and b/data/.DS_Store differ diff --git a/data/projects/070-ospri.yml b/data/projects/070-ospri.yml deleted file mode 100644 index 6ae4dfba..00000000 --- a/data/projects/070-ospri.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: SST -logo: project-logos/ospri.jpg -color: rgb(0,120,184) -tagline: Smithsonian Sustainability Team -hero_image: "project-photos/ospri-1.jpg" -lede: "Partner with the Smithsonian Institution to actualize sustainability initiatives" -description: "
SST represents a longstanding sustainability-focused relationship that CUSD has -maintained with the Smithsonian Institution. In the past, our work focused on assisting the -Smithsonian’s National Zoo with their plastics reduction initiative. Currently, our team operates -on a flexible advisory model, addressing a range of Smithsonian sustainability initiatives. In Fall -2019, we researched and wrote a report on best practices for zero-waste events planning at -Smithsonian. During Spring 2020 we are excited to continue revising and updating this report as -well as consulting on other sustainability projects Smithsonian has underway." -photos: - - url: project-photos/ospri-3.jpg - des: - - url: project-photos/ospri-2.png - des: - - url: project-photos/ospri-4.jpg - des: -impact: - stats: - - title: - number: - - title: - number: - - title: - number: diff --git a/data/projects/070-sustainablesmithsonian.yml b/data/projects/070-sustainablesmithsonian.yml new file mode 100644 index 00000000..e8e8ba0b --- /dev/null +++ b/data/projects/070-sustainablesmithsonian.yml @@ -0,0 +1,35 @@ +name: SST +logo: project-logos/ospri.jpg +color: rgb(0,120,184) +tagline: Sustainable Smithsonian! +hero_image: "project-photos/ospri-1.jpg" +lede: "Partner with the Smithsonian Institution to actualize sustainability initiatives" +description: "
SST represents a longstanding sustainability-focused relationship that +CUSD has maintained with the Smithsonian Institution. In the past, our work focused on +assisting the Smithsonian’s National Zoo with their plastics reduction initiative. +Currently, our team operates on a flexible advisory model, addressing a range of +Smithsonian sustainability initiatives. During 2019-2020 we researched and wrote a + report on best practices for zero-waste events planning at Smithsonian. In Fall + 2020, we developed a green certification comparison tool to help Smithsonian + compare and contrast opportunities and requirements for different green certification + programs they might pursue at various of its hundreds of buildings and facilities. + This project continues in Spring 2021: now we’re working on incorporating modelling + capabilities into this tool, and we’re also exploring other practices Smithsonian + could adopt tactically to improve its implementation of the array of sustainability, + wellness, and equity practices green certifications support nowadays." + +photos: + - url: project-photos/ospri-3.jpg + des: + - url: project-photos/ospri-2.png + des: + - url: project-photos/ospri-4.jpg + des: +impact: + stats: + - title: + number: + - title: + number: + - title: + number: diff --git a/data/projects/100-aquaculture.yml b/data/projects/100-aquaculture.yml index 093f3b2d..035b47ea 100644 --- a/data/projects/100-aquaculture.yml +++ b/data/projects/100-aquaculture.yml @@ -7,19 +7,28 @@ lede: "AquaCulture aims to promote educational and economic empowerment within c by creating an aquaculture system that is both financially and environmentally sustainable." description: "
-In collaboration with Shoals Marine Laboratory, this project focuses on providing accessible, -sustainable, and environmentally conscious options to the fishing industry through marine aquaculture. -The goal of this project is to design and build an aquaculture module that can maintain multiple -different species and withstand the turbulence of open waters. This project will rely on a combination -of biological study of marine species and mechanical engineering principles to build a module that is -efficient and effective. +Aquaculture is working to identify opportunities for improvement within recirculating +aquaculture systems, in order to design and implement solutions in partnership with +Pacific Jade LLC., Professor Michael Timmons, Finger Lakes Fish, and Hudson Valley +Fish Farms. The team is developing software to monitor fish feeding patterns through +multiple avenues, and evaluating data through machine learning software. The goal of +the project is to develop a ‘smart’ application for automatic fish feeding systems +in order to optimize fish feeding schedules based on behavior. The product focuses +on group monitoring, rather than individualized monitoring, and uses the concept of +“splash factor” to determine whether fish behavior remains consistent with the data on +a day to day and diurnal pattern basis. Fish behavior will be particularly monitored +during feeding cycles to identify any trends in nutrient content in the water. Water +quality parameters that will be monitored include dissolved oxygen, ammonia, electrical c +onductivity, pH, temperature and water level in the tank. 8:48 Our mission: Using +machine learning to create more feed-efficient recirculating aquaculture systems. +
" photos: - - url: project-photos/aquaculture1.jpg + - url: project-photos/aquaculture11.jpg des: - - url: project-photos/aquaculture2.jpg + - url: project-photos/aquaculture22.jpg des: - - url: project-photos/aquaculture3.jpeg + - url: project-photos/aquaculture33.jpeg des: impact: stats: diff --git a/part2 b/part2 new file mode 160000 index 00000000..30b5def7 --- /dev/null +++ b/part2 @@ -0,0 +1 @@ +Subproject commit 30b5def7952ff01ef578282f591811836f3fa653 diff --git a/source/.DS_Store b/source/.DS_Store index 3971a9d4..c2dbcbdb 100644 Binary files a/source/.DS_Store and b/source/.DS_Store differ diff --git a/source/images/project-photos/aquaculture11.jpg b/source/images/project-photos/aquaculture11.jpg new file mode 100644 index 00000000..eb7fa805 Binary files /dev/null and b/source/images/project-photos/aquaculture11.jpg differ diff --git a/source/images/project-photos/aquaculture22.jpg b/source/images/project-photos/aquaculture22.jpg new file mode 100644 index 00000000..054e4572 Binary files /dev/null and b/source/images/project-photos/aquaculture22.jpg differ diff --git a/source/images/project-photos/aquaculture33.jpeg b/source/images/project-photos/aquaculture33.jpeg new file mode 100644 index 00000000..7fb53730 Binary files /dev/null and b/source/images/project-photos/aquaculture33.jpeg differ diff --git a/vendor/bundle/ruby/2.5.0/bin/haml b/vendor/bundle/ruby/2.5.0/bin/haml index 89ab55fe..cd8b620a 100755 --- a/vendor/bundle/ruby/2.5.0/bin/haml +++ b/vendor/bundle/ruby/2.5.0/bin/haml @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/kramdown b/vendor/bundle/ruby/2.5.0/bin/kramdown index a1c29617..28dc09cb 100755 --- a/vendor/bundle/ruby/2.5.0/bin/kramdown +++ b/vendor/bundle/ruby/2.5.0/bin/kramdown @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/listen b/vendor/bundle/ruby/2.5.0/bin/listen index e2e32591..f274a634 100755 --- a/vendor/bundle/ruby/2.5.0/bin/listen +++ b/vendor/bundle/ruby/2.5.0/bin/listen @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/middleman b/vendor/bundle/ruby/2.5.0/bin/middleman index ff96a0a0..7326164c 100755 --- a/vendor/bundle/ruby/2.5.0/bin/middleman +++ b/vendor/bundle/ruby/2.5.0/bin/middleman @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/nokogiri b/vendor/bundle/ruby/2.5.0/bin/nokogiri index d8ef5349..412aae0c 100755 --- a/vendor/bundle/ruby/2.5.0/bin/nokogiri +++ b/vendor/bundle/ruby/2.5.0/bin/nokogiri @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/rackup b/vendor/bundle/ruby/2.5.0/bin/rackup index 033c72c8..e83bb9da 100755 --- a/vendor/bundle/ruby/2.5.0/bin/rackup +++ b/vendor/bundle/ruby/2.5.0/bin/rackup @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/sass b/vendor/bundle/ruby/2.5.0/bin/sass index 061cb248..ffaf2a07 100755 --- a/vendor/bundle/ruby/2.5.0/bin/sass +++ b/vendor/bundle/ruby/2.5.0/bin/sass @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/sass-convert b/vendor/bundle/ruby/2.5.0/bin/sass-convert index fae96dc6..fafa50c3 100755 --- a/vendor/bundle/ruby/2.5.0/bin/sass-convert +++ b/vendor/bundle/ruby/2.5.0/bin/sass-convert @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/scss b/vendor/bundle/ruby/2.5.0/bin/scss index d04c34e2..d993c0fa 100755 --- a/vendor/bundle/ruby/2.5.0/bin/scss +++ b/vendor/bundle/ruby/2.5.0/bin/scss @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/sprockets b/vendor/bundle/ruby/2.5.0/bin/sprockets index feac0930..5087285b 100755 --- a/vendor/bundle/ruby/2.5.0/bin/sprockets +++ b/vendor/bundle/ruby/2.5.0/bin/sprockets @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/bin/thor b/vendor/bundle/ruby/2.5.0/bin/thor index e056ddf1..251243ab 100755 --- a/vendor/bundle/ruby/2.5.0/bin/thor +++ b/vendor/bundle/ruby/2.5.0/bin/thor @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby_executable_hooks +#!/usr/bin/env ruby # # This file was generated by RubyGems. # diff --git a/vendor/bundle/ruby/2.5.0/specifications/http_parser.rb-0.6.0.gemspec b/vendor/bundle/ruby/2.5.0/specifications/http_parser.rb-0.6.0.gemspec index 6a279e6d..ef9151c5 100644 --- a/vendor/bundle/ruby/2.5.0/specifications/http_parser.rb-0.6.0.gemspec +++ b/vendor/bundle/ruby/2.5.0/specifications/http_parser.rb-0.6.0.gemspec @@ -16,10 +16,10 @@ Gem::Specification.new do |s| s.files = ["ext/ruby_http_parser/extconf.rb".freeze] s.homepage = "http://github.com/tmm1/http_parser.rb".freeze s.licenses = ["MIT".freeze] - s.rubygems_version = "3.0.3".freeze + s.rubygems_version = "3.0.9".freeze s.summary = "Simple callback-based HTTP request/response parser".freeze - s.installed_by_version = "3.0.3" if s.respond_to? :installed_by_version + s.installed_by_version = "3.0.9" if s.respond_to? :installed_by_version if s.respond_to? :specification_version then s.specification_version = 4