add devise and fix bootstrap generators

app/assets/stylesheets/application.css

@@ -10,4 +10,5 @@
  *
  *= require_self
  *= require_directory .
+ * require 'bootstrap-devise-rails'
  */

app/assets/stylesheets/tablet/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_directory .
+ */

app/assets/stylesheets/tablet/structure.css.sass

@@ -0,0 +1,13 @@
+$side-spacing: 5px
+body
+  padding-left: $side-spacing
+  padding-right: $side-spacing
+  //padding-top: 50px
+  .navbar-fixed-top
+    margin-left: -$side-spacing
+    margin-right: -$side-spacing
+    margin-bottom: 3px
+  .page-header
+    margin-top: 4px
+    margin-bottom: 6px
+    padding-bottom: 0

app/models/supplier.rb

@@ -1,5 +1,7 @@
 class Supplier
   include SimplyStored::Couch
+  include Devise::Orm::SimplyStored
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable
 
   property :name
   #has_many :orders, through: :lists

app/models/user.rb

@@ -1,7 +1,7 @@
 class User
   include SimplyStored::Couch
   include Devise::Orm::SimplyStored
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable
 
   has_and_belongs_to_many :lists, storing_keys: false
   has_many :orders

app/views/dashboard/phone_home.html.slim

@@ -6,6 +6,6 @@ ul.nav.nav-tabs.nav-stacked
     li= link_to 'Move table', '#'
     li= link_to 'I have a question', '#'
   - else
-    li= link_to 'Place order', '/select_qrcode'
+    li= link_to 'Join table with Qr scan', '/select_qrcode'
     li= link_to 'Subscribe to list', '#'
     li= link_to 'Check out menu', '#'

app/views/devise/_links.html.slim

@@ -0,0 +1,19 @@
+ul.nav.nav-pills
+  - if controller_name != 'sessions'
+    li= link_to t('devise.sessions.button'), new_session_path(resource_name)
+
+  - if devise_mapping.registerable? && controller_name != 'registrations'
+    li= link_to t('devise.registrations.button'), new_registration_path(resource_name)
+
+  - if devise_mapping.recoverable? && controller_name != 'passwords'
+    li= link_to t('devise.sessions.forgot_your_password'), new_password_path(resource_name)
+
+  - if devise_mapping.confirmable? && controller_name != 'confirmations'
+    li= link_to t('devise.confirmations.did_not_receive_instructions_link'), new_confirmation_path(resource_name)
+
+  - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+    li= link_to t('devise.unlocks.did_not_receive_instructions_link'), new_unlock_path(resource_name)
+
+  - if devise_mapping.omniauthable?
+    - resource_class.omniauth_providers.each do |provider|
+      li= link_to t('devise.omniauth_callbacks.sign_in_with', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)

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 %></div>
+
+  <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render "links" %>

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

@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.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 => @resource.confirmation_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, and you can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_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 amount 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 => @resource.unlock_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 %></div>
+
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.submit "Change my password" %></div>
+<% end %>
+
+<%= render "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 %></div>
+
+  <div><%= f.submit "Send me reset password instructions" %></div>
+<% end %>
+
+<%= render "links" %>

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

@@ -0,0 +1,25 @@
+<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 %></div>
+
+  <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 %></div>
+
+  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></div>
+
+  <div><%= f.submit "Update" %></div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+
+<%= link_to "Back", :back %>

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

@@ -0,0 +1,16 @@
+h2= t('devise.registrations.title')
+= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
+  = devise_error_messages!
+  .control-group
+     = f.label :email, class: 'control-label'
+     .controls= f.email_field :email
+  .control-group
+     = f.label :password, class: 'control-label'
+     .controls= f.password_field :password
+  .control-group
+     = f.label :password_confirmation, class: 'control-label'
+     .controls= f.password_field :password_confirmation
+  .control-group
+    .controls
+      = f.submit t('devise.registrations.button')
+= render "links"

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

@@ -0,0 +1,19 @@
+h2= t('devise.sessions.title')
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
+  = devise_error_messages!
+  .control-group
+     = f.label :email, class: 'control-label'
+     .controls= f.email_field :email
+  .control-group
+     = f.label :password, class: 'control-label'
+     .controls= f.password_field :password
+  .control-group
+    .controls
+      = f.label :remember_me do
+        = f.check_box :remember_me
+        | 
+        = t('devise.sessions.remember_me')
+  .control-group
+    .controls
+      = f.submit t('devise.sessions.button'), class: 'btn btn-primary'
+= render "links"

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 %></div>
+
+  <div><%= f.submit "Resend unlock instructions" %></div>
+<% end %>
+
+<%= render "links" %>

app/views/layouts/tablet.html.slim

@@ -11,7 +11,7 @@ html lang="en"
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
     = stylesheet_link_tag "application", :media => "all"
-    = stylesheet_link_tag "phone/application", :media => "all"
+    = stylesheet_link_tag "tablet/application", :media => "all"
     link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
     link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
     link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
@@ -47,7 +47,7 @@ html lang="en"
             div= flash[:notice]
         .row
           .span12
-            = yield
+            = content_for?(:content) ? yield(:content) : yield
     /!
       Javascripts
       \==================================================

app/views/products/_form.html.slim

@@ -15,11 +15,11 @@
   .control-group class=(@product.errors[:product_category_id].any? ? 'error' : nil)
     = f.label :product_category_id, ProductCategory.model_name.human, class: 'control-label'
     .controls
-      = f.select :product_category_id, options_for_select(@product_categories.map{|a| [a.name, a.id]}), include_blank: ''
+      = f.collection_select :product_category_id, @product_categories, :id, :name, include_blank: ''
   .control-group class=(@product.errors[:supplier_id].any? ? 'error' : nil)
     = f.label :supplier_id, Supplier.model_name.human, class: 'control-label'
     .controls
-      = f.select :supplier_id, options_for_select(@suppliers.map{|a| [a.name, a.id]}), include_blank: nil
+      = f.collection_select :supplier_id, @suppliers, :id, :name, include_blank: nil
   .form-actions
     = f.submit nil, class: 'btn btn-primary'
     '