From d7ae7feb2dd0d42b023aaab281e4f3de39913ab7 Mon Sep 17 00:00:00 2001
From: Bill <email": null>
Date: Fri, 13 May 2016 12:10:34 -0700
Subject: [PATCH 01/15] Add up and down arrows

---
 app/views/questions/show.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/questions/show.erb b/app/views/questions/show.erb
index 3cc59fc..978de04 100644
--- a/app/views/questions/show.erb
+++ b/app/views/questions/show.erb
@@ -1,6 +1,10 @@
 
 <h3><%= @question.title %></h3>
 <div>
+<div class="up-down-buttons">
+<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
+<span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span>
+</div>
 <h5><%= @question.text %></h5>
 <% @question.responses.each do |response| %>
   <p><%= response %></p>

From 18f0d84dcf3592385fb6752a8be916c8a8d7d99f Mon Sep 17 00:00:00 2001
From: Riley Scheid <riley.k.scheid@gmail.com>
Date: Fri, 13 May 2016 14:42:38 -0700
Subject: [PATCH 02/15] Login register models and routes working perfectly

---
 app/controllers/index_controller.rb   |  8 ++---
 app/models/user.rb                    | 11 ++++---
 app/views/_login.erb                  | 42 ++++++++++++++++++++++++
 app/views/_register.erb               | 47 +++++++++++++++++++++++++++
 app/views/layout.erb                  |  6 ++--
 app/views/questions/_ask_question.erb |  4 +--
 app/views/questions/_new.erb          |  9 -----
 7 files changed, 105 insertions(+), 22 deletions(-)
 create mode 100644 app/views/_login.erb
 create mode 100644 app/views/_register.erb
 delete mode 100644 app/views/questions/_new.erb

diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index e41aea4..e13e62e 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -14,17 +14,17 @@
 
 
 post '/login' do
-  @user = User.authenticate(params[:email], params[:password])
+  @user = User.authenticate(params["user"])
   if @user
     login(@user)
     redirect '/'
   else
-    redirect '/login'
+    redirect '/'
   end
 end
 
-post '/signup' do
-  @user = User.new(params[:user])
+post '/users' do
+  @user = User.new(params['user'])
   if @user.save
     login(@user)
     redirect '/'
diff --git a/app/models/user.rb b/app/models/user.rb
index 9184c06..b76d187 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -8,15 +8,16 @@ class User < ActiveRecord::Base
 
   include BCrypt
 
-  def self.authenticate(email, password)
-    user = User.find_by(email: email)
-    user && user.password == password ? user : nil
-  end
-
   def password
     @password ||= Password.new(password_hash)
   end
 
+  def self.authenticate(args)
+    user = User.find_by(email: args['email'])
+    p user
+    user && user.password == args['password'] ? user : nil
+  end
+
   def password=(new_password)
     @password = Password.create(new_password)
     self.password_hash = @password
diff --git a/app/views/_login.erb b/app/views/_login.erb
new file mode 100644
index 0000000..f10e662
--- /dev/null
+++ b/app/views/_login.erb
@@ -0,0 +1,42 @@
+ <div class="modal fade" id="modal-login" tabindex="-1" role="dialog"
+     aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <!-- Modal Header -->
+            <div class="modal-header">
+                <button type="button" class="close"
+                   data-dismiss="modal">
+                       <span aria-hidden="true">&times;</span>
+                       <span class="sr-only">Close</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel">
+                   Login
+                </h4>
+            </div>
+
+            <!-- Modal Body -->
+            <div class="modal-body">
+              <form id="question-form" role="form" action="https://github.com/login" method="post">
+                <div class="form-group">
+                  <label for="email">Email</label>
+                  <input type="text" name="user[email]" class="form-control"
+                    id="email"/>
+                </div>
+                 <div class="form-group">
+                  <label for="password">Password</label>
+                  <input type="password" name="user[password]"class="form-control"
+                    id="password"/>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">
+                        Close
+                    </button>
+                    <button type="submit" class="btn btn-primary">
+                        Submit
+                    </button>
+                </div>
+              </form>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/views/_register.erb b/app/views/_register.erb
new file mode 100644
index 0000000..ea5ea2d
--- /dev/null
+++ b/app/views/_register.erb
@@ -0,0 +1,47 @@
+ <div class="modal fade" id="modal-register" tabindex="-1" role="dialog"
+     aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <!-- Modal Header -->
+            <div class="modal-header">
+                <button type="button" class="close"
+                   data-dismiss="modal">
+                       <span aria-hidden="true">&times;</span>
+                       <span class="sr-only">Close</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel">
+                    Create A New StackOverfloweth Account
+                </h4>
+            </div>
+
+            <!-- Modal Body -->
+            <div class="modal-body">
+              <form id="question-form" role="form" action="https://github.com/users" method="post">
+                <div class="form-group">
+                  <label for="username">Username</label>
+                    <input type="text" name="user[username]" class="form-control"
+                    id="username"/>
+                </div>
+                <div class="form-group">
+                  <label for="email">Email</label>
+                  <input type="text" name="user[email]"class="form-control"
+                    id="email"/>
+                </div>
+                 <div class="form-group">
+                  <label for="password">Password</label>
+                  <input type="password" name="user[password]"class="form-control"
+                    id="password"/>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">
+                        Close
+                    </button>
+                    <button type="submit" class="btn btn-primary">
+                        Submit
+                    </button>
+                </div>
+              </form>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/views/layout.erb b/app/views/layout.erb
index 576b02e..81a786c 100644
--- a/app/views/layout.erb
+++ b/app/views/layout.erb
@@ -38,8 +38,10 @@
         <li><a href="#" aria-hidden="true"></span> Profile </a></li>
         <li><a href="https://github.com/logout"><span class="glyphicon glyphicon-send" aria-hidden="true"></span> Logout </a></li>
       <% else %>
-        <li><a href="https://github.com/signup"><span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> Register </a></li>
-        <li><a href="https://github.com/login"><span class="glyphicon glyphicon-send" aria-hidden="true"></span> Login </a></li>
+        <li><a href="#" data-toggle="modal" data-target="#modal-register"><span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> Register </a></li>
+        <%= erb :"_register" %>
+        <li><a href="#" data-toggle="modal" data-target="#modal-login"><span class="glyphicon glyphicon-send" aria-hidden="true"></span> Login </a></li>
+        <%= erb :"_login" %>
       <% end %>
     </ul>
   </div>
diff --git a/app/views/questions/_ask_question.erb b/app/views/questions/_ask_question.erb
index 7473cf7..9f9b2a6 100644
--- a/app/views/questions/_ask_question.erb
+++ b/app/views/questions/_ask_question.erb
@@ -1,9 +1,9 @@
-<button class="btn btn-primary btn-md" data-toggle="modal" data-target="#myModalNorm">
+<button class="btn btn-primary btn-md" data-toggle="modal" data-target="#modal-question">
     Ask A Question
 </button>
 
 <!-- Modal -->
-<div class="modal fade" id="myModalNorm" tabindex="-1" role="dialog"
+<div class="modal fade" id="modal-question" tabindex="-1" role="dialog"
      aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
diff --git a/app/views/questions/_new.erb b/app/views/questions/_new.erb
deleted file mode 100644
index 42b1eeb..0000000
--- a/app/views/questions/_new.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<form action="https://github.com/questions" method="post">
-  <fieldset>
-    <legend>Your question here</legend>
-    Title: <input type="text" class="form-control" name="question[title]" placeholder="Your title here"><br>
-    Content: <textarea class="form-control" name="question[text]" placeholder="Your question here"></textarea><br>
-    <button type="submit" class="btn btn-primary">Submit</button>
-  </fieldset>
-</form>
-

From 6736b71fb93b131aec2511d40db99641c767de34 Mon Sep 17 00:00:00 2001
From: Bill <email": null>
Date: Fri, 13 May 2016 14:50:53 -0700
Subject: [PATCH 03/15] Correct Ask a question functionality

---
 app/controllers/index_controller.rb     | 10 +++++-----
 app/controllers/questions_controller.rb |  7 +++++--
 app/views/index.erb                     |  6 ++----
 app/views/layout.erb                    |  2 +-
 app/views/questions/_ask_question.erb   |  4 ++--
 app/views/questions/_new.erb            | 10 +---------
 app/views/questions/new.erb             |  9 +++++++++
 public/js/application.js                | 24 +++++++++++++++++-------
 8 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 app/views/questions/new.erb

diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index e41aea4..c4fa359 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -3,14 +3,14 @@
 end
 
 get '/' do
-  @questions = []
+  @questions = Question.all.reverse
   erb :index
 end
 
-post '/questions' do
-  p params
-  redirect '/'
-end
+# post '/questions' do
+#   p params
+#   redirect '/'
+# end
 
 
 post '/login' do
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index 54d3da7..8782c70 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -8,9 +8,12 @@
 end
 
 post '/questions' do
-	#IF WE CREATE A HASH WE DONT HAVE TO PUT INDIVIDUAL PARAMS
 	@question = Question.create(params[:questions])
-  redirect '/questions'
+  if request.xhr?
+    erb :'questions/_new', layout: false
+  else
+    redirect '/'
+  end
 end
 
 get '/questions/:id' do
diff --git a/app/views/index.erb b/app/views/index.erb
index deeb882..9b23942 100644
--- a/app/views/index.erb
+++ b/app/views/index.erb
@@ -1,11 +1,9 @@
 <div align="center">
   <h1>Stack Overfloweth</h1>
 
-<div>
+<div id="questions-list">
   <% @questions.each do |question| %>
-    <div>
-      <h3><%=question.title%><a href="#"><%= question.id%></a></h3>
-    </div>
+      <h3><a href="https://github.com/questions/%3C%=%20question.id%%3E"><%=question.title%></a></h3>
   <% end %>
 </div>
 
diff --git a/app/views/layout.erb b/app/views/layout.erb
index 576b02e..ab548d1 100644
--- a/app/views/layout.erb
+++ b/app/views/layout.erb
@@ -25,7 +25,7 @@
 </head>
 <body>
   <nav class="navbar navbar-light bg-faded">
-  <div class="container">
+  <div class="container" id="question-container">
     <%= erb :"questions/_ask_question" %>
     <div class="navbar-header">
       <a class="navbar-brand" href="#"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> Index </a>
diff --git a/app/views/questions/_ask_question.erb b/app/views/questions/_ask_question.erb
index 7473cf7..156b323 100644
--- a/app/views/questions/_ask_question.erb
+++ b/app/views/questions/_ask_question.erb
@@ -25,11 +25,11 @@
                 <div class="form-group">
                   <label for="questionTitle">Title</label>
                     <input type="text" class="form-control"
-                    id="question-title" placeholder="Pithy summary"/>
+                    id="question-title" name="questions[title]"placeholder="Pithy summary" required />
                 </div>
                 <div class="form-group">
                   <label for="questionBody">Body</label>
-                  <textarea class="form-control" rows="5" id="question-textarea"></textarea>
+                  <textarea class="form-control" rows="5" name="questions[text]" id="question-textarea" required ></textarea>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">
diff --git a/app/views/questions/_new.erb b/app/views/questions/_new.erb
index 42b1eeb..454b7a5 100644
--- a/app/views/questions/_new.erb
+++ b/app/views/questions/_new.erb
@@ -1,9 +1 @@
-<form action="https://github.com/questions" method="post">
-  <fieldset>
-    <legend>Your question here</legend>
-    Title: <input type="text" class="form-control" name="question[title]" placeholder="Your title here"><br>
-    Content: <textarea class="form-control" name="question[text]" placeholder="Your question here"></textarea><br>
-    <button type="submit" class="btn btn-primary">Submit</button>
-  </fieldset>
-</form>
-
+<h3><a href="https://github.com/questions/%3C%=%20@question.id%%3E"><%=@question.title%></a></h3>
diff --git a/app/views/questions/new.erb b/app/views/questions/new.erb
new file mode 100644
index 0000000..42b1eeb
--- /dev/null
+++ b/app/views/questions/new.erb
@@ -0,0 +1,9 @@
+<form action="https://github.com/questions" method="post">
+  <fieldset>
+    <legend>Your question here</legend>
+    Title: <input type="text" class="form-control" name="question[title]" placeholder="Your title here"><br>
+    Content: <textarea class="form-control" name="question[text]" placeholder="Your question here"></textarea><br>
+    <button type="submit" class="btn btn-primary">Submit</button>
+  </fieldset>
+</form>
+
diff --git a/public/js/application.js b/public/js/application.js
index d593dc0..22bcd08 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -1,10 +1,20 @@
 $(document).ready(function() {
-  $("#question-form").submit(function(event){
-    event.preventDefault()
-    var title = $(":input")[2]["value"]
-    var body = $(":input")[3]["value"]
-    console.log(title)
-    console.log(body)
-    // $.post() to whatever controller will handle this
+
+  $("#question-container").on("submit", "#question-form", function(ev){
+    ev.preventDefault();
+    var data = $(this).serialize();
+    $.ajax({
+      url: '/questions',
+      method: 'post',
+      data: data
+    }).done(function(question) {
+      $("#myModalNorm").modal("hide");
+      $("#question-form")[0].reset();
+      $("#questions-list").prepend(question)
+  })
+
   });
+
+
+
 });

From 6c11199ab291156f63d85d8a310e8901f18f252f Mon Sep 17 00:00:00 2001
From: kristallam <kristal.lam24@gmail.com>
Date: Fri, 13 May 2016 15:08:29 -0700
Subject: [PATCH 04/15] Add code and fix database

---
 app/controllers/index_controller.rb         |  2 +-
 app/controllers/questions_controller.rb     | 21 ++++++++++++++++++++-
 app/models/answer.rb                        | 11 ++++++++++-
 app/models/question.rb                      |  9 +++++++++
 app/models/response.rb                      |  9 +++++++++
 app/views/index.erb                         |  2 +-
 app/views/questions/show.erb                |  8 ++++++--
 db/migrate/20160512151504_create_answers.rb |  1 +
 public/js/application.js                    | 14 ++++++++++++++
 9 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index e41aea4..73075df 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -3,7 +3,7 @@
 end
 
 get '/' do
-  @questions = []
+  @questions = Question.all
   erb :index
 end
 
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index 54d3da7..c54d7d4 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -15,7 +15,8 @@
 
 get '/questions/:id' do
 	@question = Question.find_by(id: params[:id])
-  redirect "/questions/#{@question.id}"
+  @answers = @question.answers
+  erb :'questions/show'
 end
 
 
@@ -61,3 +62,21 @@
   redirect "/questions/#{@question.id}"
 end
 
+post '/questions/:id/vote' do
+  p params
+  @question = Question.find_by(id: params[:id])
+  @vote = Vote.new
+  if request.xhr?
+    if params[:data] == "upvote"
+      @vote.up_vote = 1
+      @vote.save
+      return @question.up_vote_sum.to_s
+    elsif params[:data] == "downvote"
+      @vote.down_vote = 1
+      @vote.save
+      return @question.down_vote_sum.to_s
+    end
+  else
+    # redirect "/questions/#{params[:id]}/vote"
+  end
+end
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 3453167..e3c24bf 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -2,7 +2,16 @@ class Answer < ActiveRecord::Base
 	belongs_to :user
 	has_many :votes, :as => :votable
 	has_many :responses, :as => :respondable
-	has_many :questions
+	belongs_to :question
 
 	validates :text, presence: true
+
+	def up_vote_sum
+		votes.sum(:up_vote)
+	end
+
+	def down_vote_sum
+		votes.sum(:down_vote)
+	end
+
 end
diff --git a/app/models/question.rb b/app/models/question.rb
index 685e248..a64409b 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -2,6 +2,15 @@ class Question < ActiveRecord::Base
 	belongs_to :user
 	has_many :votes, :as => :votable
 	has_many :responses, :as => :respondable
+	has_many :answers
 
 	validates :title, :text, presence: true
+
+	def up_vote_sum
+		votes.sum(:up_vote)
+	end
+
+	def down_vote_sum
+		votes.sum(:down_vote)
+	end
 end
diff --git a/app/models/response.rb b/app/models/response.rb
index 49706bf..7e50f16 100644
--- a/app/models/response.rb
+++ b/app/models/response.rb
@@ -3,4 +3,13 @@ class Response < ActiveRecord::Base
   has_many :votes, :as => :votable
 
   validates :text, presence: true
+
+  def up_vote_sum
+    votes.sum(:up_vote)
+  end
+
+  def down_vote_sum
+    votes.sum(:down_vote)
+  end
+
 end
diff --git a/app/views/index.erb b/app/views/index.erb
index deeb882..6164e5f 100644
--- a/app/views/index.erb
+++ b/app/views/index.erb
@@ -4,7 +4,7 @@
 <div>
   <% @questions.each do |question| %>
     <div>
-      <h3><%=question.title%><a href="#"><%= question.id%></a></h3>
+      <h3><%=question.title%><a href="https://github.com/questions/%3C%=%20question.id%20%%3E"><%= question.id%></a></h3>
     </div>
   <% end %>
 </div>
diff --git a/app/views/questions/show.erb b/app/views/questions/show.erb
index 978de04..a9768b1 100644
--- a/app/views/questions/show.erb
+++ b/app/views/questions/show.erb
@@ -2,8 +2,12 @@
 <h3><%= @question.title %></h3>
 <div>
 <div class="up-down-buttons">
-<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
-<span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span>
+<form method="post" action='https://github.com/questions/%3C%=%20@question.id%20%%3E/vote' class="inline">
+  <button id="upvote-button" type="submit" name="submit_upvote" value="submit_up_value" class="glyphicon glyphicon-arrow-up" aria-hidden="true"><%= @question.up_vote_sum %></button>
+
+  <button id="downvote-button" type="submit" name="submit_downvote" value="submit_down_value" class="glyphicon glyphicon-arrow-down" aria-hidden="true"><%= @question.down_vote_sum %></button>
+</form>
+
 </div>
 <h5><%= @question.text %></h5>
 <% @question.responses.each do |response| %>
diff --git a/db/migrate/20160512151504_create_answers.rb b/db/migrate/20160512151504_create_answers.rb
index c9f96b7..bb05969 100644
--- a/db/migrate/20160512151504_create_answers.rb
+++ b/db/migrate/20160512151504_create_answers.rb
@@ -3,6 +3,7 @@ def change
   	 create_table :answers do |t|
   	  	t.belongs_to :user
         t.text :text
+        t.belongs_to :question
 
   	  	t.timestamps null: false
   	end
diff --git a/public/js/application.js b/public/js/application.js
index d593dc0..810576d 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -7,4 +7,18 @@ $(document).ready(function() {
     console.log(body)
     // $.post() to whatever controller will handle this
   });
+
+  $("#upvote-button").on('click', function(event){
+    event.preventDefault();
+    console.log(this)
+    var url = $(this).parent().attr('action');
+    $.ajax({
+      url: url,
+      method: 'POST',
+      data: "data=upvote"
+    }).done(function(result){
+      console.log(result);
+      $("#upvote-button").html(result);
+    })
+  })
 });

From c2b96700440258205c75cacfa5087af6e16441d7 Mon Sep 17 00:00:00 2001
From: Riley Scheid <riley.k.scheid@gmail.com>
Date: Fri, 13 May 2016 15:13:34 -0700
Subject: [PATCH 05/15] Changes to styling

---
 app/views/index.erb      | 13 +++++++------
 app/views/layout.erb     |  5 +++--
 public/js/application.js |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/index.erb b/app/views/index.erb
index 9b23942..a0970f0 100644
--- a/app/views/index.erb
+++ b/app/views/index.erb
@@ -1,11 +1,12 @@
 <div align="center">
   <h1>Stack Overfloweth</h1>
-
-<div id="questions-list">
-  <% @questions.each do |question| %>
-      <h3><a href="https://github.com/questions/%3C%=%20question.id%%3E"><%=question.title%></a></h3>
-  <% end %>
+  <br><br>
 </div>
 
-
+<div class="container">
+  <div id="questions-list" align="left">
+    <% @questions.each do |question| %>
+        <h3><a href="https://github.com/questions/%3C%=%20question.id%%3E"><%=question.title%></a></h3>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/layout.erb b/app/views/layout.erb
index bf03557..397b09d 100644
--- a/app/views/layout.erb
+++ b/app/views/layout.erb
@@ -26,13 +26,14 @@
 <body>
   <nav class="navbar navbar-light bg-faded">
   <div class="container" id="question-container">
+    <br>
     <%= erb :"questions/_ask_question" %>
-    <div class="navbar-header">
+    <!-- <div class="navbar-header">
       <a class="navbar-brand" href="#"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> Index </a>
     </div>
     <ul class="nav navbar-nav">
       <li><a href= "#"><span class="glyphicon glyphicon-play" aria-hidden="true"></span> Search </a></li>
-    </ul>
+    </ul> -->
     <ul class="nav navbar-nav navbar-right">
       <% if logged_in? %>
         <li><a href="#" aria-hidden="true"></span> Profile </a></li>
diff --git a/public/js/application.js b/public/js/application.js
index 22bcd08..6c6b41c 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -8,7 +8,7 @@ $(document).ready(function() {
       method: 'post',
       data: data
     }).done(function(question) {
-      $("#myModalNorm").modal("hide");
+      $("#modal-question").modal("hide");
       $("#question-form")[0].reset();
       $("#questions-list").prepend(question)
   })

From a153c51aa0e10c76347d02d12ccbde1697755f88 Mon Sep 17 00:00:00 2001
From: Bill <email": null>
Date: Fri, 13 May 2016 15:17:26 -0700
Subject: [PATCH 06/15] Fix broke answer show form

---
 app/controllers/questions_controller.rb     | 4 +++-
 app/models/answer.rb                        | 2 +-
 app/models/question.rb                      | 1 +
 app/views/answers/_new.erb                  | 7 -------
 app/views/answers/new.erb                   | 7 +++++++
 app/views/questions/show.erb                | 2 +-
 db/migrate/20160512151504_create_answers.rb | 1 +
 db/seeds.rb                                 | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 app/views/answers/new.erb

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index 8782c70..4f09b6f 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -18,7 +18,9 @@
 
 get '/questions/:id' do
 	@question = Question.find_by(id: params[:id])
-  redirect "/questions/#{@question.id}"
+  @answers = @question.answers
+  # redirect "/questions/#{@question.id}"
+  erb :'questions/show'
 end
 
 
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 3453167..b5d904d 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,8 +1,8 @@
 class Answer < ActiveRecord::Base
 	belongs_to :user
+  belongs_to :question
 	has_many :votes, :as => :votable
 	has_many :responses, :as => :respondable
-	has_many :questions
 
 	validates :text, presence: true
 end
diff --git a/app/models/question.rb b/app/models/question.rb
index 685e248..7609a2a 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -1,5 +1,6 @@
 class Question < ActiveRecord::Base
 	belongs_to :user
+  has_many :answers
 	has_many :votes, :as => :votable
 	has_many :responses, :as => :respondable
 
diff --git a/app/views/answers/_new.erb b/app/views/answers/_new.erb
index af5116d..e69de29 100644
--- a/app/views/answers/_new.erb
+++ b/app/views/answers/_new.erb
@@ -1,7 +0,0 @@
-<form action="https://github.com/questions/%3C%=%20@question.question_id%20%%3E/answer" method="post">
-  <fieldset>
-    <legend>Your answer here</legend>
-    Content: <textarea class="form-control" name="answer[text]" placeholder="Your Answer Here"></textarea><br>
-    <button type="submit" class="btn btn-primary">Submit</button>
-  </fieldset>
-</form>
diff --git a/app/views/answers/new.erb b/app/views/answers/new.erb
new file mode 100644
index 0000000..af5116d
--- /dev/null
+++ b/app/views/answers/new.erb
@@ -0,0 +1,7 @@
+<form action="https://github.com/questions/%3C%=%20@question.question_id%20%%3E/answer" method="post">
+  <fieldset>
+    <legend>Your answer here</legend>
+    Content: <textarea class="form-control" name="answer[text]" placeholder="Your Answer Here"></textarea><br>
+    <button type="submit" class="btn btn-primary">Submit</button>
+  </fieldset>
+</form>
diff --git a/app/views/questions/show.erb b/app/views/questions/show.erb
index 978de04..bb2526b 100644
--- a/app/views/questions/show.erb
+++ b/app/views/questions/show.erb
@@ -13,7 +13,7 @@
 
 <div>
 <% @answers.each do |answer|  %>
-  <h5><%= answer %></h5>
+  <h5><%= answer %></h5><br
   <% answer.responses.each do |response| %>
     <p><%= response %></p>
   <% end %>
diff --git a/db/migrate/20160512151504_create_answers.rb b/db/migrate/20160512151504_create_answers.rb
index c9f96b7..a4cc430 100644
--- a/db/migrate/20160512151504_create_answers.rb
+++ b/db/migrate/20160512151504_create_answers.rb
@@ -3,6 +3,7 @@ def change
   	 create_table :answers do |t|
   	  	t.belongs_to :user
         t.text :text
+        t.integer :question_id
 
   	  	t.timestamps null: false
   	end
diff --git a/db/seeds.rb b/db/seeds.rb
index e58bb8d..3d82998 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -16,5 +16,5 @@
 #Create answers
 40.times do
   user = User.all.sample
-  user.answers << Answer.create!(text: Faker::Hipster.paragraph)
+  user.answers << Answer.create!(text: Faker::Hipster.paragraph, question_id: rand(1..40))
 end

From e718f58ec34bf67081481f297c31345ca8c5e73c Mon Sep 17 00:00:00 2001
From: kristallam <kristal.lam24@gmail.com>
Date: Fri, 13 May 2016 15:22:36 -0700
Subject: [PATCH 07/15] Change method for vote sum

---
 app/models/question.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/question.rb b/app/models/question.rb
index a64409b..9645a16 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -7,7 +7,7 @@ class Question < ActiveRecord::Base
 	validates :title, :text, presence: true
 
 	def up_vote_sum
-		votes.sum(:up_vote)
+		votes.sum("1 + :up_vote")
 	end
 
 	def down_vote_sum

From a3e07b1ec4a2850b6b4d9b9132338d9f464d45c3 Mon Sep 17 00:00:00 2001
From: Riley Scheid <riley.k.scheid@gmail.com>
Date: Fri, 13 May 2016 16:04:23 -0700
Subject: [PATCH 08/15] Change seed to include votes

---
 db/seeds.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/db/seeds.rb b/db/seeds.rb
index 3d82998..66279e6 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -18,3 +18,11 @@
   user = User.all.sample
   user.answers << Answer.create!(text: Faker::Hipster.paragraph, question_id: rand(1..40))
 end
+
+50.times do
+  Vote.create(user_id: rand(1..40), up_vote: 1, down_vote: 0, votable_id: rand(1..40), votable_type: "Question")
+end
+
+50.times do
+  Vote.create(user_id: rand(1..40), up_vote: 1, down_vote: 0, votable_id: rand(1..40), votable_type: "Answer")
+end

From ef2c9379580fdf92c3e181ef84aca6e0fd6024d5 Mon Sep 17 00:00:00 2001
From: kristallam <kristal.lam24@gmail.com>
Date: Fri, 13 May 2016 16:05:30 -0700
Subject: [PATCH 09/15] Change controller

---
 app/controllers/questions_controller.rb |  6 +++++-
 app/models/question.rb                  | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index c516bb3..d58fd25 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -39,6 +39,7 @@
 
 #ANSWER A QUESTION ROUTES
 get '/questions/:id/answers/new' do
+
 end
 
 post '/questions/:id/answers' do
@@ -53,6 +54,7 @@
 
 #RESPOND TO A QUESTION'S ANSWER ROUTES
 get '/questions/:question_id/answers/:id/responses/new' do
+
 end
 
 post '/questions/:question_id/answers/:id/responses' do
@@ -68,11 +70,13 @@
 post '/questions/:id/vote' do
   p params
   @question = Question.find_by(id: params[:id])
-  @vote = Vote.new
+  @vote = Vote.create(user_id: @question.user_id, votable_id: @question.id)
   if request.xhr?
     if params[:data] == "upvote"
       @vote.up_vote = 1
       @vote.save
+      p "=======" * 50
+      p @question.up_vote_sum
       return @question.up_vote_sum.to_s
     elsif params[:data] == "downvote"
       @vote.down_vote = 1
diff --git a/app/models/question.rb b/app/models/question.rb
index 281363a..ff49213 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -8,10 +8,20 @@ class Question < ActiveRecord::Base
 	validates :title, :text, presence: true
 
 	def up_vote_sum
-		votes.sum("1 + :up_vote")
+		sum = 0
+		p "***" * 50
+		p self.votes
+		self.votes.each do |vote|
+			if vote.up_vote == 1
+				sum += 1
+			end
+		end
+		return sum
+		# self.votes.sum(:up_vote)
+		# p self.votes
 	end
 
 	def down_vote_sum
-		votes.sum(:down_vote)
+		self.votes.sum(:down_vote)
 	end
 end

From e1820959e0998661a7747872c970e6a078a4a4f3 Mon Sep 17 00:00:00 2001
From: kristallam <kristal.lam24@gmail.com>
Date: Fri, 13 May 2016 16:10:25 -0700
Subject: [PATCH 10/15] Working vote up and down buttons

---
 app/controllers/questions_controller.rb |  7 ++-----
 app/models/question.rb                  | 12 +++++++-----
 public/js/application.js                | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index d58fd25..fd1185c 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -68,15 +68,12 @@
 end
 
 post '/questions/:id/vote' do
-  p params
   @question = Question.find_by(id: params[:id])
-  @vote = Vote.create(user_id: @question.user_id, votable_id: @question.id)
+  @vote = Vote.create(user_id: @question.user_id, votable_id: @question.id, votable_type: "Question")
   if request.xhr?
     if params[:data] == "upvote"
       @vote.up_vote = 1
       @vote.save
-      p "=======" * 50
-      p @question.up_vote_sum
       return @question.up_vote_sum.to_s
     elsif params[:data] == "downvote"
       @vote.down_vote = 1
@@ -84,6 +81,6 @@
       return @question.down_vote_sum.to_s
     end
   else
-    # redirect "/questions/#{params[:id]}/vote"
+    redirect "/questions/#{params[:id]}/vote"
   end
 end
diff --git a/app/models/question.rb b/app/models/question.rb
index ff49213..7dda4b9 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -9,19 +9,21 @@ class Question < ActiveRecord::Base
 
 	def up_vote_sum
 		sum = 0
-		p "***" * 50
-		p self.votes
 		self.votes.each do |vote|
 			if vote.up_vote == 1
 				sum += 1
 			end
 		end
 		return sum
-		# self.votes.sum(:up_vote)
-		# p self.votes
 	end
 
 	def down_vote_sum
-		self.votes.sum(:down_vote)
+		sum = 0
+		self.votes.each do |vote|
+			if vote.down_vote == 1
+				sum += 1
+			end
+		end
+		return sum
 	end
 end
diff --git a/public/js/application.js b/public/js/application.js
index 43b6b87..f5e1c47 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -29,4 +29,18 @@ $(document).ready(function() {
       $("#upvote-button").html(result);
     })
   })
+
+  $("#downvote-button").on('click', function(event){
+    event.preventDefault();
+    console.log(this)
+    var url = $(this).parent().attr('action');
+    $.ajax({
+      url: url,
+      method: 'POST',
+      data: "data=downvote"
+    }).done(function(result){
+      console.log(result);
+      $("#downvote-button").html(result);
+    })
+  })
 });

From 6fff7d9e017ba62efd227c0f7cb8407627fe80d2 Mon Sep 17 00:00:00 2001
From: Bill <email": null>
Date: Fri, 13 May 2016 16:30:52 -0700
Subject: [PATCH 11/15] Add new answers feature

---
 app/controllers/questions_controller.rb | 11 ++++++++++
 app/views/answers/_new.erb              |  1 +
 app/views/answers/new.erb               |  2 +-
 app/views/questions/show.erb            | 21 ++++++++++++-------
 public/js/application.js                | 28 +++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index c516bb3..dbdfb57 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -16,6 +16,15 @@
   end
 end
 
+post '/questions/:question_id/answers' do
+  @answer = Answer.create(params[:answer])
+  @question = Question.find(params[:question_id])
+  @question.answers << @answer
+  if request.xhr?
+    erb :'answers/_new', layout: false
+  end
+end
+
 get '/questions/:id' do
 	@question = Question.find_by(id: params[:id])
   @answers = @question.answers
@@ -39,6 +48,8 @@
 
 #ANSWER A QUESTION ROUTES
 get '/questions/:id/answers/new' do
+  @question = Question.find(params[:id])
+  erb :'answers/new', layout: false
 end
 
 post '/questions/:id/answers' do
diff --git a/app/views/answers/_new.erb b/app/views/answers/_new.erb
index e69de29..fea10f0 100644
--- a/app/views/answers/_new.erb
+++ b/app/views/answers/_new.erb
@@ -0,0 +1 @@
+<h5>Answers: <br><%= @answer.text %></h5>
diff --git a/app/views/answers/new.erb b/app/views/answers/new.erb
index af5116d..6fec42f 100644
--- a/app/views/answers/new.erb
+++ b/app/views/answers/new.erb
@@ -1,4 +1,4 @@
-<form action="https://github.com/questions/%3C%=%20@question.question_id%20%%3E/answer" method="post">
+<form id="answer-form" action="https://github.com/questions/%3C%=%20@question.id%20%%3E/answers" method="post">
   <fieldset>
     <legend>Your answer here</legend>
     Content: <textarea class="form-control" name="answer[text]" placeholder="Your Answer Here"></textarea><br>
diff --git a/app/views/questions/show.erb b/app/views/questions/show.erb
index 5b6cb6c..b4a8807 100644
--- a/app/views/questions/show.erb
+++ b/app/views/questions/show.erb
@@ -1,25 +1,30 @@
 
 <h3><%= @question.title %></h3>
-<div>
+<div id="question-show-page">
 <div class="up-down-buttons">
 <form method="post" action='https://github.com/questions/%3C%=%20@question.id%20%%3E/vote' class="inline">
   <button id="upvote-button" type="submit" name="submit_upvote" value="submit_up_value" class="glyphicon glyphicon-arrow-up" aria-hidden="true"><%= @question.up_vote_sum %></button>
 
   <button id="downvote-button" type="submit" name="submit_downvote" value="submit_down_value" class="glyphicon glyphicon-arrow-down" aria-hidden="true"><%= @question.down_vote_sum %></button>
 </form>
-
 </div>
-<h5><%= @question.text %></h5>
+<h5>Description: <br><%= @question.text %></h5>
 <% @question.responses.each do |response| %>
-  <p><%= response %></p>
+  <p><%= response.text %></p>
 <% end %>
-</div>
 
-<div>
+
+<button id="answer-form-show"  type="button" class"btn btn-warning" method="get" action='https://github.com/questions/%3C%=@question.id%%3E/answers/new'>Answer</button>
+<br>
+<br>
+
+<div id="answers-list">
+Answers:
 <% @answers.each do |answer|  %>
-  <h5><%= answer %></h5><br
+  <h5><br><%= answer.text %></h5>
   <% answer.responses.each do |response| %>
-    <p><%= response %></p>
+    <p><%= response.text %></p>
   <% end %>
 <% end %>
 </div>
+</div>
diff --git a/public/js/application.js b/public/js/application.js
index 43b6b87..86e4632 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -29,4 +29,32 @@ $(document).ready(function() {
       $("#upvote-button").html(result);
     })
   })
+
+  $("#answer-form-show").on('click', function(event){
+    event.preventDefault();
+    var url = $(this).attr("action");
+    $.ajax({
+      method: "get",
+      url: url,
+    }).done(function(response){
+      $("#answers-list").prepend(response);
+    })
+  })
+
+   $("#question-show-page").on("submit", "#answer-form", function(ev){
+    ev.preventDefault();
+    var data = $("#answer-form").serialize();
+    var url = $("#answer-form").attr("action");
+    $.ajax({
+      url: url,
+      method: 'post',
+      data: data
+    }).done(function(answer) {
+      $("#answers-list").append(answer);
+      $("#answer-form").remove();
+
+  })
+  });
+
+
 });

From 46968c53389e9c4d79902767a7083e5d5efb35de Mon Sep 17 00:00:00 2001
From: Bill <email": null>
Date: Fri, 13 May 2016 16:34:39 -0700
Subject: [PATCH 12/15] Remove <br>

---
 app/views/answers/_new.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/answers/_new.erb b/app/views/answers/_new.erb
index fea10f0..f4b7514 100644
--- a/app/views/answers/_new.erb
+++ b/app/views/answers/_new.erb
@@ -1 +1 @@
-<h5>Answers: <br><%= @answer.text %></h5>
+<h5><br><%= @answer.text %></h5>

From 1215658739af30d6bd1df225c6383246abbcf638 Mon Sep 17 00:00:00 2001
From: Riley Scheid <riley.k.scheid@gmail.com>
Date: Fri, 13 May 2016 16:35:47 -0700
Subject: [PATCH 13/15] Update merge

---
 app/controllers/questions_controller.rb | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index fd1185c..54f1e7f 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -23,45 +23,26 @@
 end
 
 
-#RESPOND TO A QUESTION ROUTES
-get '/questions/:id/responses/new' do
-end
-
 post '/questions/:id/responses' do
-	@response = Response.new()
+	@response = Response.new(user_id: session[:user_id], respondable_id: params[:id], respondable_type: "Question")
   @question = Question.find_by(id: params[:id])
   @question.responses << @response
-  # @question.save DO WE NEED THIS?
   @response.save
   redirect "/questions/#{@question.id}"
 end
 
-
-#ANSWER A QUESTION ROUTES
-get '/questions/:id/answers/new' do
-
-end
-
 post '/questions/:id/answers' do
-	@answer = Answer.new()
+	@answer = Answer.new(user_id: session[:user_id], question_id: params[:id])
   @question = Question.find_by(id: params[:id])
   @question.answers << @answer
-  # @question.save DO WE NEED THIS?
   @answer.save
   redirect "/questions/#{@question.id}"
 end
 
-
-#RESPOND TO A QUESTION'S ANSWER ROUTES
-get '/questions/:question_id/answers/:id/responses/new' do
-
-end
-
 post '/questions/:question_id/answers/:id/responses' do
-  @response = Response.new()
+  @response = Response.new(user_id: session[:user_id], respondable_id: params[:id], respondable_type: "Answer")
   @answer = Answer.find_by(id: params[:id])
   @answer.responses << @response
-  # @answer.save DO WE NEED THIS?
   @response.save
   @question = Question.find_by(id: params[:question_id])
   redirect "/questions/#{@question.id}"

From 1ee85d00e827852fb854e9cc4f9551a322c68884 Mon Sep 17 00:00:00 2001
From: Riley Scheid <riley.k.scheid@gmail.com>
Date: Fri, 13 May 2016 16:51:34 -0700
Subject: [PATCH 14/15] Something?

---
 app/controllers/index_controller.rb |  3 +-
 app/controllers/users.rb            | 48 ++++++++++++++---------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index 99ab901..0caf83e 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -3,7 +3,6 @@
 end
 
 get '/' do
-
   @questions = Question.all.reverse
   erb :index
 end
@@ -25,7 +24,9 @@
 end
 
 post '/users' do
+  p params['user']
   @user = User.new(params['user'])
+  p @user
   if @user.save
     login(@user)
     redirect '/'
diff --git a/app/controllers/users.rb b/app/controllers/users.rb
index 1addf0f..991f36b 100644
--- a/app/controllers/users.rb
+++ b/app/controllers/users.rb
@@ -1,28 +1,28 @@
-get '/' do
-  erb :'index'
-end
+# get '/' do
+#   erb :'index'
+# end
 
-get '/users/new' do
+# get '/users/new' do
 
-  erb :'/users/new'
-end
+#   erb :'/users/new'
+# end
 
-post '/users' do
-  user = User.new(params[:user_info])
-  if user.save
-    session[:user_id] = user.id
-    redirect "/users/#{user.id}"
-  else
-    redirect '/users/new'
-  end
-end
+# # post '/users' do
+# #   user = User.new(params['user'])
+# #   if user.save
+# #     session[:user_id] = user.id
+# #     redirect "/users/#{user.id}"
+# #   else
+# #     redirect '/users/new'
+# #   end
+# # end
 
-get '/users/:id' do
-  @user = User.find_by(id: params[:id])
-  # @decks = Deck.find_by(user_id: @user.id)
-  if current_user == @user
-    erb :'/users/show'
-  else
-    redirect '/'
-  end
-end
+# get '/users/:id' do
+#   @user = User.find_by(id: params[:id])
+#   # @decks = Deck.find_by(user_id: @user.id)
+#   if current_user == @user
+#     erb :'/users/show'
+#   else
+#     redirect '/'
+#   end
+# end

From e00a8a698f6463cf642983e45bdeed1f7d48a76c Mon Sep 17 00:00:00 2001
From: Riley Scheid <riley.k.scheid@gmail.com>
Date: Fri, 13 May 2016 17:10:51 -0700
Subject: [PATCH 15/15] Fix form login

---
 app/controllers/index_controller.rb | 1 -
 app/views/_login.erb                | 2 +-
 app/views/_register.erb             | 2 +-
 public/js/application.js            | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index 0caf83e..28d795a 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -24,7 +24,6 @@
 end
 
 post '/users' do
-  p params['user']
   @user = User.new(params['user'])
   p @user
   if @user.save
diff --git a/app/views/_login.erb b/app/views/_login.erb
index f10e662..ba385bd 100644
--- a/app/views/_login.erb
+++ b/app/views/_login.erb
@@ -16,7 +16,7 @@
 
             <!-- Modal Body -->
             <div class="modal-body">
-              <form id="question-form" role="form" action="https://github.com/login" method="post">
+              <form id="login-form" role="form" action="https://github.com/login" method="post">
                 <div class="form-group">
                   <label for="email">Email</label>
                   <input type="text" name="user[email]" class="form-control"
diff --git a/app/views/_register.erb b/app/views/_register.erb
index ea5ea2d..2b32480 100644
--- a/app/views/_register.erb
+++ b/app/views/_register.erb
@@ -16,7 +16,7 @@
 
             <!-- Modal Body -->
             <div class="modal-body">
-              <form id="question-form" role="form" action="https://github.com/users" method="post">
+              <form id="register-form" role="form" action="https://github.com/users" method="post">
                 <div class="form-group">
                   <label for="username">Username</label>
                     <input type="text" name="user[username]" class="form-control"
diff --git a/public/js/application.js b/public/js/application.js
index 33e31ec..604ad73 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -16,6 +16,8 @@ $(document).ready(function() {
   });
 
 
+
+
   $("#upvote-button").on('click', function(event){
     event.preventDefault();
     console.log(this)
@@ -58,7 +60,6 @@ $(document).ready(function() {
   });
 
 
-
   $("#downvote-button").on('click', function(event){
     event.preventDefault();
     console.log(this)