Better sign up and sign in

This commit is contained in:
2014-09-29 16:11:59 +02:00
parent 7e34e47a99
commit 3b5651de47
9 changed files with 60 additions and 30 deletions
+6 -2
View File
@@ -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
+8
View File
@@ -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
+7
View File
@@ -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}
+6 -2
View File
@@ -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/}
scope '(/:locale)', constraints: {locale: /nl|be|de|fr|en/}, defaults: { locale: 'nl' } do
ALLOWED_LOCALES = /nl|be|de|fr|en/
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