Merge pull request #15 from beatriceo/call

added routes for call
This commit is contained in:
Beatrice Olivera 2018-08-28 18:27:02 +01:00 committed by GitHub
commit aaf935eec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 19 deletions

View File

@ -0,0 +1,13 @@
contactsVideo = document.getElementById("contacts-video");
try {
const stream = await navigator.mediaDevices.getUserMedia({
audio: false,
video: true
})
localstream = stream;
contactsVideo.srcObject = stream
contactsVideo.muted = true
} catch (e) {
console.error(e);
}

View File

@ -61,7 +61,7 @@ a:hover {
.video-content {
height: 485px;
background-color: black;
// background-color: black;
}
.half {

View File

@ -10,7 +10,8 @@
<%#= stylesheet_pack_tag 'application', media: 'all' %> <!-- Uncomment if you import CSS in app/javascript/packs/application.js -->
</head>
<body>
<%= render 'shared/navbar' unless params["action"] == "home"%>
<%= render 'shared/navbar' unless params["action"] == "home" || params["action"] == "new" %>
<%= render 'shared/flashes' %>
<%= yield %>
<%= javascript_include_tag 'application' %>

View File

@ -15,24 +15,24 @@
<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="vertical-alignment-helper">
<div class="modal-dialog vertical-align-center">
<div class="modal-content modal-color">
<div class="modal-header">
<%= link_to "#", class:"pull-right", 'data-dismiss':"modal", 'data-target':"#myModal" do %>
<i class="fas fa-times-circle"></i>
<% end %>
<div class="container">
<div class="modal-container">
<img src="https://kitt.lewagon.com/placeholder/users/ssaunier" alt="" class="profile img-circle" width=150>
<div class="modal-text">
<h4 class="modal-title" id="myModalLabel">Calling</h4>
<h4><strong>FirstName LastName</strong></h4>
</div>
</div>
</div>
</div>
<div class="vertical-alignment-helper">
<div class="modal-dialog vertical-align-center">
<div class="modal-content modal-color">
<div class="modal-header">
<%= link_to "#", class:"pull-right", 'data-dismiss':"modal", 'data-target':"#myModal" do %>
<i class="fas fa-times-circle"></i>
<% end %>
<div class="container">
<div class="modal-container">
<img src="https://kitt.lewagon.com/placeholder/users/ssaunier" alt="" class="profile img-circle" width=150>
<div class="modal-text">
<h4 class="modal-title" id="myModalLabel">Calling</h4>
<h4><strong>FirstName LastName</strong></h4>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -8,6 +8,7 @@
</div>
<div class="video-feed half">
<div class="video-content">
<video id="contacts-video" autoplay=""></video>
</div>
</div>
</div>

View File

@ -13,6 +13,8 @@ Rails.application.routes.draw do
root to: "pages#home"
end
get '/call', to: 'pages#call'
get '/contacts', to: 'pages#index'
post '/sessions', to: 'video_sessions#create'