diff --git a/app/controllers/rewards_controller.rb b/app/controllers/rewards_controller.rb deleted file mode 100644 index 1159aa194d..0000000000 --- a/app/controllers/rewards_controller.rb +++ /dev/null @@ -1,83 +0,0 @@ -class RewardsController < ApplicationController - - # GET /rewards/new - # GET /rewards/new.json - def new - @reward = Reward.new - @reward.user_id = current_user.id - - respond_to do |format| - format.html # new.html.erb - format.json { render json: @reward } - end - end - - # GET /rewards/1/edit - def edit - @reward = current_user.rewards.find(params[:id]) - end - - # POST /rewards - # POST /rewards.json - def create - @reward = Reward.new(params[:reward]) - @reward.user_id = current_user.id - - respond_to do |format| - if @reward.save - format.html { redirect_to habits_url, notice: 'Reward was successfully created.' } - format.json { render json: @reward, status: :created, location: @reward } - else - format.html { render action: "new" } - format.json { render json: @reward.errors, status: :unprocessable_entity } - end - end - end - - # PUT /rewards/1 - # PUT /rewards/1.json - def update - @reward = current_user.rewards.find(params[:id]) - - respond_to do |format| - if @reward.update_attributes(params[:reward]) - format.html { redirect_to habits_url, notice: 'Reward was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: "edit" } - format.json { render json: @reward.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /rewards/1 - # DELETE /rewards/1.json - def destroy - @reward = current_user.reward.find(params[:id]) - @reward.destroy - - respond_to do |format| - format.html { redirect_to habits_url } - format.json { head :no_content } - end - end - - - def buy - @reward = current_user.rewards.find(params[:id]) - @too_expensive = true - if current_user.money > @reward.value - current_user.money -= @reward.value - current_user.save - @too_expensive = false - end - - respond_to do |format| - # format.html { render action: "edit" } - # format.json { render json: @habit.errors, status: :unprocessable_entity } - format.js - end - end - - -end diff --git a/app/views/rewards/_form.html.erb b/app/views/rewards/_form.html.erb deleted file mode 100644 index 3a03ec063f..0000000000 --- a/app/views/rewards/_form.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -<%= form_for(@reward) do |f| %> - <% if @reward.errors.any? %> -
-

<%= pluralize(@reward.errors.count, "error") %> prohibited this reward from being saved:

- - -
- <% end %> - -
- <%= f.label :name %>
- <%= f.text_field :name %> -
-
- <%= f.label :value %>
- <%= f.number_field :value %> -
-
- <%= f.submit %> -
-<% end %> diff --git a/app/views/rewards/buy.js.erb b/app/views/rewards/buy.js.erb deleted file mode 100644 index b0d8ed9858..0000000000 --- a/app/views/rewards/buy.js.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% if @too_expensive %> - $('#money').effect("pulsate", 100); -<% else %> - $('#money').replaceWith("<%= escape_javascript(render 'shared/money') %>"); -<% end %> diff --git a/app/views/rewards/edit.html.erb b/app/views/rewards/edit.html.erb deleted file mode 100644 index dbfcff6bb3..0000000000 --- a/app/views/rewards/edit.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

Editing reward

- -<%= render 'form' %> - -<%= link_to 'Back', habits_path %> diff --git a/app/views/rewards/new.html.erb b/app/views/rewards/new.html.erb deleted file mode 100644 index 64025c3a40..0000000000 --- a/app/views/rewards/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

New reward

- -<%= render 'form' %> - -<%= link_to 'Back', habits_path %> diff --git a/config/routes.rb b/config/routes.rb index d14aed0cf7..ee0c84f508 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,12 +8,6 @@ HabitTracker::Application.routes.draw do end end - resources :rewards do - member do - get 'buy' - end - end - devise_for :users # The priority is based upon order of creation: