From 0f04ec9da6b0db396d57d70fd2ab7ef6b5fea082 Mon Sep 17 00:00:00 2001
From: Perry Fustero <pjfust@gmail.com>
Date: Thu, 14 Dec 2017 20:50:46 -0500
Subject: [PATCH 1/2] added comments

---
 README.md                                        |  8 ++++++--
 .../app/controllers/categories_controller.rb     | 12 +++++++-----
 .../app/controllers/comments_controller.rb       |  6 ++++--
 .../app/controllers/vehicles_controller.rb       |  4 ++--
 Wheeled-Rider/app/models/category.rb             |  2 +-
 .../app/views/categories/index.html.erb          |  2 +-
 Wheeled-Rider/app/views/categories/show.html.erb |  4 ++--
 Wheeled-Rider/app/views/comments/edit.html.erb   |  1 -
 .../app/views/layouts/application.html.erb       |  2 +-
 Wheeled-Rider/app/views/vehicles/_form.html.erb  |  2 ++
 Wheeled-Rider/app/views/vehicles/edit.html.erb   |  1 -
 Wheeled-Rider/app/views/vehicles/index.html.erb  |  8 +++++---
 Wheeled-Rider/app/views/vehicles/show.html.erb   | 11 ++++-------
 Wheeled-Rider/config/routes.rb                   | 16 +++++++---------
 .../migrate/20171128150511_create_categories.rb  |  3 +++
 Wheeled-Rider/db/seeds.rb                        |  4 +++-
 16 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index c3dc258..c9239fa 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@ To participate, simply make an account, click on a vehicle image, and begin post
 
 
 ### Brief Example
-Here's a sample snapshot: 
+Here's a sample snapshot:
 ![Wheeled Rider](https://i.imgur.com/l2T6Vg0.jpg)
 
 
 ### User Stories
-Users are able to log into the site, choose (or make) a vehicle, select a representative image, and post a conntroversial opinion about their vehicle of choice.
+Users are able to log into the site, choose (or make) a vehicle, select a representative image, and post a controversial opinion about their vehicle of choice.
 
 ### Technologies used
  * Ruby
@@ -24,3 +24,7 @@ Users are able to log into the site, choose (or make) a vehicle, select a repres
 https://wheeled-rider.herokuapp.com/
 
 screencast:   https://www.youtube.com/watch?v=PQbhtj6e7KQ&feature=youtu.be
+
+<!-- Good job on the readme.  Screenshot is a nice touch.  Also include instructions on how to run the app locally. -->
+<!-- Also, make sure your ERD reflects your current project, so make sure it includes comments -->
+<!-- Also in terms of file structure, these outermost files should be inside of the Wheeled-Rider directory -->
diff --git a/Wheeled-Rider/app/controllers/categories_controller.rb b/Wheeled-Rider/app/controllers/categories_controller.rb
index 1b185d4..6e787e1 100644
--- a/Wheeled-Rider/app/controllers/categories_controller.rb
+++ b/Wheeled-Rider/app/controllers/categories_controller.rb
@@ -12,8 +12,8 @@ def new
   # create
   def create
     @category = Category.create(category_params.merge(user: current_user))
-
-    @category.save
+    # Nice job using the merge method
+    @category.save # you don't need .save if you call .create
     redirect_to @category
   end
 
@@ -24,7 +24,7 @@ def show
 
   # edit
   def edit
-    # @vehicle = Vehicle.find(params[:vehicle_id])
+    # @vehicle = Vehicle.find(params[:vehicle_id]) # No commented out code in production!
     @category = Category.find(params[:id])
   end
 
@@ -39,11 +39,13 @@ def update
   def destroy
     @category = Category.find(params[:id])
     @category.destroy
-    redirect_to "/vehicles/"
+    redirect_to "/vehicles"
   end
 
   private
   def category_params
     params.require(:category).permit(:title, :author, :num_replies, :last_reply, :vehicle)
-  end
+  end # Nice job using params.require in a private method
 end
+
+# Dont really need the comments for the methods names here
diff --git a/Wheeled-Rider/app/controllers/comments_controller.rb b/Wheeled-Rider/app/controllers/comments_controller.rb
index cc82947..d5922f6 100644
--- a/Wheeled-Rider/app/controllers/comments_controller.rb
+++ b/Wheeled-Rider/app/controllers/comments_controller.rb
@@ -2,7 +2,7 @@ class CommentsController < ApplicationController
   # index
   def index
     @comments = Comment.all
-  end
+  end # You can get rid of your index method and index views since its not being used.  
 
   # new
   def new
@@ -33,7 +33,7 @@ def edit
 
   # update
   def update
-    @comment = category.find(params[:id])
+    @comment = Category.find(params[:id])
     @comment.update(comment_params)
     redirect_to @comment
   end
@@ -50,3 +50,5 @@ def comment_params
     params.require(:comment).permit(:contet, :author, :tier_of_reply, :time_posted, :category)
   end
 end
+
+# Delete commented method names
diff --git a/Wheeled-Rider/app/controllers/vehicles_controller.rb b/Wheeled-Rider/app/controllers/vehicles_controller.rb
index 5b01d81..d99a2e2 100644
--- a/Wheeled-Rider/app/controllers/vehicles_controller.rb
+++ b/Wheeled-Rider/app/controllers/vehicles_controller.rb
@@ -17,7 +17,7 @@ def create
   def show
     @vehicle = Vehicle.find(params[:id])
     @categories = Category.where(vehicle_id: params[:id])
-    # @categories = Category.all
+    # ^ This seems a little strange.  You should be able to do @vehicle.categories to get all categories under a vehicle
   end
 
   def edit
@@ -33,7 +33,7 @@ def update
   def destroy
     @vehicle = Vehicle.find(params[:id])
     @vehicle.destroy
-    redirect_to "/vehicles/"
+    redirect_to "/vehicles"
   end
 
   private
diff --git a/Wheeled-Rider/app/models/category.rb b/Wheeled-Rider/app/models/category.rb
index 7fbf72d..84b1f47 100644
--- a/Wheeled-Rider/app/models/category.rb
+++ b/Wheeled-Rider/app/models/category.rb
@@ -1,4 +1,4 @@
 class Category < ApplicationRecord
-  belongs_to :vehicle
+  belongs_to :vehicle # should also belong to users the way you have it mapped out.
   has_many :comments
 end
diff --git a/Wheeled-Rider/app/views/categories/index.html.erb b/Wheeled-Rider/app/views/categories/index.html.erb
index 3d16044..45bcf18 100644
--- a/Wheeled-Rider/app/views/categories/index.html.erb
+++ b/Wheeled-Rider/app/views/categories/index.html.erb
@@ -6,6 +6,6 @@
     <li>
       <%= link_to category.title, category_path(category) %>
     </li>
-  </br>
+  <br/>
   <% end %>
 </ul>
diff --git a/Wheeled-Rider/app/views/categories/show.html.erb b/Wheeled-Rider/app/views/categories/show.html.erb
index 79f6c47..155b9d3 100644
--- a/Wheeled-Rider/app/views/categories/show.html.erb
+++ b/Wheeled-Rider/app/views/categories/show.html.erb
@@ -1,7 +1,7 @@
 <h2><%= @category.title %> </h2>
 
 <body class = "category_show">
-
+<!-- Need <ul> wrapper around your <li>'s -->
 <li> <a href="/categories/">(go back)</a> </li>
 <li> <a href="/comment/new">Reply to post</a> </li>
 <li> <a href="/categories/<%= @category.id %>/edit">(edit category)</a></li>
@@ -10,7 +10,7 @@
 <div class="category_link_wrapper">
   <% 5.times do |category| %>
        <div class="category_link">
-         <!-- comments go here -->
+
        </div>
 
 </div>
diff --git a/Wheeled-Rider/app/views/comments/edit.html.erb b/Wheeled-Rider/app/views/comments/edit.html.erb
index ec40c74..6ba812c 100644
--- a/Wheeled-Rider/app/views/comments/edit.html.erb
+++ b/Wheeled-Rider/app/views/comments/edit.html.erb
@@ -1,6 +1,5 @@
 <h2>Edit Your Comment</h2>
 
-
 <%= render 'form' %>
 
 <%= link_to 'Delete!', comment_path(@comment), method: :delete, class: 'delete' %>
diff --git a/Wheeled-Rider/app/views/layouts/application.html.erb b/Wheeled-Rider/app/views/layouts/application.html.erb
index 035999b..2edaf3b 100644
--- a/Wheeled-Rider/app/views/layouts/application.html.erb
+++ b/Wheeled-Rider/app/views/layouts/application.html.erb
@@ -19,7 +19,7 @@
               <%= link_to 'Login', new_user_session_path %>
             <% end %>
           </div>
-
+<!-- Good job setting this up for so a non-user cant use your page -->
 
 
     <%= yield %>
diff --git a/Wheeled-Rider/app/views/vehicles/_form.html.erb b/Wheeled-Rider/app/views/vehicles/_form.html.erb
index e1a8af7..e66a289 100644
--- a/Wheeled-Rider/app/views/vehicles/_form.html.erb
+++ b/Wheeled-Rider/app/views/vehicles/_form.html.erb
@@ -9,3 +9,5 @@
   <%= f.submit %>
 
 <% end %>
+
+<!-- Nice job using _forms to keep things dry -->
diff --git a/Wheeled-Rider/app/views/vehicles/edit.html.erb b/Wheeled-Rider/app/views/vehicles/edit.html.erb
index c14d6ba..39ca738 100644
--- a/Wheeled-Rider/app/views/vehicles/edit.html.erb
+++ b/Wheeled-Rider/app/views/vehicles/edit.html.erb
@@ -1,6 +1,5 @@
 <h2>Edit Vehicle</h2>
 
-
 <%= render 'form' %>
 
 <%= link_to 'Delete!', vehicle_path(@vehicle), method: :delete, class: 'delete' %>
diff --git a/Wheeled-Rider/app/views/vehicles/index.html.erb b/Wheeled-Rider/app/views/vehicles/index.html.erb
index e86e5d2..b59517a 100644
--- a/Wheeled-Rider/app/views/vehicles/index.html.erb
+++ b/Wheeled-Rider/app/views/vehicles/index.html.erb
@@ -1,17 +1,19 @@
 <div class="title_box_container">
   <div class="title_box">
     <h2>Welcome to Wheeled Rider!!!</h2>
-    <h3> A forum for enthusiasts of ALL vehicles on wheels <h3>  <h5> <a href="/vehicles/new">(click here if there's a vehicle you want, but dont see)</a> </h5>
+    <h3> A forum for enthusiasts of ALL vehicles on wheels <h3>
+    <h5> <a href="/vehicles/new">(click here if there's a vehicle you want, but dont see)</a> </h5>
+    <!-- Probably doesn't need to be h5, just bold or something -->
   </div>
 </div>
 
 <body background = "https://i.pinimg.com/originals/9f/32/5a/9f325a4a82e07083f703de79893a2b28.jpg">
-
+<!-- You shouldn't be using body, that tag should only be used once in your app, and it should be in your layout page.  Also, put the background property in css -->
 <div id = "vehicle_image_wrapper">
   <% @vehicles.each do |vehicle| %>
     <div class="vehicle_image_container">
       <a href="/vehicles/<%= vehicle.id %>">
-      <img class = "vehicle_image" src = "<%= vehicle.img_url%>" alt = "<%= vehicle.name%>" class = "vehicle_image">
+        <img class = "vehicle_image" src = "<%= vehicle.img_url%>" alt = "<%= vehicle.name%>" class = "vehicle_image">
       </a>
     </div>
   <% end %>
diff --git a/Wheeled-Rider/app/views/vehicles/show.html.erb b/Wheeled-Rider/app/views/vehicles/show.html.erb
index f778cd6..13e117c 100644
--- a/Wheeled-Rider/app/views/vehicles/show.html.erb
+++ b/Wheeled-Rider/app/views/vehicles/show.html.erb
@@ -1,11 +1,8 @@
 <body id = "vehicle_show">
-
+<!-- Use a div instead of body -->
 <h3> <%= @vehicle.name %> </h3>
 <h5><a class="vehicle_show_edit_link" href="/vehicles/<%= @vehicle.id %>/edit">Edit page</a> </h5>
 
-
-<ul>
-
 <div class= "button_wrapper">
 
   <a class = "button" href = "/categories/"> See all categories </a>
@@ -16,13 +13,13 @@
 </br>
 </br>
 </br>
-
+<!-- Instead of multiple line breaks, change margins instead -->
 <div class="category_link_wrapper">
   <% @categories.each do |category| %>
 
    <a class="category_link_text" href="/categories/<%= category.id %>">
-       <div class="category_link">
-       <%= category.title %>
+       <div class="category_link"> <!-- might not need a nested div here -->
+         <%= category.title %>
        </div>
     </a>
 
diff --git a/Wheeled-Rider/config/routes.rb b/Wheeled-Rider/config/routes.rb
index 89b7d73..1dd03c1 100644
--- a/Wheeled-Rider/config/routes.rb
+++ b/Wheeled-Rider/config/routes.rb
@@ -4,14 +4,12 @@
 
   root to: 'vehicles#index'
 
-    resources :vehicles do
-      resources :categories
-    end
-
-    resources :categories do
-      resources :comments
-    end
-
-
+  resources :vehicles do
+    resources :categories
+  end
 
+  resources :categories do
+    resources :comments
   end
+
+end
diff --git a/Wheeled-Rider/db/migrate/20171128150511_create_categories.rb b/Wheeled-Rider/db/migrate/20171128150511_create_categories.rb
index e266881..c19c064 100644
--- a/Wheeled-Rider/db/migrate/20171128150511_create_categories.rb
+++ b/Wheeled-Rider/db/migrate/20171128150511_create_categories.rb
@@ -9,3 +9,6 @@ def change
     end
   end
 end
+
+# good job using the foreign_key constraint however, you do not need to specify index: true as t.references will automatically add this constraint
+# you would want to specify it if you used t.integer 
diff --git a/Wheeled-Rider/db/seeds.rb b/Wheeled-Rider/db/seeds.rb
index d4e25d5..b76ad5d 100644
--- a/Wheeled-Rider/db/seeds.rb
+++ b/Wheeled-Rider/db/seeds.rb
@@ -18,7 +18,7 @@
 muni = unicycle.categories.create({title:"Muni: mountain unicycling", author:"pagemaker", num_replies: 0, last_reply: nil, vehicle: unicycle})
 mewni = unicycle.categories.create({title:"Mewni: mountain unicycling", author:"pagemaker", num_replies: 0, last_reply: nil, vehicle: unicycle})
 no_seat = bicycle.categories.create({title:"Riding without a seat", author:"pagemaker", num_replies: 0, last_reply: nil})
-
+# I had no idea mountain unicycling was a thing...
 # muni.comments.create ([{content:"I ride a 26er", tier_of_reply: 1, author:"pagemaker", time_posted: nil}])
 # no_seat.comments.create ([{content:"Does it hurt for you folks?", tier_of_reply: 1, author:"pagemaker", time_posted: nil}])
 
@@ -30,3 +30,5 @@
 #     password: "12345678"
 #   )
 # end
+
+# Get rid of commented out code in production branch

From e5eeab9c59c2cda43d45a197376f747a450e949b Mon Sep 17 00:00:00 2001
From: Perry Fustero <pjfust@gmail.com>
Date: Thu, 14 Dec 2017 20:52:51 -0500
Subject: [PATCH 2/2] added feedback

---
 feedback.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 feedback.md

diff --git a/feedback.md b/feedback.md
new file mode 100644
index 0000000..c7be4c5
--- /dev/null
+++ b/feedback.md
@@ -0,0 +1,21 @@
+# Project 2 Evaluation
+[inline code comments]()
+## Technical Requirements
+**2: Performing**
+>The app contains 2 models, with at least 1 association. At least 1 model is full CRUD.
+
+## Creativity and Interface
+**2: Performing**
+>The app displays a personal spin or creative element through its written language, functionality, purpose, and/or CSS. Submission includes proof of HTML / CSS validation
+
+## Code Quality
+**1: Progressing**
+>Code lacks proper formatting, includes commented out, non-functional code, or otherwise contains major issues of quality (DRY, naming, etc)
+
+## Deployment and Functionality
+**1: Progressing**
+>Application contains minimal functionality, but deployment is non-functional, or application contains major errors when used
+
+## Planning / Process / Submission
+**1: Progressing**
+>App is submitted, with basic evidence of planning. Documentation exists, but lacks common areas such as setup instructions, description of application functionality and link to deployed application