Skip to content
Browse files

Merge branch 'master' of github.com:jessieay/tithe

  • Loading branch information...
2 parents 2df11fc + fe22e9d commit b31f2178714fb11254cf381157277ec4ea24ee1e David Lee committed Sep 24, 2012
View
0 app/assets/images/icon.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
53 app/assets/stylesheets/animate.css
@@ -1,53 +0,0 @@
-.animated {
- -webkit-animation-fill-mode: both;
- -moz-animation-fill-mode: both;
- -ms-animation-fill-mode: both;
- -o-animation-fill-mode: both;
- animation-fill-mode: both;
- -webkit-animation-duration: 1s;
- -moz-animation-duration: 1s;
- -ms-animation-duration: 1s;
- -o-animation-duration: 1s;
- animation-duration: 1s;
-}
-
-.animated.hinge {
- -webkit-animation-duration: 2s;
- -moz-animation-duration: 2s;
- -ms-animation-duration: 2s;
- -o-animation-duration: 2s;
- animation-duration: 2s;
-}
-
-@-webkit-keyframes fadeIn {
- 0% {opacity: 0;}
- 100% {opacity: 1;}
-}
-
-@-moz-keyframes fadeIn {
- 0% {opacity: 0;}
- 100% {opacity: 1;}
-}
-
-@-ms-keyframes fadeIn {
- 0% {opacity: 0;}
- 100% {opacity: 1;}
-}
-
-@-o-keyframes fadeIn {
- 0% {opacity: 0;}
- 100% {opacity: 1;}
-}
-
-@keyframes fadeIn {
- 0% {opacity: 0;}
- 100% {opacity: 1;}
-}
-
-.fadeIn {
- -webkit-animation-name: fadeIn;
- -moz-animation-name: fadeIn;
- -ms-animation-name: fadeIn;
- -o-animation-name: fadeIn;
- animation-name: fadeIn;
-}
View
53 app/assets/stylesheets/animate.scss
@@ -0,0 +1,53 @@
+.animated {
+ -webkit-animation-fill-mode: both;
+ -moz-animation-fill-mode: both;
+ -ms-animation-fill-mode: both;
+ -o-animation-fill-mode: both;
+ animation-fill-mode: both;
+ -webkit-animation-duration: 1s;
+ -moz-animation-duration: 1s;
+ -ms-animation-duration: 1s;
+ -o-animation-duration: 1s;
+ animation-duration: 1s;
+}
+
+.animated.hinge {
+ -webkit-animation-duration: 2s;
+ -moz-animation-duration: 2s;
+ -ms-animation-duration: 2s;
+ -o-animation-duration: 2s;
+ animation-duration: 2s;
+}
+
+@-webkit-keyframes fadeIn {
+ 0% {opacity: 0;}
+ 100% {opacity: 1;}
+}
+
+@-moz-keyframes fadeIn {
+ 0% {opacity: 0;}
+ 100% {opacity: 1;}
+}
+
+@-ms-keyframes fadeIn {
+ 0% {opacity: 0;}
+ 100% {opacity: 1;}
+}
+
+@-o-keyframes fadeIn {
+ 0% {opacity: 0;}
+ 100% {opacity: 1;}
+}
+
+@keyframes fadeIn {
+ 0% {opacity: 0;}
+ 100% {opacity: 1;}
+}
+
+.fadeIn {
+ -webkit-animation-name: fadeIn;
+ -moz-animation-name: fadeIn;
+ -ms-animation-name: fadeIn;
+ -o-animation-name: fadeIn;
+ animation-name: fadeIn;
+}
View
0 app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss
File renamed without changes.
View
0 app/assets/stylesheets/bootstrap_and_overrides.css.less 100755 → 100644
File mode changed.
View
3 app/assets/stylesheets/custom.css → app/assets/stylesheets/custom.scss 100755 → 100644
@@ -19,7 +19,6 @@
}
#jstwitter .tweet .time {}
-}
/* Custom Footer Styles */
footer {
@@ -28,4 +27,4 @@
margin-top: 20px;
padding-top: 20px;
margin-bottom:10px;
-}
+}
View
0 app/assets/stylesheets/responsive.css → app/assets/stylesheets/responsive.scss 100755 → 100644
File renamed without changes.
View
2 app/controllers/application_controller.rb
@@ -17,6 +17,6 @@ def authenticate_user!
end
def check_current_user
- redirect_to root_path if current_user
+ redirect_to organizations_path if current_user
end
end
View
2 app/controllers/sessions_controller.rb
@@ -7,7 +7,7 @@ def new
def create
if user = User.authenticate(params[:email], params[:password])
self.current_user = user
- redirect_to root_path, :notice => "Logged in!"
+ redirect_to organizations_path, :notice => "Logged in!"
else
flash.now[:error] = "Invalid email or password"
render "new"
View
2 app/controllers/users_controller.rb
@@ -8,7 +8,7 @@ def new
def create
@user = User.new(params[:user])
if @user.save
- Notifier.signup_email(@user).deliver
+ Notifier.welcome(@user).deliver
self.current_user = @user
redirect_to root_path, :notice => "Signed up!"
else
View
8 app/mailers/notifier.rb
@@ -1,10 +1,10 @@
class Notifier < ActionMailer::Base
- default :from => "yay@tithe.boon.gl"
+ default :from => "Tithe <welcome@tithe.boon.gl>"
# send a signup email to the user, pass in the user object that contains the user's email address
- def signup_email(user)
- mail( :to => user.email,
- :subject => "Thanks for signing up" )
+ def welcome(user)
+ @user = user
+ mail( :to => user.email, :subject => "Welcome to Tithe!" )
end
end
View
12 app/views/layouts/_carousel.html.erb
@@ -1,12 +0,0 @@
- <div id="myCarousel" class="carousel slide">
- <!-- Carousel items -->
- <div class="carousel-inner">
- <div class="active item"><%= image_tag("slide_a.jpg") %></div>
- <div class="item"><%= image_tag("slide_b.jpg") %></div>
- <div class="item"><%= image_tag("slide_c.jpg") %></div>
- <div class="item"><%= image_tag("slide_d.jpg") %></div>
- </div>
- <!-- Carousel nav -->
- <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
- <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
- </div>
View
8 app/views/layouts/_carousel.html.haml
@@ -0,0 +1,8 @@
+#myCarousel{ :class => "carousel slide" }
+ .carousel-inner
+ %div{ :class => "active item" }= image_tag("slide_a.jpg")
+ .item= image_tag("slide_b.jpg")
+ .item= image_tag("slide_c.jpg")
+ .item= image_tag("slide_d.jpg")
+ = link_to("‹", "#myCarousel", :class => "carousel-control left", "data-slide" => "prev")
+ = link_to("›", "#myCarousel", :class => "carousel-control right", "data-slide" => "next")
View
6 app/views/layouts/_header.html.erb
@@ -11,10 +11,10 @@
</div>
<div class="container nav-collapse">
<ul class="nav pull-right">
-
- <li><%= link_to "Login or Sign Up", "#" %></li>
+
+ <li><% if current_user %><%= link_to "Log Out", logout_path %><% end %></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
- </div>
+ </div>
View
11 app/views/notifier/welcome.html.haml
@@ -0,0 +1,11 @@
+%h3 Hi, #{@user.first_name}!
+
+%p
+ Thanks so much for joining Tithe! Let's get started contributing:
+
+%h3= link_to("Tithe", "http://tithe.boon.gl")
+
+%p
+ Cheers!
+ %br
+ The Tithe team
View
2 app/views/pages/home.html.erb
@@ -5,4 +5,4 @@
<p>The government--whether federal, state, or local--provides many vital services that we depend on. These services include everything from the streets we drive on, the schools our children are educated in, and the public transportation that help us get to work. </p>
<p> Public spending has been drastically reduced in many key areas over the last few years due to the economic recession. These reductions have meant fewer afterschool programs, fewer operating hours for local libraries, fewer police officers keeping our neighborhoods safe, and fewer services in every manner.</p>
<p> Tithe exists to connect citizens with the governmental agencies you support most. Through Tithe, you can easily make a donation to help support the government service. </p>
-<%= button_to "Join today!", sign_up_path, class: "center btn btn-primary btn-large", :method => :get %> <%= button_to "Log in!", login_path, class: "center btn btn-primary btn-large", :method => :get %>
+<%= link_to "Join today!", sign_up_path, class: "center btn btn-primary btn-large", :method => :get %> <%= link_to "Log in!", login_path, class: "center btn btn-primary btn-large", :method => :get %>
View
8 app/views/users/new.html.haml
@@ -8,6 +8,14 @@
- @user.errors.full_messages.each do |message|
%li= message
%p
+ = f.label :first_name
+ %br
+ = f.text_field :first_name
+ %p
+ = f.label :last_name
+ %br
+ = f.text_field :last_name
+ %p
= f.label :email
= f.text_field :email
%p

0 comments on commit b31f217

Please sign in to comment.
Something went wrong with that request. Please try again.