Skip to content
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
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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."

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions app/views/horoscopes/waterbearer.html.erb

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions app/views/zodiacs/waterbearer.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<h1>Aquarius</h1>

<p><%= @prediction %></p>
35 changes: 23 additions & 12 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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