diff --git a/config/environments/colab.rb b/config/environments/colab.rb index 9281287..ea27a8b 100644 --- a/config/environments/colab.rb +++ b/config/environments/colab.rb @@ -47,5 +47,4 @@ Rails.application.configure do # Responds on a subdirectory config.relative_url_root = '/mezuro' - config.assets.prefix = '/mezuro' end diff --git a/config/routes.rb b/config/routes.rb index 0afeb28..c58987d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,52 +1,50 @@ Rails.application.routes.draw do - scope "mezuro" do - scope "(:locale)", locale: /en|pt/ do - # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope - devise_for :users, skip: :omniauth_callbacks - get 'users/:user_id/projects' => 'users#projects', as: :user_projects - - resources :projects do - resources :repositories, except: [:update, :index] - get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module - post '/repositories/:id/state' => 'repositories#state', as: :repository_state - post '/repositories/:id/state_with_date' => 'repositories#state_with_date', as: :repository_state_with_date - put '/repositories/:id' => 'repositories#update', as: :repository_update - get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process - end + scope "(:locale)", locale: /en|pt/ do + # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope + devise_for :users, skip: :omniauth_callbacks + get 'users/:user_id/projects' => 'users#projects', as: :user_projects + + resources :projects do + resources :repositories, except: [:update, :index] + get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module + post '/repositories/:id/state' => 'repositories#state', as: :repository_state + post '/repositories/:id/state_with_date' => 'repositories#state_with_date', as: :repository_state_with_date + put '/repositories/:id' => 'repositories#update', as: :repository_update + get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process + end - resources :kalibro_configurations do - get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric - resources :metric_configurations, except: [:update, :new] do - get '/kalibro_ranges/new' => 'kalibro_ranges#new', as: :new_kalibro_range - resources :kalibro_ranges, except: [:update, :new] - put '/kalibro_ranges/:id' => 'kalibro_ranges#update', as: :kalibro_range_update - end - post '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration - put '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update - - resources :compound_metric_configurations, except: [:destroy, :update] - put '/compound_metric_configurations/:id' => 'compound_metric_configurations#update', as: :compound_metric_configuration_update + resources :kalibro_configurations do + get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric + resources :metric_configurations, except: [:update, :new] do + get '/kalibro_ranges/new' => 'kalibro_ranges#new', as: :new_kalibro_range + resources :kalibro_ranges, except: [:update, :new] + put '/kalibro_ranges/:id' => 'kalibro_ranges#update', as: :kalibro_range_update end + post '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration + put '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update - resources :reading_groups do - resources :readings, except: [:index, :update, :show] - put '/readings/:id' => 'readings#update', as: :reading_update - end + resources :compound_metric_configurations, except: [:destroy, :update] + put '/compound_metric_configurations/:id' => 'compound_metric_configurations#update', as: :compound_metric_configuration_update + end - #resources :modules - post '/modules/:id/metric_history' => 'modules#metric_history' - post '/modules/:id/tree' => 'modules#load_module_tree' + resources :reading_groups do + resources :readings, except: [:index, :update, :show] + put '/readings/:id' => 'readings#update', as: :reading_update + end - # Tutorials - get '/tutorials/:name' => 'tutorials#view', as: 'tutorials' + #resources :modules + post '/modules/:id/metric_history' => 'modules#metric_history' + post '/modules/:id/tree' => 'modules#load_module_tree' - root "home#index" - end + # Tutorials + get '/tutorials/:name' => 'tutorials#view', as: 'tutorials' + + root "home#index" end + # See comment above for devise_for devise_for :users, only: :omniauth_callbacks, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } - # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". -- libgit2 0.21.2