Louis | reverts fa110, which was branched instead

app/views/bikes/_fields.html.haml

@@ -0,0 +1,78 @@
+- disabled ||= false 
+.form-horizontal
+  .form-group
+    = f.label "Log Number", class: "col-sm-2 control-label" 
+    .col-sm-10
+      = f.text_field :log_number, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Bike Entry Date:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :entry_date, class: "form-control datepicker", disabled: disabled
+  
+  .form-group
+    = f.label "Brand:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :brand, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Color:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :color, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Top Tube Size:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :top_tube_size, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Seat Tube Size:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :seat_tube_size, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Model:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :model, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Type:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.select :bike_type, [["BMX", "BMX"], ["Cruiser", "Cruiser"], ["Hybrid", "Hybrid"], ["Mountain", "Mountain"], ["Road", "Road"], ["Touring", "Touring"], ["Track", "Track"], ["Utility", "Utility"]], {}, class: "selectpicker", disabled: disabled
+  
+  .form-group
+    = f.label "Purpose:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.select :purpose, [["Freecyclery", "Freecyclery"], ["Sale", "Sale"]], {}, class: "selectpicker", disabled: disabled
+  
+  .form-group
+    = f.label "Serial Number", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :serial_number, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Notes", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_area :notes, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Tag Info", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_area :tag_info, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Mechanic:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :mechanic, class: "form-control", disabled: disabled
+  
+  .form-group
+    = f.label "Completion Date:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.text_field :completion_date, class: "form-control datepicker", disabled: disabled
+  
+  .form-group
+    = f.label "Price", class: "col-sm-2 control-label"
+    .col-sm-10
+      .input-group
+        %span.input-group-addon $
+        = f.text_field :price, class: "form-control", disabled: disabled

app/views/bikes/_form.html.haml

@@ -0,0 +1,12 @@
+.container
+  = form_for @bike, html: {class: 'form-horizontal'} do |f|
+    - if @bike.errors.any? 
+      #error_explanation
+        %h2= pluralize(@bike.errors.count, "error") + " prohibited this bike from being saved:"
+        %ul
+          - @bike.errors.full_messages.each do |msg|
+            %li= msg 
+    = render 'fields', f: f 
+    .row
+      .actions.col-sm-offset-2
+        = f.submit class: "btn btn-default"

app/views/bikes/edit.html.haml

@@ -0,0 +1,6 @@
+.container
+  %h1 Editing bike
+  = render 'form' 
+  = link_to 'Show', @bike
+  |
+  = link_to 'Back', bikes_path

app/views/bikes/index.html.haml

@@ -0,0 +1,22 @@
+.container
+  %h1 Bikes
+
+  %table.table.table-striped.table-bordered.table-hover
+    %thead
+      %tr
+        %th Brand
+        %th Model
+        %th
+        %th
+        %th
+    %tbody
+      - @bikes.each do |bike|
+        %tr
+          %td= bike.brand 
+          %td= bike.model
+          %td= link_to 'Show', bike
+          %td= link_to 'Edit', edit_bike_path(bike)
+          %td= link_to 'Destroy', bike, method: :delete, data: { confirm: 'Are you sure?' }
+  
+  %br
+  = link_to ' + Log Bike', new_bike_path, class: "btn btn-default"

app/views/bikes/new.html.haml

@@ -0,0 +1,3 @@
+%h1 New bike
+= render 'form'
+= link_to 'Back', bikes_path

app/views/bikes/show.html.haml

@@ -0,0 +1,7 @@
+.container
+  %p#notice= notice
+  = form_for(@bike) do |f|
+    = render 'fields', f: f, disabled: true
+  = link_to 'Edit', edit_bike_path(@bike)
+  |
+  = link_to 'Back', bikes_path

app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, autofocus: true %></div>
+
+  <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>

app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div><%= f.label :password, "New password" %><br />
+    <%= f.password_field :password, autofocus: true, autocomplete: "off" %></div>
+
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %></div>
+
+  <div><%= f.submit "Change my password" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

app/views/devise/passwords/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, autofocus: true %></div>
+
+  <div><%= f.submit "Send me reset password instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,29 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, autofocus: true %></div>
+
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
+
+  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.password_field :password, autocomplete: "off" %></div>
+
+  <div><%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %></div>
+
+  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.password_field :current_password, autocomplete: "off" %></div>
+
+  <div><%= f.submit "Update" %></div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+
+<%= link_to "Back", :back %>

app/views/devise/registrations/new.html.haml

@@ -0,0 +1,20 @@
+.container
+  %h2 Sign up
+  = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| 
+    = devise_error_messages! 
+  
+    = f.label :email 
+    = f.email_field :email, autofocus: true
+    %br
+  
+    = f.label :password 
+    = f.password_field :password, autocomplete: "off"
+    %br
+  
+    = f.label :password_confirmation 
+    = f.password_field :password_confirmation, autocomplete: "off"
+    %br
+  
+    = f.submit "Sign up"
+  
+  = render "devise/shared/links"

app/views/devise/sessions/new.html.erb

@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, autofocus: true %></div>
+
+  <div><%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "off" %></div>
+
+  <% if devise_mapping.rememberable? -%>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+  <% end -%>
+
+  <div><%= f.submit "Sign in" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, autofocus: true %></div>
+
+  <div><%= f.submit "Resend unlock instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

app/views/layouts/_head.html.erb

@@ -0,0 +1,10 @@
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title><%= content_for?(:title) ? yield(:title) : "Bicycle Project Tracker" %></title>
+  <%= csrf_meta_tags %>
+  <%= stylesheet_link_tag "application", :media => "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= favicon_link_tag '/favicon.ico' %>
+</head>

app/views/layouts/_navbar.html.erb

@@ -0,0 +1,18 @@
+<nav class="navbar navbar-default">
+  <div class='navbar-header'>
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#collapse-1">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <%= link_to "Bicycle Projects", root_path, :class=>"navbar-brand" %>
+  </div>
+
+  <div class="navbar-collapse collapse navbar-responsive-collapse" id='collapse-1'>
+    <ul class="nav navbar-nav navbar-right">
+      <li><%= link_to "Bikes", bikes_path %></li>
+      <li><%= link_to "Volunteers", volunteers_path %></li>
+    </ul>
+  </div>
+</nav>

app/views/layouts/application.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<%= render "layouts/head" %>
+<%= render "layouts/navbar" %>
+  <body>
+    <p class="notice"><%= notice %></p>
+    <p class="alert"><%= alert %></p>
+    <%= yield %>
+  </body>
+</html>

app/views/static_pages/home.html.haml

@@ -0,0 +1,5 @@
+.container
+  %h1 Bicycle Data Tracker
+  = link_to "Bikes", bikes_path
+  %br
+  = link_to "Volunteers", volunteers_path

app/views/volunteers/_fields.html.haml

@@ -0,0 +1,17 @@
+- disabled ||= false
+
+.form-group
+  = f.label "Name", class: "col-sm-2 control-label"
+  .col-sm-10
+    = f.text_field :name, class: "form-control", disabled: disabled
+
+.form-group
+  = f.label "Email address:", class: "col-sm-2 control-label"
+  .col-sm-10
+    = f.text_field :email, class: "form-control", disabled: disabled
+
+.form-group
+  = f.label "Phone Number:", class: "col-sm-2 control-label"
+  .col-sm-10
+    = f.text_field :phone, class: "form-control", disabled: disabled
+

app/views/volunteers/_form.html.haml

@@ -0,0 +1,12 @@
+.container
+  = form_for @volunteer, html: {class: 'form-horizontal'} do |f|
+    - if @volunteer.errors.any?
+      #error_explanation
+        %h2= pluralize(@volunteer.errors.count, "error") + "prohibited this volunteer from being saved:"
+        %ul
+        - @volunteer.errors.full_messages.each do |msg|
+          %li= msg
+    = render 'fields', f: f
+    .row
+      .actions.col-sm-offset-2
+        = f.submit class: "btn btn-default"

app/views/volunteers/edit.html.haml

@@ -0,0 +1,6 @@
+.container
+  %h1 Editing Volunteer Information
+  = render 'form'
+  = link_to 'Show', @volunteer
+  |
+  = link_to 'Back', volunteers_path

app/views/volunteers/index.html.haml

@@ -0,0 +1,23 @@
+.container
+  %h1 Volunteers
+  %table.table.table-striped.table-bordered.table-hover
+    %thead
+      %tr
+        %th Name
+        %th Phone
+        %th Email
+        %th
+        %th
+        %th
+    %tbody
+      - @volunteers.each do |volunteer|
+        %tr
+          %td= volunteer.name
+          %td= volunteer.phone
+          %td= volunteer.email
+          %td= link_to 'Show', volunteer
+          %td= link_to 'Edit', edit_volunteer_path(volunteer)
+          %td= link_to 'Destroy', volunteer, method: :delete, data: { confirm: 'Are you sure?' }
+
+  = link_to '+ Add Volunteer', new_volunteer_path, class: "btn btn-default"
+

app/views/volunteers/new.html.haml

@@ -0,0 +1,3 @@
+%h1 New Volunteer
+= render 'form'
+= link_to 'Back', volunteers_path

app/views/volunteers/show.html.haml

@@ -0,0 +1,7 @@
+.container
+  %p#notice= notice
+  = form_for(@volunteer) do |f|
+    = render 'fields', f: f, disabled: true
+  = link_to 'Edit', edit_volunteer_path(@volunteer)
+  |
+  = link_to 'Back', volunteers_path