User flow updates

config/application.rb

@@ -40,7 +40,7 @@ if Rails.env.development?
     alias_method :old_execute, :execute
     def execute(method, path, options, payload = nil, &block)
       Rails.logger.debug "Couch: #{method} #{Rack::Utils.unescape path} #{options}"
-      puts "Couch: #{method} #{Rack::Utils.unescape path} #{options}"
+      #puts "Couch: #{method} #{Rack::Utils.unescape path} #{options}"
       old_execute(method, path, options, payload, &block)
     end
   end

config/initializers/devise.rb

@@ -256,10 +256,10 @@ Devise.setup do |config|
       provider_ignores_state: true
     config.omniauth :instagram, "cd7bdfbee825499b94fb3783d1bc143b", "6b4f9ecf251c462993a696eebc0189be"
   else
-    config.omniauth :facebook, "168928633304849", "22bc53e1a390c1e62d004195c55fe336",
-      scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location',
-      provider_ignores_state: true
-    config.omniauth :instagram, "81c78b969a7046d6b6b5b5fe3f30929c", "3697c16762ad4f1ca088e829efbaddde"
+    # config.omniauth :facebook, "168928633304849", "22bc53e1a390c1e62d004195c55fe336",
+    #   scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location',
+    #   provider_ignores_state: true
+    # config.omniauth :instagram, "81c78b969a7046d6b6b5b5fe3f30929c", "3697c16762ad4f1ca088e829efbaddde"
   end
 
   # ==> Warden configuration

config/initializers/omniauth.rb

@@ -1,2 +1,2 @@
-OmniAuth.config.full_host = Rails.env.production? ? 'https://www.mozo.bar' : 'https://localhost:3002'
+#OmniAuth.config.full_host = Rails.env.production? ? 'https://www.mozo.bar' : 'https://localhost:3002'
 

config/locales/devise.en.yml

@@ -1,19 +1,24 @@
 en:
   devise:
-    sign_in:
-      title: Sign in
-      remember_me: Remember me
-      link: Sign in
-      button: Sign in
-    passwords:
-      title: Recover password
-      link: Recover password
-      button: Send reset
-      edit:
-        title: Change your password
-        button: Change password
-    registrations:
-      title: Sign up for mozo as a restaurant
-      link: Sign up
+    user:
+      sign_in:
+        title: Sign in
+        remember_me: Remember me
+        link: Sign in
+        button: Sign in
+      passwords:
+        title: Recover password
+        link: Recover password
+        button: Send reset
+        edit:
+          title: Change your password
+          button: Change password
+      registrations:
+        title: Sign up for mozo as a user
+        link: Sign up
+        button: Sign up
+      confirmations:
+        title: Resend confirmation instructions
+        button: Resend confirmation instructions
     links:
       prefix: 'OR:'

config/locales/devise.nl.yml

@@ -1,19 +1,24 @@
 nl:
   devise:
-    sign_in:
-      title: Inloggen
-      remember_me: Mij onthouden
-      link: Inloggen
-      button: Inloggen
-    passwords:
-      title: Wachtwoord vergeten
-      link: Wachtwoord vergeten
-      button: Stuur reset
-      edit:
-        title: Change your password
-        button: Change password
-    registrations:
-      title: Aanmelden als restaurant
-      link: Aanmelden
+    user:
+      sign_in:
+        title: Inloggen
+        remember_me: Mij onthouden
+        link: Inloggen
+        button: Inloggen
+      passwords:
+        title: Wachtwoord vergeten
+        link: Wachtwoord vergeten
+        button: Stuur reset
+        edit:
+          title: Change your password
+          button: Change password
+      registrations:
+        title: Aanmelden als gebruiker
+        link: Aanmelden
+        button: Aanmelden
+      confirmations:
+        title: Resend confirmation instructions
+        button: Resend confirmation instructions
     links:
       prefix: 'OF:'

config/locales/mailer.en.yml

@@ -0,0 +1,12 @@
+en:
+  mailer:
+    supplier:
+      creation:
+        subject: 'Weklom bij mozo.bar'
+        title: 'De aanmelding van %{name} bij mozo.bar is gelukt!'
+    user:
+      confirmation_instructions:
+        salutation: Welcome to mozo.bar. You registered a new account as %{email}
+        body: |
+          Your registration at the moment is unconfirmed. To confirm your email, click on the following link:
+          <a href="%{confirm_url}">Confirm %{unconfirmed_email}</a>

config/locales/mailer.nl.yml

@@ -4,3 +4,9 @@ nl:
       creation:
         subject: 'Weklom bij mozo.bar'
         title: 'De aanmelding van %{name} bij mozo.bar is gelukt!'
+    user:
+      confirmation_instructions:
+        salutation: Welcome to mozo.bar. You registered a new account as %{email}
+        body: |
+          Your registration at the moment is unconfirmed. To confirm your email, click on the following link:
+          <a href="%{confirm_url}">Confirm %{unconfirmed_email}>

config/routes.rb

@@ -1,13 +1,19 @@
 ALLOWED_LOCALES = /nl|de|fr|en|es/
 Mozo::Application.routes.draw do
-  devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
+  match '/.well-known/*rest', to: 'errors#not_found', via: :all
+  match '/system/*rest',      to: 'errors#not_found', via: :all
+  devise_for :users, controllers: {
+    registrations: 'users/registrations'
+  } #, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
+  resources :users, only: [:show]
   #devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' }
   devise_for :employees, controllers: {
     #confirmations: 'confirmations',
     #registrations: 'registrations',
-    sessions: 'suppliers/sessions'
+    sessions: 'employees/sessions'
   }
   devise_for :administrators
+
   namespace :admin do
     resources :users do
       collection do