Layout changes

pikesley · Feb 8, 2015 · 94e90bb · 94e90bb
1 parent 16c91f6
commit 94e90bb
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 65 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
 
-#ruby=2.1.5
-ruby '2.1.5'
-#ruby-gemset=crunch
-
 gem 'dashing'
 gem 'google_drive'
 gem 'flickraw'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.3.7)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -20,7 +20,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.0)
     coveralls (0.7.2)
       multi_json (~> 1.3)
       rest-client (= 1.6.7)
@@ -29,7 +29,7 @@ GEM
       thor (= 0.18.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    cucumber (1.3.17)
+    cucumber (1.3.18)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
@@ -50,63 +50,71 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     dotenv (1.0.2)
-    eventmachine (1.0.3)
+    eventmachine (1.0.6)
     execjs (2.0.2)
     extlib (0.9.16)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.6)
     flickraw (0.9.8)
     formatador (0.2.5)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    google-api-client (0.7.1)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.3)
-      extlib (>= 0.9.15)
-      faraday (>= 0.9.0)
-      jwt (>= 0.1.5)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      retriable (>= 1.4)
-      signet (>= 0.5.0)
-      uuidtools (>= 2.1.0)
-    google_drive (0.3.11)
+    google-api-client (0.8.2)
+      activesupport (>= 3.2)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
+    google_drive (1.0.0)
       google-api-client (>= 0.7.0)
       nokogiri (>= 1.4.4, != 1.5.2, != 1.5.1)
       oauth (>= 0.3.6)
       oauth2 (>= 0.5.0)
-    guard (2.8.2)
+    guard (2.11.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-rspec (4.3.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.5.0)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     hike (1.2.3)
     hitimes (1.2.2)
-    i18n (0.6.11)
-    json (1.8.1)
-    jwt (1.0.0)
+    i18n (0.7.0)
+    json (1.8.2)
+    jwt (1.2.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (2.8.0)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.4.1)
+    nenv (0.2.0)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    notiffany (0.0.4)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     oauth (0.4.7)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -121,34 +129,41 @@ GEM
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retriable (1.4.1)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rspec-pride (2.3.0)
-      rspec (~> 2.10)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-pride (3.1.0)
+      rspec (~> 3.0)
+    rspec-support (3.2.1)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    signet (0.5.1)
-      addressable (>= 2.2.3)
-      faraday (>= 0.9.0.rc5)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
+    shellany (0.0.1)
+    signet (0.6.0)
+      addressable (~> 2.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      jwt (~> 1.0)
+      multi_json (~> 1.10)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -187,7 +202,6 @@ GEM
     tins (0.13.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uuidtools (2.1.5)
     vcr (2.9.3)
     webmock (1.20.4)
       addressable (>= 2.3.6)

diff --git a/dashboards/snake.erb b/dashboards/snake.erb
@@ -1,24 +1,24 @@
 <% content_for(:title) { "Crunchy Nut Corn Snake" } %>
 <div class="gridster">
   <ul>
-    <li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
-      <div data-id="meal" data-view="Meal" data-title="Feeds"></div>
+    <li data-row="1" data-col="1" data-sizex="2" data-sizey="1">
+      <div data-id="weight" data-view="Weight" data-title="Weight"></div>
     </li>
 
-    <li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
+    <li data-row="1" data-col="3" data-sizex="2" data-sizey="1">
       <div data-id="length" data-view="Length" data-title="Length"></div>
     </li>
 
-    <li data-row="1" data-col="1" data-sizex="2" data-sizey="1">
-      <div data-id="picture" data-view="Image" data-title="Latest photo"></div>
+    <li data-row="2" data-col="1" data-sizex="1" data-sizey="1">
+      <div data-id="meal" data-view="Meal" data-title="Feeds"></div>
     </li>
 
-    <li data-row="2" data-col="1" data-sizex="1" data-sizey="1">
+    <li data-row="2" data-col="2" data-sizex="1" data-sizey="1">
       <div data-id="shed" data-view="Shed" data-title="Shed"></div>
     </li>
 
-    <li data-row="2" data-col="2" data-sizex="1" data-sizey="1">
-      <div data-id="weight" data-view="Weight" data-title="Weight"></div>
+    <li data-row="1" data-col="1" data-sizex="2" data-sizey="1">
+      <div data-id="picture" data-view="Image" data-title="Latest photo"></div>
     </li>
   </ul>
 </div>
diff --git a/jobs/google_spreadsheet.rb b/jobs/google_spreadsheet.rb
@@ -1,10 +1,10 @@
-require 'google_drive'
+require 'google_drive_v0'
 require 'dotenv'
 
 Dotenv.load
 
 SCHEDULER.every '5m', :first_at => Time.now do
-  session = GoogleDrive.login(ENV['GOOGLE_USER'], ENV['GOOGLE_PASS'])
+  session = GoogleDriveV0.login(ENV['GOOGLE_USER'], ENV['GOOGLE_PASS'])
   sheet = session.spreadsheet_by_key(ENV['SPREADSHEET_ID'])
 
   feeds = sheet.worksheets[0]

diff --git a/lib/crunch.rb b/lib/crunch.rb
@@ -1,6 +1,6 @@
 require 'date'
 require 'dotenv'
-require 'google_drive'
+require 'google_drive_v0'
 require 'active_support/core_ext/integer/inflections'
 
 require_relative 'crunch/meal'

diff --git a/widgets/length/length.coffee b/widgets/length/length.coffee
@@ -9,7 +9,7 @@ class Dashing.Length extends Dashing.Widget
       points[points.length - 1].y
 
   ready: ->
-    color = '#207e62'
+    color = '#ffffff'
     container = $(@node).parent()
     # Gross hacks. Let's fix this.
     width = (Dashing.widget_base_dimensions[0] * container.data("sizex")) + Dashing.widget_margins[0] * 2 * (container.data("sizex") - 1)

diff --git a/widgets/weight/weight.coffee b/widgets/weight/weight.coffee
@@ -9,7 +9,7 @@ class Dashing.Weight extends Dashing.Widget
       points[points.length - 1].y
 
   ready: ->
-    color = '#207e62'
+    color = '#ffffff'
     container = $(@node).parent()
     # Gross hacks. Let's fix this.
     width = (Dashing.widget_base_dimensions[0] * container.data("sizex")) + Dashing.widget_margins[0] * 2 * (container.data("sizex") - 1)