minor updates to clean up code

This commit is contained in:
Beatrice Olivera 2018-08-31 21:38:48 +01:00
parent 157d056708
commit 9970c384c6
5 changed files with 2 additions and 14 deletions

View File

@ -13,8 +13,6 @@ class PagesController < ApplicationController
end
def cable_testing
chatroom = 'chat_room_' + params[:chat_room_id]
puts params

View File

@ -1,4 +1,3 @@
const triggerModalEvent = () => {
const btn = document.getElementById("modalTrigger");
const modal = document.getElementById("myModal");

View File

@ -12,7 +12,6 @@ import ActionCable from 'actioncable'
const userId = parseInt(document.getElementById("my-user-id").dataset["userId"])
let chatRoomId = null
App.cable.subscriptions.create({
channel: 'NotificationsChannel'
}, {

View File

@ -1,5 +1,4 @@
<div id="join-btn" data-room="<%= @chat_room.id %>"></div>
<!-- <div id="join-session" onclick="handleJoinSession()" data-room="<%= @chat_room.id %>"> -->
<div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div>
@ -11,16 +10,10 @@
</div>
</div>
<div>
<span id="current-user" class="text-color" style="display:none"><%= current_user.id %></span>
</div>
<div><span id="current-user" class="text-color" style="display:none"><%= current_user.id %></span></div>
<%= javascript_pack_tag 'chatrooms' %>
<%= javascript_pack_tag 'webrtc' %>
<script>
</script>

View File

@ -15,14 +15,13 @@
</div>
</div>
<div class="call" data-user-id="<%= contact.id %>">
<!-- Calls establish_call in pages_controller -->
<%= link_to establish_call_path(contact.id), remote: true, id: "modalTrigger" do %>
<i class="fas fa-phone"></i>
<% end %>
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="vertical-alignment-helper">