Merge branch 'bk_dhp_solr' into dhp_solr

# Conflicts:
#	Gemfile
#	app/controllers/product_items_controller.rb
#	app/helpers/carts_helper.rb
#	app/services/cart.rb

Gemfile

@@ -36,6 +36,8 @@ gem 'carrierwave', '~> 1.0'
 gem 'mini_magick'
 gem 'mini_magick'
 # bootstrap-sass is a Sass-powered version of Bootstrap 3
 # bootstrap-sass is a Sass-powered version of Bootstrap 3
 gem 'bootstrap-sass', '~> 3.3.6'
 gem 'bootstrap-sass', '~> 3.3.6'
+# Config helps you easily manage environment specific settings in an easy and usable manner.
+gem 'config'
 # Faker, a port of Data::Faker from Perl, is used to easily generate fake data: names, addresses, phone numbers, etc.
 # Faker, a port of Data::Faker from Perl, is used to easily generate fake data: names, addresses, phone numbers, etc.
 gem 'faker', '~> 1.6', '>= 1.6.3'
 gem 'faker', '~> 1.6', '>= 1.6.3'
 # Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 4+
 # Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 4+
@@ -58,6 +60,8 @@ gem 'toastr-rails', '~> 1.0', '>= 1.0.3'
 # (or more often navigation item)
 # (or more often navigation item)
 # is selected based on the current page or other arbitrary condition
 # is selected based on the current page or other arbitrary condition
 gem 'active_link_to', '~> 1.0', '>= 1.0.4'
 gem 'active_link_to', '~> 1.0', '>= 1.0.4'
+# RSolr aims to provide a simple and extensible library for working with Solr
+gem 'rsolr', '~> 2.0', '>= 2.0.2'
 
 
 # Use Capistrano for deployment
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 # gem 'capistrano-rails', group: :development

app/assets/javascripts/cart/cart.js

 (function($) {
 (function($) {
     // Vertical Spinner - Touchspin - Product Details Quantity input
     // Vertical Spinner - Touchspin - Product Details Quantity input
     if ( $.fn.TouchSpin ) {
     if ( $.fn.TouchSpin ) {
-        $('#product_quantity').TouchSpin({
+        $('.vertical-spinner').TouchSpin({
             verticalbuttons: true
             verticalbuttons: true
         });
         });
         $('.qty-input').TouchSpin();
         $('.qty-input').TouchSpin();

app/assets/javascripts/global.js

 (function($) {
 (function($) {
     toastr.options.closeButton = true;
     toastr.options.closeButton = true;
+    // Search Dropdown Toggle
+    $('.search-toggle').on('click', function (e) {
+        $('.header-search-wrapper').toggleClass('open');
+        e.preventDefault();
+    });
 }).apply(this, [jQuery]);
 }).apply(this, [jQuery]);
\ No newline at end of file

app/assets/stylesheets/skin_14.scss

@@ -92,15 +92,6 @@ html .btn-primary:active:focus {
 #header .header-logo img {
 #header .header-logo img {
   margin: 0 24px 0 0;
   margin: 0 24px 0 0;
 }
 }
-#header .header-container {
-  padding-top: 28px;
-  padding-bottom: 28px;
-  position: relative;
-  display: table;
-}
-#header .header-container.header-nav {
-  padding: 0;
-}
 #header .cart-area {
 #header .cart-area {
   float: right;
   float: right;
   vertical-align: middle;
   vertical-align: middle;
@@ -171,7 +162,6 @@ header .header-search {
   position: relative;
   position: relative;
   width: 100%;
   width: 100%;
   min-width: 250px;
   min-width: 250px;
-  padding-right: 170px;
   background-color: #fff;
   background-color: #fff;
 }
 }
 #header .header-search .header-search-wrapper.open {
 #header .header-search .header-search-wrapper.open {
@@ -278,6 +268,9 @@ header .header-search {
   color: #000;
   color: #000;
   background-color: transparent;
   background-color: transparent;
 }
 }
+#header .header-nav-main nav > ul > li > a {
+  border-radius: 0;
+}
 .panel-default>.panel-heading {
 .panel-default>.panel-heading {
   color: #333;
   color: #333;
   background-color: #f5f5f5;
   background-color: #f5f5f5;

app/controllers/search_controller.rb

+class SearchController < ApplicationController
+  before_action :set_solr
+  before_action :set_search_request, only: :show
+
+  # GET /search
+  def show
+    products = Search.matched_products(@solr.docs)
+    if products.is_a?(Array)
+      @products = Kaminari.paginate_array(products).page(params[:page]).per(10)
+    else
+      @products = products.page(params[:page]).per(10)
+    end
+  end
+
+  private
+
+  def set_solr
+    @solr = SolrSearch.new
+  end
+
+  def set_search_request
+    @solr.search_for(params[:q])
+  end
+end
\ No newline at end of file

app/controllers/static_pages_controller.rb

 class StaticPagesController < ApplicationController
 class StaticPagesController < ApplicationController
   def index
   def index
-    @latest_products = Product.page(params[:page]).per(10)
+    @latest_products = Product.page(params[:page]).per(5)
     # @TODO: Get recommended products
     # @TODO: Get recommended products
     @recommended_products = Product.last(6)
     @recommended_products = Product.last(6)
     # session.clear
     # session.clear

app/services/cart.rb

@@ -16,7 +16,7 @@ class Cart
     real_quantity = product_quantity(product_id, quantity)
     real_quantity = product_quantity(product_id, quantity)
     return false unless product_is_in_stock?(product_id, real_quantity)
     return false unless product_is_in_stock?(product_id, real_quantity)
     if product_item_exist?(product_id)
     if product_item_exist?(product_id)
-      @cart[product_id.to_s][:quantity.to_s] += real_quantity.to_i
+      @cart[product_id.to_s][:quantity.to_s] = real_quantity.to_i
     else
     else
       @cart[product_id.to_s] = { quantity: real_quantity.to_i }
       @cart[product_id.to_s] = { quantity: real_quantity.to_i }
     end
     end

app/services/search.rb

+class Search
+  def self.matched_products(array)
+    return Product.all if array.empty?
+    product_ids = []
+    array.each do |product|
+      product_ids << product[:id.to_s]
+    end
+    Product.find(product_ids)
+  end
+end
\ No newline at end of file

app/services/solr_search.rb

@@ -5,5 +5,19 @@ class SolrSearch
 
 
   def initialize
   def initialize
     @rsolr = RSolr.connect url: Settings.rsolr.address
     @rsolr = RSolr.connect url: Settings.rsolr.address
+    @response = nil
+  end
+
+  def search_for(search_query)
+    search_query ||= ''
+    @response = rsolr.get 'select', params: { q: sanitize_query(search_query) }
+  end
+
+  def docs
+    @response['response']['docs']
+  end
+
+  def sanitize_query(query)
+    query.delete(':')
   end
   end
 end
 end
\ No newline at end of file

app/views/carts/_product_item.html.erb

@@ -5,7 +5,7 @@
   <td class="product-image-td"></td>
   <td class="product-image-td"></td>
   <td class="product-name-td">
   <td class="product-name-td">
     <h2 class="product-name">
     <h2 class="product-name">
-      <%= link_to product_item[:product].title, product_item_url(product_item[:product]) %>
+      <%= link_to product_item[:product].title, product_url(product_item[:product]) %>
     </h2>
     </h2>
   </td>
   </td>
   <td><%= number_to_currency(product_item[:product].price) %></td>
   <td><%= number_to_currency(product_item[:product].price) %></td>

app/views/layouts/_header.html.erb

@@ -36,15 +36,11 @@
                 </a>
                 </a>
               </div>
               </div>
             </div>
             </div>
-            <div class="header-search">
-
+            <%= render 'layouts/header/search_form' %>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
-    </div>
-    <div class="header-container header-nav">
-
-    </div>
+    <%= render 'layouts/header/main_nav' %>
   </div>
   </div>
 </header>
 </header>
\ No newline at end of file

app/views/layouts/header/_main_nav.html.erb

+<div class="header-container header-nav">
+  <div class="container">
+    <div class="header-nav-main">
+      <nav>
+        <ul id="mainNav" class="nav nav-pills">
+          <%= active_link_to 'Home', root_url, wrap_tag: :li, active: :exclusive %>
+        </ul>
+      </nav>
+    </div>
+  </div>
+</div>
\ No newline at end of file

app/views/layouts/header/_search_form.html.erb

+<div class="header-search">
+  <a href="#" class="search-toggle"><i class="fa fa-search"></i></a>
+  <%= form_tag search_result_path, method: :get do %>
+    <div class="header-search-wrapper">
+      <%= text_field_tag :q, params[:q], class: 'form-control', placeholder: 'Search...' %>
+      <%= button_tag raw('<i class="fa fa-search"></i>'), class: 'btn btn-default'  %>
+    </div>
+  <% end %>
+</div>
\ No newline at end of file

app/views/products/_form.html.erb

@@ -26,7 +26,7 @@
       <div class="col-md-12">
       <div class="col-md-12">
         <div class="form-group">
         <div class="form-group">
           <%= f.label :quantity %>
           <%= f.label :quantity %>
-          <%= f.number_field :quantity, class: "form-control" %>
+          <%= f.number_field :quantity, class: "form-control vertical-spinner" %>
         </div>
         </div>
       </div>
       </div>
 
 

app/views/products/_product_action.html.erb

+<div class="product-actions">
+  <%= form_tag cart_add_product_item_path(product.id), remote: true do %>
+      <%= hidden_field_tag :product_quantity, 1 %>
+      <%= button_tag fa_icon('shopping-cart', text: 'Add to cart'), class: 'addtocart' %>
+  <% end %>
+</div>
\ No newline at end of file

app/views/products/_product_grid.html.erb

@@ -12,6 +12,7 @@
             <div class="product-price-box">
             <div class="product-price-box">
               <span class="product-price"><%= number_to_currency(product.price) %></span>
               <span class="product-price"><%= number_to_currency(product.price) %></span>
             </div>
             </div>
+            <%= render partial: 'products/product_action', locals: { product: product } %>
           </div>
           </div>
         </div>
         </div>
       </li>
       </li>

app/views/products/_product_list.html.erb

@@ -11,11 +11,12 @@
               <%= link_to fa_icon('pencil'), edit_product_path(product) if product.belongs_to_user?(current_user) %>
               <%= link_to fa_icon('pencil'), edit_product_path(product) if product.belongs_to_user?(current_user) %>
             </h2>
             </h2>
             <div class="product-short-desc">
             <div class="product-short-desc">
-              <%= product.description %>
+              <%= truncate(product.description, length: 300) %>
             </div>
             </div>
             <div class="product-price-box">
             <div class="product-price-box">
               <span class="product-price"><%= number_to_currency(product.price) %></span>
               <span class="product-price"><%= number_to_currency(product.price) %></span>
             </div>
             </div>
+            <%= render partial: 'products/product_action', locals: { product: product } %>
           </div>
           </div>
         </div>
         </div>
       </li>
       </li>

app/views/search/show.html.erb

+<div class="container">
+  <div class="row">
+    <div class="col-md-9 col-md-push-3">
+      <h2 class="h2 heading-primary mt-lg clearfix">
+        <span>Search result</span>
+      </h2>
+      <%= render partial: 'products/product_list', locals: { products: @products } %>
+
+      <div class="toolbar-bottom">
+        <div class="toolbar">
+          <div class="sorter">
+            <%= paginate @products, theme: 'bootstrap' %>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-3 col-md-pull-9 sidebar shop-sidebar">
+      <%= render 'shared/sidebar' %>
+    </div>
+  </div>
+</div>

app/views/users/_product.html.erb

+<tr>
+  <td><%= link_to "##{product.id}", edit_product_path(product) %></td>
+  <td class="product-name-td">
+    <h2 class="product-name">
+      <%= link_to product.title, product_url(product) %>
+    </h2>
+  </td>
+  <td><%= number_to_currency(product.price) %></td>
+  <td><%= product.quantity %></td>
+  <td><%= link_to fa_icon('pencil'), edit_product_path(product) %></td>
+</tr>
\ No newline at end of file

app/views/users/_product_table.html.erb

+<table class="cart-table">
+  <thead>
+  <tr>
+    <th>ID</th>
+    <th>Product Name</th>
+    <th>Unit Price</th>
+    <th>Qty</th>
+    <th></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @products.each do |product| %>
+      <%= render partial: 'product', locals: { product: product } %>
+  <% end %>
+  </tbody>
+</table>
\ No newline at end of file

app/views/users/products.html.erb

@@ -4,7 +4,7 @@
       <h2 class="h2 heading-primary font-weight-normal">
       <h2 class="h2 heading-primary font-weight-normal">
         My Products
         My Products
       </h2>
       </h2>
-      <%= render partial: 'products/product_list', locals: { products: @products } %>
+      <%= render 'product_table' %>
       <div class="toolbar-bottom">
       <div class="toolbar-bottom">
         <div class="toolbar">
         <div class="toolbar">
           <div class="sorter">
           <div class="sorter">

config/routes.rb

@@ -20,4 +20,5 @@ Rails.application.routes.draw do
     get '/', to: 'users#show', as: 'user_profile'
     get '/', to: 'users#show', as: 'user_profile'
     get '/products', to: 'users#products', as: 'user_products'
     get '/products', to: 'users#products', as: 'user_products'
   end
   end
+  get '/search', to: 'search#show', as: 'search_result'
 end
 end