Merge branch 'master' of https://github.com/kevalwell/StackOverflow

Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/new.html.erb
	app/views/questions/show.html.erb

Author: Hoa Nguyen & Hoa Nguyen

Gemfile

@@ -28,14 +28,23 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 
 # Use Unicorn as the app server
 # gem 'unicorn'
+group :test, :development do
+  gem "rspec-rails", "~> 2.0"
+end
+
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'shoulda-matchers'
   gem 'byebug'
-
+  gem 'factory_girl_rails'
+  gem 'faker'
+  gem 'capybara'
+  gem 'launchy'
+  gem 'database_cleaner'
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '~> 2.0'
 

Gemfile.lock

@@ -36,13 +36,20 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.3.8)
     arel (6.0.0)
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
+    capybara (2.4.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -51,9 +58,18 @@ GEM
       execjs
     coffee-script-source (1.9.1)
     columnize (0.9.0)
+    database_cleaner (1.4.1)
     debug_inspector (0.0.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.5.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    faker (1.4.3)
+      i18n (~> 0.5)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
     hike (1.2.3)
@@ -66,6 +82,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -107,6 +125,21 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
+    rspec-collection_matchers (1.1.2)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    rspec-rails (2.99.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
     sass (3.4.13)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -117,6 +150,8 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
     spring (1.3.4)
     sprockets (2.12.3)
       hike (~> 1.2)
@@ -142,20 +177,29 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
   byebug
+  capybara
   coffee-rails (~> 4.1.0)
+  database_cleaner
+  factory_girl_rails
+  faker
   jbuilder (~> 2.0)
   jquery-rails
+  launchy
   pg
   rails (= 4.2.1)
+  rspec-rails (~> 2.0)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  shoulda-matchers
   spring
   turbolinks
   uglifier (>= 1.3.0)

app/assets/stylesheets/application.css

@@ -109,7 +109,7 @@ ul li {
 	width: 17em;
 }
 
-/*Questions Index*/
+/*Questions Index************************************** */
 
 #all_questions {
 	margin-top: 3em;
@@ -123,6 +123,7 @@ ul li {
 
 .ind_ques_contents {
 	margin-left: 6em;
+	list-style-type: none;
 }
 
 .ui_avatar_question {
@@ -134,24 +135,28 @@ ul li {
 }
 
 div div p {
-	color: #0c65a5;
+	color: #0c65a5 !important;
 	font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
 }
 
 div div p:nth-child(2) {
-	font-size: .7em;
-	color: #444;
+	font-size: .8em;
+	color: #444 !important;
 }
 
 div div p:nth-child(4) {
 	font-size: .7em;
 	position: absolute;
 	margin-left: 4.5em;
 	margin-top: -5.5em;
-	mar
 }
 
-/* question show */
+.qi_link {
+	text-decoration: none !important;
+	color: #0c65a5 !important;
+}
+
+/* question show ********************************* */
 
 .avy {
 	width: 2em;
@@ -166,7 +171,6 @@ div div p:nth-child(4) {
 
 .user_section {
 	padding: 12px 0 10px 0;
-	border-bottom: 1px solid #e0e0e0;
 	border-top: 1px solid #e0e0e0;
 	margin-left: 1.2em;
 	font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
@@ -180,33 +184,83 @@ div div p:nth-child(4) {
 }
 
 #qu_box {
-	margin-left: 33em;
+	margin-left: 5em;
+	margin-top: 2em;
 }
 
 .ind_question {
 	padding: 12px 0 10px 0;
-	border-bottom: 1px solid #e0e0e0;
 	border-top: 1px solid #e0e0e0;
-	margin-left: 1.2em;
+	margin-left: 5.4em;
 	font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
 	font-size: .9em;
 }
 
 .user {
-	margin-left: 37em;
+	margin-top: 2em;
+	margin-left: .2em;
 }
 
 #answer_submit {
 	margin-top: 2em;
 	margin-left: 1em;
 }
 
+#qs_content{
+	margin-left: 5em;
+}
+
+/* Votes ********************************************************* */
 
-/* User Index/log/signin */
+#voting {
+	margin-top: -4em;
+	margin-left: 1em;
+}
+
+#voting_answer {
+	margin-left: -4.4em;
+	position: absolute;
+	margin-top: -2em;
+}
+
+#dislike {
+	margin-top: .9em;
+}
+
+#votes_total {
+	color: #858D93;
+	margin-left: .6em;
+}
+
+#answer_amount {
+	font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
+	color: #444;
+	margin-left: 5em;
+	margin-bottom: .6em;
+}
+
+.arrow-up {
+	width: 0; 
+	height: 0; 
+	border-left: 15px solid transparent;
+	border-right: 15px solid transparent;
+	border-bottom: 15px solid #858D93;
+}
+
+.arrow-down {
+	width: 0; 
+	height: 0; 
+	border-left: 15px solid transparent;
+	border-right: 15px solid transparent;
+	border-top: 15px solid #858D93;
+}
+
+/* User Index/log/signin****************************** */
 
 #ui_title {
 	font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
 	margin-left: .7em;
+	margin-top: 2em;
 }
 
 #user_index {
@@ -230,11 +284,12 @@ div div p:nth-child(4) {
 }
 
 .user_pro_name {
-	color: #0c65a5;
+	color: #0c65a5 !important;
 	font-size: .8em;
 	margin-left: 4.5em;
 	margin-top: 1.2em;
 	position: absolute;
+	text-decoration: none !important;
 }
 
 .user_pro_location {
@@ -331,7 +386,7 @@ span:hover {
 }
 
 
-/* user show */
+/* user show****************************************** */
 .user_show {
 	padding: 12px 0 10px 0;
 	border-top: 1px solid #e0e0e0;
@@ -364,3 +419,9 @@ span:hover {
 	position: absolute;
 	margin-top: .3em;
 }
+
+li .new_comment{
+	color: #888;
+	opacity: .6;
+	padding: 0 3px 2px 3px;
+}

app/controllers/users_controller.rb

@@ -12,7 +12,7 @@ def new_login
       redirect_to questions_path
     else
       flash.now[:danger] = "Invalid email/password combination"
-      redirect_to login_path
+      redirect_to login_users_path
     end
   end
 

app/controllers/votes_controller.rb

@@ -11,21 +11,33 @@ def create
     p "Over Here!!!"
     p "#{params[:test]}"
     @question = params[:question_id]
-
-    if params[:like] == "yes"
-    @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:question_id], votable_type: "Question" , point: 1)
-
-    elsif params[:like] == "no"
-    @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:question_id], votable_type: "Question", point: -1)
-    # @question = @vote.question
-  #   if @vote.save!
-  #     redirect_to question_path(@question)
-  #   else
-  #     flash[:notice] = "You can't vote!"
-  #     redirect_to question_path(@question)
-  #   end
+    @answer = params[:answer_id]
+
+    if @question    
+      if params[:like] == "yes"
+        @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:question_id], votable_type: "Question", point: 1)
+      elsif params[:like] == "no"
+        @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:question_id], votable_type: "Question", point: -1)
+      end
+      redirect_to question_path(@question)
+    elsif @answer
+      if params[:like] == "yes"
+        @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:answer_id], votable_type: "Answer", point: 1)
+      elsif params[:like] == "no"
+        @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:answer_id], votable_type: "Answer", point: -1)
+      end
+      the_answer = Answer.find(@answer)
+      redirect_to question_path(the_answer.question)
     end
-    redirect_to question_path(@question)
   end
 
+  #   if params[:like] == "yes"
+  #   @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:question_id], votable_type: "Question" , point: 1)
+
+  #   elsif params[:like] == "no"
+  #   @vote = Vote.create!(user_id: session[:user_id], votable_id: params[:question_id], votable_type: "Question", point: -1)
+  #   end
+  #   redirect_to question_path(@question)
+  # end
+
 end

app/models/user.rb

@@ -2,6 +2,13 @@ class User < ActiveRecord::Base
   has_secure_password
   has_many :questions, foreign_key: 'creator_id'
   has_many :answers
+  validates :email, presence: true
+  validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
 
+  before_save :rename
+
+  def rename
+     self.name = email.slice(/^(.*?)@/).chop
+  end
 
 end

app/views/comments/_comment.html.erb

@@ -0,0 +1,4 @@
+<li>
+  <%= comment.user.username %><BR>
+  <%= comment.body %>
+</li>