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

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
parent 3dfbc577b6 4b1636ee78
commit aaf935eec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/test.js Normal file
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);
}

2
app/assets/stylesheets/pages/_contacts.scss
View File

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

3
app/views/layouts/application.html.erb
View File

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

1
app/views/pages/index.html.erb
View File

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

2
config/routes.rb
View File

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