Finalised comments

app/assets/javascripts/application.js

@@ -19,18 +19,16 @@
 //= require turbolinks
 //= require_tree .
 $(document).ready(function(e){
+    //Only changes the name of the selected tem in the drop down
     $('.search-panel .dropdown-menu').find('a').click(function(e) {
-		e.preventDefault();
-		var concept = $(this).text();
-		$('.search-panel span#search_concept').text(concept);
+		//prevents the page from refreshing when clicking an item
+        e.preventDefault(); 
+		$('.search-panel span#search_concept').text($(this).text());
 	});
 
-    $('#toggle').click(function() {
-    	$(this).toggleClass('clicked');
-  	});
 
+    //When the mouse goes off the navbar toggle button, it will not be highlighted
     $(".navbar-toggle").mouseup(function(){
     	$(this).blur();
 	})
-
 });
\ No newline at end of file

app/assets/stylesheets/application.scss

@@ -18,26 +18,20 @@
 @import "bootstrap-sprockets";
 @import "bootstrap";
 
+/* Variables*/
 $warm-colour: #efefef;
 $shadow-effect: inset 0px 0px 50px rgba(0,0,0,0.55);
 $hover-colour: #d3d3d3;
-
 $font: sans serif;
-
 $white: #FFFFFF;
 /* Nav bar colours */
 $navbar-background: #323232;
-
-
 /*Toggle button background colour */
 $toggle-active-background: #3c3c3c;
-
 /* Globally setting font family to be sans serif */
 * {
 	font-family: $font !important;
 }
-
-
 /*Sets the background color*/
 body {
   background: $warm-colour;
@@ -51,6 +45,7 @@ body {
 }
 
 
+/* Setting some global attributes for the tag hr */
 hr {
   height: 1px;
   color: #d2d2d2;
@@ -59,16 +54,13 @@ hr {
   border: none;
 }
 
+/* Setting some global attributes for the tag a */
  a:hover, a:focus, a:active {
  	background: transparent;
     text-decoration: none;
     color: inherit;
  }
 
-
-
-
-
 /* DEVISE: LOGIN STYLING
 ========================================*/
 
@@ -205,6 +197,8 @@ Flash container msg
 
 }
 
+/* Editing the footer so that the text are in line
+ making sure the footer covers the whole width*/
 footer {
 	width: 100%;
 	background-color: $navbar-background;

app/assets/stylesheets/pages.scss

@@ -2,7 +2,8 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-
+/* Makes sure the footer stays at the bottom 
+   Makes sure the container is below the navbar when loaded*/
 #contact.row {
 	margin-top: 80px;
 	position: relative;

app/assets/stylesheets/profiles.scss

@@ -3,21 +3,20 @@
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
 
- /* Moves header below the nav bar */
-
+ /* Provides room for the list of posts that belong to the user */
 .halfpage {
 	min-height:35vh;
 }
 
-
+/* Makes sure the footer stays at the bottom 
+   Makes sure the container is below the navbar when loaded
+   this is applied to the similar views*/
 #profile_show.row {
 	margin-top: 80px;
 	position: relative;
 	padding: 0 30px;
 	height: 45vh;
 }
-
-
 #profile_new.row {
 	margin: 80px 0px;
 	padding: 0 30px;
@@ -30,6 +29,7 @@
 	height: 70vh;
 }
 
+/* reducing the padding on this hr tag */
 hr.divider {
 	margin: 0em;
   	border-width: 2px;

app/assets/stylesheets/reviews.scss

@@ -2,7 +2,9 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-
+/* Makes sure the footer stays at the bottom 
+   Makes sure the container is below the navbar when loaded
+   this is applied to the similar views*/
 #reviews_new.row {
 	margin-top: 80px;
 	padding: 0 30px;

app/assets/stylesheets/scaffolds.scss

+/* CSS GENERATED BY SCAFFOLD */
 body {
   background-color: #fff;
   color: #333;

app/controllers/reviews_controller.rb

@@ -7,10 +7,7 @@ class ReviewsController < ApplicationController
   before_action :same_account, :authenticate_user!, :must_make_account, only: [:new, :edit, :create, :update, :destroy, ]
   #Finds the currently viewed profile
   before_action :find_profile
-  #The index action which displays all the reviews onto a form
-  def index
-    @reviews = Review.all
-  end
+
   #The new action allows the user to create a new review
   def new
     @review = Review.new

app/models/post.rb

@@ -8,10 +8,9 @@ class Post < ActiveRecord::Base
     validates :title, :description, :price, :address_one, :city, :postal_code,
     :city, :postal_code, :phone_number, :category_id, :user_id, presence: true 
     #Validates the phone number checking if it has a valid phone number
-	validates :phone_number, format: { with: /\d{11}/, message: "Enter valid phone number" }
+	validates :phone_number, format: { with: /\d{11}/}
 	#Validates the postal code checking if it has a valida email
-    validates :postal_code, format: { with: /([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9][A-Za-z]?))))\s?[0-9][A-Za-z]{2})/,
-    message: "Enter valid postal code" }
+    validates :postal_code, format: { with: /([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9][A-Za-z]?))))\s?[0-9][A-Za-z]{2})/}
     #Sets up paper clip to be used within post
 	has_attached_file :post_image, styles: { post_index: "300x300>", post_show: "300x300>" }, default_url: "/images/:style/missing.png"
 	#validates an image, 

app/views/posts/_masthead.haml

@@ -28,7 +28,11 @@
 										%input.form-control{:name => "x", :placeholder => "Search for something", :type => "text"}
 											%span.input-group-btn
 												%button.btn.btn-default{:type => "button"}
-													%span.glyphicon.glyphicon-search
+													Search
 					-#SUBHEADING
 					%br
 					%span.subheading Find something in time for christmas
+
+= simple_form_for :search, {url: posts_path} do |f|
+	= f.input :user_email, :as => :hidden, :input_html => { :value => current_user.email}
+	= f.input :user_telephone, :as => :hidden, :input_html => { :value => current_user.profile.number}

config/locales/en.yml

@@ -24,6 +24,8 @@ en:
   app_Description: Sell sell sell
   back: Back
   additional: Contact Information
+  model:
+    phonenumber: Enter a valid phone number
   devise:
     passwords:
       new:

test/controllers/reviews_controller_test.rb

@@ -20,13 +20,6 @@ class ReviewsControllerTest < ActionController::TestCase
     # resets the cache
     Rails.cache.clear
   end
-
-  test "should get index" do
-    get :index, profile_id: @profile.id
-    assert_response :success
-    assert_not_nil assigns(:reviews)
-  end
-
   test "should get new" do
     get :new, profile_id: @profile.id
     assert_select "h1" , I18n.t('reviews.new.title')

test/models/category_test.rb

@@ -8,7 +8,7 @@ class CategoryTest < ActiveSupport::TestCase
 
 
    #Cannot create a category with empty name field
-  test 'should not save invalid user' do
+  test 'should not save invalid category' do
     category = Category.new
     category.save
     refute category.valid?