Permalink
Browse files

merged in more interfaces

  • Loading branch information...
2 parents 2cdbfbf + e5a63cd commit 909bea9f8460b42b9c63c3e421f3bae356bcd6f5 @mikeymicrophone committed Apr 10, 2012
View
@@ -13,3 +13,4 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
+/public/uploads
View
@@ -10,6 +10,7 @@ gem 'acts_as_list'
gem 'kaminari'
gem 'devise'
gem 'facebooker2'
+
# gem 'mini_magick'
@@ -33,7 +34,7 @@ gem 'jquery-rails'
# gem 'capistrano'
# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+gem 'ruby-debug19', :require => 'ruby-debug'
group :development do
gem 'sqlite3'
View
@@ -31,7 +31,9 @@ GEM
multi_json (~> 1.0)
acts_as_list (0.1.4)
ansi (1.4.1)
+ archive-tar-minitar (0.5.2)
arel (2.2.1)
+ bcrypt-ruby (3.0.1)
builder (3.0.0)
carrierwave (0.5.8)
activesupport (~> 3.0)
@@ -42,22 +44,55 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
+ columnize (0.3.6)
+ devise (2.0.0)
+ bcrypt-ruby (~> 3.0)
+ orm_adapter (~> 0.0.3)
+ railties (~> 3.1)
+ warden (~> 1.1)
erubis (2.7.0)
execjs (1.2.13)
multi_json (~> 1.0)
+ facebooker2 (0.0.16)
+ mogli (>= 0.0.33)
+ ruby-hmac
+ hashie (1.1.0)
hike (1.2.1)
+ httmultiparty (0.3.6)
+ httparty (>= 0.7.3)
+ multipart-post
+ httparty (0.8.1)
+ multi_json
+ multi_xml
i18n (0.6.0)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.5)
+ kaminari (0.13.0)
+ actionpack (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ railties (>= 3.0.0)
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
+ mogli (0.0.37)
+ hashie (~> 1.1.0)
+ httmultiparty (>= 0.3.6)
+ httparty (>= 0.4.3)
+ multi_json (~> 1.0.3)
multi_json (1.0.4)
+<<<<<<< HEAD
pg (0.11.0)
+=======
+ multi_xml (0.4.1)
+ multipart-post (1.1.4)
+ orm_adapter (0.0.6)
+>>>>>>> e5a63cdcd3117885551a06357ee560413cb42bcf
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.1)
@@ -86,6 +121,17 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby-hmac (0.4.0)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
sass (3.1.12)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
@@ -108,6 +154,8 @@ GEM
uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
+ warden (1.1.0)
+ rack (>= 1.0)
PLATFORMS
ruby
@@ -116,9 +164,16 @@ DEPENDENCIES
acts_as_list
carrierwave
coffee-rails (~> 3.1.1)
+ devise
+ facebooker2
jquery-rails
+<<<<<<< HEAD
pg
+=======
+ kaminari
+>>>>>>> e5a63cdcd3117885551a06357ee560413cb42bcf
rails (= 3.1.3)
+ ruby-debug19
sass-rails (~> 3.1.5)
sqlite3
turn (= 0.8.2)
@@ -5,7 +5,7 @@ def index
@listed_pictures = ListedPicture.all
respond_to do |format|
- format.html
+ format.html # index.html.erb
format.json { render json: @listed_pictures }
end
end
View
@@ -7,6 +7,7 @@ class Picture < ActiveRecord::Base
mount_uploader :photo_file, PhotoUploader
paginates_per 2
+
scope :not_in_list, lambda { |list| where("id not in (select picture_id from listed_pictures where list_id = ?)", list.id) }
scope :fresh, lambda { where('created_at > ?', 5.minutes.ago) }
end
@@ -8,7 +8,7 @@
<%= "Hello #{fb_name(current_facebook_user, :useyou => false)}!".html_safe %>
<%= fb_logout_link("Logout of fb", request.url) %><br />
<% else %>
- <%= fb_login_and_redirect('http://4i34.localtunnel.com/facebook_login', :scope => 'email,user_birthday') %>
+ <%= fb_login_and_redirect('http://3dqy.localtunnel.com/facebook_login', :scope => 'email,user_birthday') %>
<% end %>
@@ -3,11 +3,15 @@
<table>
<tr>
<th>Name</th>
+ <th></th>
+ <th></th>
</tr>
<% @lists.each do |list| %>
<tr>
<td><%= link_to list.name, list %></td>
+ <td><%= link_to 'Edit', edit_list_path(list) %></td>
+ <td><%= link_to 'Destroy', list, confirm: 'Are you sure?', method: :delete %></td>
</tr>
<% end %>
</table>
@@ -11,7 +11,6 @@
<%= render :partial => 'listed_pictures/listed_picture_form' %>
-
<%= link_to 'add picture to list', new_listed_picture_path(:listed_picture => {:list_id => @list.id}) %>
<%= link_to 'Edit', edit_list_path(@list) %> |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 909bea9

Please sign in to comment.