Merge pull request #145 from zach-chai/better_encoding

Better encoding

app/assets/javascripts/shared.js.erb

@@ -51,6 +51,13 @@ var showAlert = function(html, timeout_delay) {
   }
 };
 
+// remove flash alerts after 5 seconds
+var flashAlertDelayedDismiss = function() {
+  setTimeout(function(){
+    $('.flash-alerts').remove();
+  }, 5000);
+};
+
 var displayRoomURL = function() {
   $('.meeting-url').val(Meeting.getInstance().getURL());
 };
@@ -78,4 +85,5 @@ $(document).on("turbolinks:load", function() {
   if (isRoomOwner()) {
     Notification.requestPermission();
   }
+  flashAlertDelayedDismiss();
 });

app/controllers/landing_controller.rb

@@ -23,12 +23,12 @@ class LandingController < ApplicationController
   def resource
     if params[:id].size > meeting_name_limit
       redirect_to action: :index
-    elsif params[:resource] == 'meetings'
+    elsif params[:resource] == 'meetings' && !params[:room_id]
       render_meeting
     elsif params[:resource] == 'rooms'
       render_room
     else
-      render 'errors/error'
+      redirect_to root_url, flash: {danger: "An error occured"}
     end
   end
 

app/views/layouts/application.html.erb

@@ -51,6 +51,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     style="background-image:url(<%= image_path('greenlight_background.png') if params[:controller] == 'landing' %>);">
     <!-- Messages -->
     <div id='alerts'>
+      <div class='flash-alerts'>
+        <% flash.each do |name, msg| %>
+          <div class="alert alert-<%= name %> alert-dismissible fade in" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <span class="alert-message"><%= msg %></span>
+          </div>
+        <% end %>
+      </div>
     </div>
 
     <!-- Header -->

config/routes.rb

@@ -45,7 +45,7 @@ Rails.application.routes.draw do
 
     # routes shared between meetings and rooms
     get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}
-    get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}
+    get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => /[^\/]+/} # override the constraint to allow '.' and disallow '/'
   end
 
   root to: 'landing#index', :resource => 'meetings'