Better sign up and sign in

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/bterkuile/cmtool.git
-  revision: 683791730638cda48ed326b7812396da04b7990f
+  revision: f61f94c8831db5c8f73df0835ccfebe2a20c9f1f
   specs:
     cmtool (1.0.0)
       bourbon
@@ -37,7 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/plataformatec/devise.git
-  revision: ce6e369ba85d3759474e468dd0b28735e7450a3d
+  revision: 8482e485d1396fdc43c030098f80c90f11763a3a
   branch: lm-rails-4-2
   specs:
     devise (3.3.0)
@@ -118,7 +118,7 @@ GEM
     capistrano-rvm (0.1.1)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (2.4.1)
+    capybara (2.4.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -199,7 +199,7 @@ GEM
       websocket-driver (>= 0.3.1)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    foundation-rails (5.4.4.0)
+    foundation-rails (5.4.5.0)
       railties (>= 3.1.0)
       sass (>= 3.2.0)
     fuubar (2.0.0)
@@ -246,7 +246,7 @@ GEM
     mini_magick (3.8.1)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
-    minitest (5.4.1)
+    minitest (5.4.2)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -300,9 +300,9 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.0.beta1)
       sprockets-rails (~> 3.0.0.beta1)
-    rails-deprecated_sanitizer (1.0.2)
+    rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.2)
+    rails-dom-testing (1.0.3)
       activesupport
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -324,15 +324,15 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.3)
+    rspec-core (3.1.4)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.1)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
     rspec-its (1.0.1)
       rspec-core (>= 2.99.0.beta1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (3.1.0)
+    rspec-mocks (3.1.2)
       rspec-support (~> 3.1.0)
     rspec-rails (3.1.0)
       actionpack (>= 3.0)
@@ -342,9 +342,9 @@ GEM
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
+    rspec-support (3.1.1)
-    ruby-progressbar (1.5.1)
+    ruby-progressbar (1.6.0)
-    sass (3.4.4)
+    sass (3.4.5)
     sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2)
@@ -353,9 +353,9 @@ GEM
     simple_form (3.0.2)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.9.0)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slim (2.0.3)
@@ -392,9 +392,9 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tinymce-rails (4.1.4)
+    tinymce-rails (4.1.5)
       railties (>= 3.1.1)
-    turnip (1.2.3)
+    turnip (1.2.4)
       gherkin (>= 2.5)
       rspec (>= 2.14.0, < 4.0)
     tzinfo (1.2.2)
@@ -404,7 +404,7 @@ GEM
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
-    web-console (2.0.0.beta3)
+    web-console (2.0.0.beta4)
       activemodel (~> 4.0)
       binding_of_caller (= 0.7.3.pre1)
       railties (~> 4.0)

Procfile

@@ -1,6 +1,7 @@
 #web:     bundle exec thin start -p $PORT
 faye:     thin start -R faye/config.ru -p 9296
-#faye:    rackup faye.ru -s thin -E production
+# production: faye:     thin start -d -R faye/config.ru -p 9296
 counters: bin/drb_counter.rb run
-database: echo "BuenosAires" | sudo -S couchdb start | ~/bin/couch_output
+# production: conters: bin/drb_counter.rb start
+#database: echo "BuenosAires" | sudo -S couchdb start | ~/bin/couch_output
 #server: rails s

app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,5 +1,6 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def passthru
+    send(params[:provider]) and return if available_action?(params[:provider])
     show_404
     # Or alternatively,
     # raise ActionController::RoutingError.new('Not Found')

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

@@ -1,9 +1,6 @@
 h2= t('devise.registrations.title')
-p
+p=raw t('supplier.sign_up.header')
-  |
+= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'form-horizontal'}) do |f|
-    Leuk dat je je wilt aanmelden voor Qwaiter. Na de aanmelding zal er een bevestigings e-mail worden gestuurd
-    om het e-mailadres te bevestigen. Hierna kan je aan de slag met mobiel bestellen!
-= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
   = devise_error_messages!
   .control-group
   = f.row :name do
@@ -18,5 +15,5 @@ p
   = f.row :password_confirmation do
      .form-label= f.label :password_confirmation, class: 'control-label'
      .form-field= f.password_field :password_confirmation
-  .form-row.form-actions= f.submit t('devise.registrations.button'), class: 'button'
+  .form-row.form-actions= f.submit t('supplier.sign_up.button'), class: 'button'
 = render "links"

config/couchdb.yml

@@ -1,9 +1,13 @@
 development:
   validation_framework: :active_model #optional
-  database: qwaiter_development
+  #database: qwaiter_development
+  database: "http://mozo:secret@localhost:5984/qwaiter_development"
 test:
   validation_framework: :active_model #optional
-  database: qwaiter_test
+  #database: "http://mozo:secret@localhost:5984/qwaiter_test"
+  #Testing can only be done as couchdb admin, since it requires creating and destroying the database
+  #database: "qwaiter_test"
+  database: "http://admin:secret@localhost:5984/qwaiter_test"
 production:
   validation_framework: :active_model #optional
   database: qwaiter

config/locales/supplier.en.yml

@@ -1,5 +1,13 @@
 en:
   supplier:
+    sign_up:
+      header: |
+        Nice that you want to start using Mozo.
+        After signing up a confirmation e-mail will be sent to you
+        in order to confirm your email. After clicking the link in
+        this e-mail you will be fully operational!<br>
+        Happy ordering!
+      button: Sign up
     dashboard:
       active_lists:
         no_lists: No active lists

config/locales/supplier.nl.yml

@@ -1,5 +1,12 @@
 nl:
   supplier:
+    sign_up:
+      header: |
+        Leuk dat je je wilt aanmelden voor Mozo.
+        Na de aanmelding zal er een bevestigings e-mail worden gestuurd
+        om het e-mailadres te bevestigen.
+        Hierna kan je aan de slag met mobiel bestellen!
+      button: Aanmelden
     dashboard:
       active_lists:
         no_lists: Geen actieve ${models.plural.list}

config/routes.rb

@@ -207,8 +207,12 @@ Qwaiter::Application.routes.draw do
   #
   #root :to => 'dashboard#home'
   root :to => 'pages#home', defaults: {locale: 'nl'}
-  get '/:locale' => 'pages#home', constraints: {locale: /nl|be|de|fr|en/}
+  ALLOWED_LOCALES = /nl|be|de|fr|en/
-  scope '(/:locale)', constraints: {locale: /nl|be|de|fr|en/}, defaults: { locale: 'nl' } do
+  get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}
+  devise_scope :supplier do
+    get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES}
+  end
+  scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: 'nl' } do
     get "/:name" => "pages#show", constraints: {name: /.*/}, as: :go_to
   end
 

wip.md

@@ -23,6 +23,13 @@ Bugs
 
 <!-- - nothing!!! -->
 
+General
+-------
+
+- split off faye server
+- split off counter server
+	- rails runner Supplier.reset_counters on start!
+
 Post release
 ============
 
@@ -30,6 +37,7 @@ Post release
 - Do not destroy tables with active list
 - Test list view when table is destroyed
 - Test a whole bunch of destroy actions (soft delete? DestoyedTable model?)
+- rate experience
 
 Website
 -------