diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index dd8b1f4..479ef60 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -13,8 +13,6 @@ class PagesController < ApplicationController end - - def cable_testing chatroom = 'chat_room_' + params[:chat_room_id] puts params diff --git a/app/javascript/components/modal.js b/app/javascript/components/modal.js index 44cd97f..a35d32a 100644 --- a/app/javascript/components/modal.js +++ b/app/javascript/components/modal.js @@ -1,4 +1,3 @@ - const triggerModalEvent = () => { const btn = document.getElementById("modalTrigger"); const modal = document.getElementById("myModal"); diff --git a/app/javascript/packs/notifications.js b/app/javascript/packs/notifications.js index 056a931..9310ce3 100644 --- a/app/javascript/packs/notifications.js +++ b/app/javascript/packs/notifications.js @@ -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' }, { diff --git a/app/views/chat_rooms/show.html.erb b/app/views/chat_rooms/show.html.erb index 92b2f05..92a9f7f 100644 --- a/app/views/chat_rooms/show.html.erb +++ b/app/views/chat_rooms/show.html.erb @@ -1,5 +1,4 @@
-
@@ -11,16 +10,10 @@ -
- -
+
<%= javascript_pack_tag 'chatrooms' %> <%= javascript_pack_tag 'webrtc' %> - - diff --git a/app/views/pages/_contact.html.erb b/app/views/pages/_contact.html.erb index 0c791e5..7b06c6c 100644 --- a/app/views/pages/_contact.html.erb +++ b/app/views/pages/_contact.html.erb @@ -15,14 +15,13 @@
+ <%= link_to establish_call_path(contact.id), remote: true, id: "modalTrigger" do %> <% end %>
- -