Final PR - Wang & Walentin

.gitignore

@@ -16,3 +16,4 @@
 !/log/.keep
 /tmp
 coverage/
+/public/uploads

Gemfile

@@ -27,6 +27,10 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'bcrypt', '~> 3.1.7'
 gem 'bootstrap-sass'
 
+# for uploads
+gem 'mini_magick'
+gem 'carrierwave'
+
 # Use Unicorn as the app server
 # gem 'unicorn'
 

Gemfile.lock

@@ -53,6 +53,11 @@ GEM
     builder (3.2.2)
     byebug (5.0.0)
       columnize (= 0.9.0)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -89,6 +94,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.6.1)
+    mini_magick (4.2.7)
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.2)
@@ -196,10 +202,12 @@ DEPENDENCIES
   binding_of_caller
   bootstrap-sass
   byebug
+  carrierwave
   coffee-rails (~> 4.1.0)
   factory_girl_rails (~> 4.0)
   jbuilder (~> 2.0)
   jquery-rails
+  mini_magick
   pg
   pry-rails
   rails (= 4.2.3)

app/assets/javascripts/application.js

@@ -13,4 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
+//= require bootstrap-sprockets
 //= require_tree .

app/assets/javascripts/cookbooks.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/home.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/ingredients.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/recipes.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/sessions.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/users.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss

@@ -1,3 +1,4 @@
+
 /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
@@ -13,3 +14,16 @@
  *= require_tree .
  *= require_self
  */
+
+ @import "bootstrap-sprockets";
+ @import "bootstrap";
+
+ $error: #F72B1D; /* red for warining */
+
+ .container {
+   margin-top: 30px
+ }
+
+ .error {
+  color: $error;
+}

app/assets/stylesheets/cookbooks.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the Cookbooks controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/home.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the home controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/ingredients.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the ingredients controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/recipes.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the recipes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/sessions.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the sessions controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/users.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/application_controller.rb

@@ -2,4 +2,13 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+  MESSAGES = {not_logged_in: "You must be logged in to view this page!" }
+
+  def require_login
+    redirect_to login_path, flash: {error: MESSAGES[:not_logged_in]} unless session[:user_id]
+  end
+
+  # def user_cookbooks
+  #   redirect_to root_path unless session[:user_id]
+  # end
 end

app/controllers/cookbooks_controller.rb

@@ -0,0 +1,54 @@
+class CookbooksController < ApplicationController
+  before_action :require_login, only: [:show, :edit]
+  before_action :find_cookbook, only: [:show, :edit, :update, :destroy]
+
+  def new
+    @cookbook = Cookbook.new
+  end
+
+  def create
+    @cookbook = Cookbook.create(cookbook_params)
+    @cookbook.user_id = session[:user_id]
+
+    if @cookbook.save
+        redirect_to user_path(session[:user_id])
+    else
+      flash[:name] = "Please provide a name for your cookbook."
+      render 'new'
+    end
+  end
+
+  def show
+    session[:cookbook_id] = @cookbook.id
+    if session[:user_id] != @cookbook.user_id
+      redirect_to user_path(session[:user_id])
+    end
+
+  end
+
+  def edit
+    @cookbook = Cookbook.find(params[:id])
+    if session[:user_id] != @cookbook.user_id
+      redirect_to user_path(session[:user_id])
+    end
+  end
+
+  def update
+    @cookbook.update(cookbook_params)
+    redirect_to user_path(session[:user_id])
+  end
+
+  def destroy
+    @cookbook.destroy
+    redirect_to user_path(session[:user_id])
+  end
+
+  private
+  def find_cookbook
+    @cookbook = Cookbook.find(params[:id])
+  end
+
+  def cookbook_params
+    params.require(:cookbook).permit(:name, :description, {:recipe_ids => [] })
+  end
+end

app/controllers/home_controller.rb

@@ -0,0 +1,5 @@
+class HomeController < ApplicationController
+  def index
+    @recipes = Recipe.all
+  end
+end

app/controllers/ingredients_controller.rb

@@ -0,0 +1,63 @@
+class IngredientsController < ApplicationController
+  before_action :find_ingredient, only: [:show, :destroy]
+  before_action :require_login, only: [:new]
+
+  def index
+    @ingredients = Ingredient.all.alphabet
+  end
+
+  def edit
+    @ingredient = Ingredient.find(params[:id])
+    if session[:user_id] != @ingredient.user_id
+      redirect_to ingredient_path(@ingredient)
+    end
+  end
+
+  def update
+    @ingredient = Ingredient.find(params[:id])
+    @ingredient.update(ingredient_params)
+
+    if @ingredient.save
+      redirect_to user_path(session[:user_id])
+    else
+      flash[:name] = "Please provide your ingredient name."
+      render :edit
+    end
+  end
+
+  def show
+    @ingredient = find_ingredient
+  end
+
+  def new
+    @ingredient = Ingredient.new
+  end
+
+  def create
+    @ingredient = Ingredient.new(ingredient_params)
+    @ingredient.user_id = session[:user_id]
+    if @ingredient.save
+      redirect_to ingredient_path(@ingredient)
+    else
+      flash[:name] = "Please provide your ingredient name."
+      render :new
+    end
+  end
+
+  def destroy
+    @ingredient.destroy
+
+    redirect_to user_path(session[:user_id])
+  end
+
+  private
+
+    def find_ingredient
+      @ingredient = Ingredient.find(params[:id])
+    end
+
+    def ingredient_params
+      params.require(:ingredient).permit(:name, :image)
+    end
+
+end

app/controllers/recipes_controller.rb

@@ -0,0 +1,96 @@
+class RecipesController < ApplicationController
+  before_action :require_login, only: [:new, :add]
+
+  def index
+    if params[:search]
+      @recipes = Recipe.search(params[:search])
+      render :results
+    else
+      @recipes = Recipe.all.alphabet
+      render :index
+    end
+  end
+
+  def edit
+    @recipe = Recipe.find(params[:id])
+    if session[:user_id] != @recipe.user_id
+      redirect_to recipe_path(@recipe)
+    end
+  end
+
+  def update
+    @recipe = Recipe.find(params[:id])
+    @recipe.update(recipe_params)
+
+    if @recipe.save
+      redirect_to user_path(session[:user_id])
+    else
+      render :edit
+    end
+
+  end
+
+  def new
+    @user = User.find(session[:user_id])
+    @recipe = Recipe.new(user_id: @user.id)
+    @ingredients = Ingredient.all
+    @cookbook = Cookbook.where(user_id: @user.id )
+  end
+
+  def show
+    @recipe = Recipe.find(params[:id])
+    # @user = User.find(@recipe.user_id).username.capitalize
+    @user_recipes = User.find(@recipe.user_id).username.capitalize
+    @your_cookbook = User.find(session[:user_id]).cookbooks if session[:user_id]
+  end
+
+  def add
+    @user = User.find(session[:user_id])
+    @recipe = Recipe.find(params[:id])
+    @cookbook = Cookbook.where(user_id: @user.id)
+    render :add
+  end
+
+  def create
+    @recipe = Recipe.new(recipe_params)
+    @recipe.user_id = session[:user_id]
+    @recipe.validate
+
+    if @recipe.valid?
+      @ingredient_recipe = (params[:recipe][:ingredient_ids].first).to_i
+      @recipe.ingredients << Ingredient.find(@ingredient_recipe) unless @ingredient_recipe != 0
+      # This prevents anything from being saved if the user didn't input any ingredients for a recipe
+      @recipe.save
+      redirect_to user_path(session[:user_id])
+    else
+      @cookbook = Cookbook.where(user_id: session[:user_id])
+      @user = User.find(session[:user_id])
+      @ingredients = Ingredient.all
+      @recipe = Recipe.new(user_id: @user.id)
+      render :new
+    end
+  end
+
+  def remove_recipe
+     cookbook = Cookbook.find(session[:cookbook_id])
+     recipe = Recipe.find(params[:recipe_id])
+
+     if cookbook
+        recipe.cookbooks.delete(cookbook)
+        redirect_to root_path
+     end
+  end
+
+  def destroy
+    @recipe = Recipe.find(params[:id])
+    @recipe.destroy
+    redirect_to user_path(session[:user_id])
+  end
+
+  private
+
+
+  def recipe_params
+    params.require(:recipe).permit(:user_id, :recipe_id, :name, :description, :image, :ingredients, :preparation, {:ingredient_ids => [] }, {:cookbook_ids => [] })
+  end
+end

app/controllers/sessions_controller.rb

@@ -0,0 +1,22 @@
+class SessionsController < ApplicationController
+  def new
+  end
+
+  def create
+    @user = User.find_by_username(params[:session][:username])
+
+    if @user && @user.authenticate(params[:session][:password])
+      session[:user_id] = @user.id
+      redirect_to user_path(session[:user_id])
+    else
+      flash.now[:error] = "Incorrect Username/Password Combination, Please Try Again."
+      render 'new'
+    end
+  end
+
+  def destroy
+    session[:user_id] = nil
+    redirect_to login_path
+  end
+
+end