Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Aquaculture & Sustainable Smithsonian #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Binary file modified .DS_Store
Binary file not shown.
3 changes: 2 additions & 1 deletion .bundle/config
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
---
BUNDLE_PATH: "vendor/bundle"
BUNDLE_PATH: vendor/bundle
BUNDLE_DISABLE_SHARED_GEMS: '1'
72 changes: 31 additions & 41 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -151,4 +141,4 @@ DEPENDENCIES
wdm (~> 0.1.0)

BUNDLED WITH
2.0.1
1.17.3
Binary file modified data/.DS_Store
Binary file not shown.
28 changes: 0 additions & 28 deletions data/projects/070-ospri.yml

This file was deleted.

35 changes: 35 additions & 0 deletions data/projects/070-sustainablesmithsonian.yml
Original file line number Diff line number Diff line change
@@ -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: " <p> 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:
27 changes: 18 additions & 9 deletions data/projects/100-aquaculture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"<p>
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.

</p>"
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:
Expand Down
1 change: 1 addition & 0 deletions part2
Submodule part2 added at 30b5de
Binary file modified source/.DS_Store
Binary file not shown.
Binary file added source/images/project-photos/aquaculture11.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/project-photos/aquaculture22.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/project-photos/aquaculture33.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/kramdown
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/listen
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/middleman
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/nokogiri
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/rackup
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/sass-convert
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/sprockets
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
2 changes: 1 addition & 1 deletion vendor/bundle/ruby/2.5.0/bin/thor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby_executable_hooks
#!/usr/bin/env ruby
#
# This file was generated by RubyGems.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down