Browse Source

lk | adds search bar to header

master
Louis Knapp 9 years ago
parent
commit
961d47f7ff
  1. 3
      app/assets/stylesheets/layout.css
  2. 14
      app/views/layouts/_navbar.html.erb
  3. 4
      app/views/static_pages/home.html.haml
  4. 58
      db/schema.rb

3
app/assets/stylesheets/layout.css

@ -0,0 +1,3 @@
.bike-search {
padding-top: 7px;
}

14
app/views/layouts/_navbar.html.erb

@ -11,12 +11,20 @@
<div class="navbar-collapse collapse navbar-responsive-collapse" id='collapse-1'>
<ul class="nav navbar-nav navbar-right">
<li><%= if current_user
<li class="bike-search">
<%= form_tag("bikes/search", method: "get", class: "form-inline") do %>
<%= label_tag(:log_number, "Search for a bike by log number:") %>
<%= text_field_tag :log_number, "", class: "form-control" %>
<%= submit_tag("Search", class: "btn btn-default") %>
<% end %>
</li>
<li>
<%= if current_user
link_to "Sign Out", destroy_user_session_path, method: :delete
else
link_to "Sign In", new_user_session_path
end %></li>
end %>
</li>
</ul>
</div>
</nav>

4
app/views/static_pages/home.html.haml

@ -2,10 +2,6 @@
%h1 Bike &amp; Client Tracker
%br
%h2 Bikes
= form_tag("bikes/search", method: "get", class: "form-inline") do
= label_tag(:log_number, "Search by log number:")
= text_field_tag :log_number, "", class: "form-control"
= submit_tag("Search", class: "btn btn-default")
%br
= link_to "Log Bikes", new_bike_path
%br

58
db/schema.rb

@ -17,27 +17,27 @@ ActiveRecord::Schema.define(version: 20150930005913) do
enable_extension "plpgsql"
create_table "agencies", force: :cascade do |t|
t.string "agency_name", limit: 255
t.string "contact_name", limit: 255
t.string "street_address", limit: 255
t.string "city", limit: 255
t.string "state", limit: 255
t.string "postal_code", limit: 255
t.string "phone_number", limit: 255
t.string "email", limit: 255
t.string "agency_name"
t.string "contact_name"
t.string "street_address"
t.string "city"
t.string "state"
t.string "postal_code"
t.string "phone_number"
t.string "email"
end
create_table "bikes", force: :cascade do |t|
t.string "entry_date", limit: 255
t.string "brand", limit: 255
t.string "model", limit: 255
t.string "bike_type", limit: 255
t.string "color", limit: 255
t.string "serial_number", limit: 255
t.string "entry_date"
t.string "brand"
t.string "model"
t.string "bike_type"
t.string "color"
t.string "serial_number"
t.text "work_done"
t.text "new_parts"
t.string "completion_date", limit: 255
t.string "price", limit: 255
t.string "completion_date"
t.string "price"
t.datetime "created_at"
t.datetime "updated_at"
t.float "seat_tube_size"
@ -50,10 +50,10 @@ ActiveRecord::Schema.define(version: 20150930005913) do
end
create_table "clients", force: :cascade do |t|
t.string "first_name", limit: 255
t.string "last_name", limit: 255
t.string "first_name"
t.string "last_name"
t.date "application_date"
t.string "gender", limit: 255
t.string "gender"
t.integer "age"
t.boolean "helmet"
t.boolean "lock"
@ -61,7 +61,7 @@ ActiveRecord::Schema.define(version: 20150930005913) do
t.datetime "created_at"
t.datetime "updated_at"
t.integer "bike_id"
t.string "bike_type_requested", limit: 255
t.string "bike_type_requested"
t.boolean "will_pay"
t.integer "agency_id"
t.text "notes"
@ -69,7 +69,7 @@ ActiveRecord::Schema.define(version: 20150930005913) do
t.integer "number_of_calls"
t.boolean "application_voided"
t.date "pickup_date"
t.string "volunteer_at_pickup", limit: 255
t.string "volunteer_at_pickup"
t.float "weight"
t.float "height"
end
@ -78,16 +78,16 @@ ActiveRecord::Schema.define(version: 20150930005913) do
add_index "clients", ["bike_id"], name: "index_clients_on_bike_id", using: :btree
create_table "users", force: :cascade do |t|
t.string "email", limit: 255, default: "", null: false
t.string "encrypted_password", limit: 255, default: "", null: false
t.string "reset_password_token", limit: 255
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip", limit: 255
t.string "last_sign_in_ip", limit: 255
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
end
@ -96,9 +96,9 @@ ActiveRecord::Schema.define(version: 20150930005913) do
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
create_table "volunteers", force: :cascade do |t|
t.string "name", limit: 255
t.string "email", limit: 255
t.string "phone", limit: 255
t.string "name"
t.string "email"
t.string "phone"
t.date "orientation_date"
t.integer "other_volunteer_hours"
t.text "referral"

Loading…
Cancel
Save