Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:jhubert/iparty

  • Loading branch information...
commit 35616436e09b87d6c921dc23acb4609bc6751a45 2 parents 4f984aa + 11cd5ec
@jhubert authored
View
2  app/models/event.rb
@@ -31,7 +31,7 @@ def self.create_from_facebook_graph_and_facebook_eid(koala, eid, attrs = {})
:facebook_eid => fb_event_data['id'],
:facebook_owner_id => fb_event_data['owner'] && fb_event_data['owner']['id'],
:name => fb_event_data['name'],
- :image_url => fb_event_data['pic'],
+ :image_url => koala.get_picture(fb_event_data['id'],{'type'=>'large'}),
:start_time => fb_event_data['start_time'],
:end_time => fb_event_data['end_time'],
:venue_facebook_vid => fb_venue_data['id'],
View
17 app/views/general/index.html.erb
@@ -5,12 +5,25 @@
<h2>Your Donations</h2>
<table class='table table-striped table-bordered'>
+ <thead>
+ <tr>
+ <th>Party</th>
+ <th>Date</th>
+ <th>Amount</th>
+ </tr>
+ </thead>
+ <tbody>
<% current_user.donations.each do |donation| %>
- <tr><td><%= donation.inspect %></td></tr>
+ <tr>
+ <td><%= donation.description %></td>
+ <td><%= donation.created_at.strftime("%m/%d/%y %I:%M%p") %></td>
+ <td><%= number_to_currency((donation.amount || 0).to_i/100) %></td>
+ </tr>
<% end %>
+ </tbody>
</table>
<% else %>
<h1>Welcome</h1>
<%= link_to "Sign in with Facebook", '/users/auth/facebook' %>
-<% end %>
+<% end %>
View
2  config/initializers/devise.rb
@@ -216,7 +216,7 @@
require "omniauth-facebook"
config.omniauth :facebook, FACEBOOK['app_id'], FACEBOOK['app_secret'],
- :scope => 'email,user_events,offline_access'
+ :scope => 'email,user_events,friends_events,offline_access'
# ==> Warden configuration
# If you want to use other strategies, that are not supported by Devise, or
Please sign in to comment.
Something went wrong with that request. Please try again.