Changed the routes so we have only 3 locations to configure in nginx

This commit is contained in:
jfederico 2016-10-19 15:57:03 -04:00
parent 12aac189a8
commit 36d83b99c6
3 changed files with 14 additions and 8 deletions

View File

@ -6,7 +6,7 @@
<div class="col-sm-2 col-sm-offset-10">
<% if !current_user.nil? %>
<span class="user">Hello <%= current_user.name %></span>
<%= link_to "Logout", "/logout" %>
<%= link_to "Logout", user_logout_url() %>
<div><%= link_to 'Personal Room', current_user.room_url %></div>
<% end %>
</div>

View File

@ -6,7 +6,7 @@
<div class="col-sm-2 col-sm-offset-10">
<% if admin? %>
<span class="user">Hello <%= current_user.name %></span>
<%= link_to "Logout", "/logout" %>
<%= link_to "Logout", user_logout_url() %>
<% else %>
<%= link_to "Login", "/auth/twitter" %>
<% end %>

View File

@ -1,13 +1,19 @@
Rails.application.routes.draw do
resources :users, only: [:edit, :update]
get 'bbb/join/:resource/:id', to: 'bbb#join', as: :bbb_join
get '/meetings/new', to: 'landing#new_meeting', as: :new_meeting
get '/:resource(/:id)', to: 'landing#index', as: :resource
# This should be removed once before being released
get '/auth/:provider/callback', to: 'sessions#create'
get '/logout', to: 'sessions#destroy'
###########################################################
get '/users/auth/:provider/callback', to: 'sessions#create'
get '/users/logout', to: 'sessions#destroy', as: :user_logout
get '/meetings/join/:resource/:id', to: 'bbb#join', as: :bbb_join
get '/meetings/new', to: 'landing#new_meeting', as: :new_meeting
# There are two resources [meetings|rooms]
# meetings offer a landing page for NON authenticated users to create and join session in BigBlueButton
# rooms offer a customized landing page for authenticated users to create and join session in BigBlueButton
get '/:resource(/:id)', to: 'landing#index', as: :resource
root to: 'landing#meeting', :resource => "meetings"
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html