From c264c98444b2f582bfdc8ac382be471dec5ecc0e Mon Sep 17 00:00:00 2001
From: Beatrice Olivera <beatriceolivera1999@gmail.com>
Date: Fri, 31 Aug 2018 06:02:24 +0100
Subject: [PATCH] added polyglot.live to request origins and commented out
 unnecessary information on chatroom show page

---
 app/views/chat_rooms/show.html.erb | 14 ++++++++++----
 config/environments/production.rb  |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/views/chat_rooms/show.html.erb b/app/views/chat_rooms/show.html.erb
index 4f6f6f4..0835cd4 100644
--- a/app/views/chat_rooms/show.html.erb
+++ b/app/views/chat_rooms/show.html.erb
@@ -1,9 +1,9 @@
 <button onclick="handleJoinSession()" data-room="<%= @chat_room.id %>">Join Room</button>
-
-<h1 style="color: white;">This is chatroom #<%= @chat_room.id %></h1>
+<!-- <div id="join-session" data-room="<%= @chat_room.id %>"> -->
+<!-- <h1 style="color: white;">This is chatroom #<%= @chat_room.id %></h1> -->
 <div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div>
 
-<button id="test-btn">Test Connection</button>
+<!-- <button id="test-btn">Test Connection</button> -->
 <div class="call-container">
   <div id="remote-video-container">
     <div id="video_overlays">
@@ -13,9 +13,15 @@
 </div>
 
 <div>
-  <span class="text-color" style="display:none">Random User ID:</span>
   <span id="current-user" class="text-color" style="display:none"><%= current_user.id %></span>
 </div>
 
+<!-- <script>
+  const joinSession = document.getElementById("join-session")
+  joinSession.addEventListener('load', event => {
+    handleJoinSession()
+  })
+</script> -->
+
 
 <%= javascript_pack_tag 'chatrooms' %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b3051b4..aeba4f1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -47,7 +47,7 @@ Rails.application.configure do
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   config.action_cable.url = 'wss://polyglot-173.herokuapp.com/cable'
-  config.action_cable.allowed_request_origins = [ 'https://polyglot-173.herokuapp.com/' ]
+  config.action_cable.allowed_request_origins = [ 'https://polyglot-173.herokuapp.com/', 'https://www.polyglot.live/' ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = true