paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22 from beatriceo/request-origins 

added polyglot.live to request origins and commented out unnecessary …
This commit is contained in:
Beatrice Olivera 2018-08-31 06:03:13 +01:00 committed by GitHub
parent f911f91da5 c264c98444
commit e59b4305d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/chat_rooms/show.html.erb
View File

@ -1,9 +1,9 @@
<button onclick="handleJoinSession()" data-room="<%= @chat_room.id %>">Join Room</button> <button onclick="handleJoinSession()" data-room="<%= @chat_room.id %>">Join Room</button>
<!-- <div id="join-session" data-room="<%= @chat_room.id %>"> -->
<h1 style="color: white;">This is chatroom #<%= @chat_room.id %></h1> <!-- <h1 style="color: white;">This is chatroom #<%= @chat_room.id %></h1> -->
<div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div> <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 class="call-container">
<div id="remote-video-container"> <div id="remote-video-container">
<div id="video_overlays"> <div id="video_overlays">
@ -13,9 +13,15 @@
</div> </div>
<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> <span id="current-user" class="text-color" style="display:none"><%= current_user.id %></span>
</div> </div>
<!-- <script>
const joinSession = document.getElementById("join-session")
joinSession.addEventListener('load', event => {
handleJoinSession()
})
</script> -->
<%= javascript_pack_tag 'chatrooms' %> <%= javascript_pack_tag 'chatrooms' %>

2
config/environments/production.rb
View File

@ -47,7 +47,7 @@ Rails.application.configure do
# Mount Action Cable outside main process or domain # Mount Action Cable outside main process or domain
# config.action_cable.mount_path = nil # config.action_cable.mount_path = nil
config.action_cable.url = 'wss://polyglot-173.herokuapp.com/cable' 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. # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = true config.force_ssl = true