Skip to content

Commit

Permalink
final
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyler Singletary authored and Tyler Singletary committed Jan 7, 2015
1 parent 35b6cff commit 1cc585d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified app/assets/stylesheets/.DS_Store
Binary file not shown.
10 changes: 5 additions & 5 deletions app/controllers/movies_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ class MoviesController < ApplicationController
include HTTParty

base_uri = 'https://www.manpacks.com/api/update/user'
@manpack_api_key = 'RQ44_V0WCREJHD3H2JP9'
@manpack_user_key = 'KPWQ_WAX3WNLCP0OIPGT'
Rotten.api_key = '34r59jew67w375sraaqhm33q'
@manpack_api_key = 'censored'
@manpack_user_key = 'censored'
Rotten.api_key = 'censored'

# GET /movies
# GET /movies.json
Expand Down Expand Up @@ -66,11 +66,11 @@ def create
@movie.will_shit_your_pants = true
#@manpack = Manpacks.first
options = { :body => {
:userKey => '5I9K_QWRKIEKSL9QRKYM',
:userKey => 'censored',
:timestamp => Time.now.next_week.to_i }
}
response = self.class.post('https://www.manpacks.com/api/update/user/shipdate?api_key=' +
'RQ44_V0WCREJHD3H2JP9', options)
"manpack_api_key, options)
if response.code == 200 then
puts 'Successfully bumped your underwear order to next week, poop pants.'
notice_message = 'Successfully bumped your underwear order to next week, pooppants.'
Expand Down
8 changes: 4 additions & 4 deletions app/views/manpack_accounts/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<%= form_for(@manpack_account) do |f| %>
<% if @manpack_account.errors.any? %>
<%= form_for(@manbag_account) do |f| %>
<% if @manbag_account.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@manpack_account.errors.count, "error") %> prohibited this manpack_account from being saved:</h2>
<h2><%= pluralize(@manbag_account.errors.count, "error") %> prohibited this manbag_account from being saved:</h2>

<ul>
<% @manpack_account.errors.full_messages.each do |msg| %>
<% @manbag_account.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
Expand Down

0 comments on commit 1cc585d

Please sign in to comment.