Merge branch 'master' of https://github.com/jatwell93/rubyproject

README.rdoc

@@ -43,14 +43,10 @@ Javascript trouble shooting stuff ...
 
 to do first:
 
-- fix delete posts 
 - add images parralax image to aws 
-- go through every page and double check and every file 
 - fix facebook login by changing details in facebook app homepage 
-- fix workout show on users homepage
-- fix delete review function
-- fix javascript on login page
 - get rid of inline javascripts 
+- fix feeds and preptime 
 
 Beta:
 
@@ -68,9 +64,7 @@ Beta:
 - refactor and speed up
 - add gravatar to mailbox
 - add font awesomes to icons
-- change to 'birthday' social share icons
 - add measurements again
-- change to link back to previous page
 - add redcarpet and friendly_id
 - add confirmaions in devise then add promo html markup to the mailer
 

app/assets/javascripts/application.js

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery_ujs 
 //= require cocoon
 //= require bootstrap-sprockets
 //= require turbolinks

app/views/recipes/_form.html.erb

@@ -47,13 +47,13 @@
             <br>
             <br>
             <strong>Feeds: </strong>
-           <%= f.collection_check_boxes :feed_ids, Feed.all, :id, :people do |cb| %>
+             <%= f.collection_check_boxes :feed_ids, Feed.all, :id, :people do |cb| %>
                 <% cb.label(class: "checkbox-inline input_checkbox") {cb.check_box(class: "checkbox") + cb.text} %>
              <% end %>
             <br>
              <br>
             <strong>Preptime: </strong>
-           <%= f.collection_check_boxes :preptime_ids, Preptime.all, :id, :time do |cb| %>
+             <%= f.collection_check_boxes :preptime_ids, Preptime.all, :id, :time do |cb| %>
                 <% cb.label(class: "checkbox-inline input_checkbox") {cb.check_box(class: "checkbox") + cb.text} %>
              <% end %>
             <br>

app/views/recipes/show.html.erb

@@ -52,8 +52,9 @@
 				<%if logged_in? and is_owner? %>
 					<%= link_to "Edit this Recipe", edit_recipe_path(@recipe), class: "btn btn-success pull-right edit" %>
 				<%end %>
+
 				<%if logged_in? and (is_owner?) %>
-					<%= link_to "[Delete Recipe]", recipe_path(@recipe.delete), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger pull-right delete"%>
+					 <%= link_to "[Delete Recipe]", @recipe, method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger pull-right delete"%>
 				<%end %>
 			<div class="social-share-button">
 				Share this! <%= social_share_button_tag(@recipe.name) %>

app/views/users/show.html.erb

@@ -1,4 +1,4 @@
-<% provide(:title, "User: #{@user.username})" %>
+<% provide(:title, "User: #{@user.username}") %>
 <div class="container">
 <nav class="breadcrumb">
   <a class="breadcrumb-item" <%= link_to 'Home/', root_path%></a>

config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
-    # users rotues
+  # users rotues
   devise_for :users, :controllers => {registrations: "registrations", omniauth_callbacks: "omniauth_callbacks"}
   match '/users/:id/finish_signup' => 'users#finish_signup', via: [:get, :patch], :as => :finish_signup
   #workout routes
@@ -12,6 +12,7 @@
       get 'like'
       post 'like'
       post 'review'
+      delete 'review', to: "recipes#deletereview"
     end
     resources :reviews, except: [:show, :index]
   end
@@ -33,6 +34,7 @@
       get 'like'
       post 'like'
       post 'review'
+      delete 'review', to: "recipes#deletereview"
     end
     resources :reviews, except: [:show, :index]
   end