merge master

config/application.rb

@@ -80,5 +80,11 @@ module Osem
         end
       end
     end
+
+    config.assets.paths << Rails.root.join('node_modules')
+
+    config.fullcalendar = {
+      license_key: ENV['FULL_CALENDAR_LICENSE_KEY']
+    }
   end
 end

config/routes.rb

@@ -168,6 +168,7 @@ Osem::Application.routes.draw do
       end
     end
     resource :program, only: [] do
+      get 'event/:id', to: 'proposals#show', as: :conference_program_event
       get 'proposal/:id', to: 'proposals#show' # For backward compatibility
       resources :proposals, except: :destroy do
         get 'commercials/render_commercial' => 'commercials#render_commercial'
@@ -202,6 +203,7 @@ Osem::Application.routes.draw do
       member do
         get :events
         get :happening_now
+        get :vertical_schedule
       end
     end
   end
@@ -221,9 +223,11 @@ Osem::Application.routes.draw do
     end
   end
 
-  get '/admin' => redirect('/admin/conferences')
-
-  get '/calendar' => 'conferences#calendar'
+  # Handle conferences on custom domains.
+  # This *must* come before any other root definition.
+  constraints DomainConstraint do
+    root to: 'conferences#show'
+  end
 
   unless ENV['OSEM_ROOT_CONFERENCE'].blank?
     root to: redirect("/conferences/#{ENV['OSEM_ROOT_CONFERENCE']}")
@@ -231,9 +235,10 @@ Osem::Application.routes.draw do
     root to: 'conferences#index', via: [:get, :options]
   end
 
-  constraints DomainConstraint do
-    root to: 'conferences#show'
-  end
-
+  get '/admin' => redirect('/admin/conferences')
+  get '/calendar' => 'conferences#calendar'
   get '/.well-known/apple-developer-merchantid-domain-association', to: 'application#apple_pay'
+
+  # A Short Fallback Route
+  get '/:id', to: 'conferences#show'
 end