From 33be43901f871a864b245d7df8255f3dec6dc7ad Mon Sep 17 00:00:00 2001
From: Em Klick <eklick@chicagobooth.edu>
Date: Mon, 17 Jul 2017 18:25:34 +0000
Subject: [PATCH 1/4] first error

---
 Gemfile.lock                                           | 10 +++++-----
 .../{Zodiac_controller.rb => zodiacs_controller.rb}    |  0
 app/views/{horoscopes => zodiacs}/bull.html.erb        |  0
 app/views/{horoscopes => zodiacs}/crab.html.erb        |  0
 app/views/{horoscopes => zodiacs}/goat.html.erb        |  0
 app/views/{horoscopes => zodiacs}/lion.html.erb        |  0
 app/views/{horoscopes => zodiacs}/maiden.html.erb      |  0
 app/views/{horoscopes => zodiacs}/ram.html.erb         |  0
 app/views/{horoscopes => zodiacs}/sagittarius.html.erb |  0
 app/views/{horoscopes => zodiacs}/scales.html.erb      |  0
 app/views/{horoscopes => zodiacs}/scorpion.html.erb    |  0
 app/views/{horoscopes => zodiacs}/twins.html.erb       |  0
 app/views/{horoscopes => zodiacs}/waterbearer.html.erb |  0
 13 files changed, 5 insertions(+), 5 deletions(-)
 rename app/controllers/{Zodiac_controller.rb => zodiacs_controller.rb} (100%)
 rename app/views/{horoscopes => zodiacs}/bull.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/crab.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/goat.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/lion.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/maiden.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/ram.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/sagittarius.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/scales.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/scorpion.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/twins.html.erb (100%)
 rename app/views/{horoscopes => zodiacs}/waterbearer.html.erb (100%)

diff --git a/Gemfile.lock b/Gemfile.lock
index da4ede5..869c6ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,11 +208,11 @@ GEM
     rspec-support (3.6.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.0)
-      sass-listen (~> 3.0.7)
-    sass-listen (3.0.7)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
diff --git a/app/controllers/Zodiac_controller.rb b/app/controllers/zodiacs_controller.rb
similarity index 100%
rename from app/controllers/Zodiac_controller.rb
rename to app/controllers/zodiacs_controller.rb
diff --git a/app/views/horoscopes/bull.html.erb b/app/views/zodiacs/bull.html.erb
similarity index 100%
rename from app/views/horoscopes/bull.html.erb
rename to app/views/zodiacs/bull.html.erb
diff --git a/app/views/horoscopes/crab.html.erb b/app/views/zodiacs/crab.html.erb
similarity index 100%
rename from app/views/horoscopes/crab.html.erb
rename to app/views/zodiacs/crab.html.erb
diff --git a/app/views/horoscopes/goat.html.erb b/app/views/zodiacs/goat.html.erb
similarity index 100%
rename from app/views/horoscopes/goat.html.erb
rename to app/views/zodiacs/goat.html.erb
diff --git a/app/views/horoscopes/lion.html.erb b/app/views/zodiacs/lion.html.erb
similarity index 100%
rename from app/views/horoscopes/lion.html.erb
rename to app/views/zodiacs/lion.html.erb
diff --git a/app/views/horoscopes/maiden.html.erb b/app/views/zodiacs/maiden.html.erb
similarity index 100%
rename from app/views/horoscopes/maiden.html.erb
rename to app/views/zodiacs/maiden.html.erb
diff --git a/app/views/horoscopes/ram.html.erb b/app/views/zodiacs/ram.html.erb
similarity index 100%
rename from app/views/horoscopes/ram.html.erb
rename to app/views/zodiacs/ram.html.erb
diff --git a/app/views/horoscopes/sagittarius.html.erb b/app/views/zodiacs/sagittarius.html.erb
similarity index 100%
rename from app/views/horoscopes/sagittarius.html.erb
rename to app/views/zodiacs/sagittarius.html.erb
diff --git a/app/views/horoscopes/scales.html.erb b/app/views/zodiacs/scales.html.erb
similarity index 100%
rename from app/views/horoscopes/scales.html.erb
rename to app/views/zodiacs/scales.html.erb
diff --git a/app/views/horoscopes/scorpion.html.erb b/app/views/zodiacs/scorpion.html.erb
similarity index 100%
rename from app/views/horoscopes/scorpion.html.erb
rename to app/views/zodiacs/scorpion.html.erb
diff --git a/app/views/horoscopes/twins.html.erb b/app/views/zodiacs/twins.html.erb
similarity index 100%
rename from app/views/horoscopes/twins.html.erb
rename to app/views/zodiacs/twins.html.erb
diff --git a/app/views/horoscopes/waterbearer.html.erb b/app/views/zodiacs/waterbearer.html.erb
similarity index 100%
rename from app/views/horoscopes/waterbearer.html.erb
rename to app/views/zodiacs/waterbearer.html.erb

From e388fb997ade78241f06ff2ae5ee0c6011d0d711 Mon Sep 17 00:00:00 2001
From: Em Klick <eklick@chicagobooth.edu>
Date: Mon, 17 Jul 2017 18:36:57 +0000
Subject: [PATCH 2/4] gemini

---
 app/controllers/zodiacs_controller.rb |  2 +-
 config/routes.rb                      | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/zodiacs_controller.rb b/app/controllers/zodiacs_controller.rb
index da2e8de..787f5e3 100644
--- a/app/controllers/zodiacs_controller.rb
+++ b/app/controllers/zodiacs_controller.rb
@@ -1,4 +1,4 @@
-class Zodiacscontroller
+class ZodiacsController < ApplicationController
   def ram
     @prediction = "As your professional dreams unfold, Aries, you may worry about the downside. First, there are new responsibilities that you might doubt your ability to fulfill. Second, you might be catapulted into an uncomfortable new realm of office politics. Don't let these matters put a damper on your enthusiasm. You have what it takes to fulfill the first concern and the wisdom to avoid the second. Onward and upward."
 
diff --git a/config/routes.rb b/config/routes.rb
index e6b4cd7..41a1569 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,17 +9,28 @@
 
   # Uncomment each route below ONE AT A TIME and debug.
 
-  # get("/zodiacs/aries",       { :controller =>  zodiacs,  action =>  "ram" })
-  # get("/zodiacs/taurus",      { :controller,   "zodiacs", :action,   "bull" })
-  # get(/zodiacs/gemini,        { :controller => "zodiacs", :action => "twins" })
+  get("/zodiacs/aries",       { :controller =>  "zodiacs",  :action =>  "ram" })
+  
+  get("/zodiacs/taurus",      { :controller =>  "zodiacs", :action =>   "bull" })
+  
+  get("/zodiacs/gemini",        { :controller => "zodiacs", :action => "twins" })
+  
   # get("/zodiacs/cancer"       { :controller => "zodiacs"  :action => "crab" })
+  
   # get ("/zodiacs/leo",        { :controller => "zodiac",  :action => "lion" })
+  
   # get(" /zodiacs/virgo",      { :controller => "Zodiacs", :action => "maiden" })
+  
   # get("/zodiacs/libra",       { :controller => "zodiacs", :action => "scales" })
+  
   # get("/zodiac/scorpio",      { :controller => "zodiacs", :action => "scorpion" })
+  
   # get("/zodiacs/sagittarius", { :controller => "zodiacs", :action => "archer" })
+  
   # get("/zodiacs/capricorn",   { :controller => "zodiacs", :action => "goat" })
+  
   # get("/zodiacs/aquarius",    { :controller => "zodiacs", :action => "waterbearer" })
+  
   # get("/zodiacs/pisces",      { :controller => "zodiacs", :action => "fish" })
 
   mount WebGit::Engine, at: "/rails/git"

From f6f53ec8ec58a587c28126efd61be72e6ef138d1 Mon Sep 17 00:00:00 2001
From: Em Klick <eklick@chicagobooth.edu>
Date: Mon, 17 Jul 2017 18:43:40 +0000
Subject: [PATCH 3/4] virgo

---
 config/routes.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 41a1569..dcfc2f6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,11 +15,11 @@
   
   get("/zodiacs/gemini",        { :controller => "zodiacs", :action => "twins" })
   
-  # get("/zodiacs/cancer"       { :controller => "zodiacs"  :action => "crab" })
+  get("/zodiacs/cancer",       { :controller => "zodiacs",  :action => "crab" })
   
-  # get ("/zodiacs/leo",        { :controller => "zodiac",  :action => "lion" })
+  get("/zodiacs/leo",        { :controller => "zodiacs",  :action => "lion" })
   
-  # get(" /zodiacs/virgo",      { :controller => "Zodiacs", :action => "maiden" })
+  get("/zodiacs/virgo",      { :controller => "zodiacs", :action => "maiden" })
   
   # get("/zodiacs/libra",       { :controller => "zodiacs", :action => "scales" })
   

From 1f0238e4e0fbc97d3c2f25dd8add4828dc4008eb Mon Sep 17 00:00:00 2001
From: Em Klick <eklick@chicagobooth.edu>
Date: Mon, 17 Jul 2017 19:26:50 +0000
Subject: [PATCH 4/4] done with part 1

---
 app/controllers/zodiacs_controller.rb            |  4 ++--
 .../{sagittarius.html.erb => archer.html.erb}    |  0
 app/views/{ => zodiacs}/fish.html.erb            |  0
 app/views/zodiacs/waterbearer.html.erb           |  2 +-
 config/routes.rb                                 | 16 ++++++++--------
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename app/views/zodiacs/{sagittarius.html.erb => archer.html.erb} (100%)
 rename app/views/{ => zodiacs}/fish.html.erb (100%)

diff --git a/app/controllers/zodiacs_controller.rb b/app/controllers/zodiacs_controller.rb
index 787f5e3..34c0ac7 100644
--- a/app/controllers/zodiacs_controller.rb
+++ b/app/controllers/zodiacs_controller.rb
@@ -36,7 +36,7 @@ def maiden
   end
 
   def scales
-    @fortune = "People close to you might be a bit worried about you, Libra. Too much work and socializing might have you feeling less than your usual self, and perhaps even a little feverish and headachy. If so, this is a good day to take time out, stay home, and rest. Don't worry about sabotaging your success. It will continue. Take a break and your body will reward you with greater clarity and concentration."
+    @prediction = "People close to you might be a bit worried about you, Libra. Too much work and socializing might have you feeling less than your usual self, and perhaps even a little feverish and headachy. If so, this is a good day to take time out, stay home, and rest. Don't worry about sabotaging your success. It will continue. Take a break and your body will reward you with greater clarity and concentration."
 
     render("scales.html.erb")
   end
@@ -54,7 +54,7 @@ def archer
   end
 
   def goat
-    prediction = "You could be on a real emotional high today because of your success and that of other household members, Capricorn. Your mind may be buzzing with ideas for future expansion, some of which may not be all that workable. However, you should allow yourself a few flights of fancy. Tomorrow your feet will be back on the ground and you will see things in a more practical light."
+    @prediction = "You could be on a real emotional high today because of your success and that of other household members, Capricorn. Your mind may be buzzing with ideas for future expansion, some of which may not be all that workable. However, you should allow yourself a few flights of fancy. Tomorrow your feet will be back on the ground and you will see things in a more practical light."
 
     render("goat.html.erb")
   end
diff --git a/app/views/zodiacs/sagittarius.html.erb b/app/views/zodiacs/archer.html.erb
similarity index 100%
rename from app/views/zodiacs/sagittarius.html.erb
rename to app/views/zodiacs/archer.html.erb
diff --git a/app/views/fish.html.erb b/app/views/zodiacs/fish.html.erb
similarity index 100%
rename from app/views/fish.html.erb
rename to app/views/zodiacs/fish.html.erb
diff --git a/app/views/zodiacs/waterbearer.html.erb b/app/views/zodiacs/waterbearer.html.erb
index 224ba4d..57fa2cf 100644
--- a/app/views/zodiacs/waterbearer.html.erb
+++ b/app/views/zodiacs/waterbearer.html.erb
@@ -1,3 +1,3 @@
 <h1>Aquarius</h1>
 
-<p><%= prediction %></p>
+<p><%= @prediction %></p>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index dcfc2f6..64abba4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,9 +9,9 @@
 
   # Uncomment each route below ONE AT A TIME and debug.
 
-  get("/zodiacs/aries",       { :controller =>  "zodiacs",  :action =>  "ram" })
+  get("/zodiacs/aries",       { :controller =>  "zodiacs",  :action => "ram" })
   
-  get("/zodiacs/taurus",      { :controller =>  "zodiacs", :action =>   "bull" })
+  get("/zodiacs/taurus",      { :controller =>  "zodiacs", :action => "bull" })
   
   get("/zodiacs/gemini",        { :controller => "zodiacs", :action => "twins" })
   
@@ -21,17 +21,17 @@
   
   get("/zodiacs/virgo",      { :controller => "zodiacs", :action => "maiden" })
   
-  # get("/zodiacs/libra",       { :controller => "zodiacs", :action => "scales" })
+  get("/zodiacs/libra",       { :controller => "zodiacs", :action => "scales" })
   
-  # get("/zodiac/scorpio",      { :controller => "zodiacs", :action => "scorpion" })
+  get("/zodiacs/scorpio",      { :controller => "zodiacs", :action => "scorpion" })
   
-  # get("/zodiacs/sagittarius", { :controller => "zodiacs", :action => "archer" })
+  get("/zodiacs/sagittarius", { :controller => "zodiacs", :action => "archer" })
   
-  # get("/zodiacs/capricorn",   { :controller => "zodiacs", :action => "goat" })
+  get("/zodiacs/capricorn",   { :controller => "zodiacs", :action => "goat" })
   
-  # get("/zodiacs/aquarius",    { :controller => "zodiacs", :action => "waterbearer" })
+  get("/zodiacs/aquarius",    { :controller => "zodiacs", :action => "waterbearer" })
   
-  # get("/zodiacs/pisces",      { :controller => "zodiacs", :action => "fish" })
+  get("/zodiacs/pisces",      { :controller => "zodiacs", :action => "fish" })
 
   mount WebGit::Engine, at: "/rails/git"
 end