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 84% rename from app/controllers/Zodiac_controller.rb rename to app/controllers/zodiacs_controller.rb index da2e8de..34c0ac7 100644 --- a/app/controllers/Zodiac_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." @@ -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/horoscopes/waterbearer.html.erb b/app/views/horoscopes/waterbearer.html.erb deleted file mode 100644 index 224ba4d..0000000 --- a/app/views/horoscopes/waterbearer.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -

Aquarius

- -

<%= prediction %>

diff --git a/app/views/horoscopes/sagittarius.html.erb b/app/views/zodiacs/archer.html.erb similarity index 100% rename from app/views/horoscopes/sagittarius.html.erb rename to app/views/zodiacs/archer.html.erb 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/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/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/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/zodiacs/waterbearer.html.erb b/app/views/zodiacs/waterbearer.html.erb new file mode 100644 index 0000000..57fa2cf --- /dev/null +++ b/app/views/zodiacs/waterbearer.html.erb @@ -0,0 +1,3 @@ +

Aquarius

+ +

<%= @prediction %>

\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index e6b4cd7..64abba4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,18 +9,29 @@ # 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/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" }) + 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 => "zodiacs", :action => "lion" }) + + get("/zodiacs/virgo", { :controller => "zodiacs", :action => "maiden" }) + + get("/zodiacs/libra", { :controller => "zodiacs", :action => "scales" }) + + get("/zodiacs/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" end