paoda/polyglot
1
0
Fork 0
mirror of https://github.com/beatriceo/polyglot.git synced 2025-10-25 18:52:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into cross

Browse Source
This commit is contained in:
Benjamin Myara
2018-09-03 15:19:04 +01:00
committed by GitHub
parent 480fbbdbfb 03e6e0cc1a
commit e6828b3bb4
47 changed files with 700 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/pages/_contact.html.erb
View File

@@ -1,9 +1,3 @@
<%
def hello_world
puts "Hello World"
end
%>
<div class="card">
<div class="info">
<% if contact.photo.url.nil? %>
@@ -12,17 +6,17 @@ end
<%= cl_image_tag contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65%>
<% end %>
<div class="text text-color">
<% if contact.nil? || contact.nil? %> <!-- REPLACE WITH FIRST NAME AND LAST NAME -->
<% if contact.first_name.nil? || contact.last_name.nil? %>
<p><%= contact.email %></p>
<% else %>
<p><%= contact.email %></p>
<!-- <p><%#= contact.first_name %> <%#= contact.last_name %></p> -->
<p><%= contact.first_name %> <%= contact.last_name %></p>
<% end %>
<p class="darker">Last call: <%= Time.now %></p>
</div>
</div>
<div class="call" data-user-id="<%= contact.id %>">
<%= link_to establish_call_path(contact.id), remote: true, id: "modalTrigger" do %>
<!-- Calls establish_call in pages_controller -->
<%= link_to establish_call_path(contact.id), remote: true, class: "modalTrigger", data: {'user-id': contact.id } do %>
<i class="fas fa-phone"></i>
<% end %>
</div>
@@ -32,30 +26,30 @@ end
</div>
<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal fade" id="myModal<%= contact.id %>" 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 %>
<%= link_to "#", class:"pull-right", 'data-dismiss':"modal", 'data-target':"#myModal#{contact.id}" 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-container modal-flex">
<% if contact.photo.url.nil? %>
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle modal-picture" width=150>
<% else %>
<%= cl_image_tag contact.photo, class: "profile avatar dropdown-toggle img-circle modal-picture", width:150%>
<% end %>
<div class="modal-text">
<h4 class="modal-title" id="myModalLabel">Calling</h4>
<h4>
<strong>
<!-- REPLACE WITH FIRST NAME AND LAST NAME -->
<% if contact.nil? || contact.nil? %>
<% if contact.first_name.nil? || contact.last_name.nil? %>
<p><%= contact.email %></p>
<% else %>
<p><%= contact.email %></p>
<!-- <p><%#= contact.first_name %> <%#= contact.last_name %></p> -->
<p><%= contact.first_name %> <%= contact.last_name %></p>
<% end %>
</strong>
</h4>

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

@@ -1,28 +1,37 @@
<div id="contacts-page"></div>
<!-- CONTACTS PAGE -->
<div class="container">
<div class="contacts-container text-color">
<div class="contacts half">
<div class="contacts-header">
<h2>Contacts</h2>
<%= link_to new_connection_path do %>
<i class="fas fa-plus-square"></i>
<% end %>
<div class="row">
<div class="col-xs-12 col-md-6">
<div class="contacts">
<div class="contacts-header">
<h2>Contacts</h2>
<%= link_to add_contact_path do %>
<i class="fas fa-plus-square"></i>
<% end %>
</div>
<div class="contacts-list">
<% current_user.contacts.each do |contact| %>
<%= render "pages/contact", contact: contact %>
<% end %>
</div>
</div>
</div>
<% current_user.contacts.each do |contact| %>
<%= render "pages/contact", contact: contact %>
<% end %>
</div>
<div class="video-feed half">
<div class="video-content">
<!-- <video id="contacts-video" autoplay=""></video> -->
<div class="col-xs-12 col-md-6 hidden-xs hidden-sm">
<div class="video-feed">
<div class="video-content">
<video id="contacts-video" class="flex-video" autoplay=""></video>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- INFORMATION TO BE PASSED TO NOTIFICATIONS.JS -->
<div id="my-user-id" data-user-id="<%= current_user.id %>"></div>
<form action="/accept_call" method="post">
@@ -31,5 +40,6 @@
</form>
<%= javascript_pack_tag 'notifications' %>
<%= javascript_pack_tag 'local_video' %>

2
app/views/pages/new.html.erb
View File

@@ -8,3 +8,5 @@
<%= p.button :submit, class: "btn btn-primary" %>
<% end %>