End of day commit

This commit is contained in:
2015-02-18 22:36:47 +01:00
parent 82670f271b
commit c1858455e9
68 changed files with 633 additions and 145 deletions
+6 -2
View File
@@ -1,7 +1,8 @@
ALLOWED_LOCALES = /nl|be|de|fr|en/
Qwaiter::Application.routes.draw do
devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' }
#devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' }
devise_for :employees
devise_for :administrators
namespace :admin do
resources :users do
@@ -9,7 +10,8 @@ Qwaiter::Application.routes.draw do
get :test_login
end
end
resources :suppliers do
resources :suppliers
resources :employees do
collection do
get :test_login
end
@@ -26,6 +28,8 @@ Qwaiter::Application.routes.draw do
root to: 'users#index'
end
resources :new_suppliers
post '/user_app' => 'dashboard#user_app_log' #TODO: separate high speed app at log.mozo.bar
post '/user_feedback' => 'user#feedback'