Skip to content

Commit 77521d8

Browse files
goxr3plusgoxr3plus
committed
Styled Search Bar
1 parent c6581fd commit 77521d8

8 files changed

Lines changed: 155 additions & 29 deletions

File tree

‎app/assets/javascripts/nicescrollFix.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
$(function () {
2+
$("body").niceScroll({
3+
cursorwidth: 12,
4+
cursoropacitymin: 0.4,
5+
cursorcolor: 'firebrick',
6+
cursorborder: 'none',
7+
cursorborderradius: 4,
8+
autohidemode: 'leave'
9+
}); // free your immagination
10+
$("body").niceScroll().resize();
11+
// console.log("Entered..");
12+
});

‎app/controllers/line_items_controller.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def create
2626
@line_item.save!
2727

2828
# redirect_to cart_path(@current_cart)
29-
redirect_back(fallback_location: root_url)
29+
# redirect_back(fallback_location: root_url)
30+
# render layout: false
3031
end
3132

3233
def destroy

‎app/views/layouts/_header.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<header class="navbar navbar-fixed-top navbar-inverse">
1+
<header class="navbar navbar-inverse navbar-fixed-top">
22
<div class="container">
33
<nav>
44
<%= link_to image_tag("logo2.png",size:"52x42" , alt: "Rails logo"), 'http://rubyonrails.org/' %>

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

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<header class="navbar navbar-fixed-top navbar-inverse">
2+
<div class="container">
3+
<nav>
4+
<%= link_to image_tag("logo2.png",size:"52x42" , alt: "Rails logo"), 'http://rubyonrails.org/' %>
5+
<%= link_to "Dope Shop 2018 ~ ", root_path, id: "logo" %>
6+
<ul class="nav navbar-nav navbar-right">
7+
<!-- Search Bar -->
8+
<li></li>
9+
<!-- Home -->
10+
<li><%= link_to root_path do %>
11+
<i class="glyphicon glyphicon-home"></i>
12+
Home
13+
<% end %>
14+
</li>
15+
16+
<!-- Users -->
17+
<% if logged_in? %>
18+
19+
<li><%= link_to users_path do %>
20+
<i class="glyphicon glyphicon-sunglasses"></i>
21+
Users
22+
<% end %>
23+
</li>
24+
25+
<li class="dropdown">
26+
<li><%= link_to "#", { :class => 'dropdown-toggle', 'data-toggle' => 'dropdown', 'data-placement' => 'top', :title => 'Account', 'data-original-title' => 'Account' } do %>
27+
<!-- <i class="glyphicon glyphicon-user"></i> -->
28+
<i class="glyphicon glyphicon-shopping-cart" style="color:#FFD700"></i>
29+
Basket <span class="badge badge-pill badge-warning"><%= @current_cart.line_items.count %></span> |
30+
<i class="glyphicon glyphicon-eye-open" style="color:firebrick"></i>
31+
Orders <span class="badge badge-pill badge-warning"><%= @current_user.orders.count %></span>
32+
<b class="caret"></b>
33+
<% end %>
34+
35+
<ul class="dropdown-menu">
36+
37+
<!-- Basket -->
38+
<li><%= link_to cart_path(@current_cart) do %>
39+
<i class="glyphicon glyphicon-shopping-cart" style="color:#FFD700"></i>
40+
Basket
41+
<% end %>
42+
</li>
43+
44+
<!-- Orders -->
45+
<li><%= link_to orders_path do %>
46+
<i class="glyphicon glyphicon-eye-open" style="color:firebrick"></i>
47+
Orders
48+
<% end %>
49+
</li>
50+
51+
</li>
52+
</ul>
53+
</li>
54+
55+
<!-- Account -->
56+
<li class="dropdown">
57+
<li><%= link_to "#", { :class => 'dropdown-toggle', 'data-toggle' => 'dropdown', 'data-placement' => 'top', :title => 'Account', 'data-original-title' => 'Account' } do %>
58+
<!-- <i class="glyphicon glyphicon-user"></i> -->
59+
<%= gravatar_for @current_user, size: 20 %>
60+
Account
61+
<b class="caret"></b>
62+
<% end %>
63+
64+
<!-- Profile -->
65+
<ul class="dropdown-menu">
66+
<li><%= link_to current_user do %>
67+
<i class="glyphicon glyphicon-eye-open"></i>
68+
Profile
69+
<% end %>
70+
</li>
71+
<!-- Setting -->
72+
<li><%= link_to edit_user_path(current_user) do %>
73+
<i class="glyphicon glyphicon-cog"></i>
74+
Settings
75+
<% end %>
76+
</li>
77+
<!-- Logout -->
78+
<li class="divider"></li>
79+
<li>
80+
<li><%= link_to logout_path, method: :delete do %>
81+
<i class="glyphicon glyphicon-off"></i>
82+
Log out
83+
<% end %>
84+
</li>
85+
</li>
86+
</ul>
87+
</li>
88+
89+
<% else %>
90+
91+
<!-- Log In -->
92+
<li><%= link_to login_path do %>
93+
<i class="glyphicon glyphicon-log-out"></i>
94+
Log In
95+
<% end %>
96+
</li>
97+
98+
<% end %>
99+
100+
</ul>
101+
</nav>
102+
</div></header>

‎app/views/products/_product.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<!-- Add to Basket -->
2727
<%=button_to line_items_path(:product_id => product.id) , class: "btn btn-warning" , style: "margin-top:15px;" do %>
2828
<i class="glyphicon glyphicon-plus" style="color:black;"></i>
29-
Add to Cart
29+
Add to Basket
3030
<% end %>
3131
<%# end %>
3232
</p>

‎app/views/shared/_products.html.erb‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,47 @@ class="form-control" type="text"/> </div> <button type="submit" class="btn btn-p
1515
<%end %>
1616
</h2>
1717

18-
<!-- Search Bar -->
19-
<div class="input-group" id="adv-search">
20-
<%= form_tag(root_url, :method => "get", id: "search-form") do %>
21-
<%= text_field_tag :search, params[:search], placeholder: "Search..." , class: "form-control" %>
22-
<%= submit_tag "Search" , class: "form_submit"%>
18+
<!-- Search Bar -->
19+
<%= form_tag(root_url, :method => "get", id: "search-form") do %>
20+
<div class="input-group" id="adv-search">
21+
<%= text_field_tag :search, params[:search], placeholder: "Search..." , class: "form-control" %>
22+
<div class="input-group-btn">
23+
<%= button_tag(type: 'submit', class: "btn btn-primary") do %>
24+
<span class="glyphicon glyphicon-search"></span>
2325
<% end %>
26+
</div>
2427
</div>
28+
<% end %>
2529

2630
<!-- Only Admin is allowed to create new products -->
2731
<% if logged_in? && current_user.admin? %>
28-
<%= link_to new_product_path , class: "btn btn-success" , style: "margin-top:15px;" do %>
29-
<i class="glyphicon glyphicon-plus" style="color:black;"></i>
30-
Create New Product (Admin)
32+
<%= link_to new_product_path , class: "btn btn-success" , style: "margin-top:15px;" do %>
33+
<i class="glyphicon glyphicon-plus" style="color:black;"></i>
34+
Create New Product (Admin)
3135
<%end %>
3236
<% end %>
3337
</div>
3438

3539
<%= will_paginate @products %>
3640

37-
3841
<ul class="users">
3942
<% if @products.present? %>
4043

4144
<%= render @products %>
4245
<%# @products.each do |product| %>
43-
<%#= render 'shared/product' , product: product %>
44-
<%# end %>
45-
</ul>
46+
<%#= render 'shared/product' , product: product %>
47+
<%# end %>
48+
</ul>
4649

47-
<%= will_paginate @products %>
50+
<%= will_paginate @products %>
4851

49-
<% else %>
50-
<p>
51-
<br/><br/><hr/>
52-
There are no products containing the term(s) => [
53-
<strong><%= params[:search] %></strong>
54-
] .
52+
<% else %>
53+
<p>
54+
<br/><br/><hr/>
55+
There are no products containing the term(s) => [
56+
<strong><%= params[:search] %></strong>
57+
] .
5558

56-
</p>
57-
<% end %>
58-
<br>
59+
</p>
60+
<% end %>
61+
<br>

‎app/views/users/index.html.erb‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@
99
<%end %>
1010
</h2>
1111

12+
<!-- Search Bar -->
13+
<%= form_tag(users_path, :method => "get", id: "search-form") do %>
1214
<div class="input-group" id="adv-search">
13-
<%= form_tag(users_path, :method => "get", id: "search-form") do %>
14-
<%= text_field_tag :search, params[:search], placeholder: "Search by user name..." , class: "form-control" %>
15-
<%= submit_tag "Search" , class: "form_submit"%>
15+
<%= text_field_tag :search, params[:search], placeholder: "Search..." , class: "form-control" %>
16+
<div class="input-group-btn">
17+
<%= button_tag(type: 'submit', class: "btn btn-primary") do %>
18+
<span class="glyphicon glyphicon-search"></span>
19+
<% end %>
20+
</div>
21+
</div>
1622
<% end %>
17-
</div>
23+
1824
</div>
1925

2026
<%= will_paginate %>

‎config/initializers/assets.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# Add Yarn node_modules folder to the asset load path.
99
Rails.application.config.assets.paths << Rails.root.join('node_modules')
1010

11+
# Rails.application.config.assets.precompile += %w( nicescrollFix.js )
12+
1113
# Precompile additional assets.
1214
# application.js, application.css, and all non-JS/CSS in the app/assets
1315
# folder are already added.

0 commit comments

Comments
 (0)