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

Merge pull request #73 from beatriceo/cloudinary-v2 

Completed cloudinaryv2 fix
This commit is contained in:
Beatrice Olivera 2018-09-06 14:18:26 +01:00 committed by GitHub
parent 1327e86d03 26ecd1182e
commit d7ebdeea6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ a:hover {
@media only screen and (max-width: 1100px) { @media only screen and (max-width: 1100px) {
.modal-picture { .modal-picture {
width: 50px; width: 50px;
height: 50px;
} }
} }

4
app/javascript/packs/application.js
View File

@ -81,8 +81,10 @@ App.cable.subscriptions.create({
acceptButton.style.display = "block" acceptButton.style.display = "block"
triggerCalleeModalEvent() triggerCalleeModalEvent()
const photo = document.getElementById('caller-photo');
document.getElementById('caller-name').innerHTML = data["message"]["caller_info"] document.getElementById('caller-name').innerHTML = data["message"]["caller_info"]
document.getElementById('caller-photo').src = data["message"]["caller_photo"] photo.src = data["message"]["caller_photo"];
photo.style.objectFit = "cover";
chatRoomId = data["message"]["chat_room_id"] chatRoomId = data["message"]["chat_room_id"]
console.log(`user with id: ${userId} needs to subscribe to chatroom ${[chatRoomId]}`) console.log(`user with id: ${userId} needs to subscribe to chatroom ${[chatRoomId]}`)

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

@ -4,7 +4,7 @@
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle" width=65> <img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle" width=65>
<% else %> <% else %>
<%= cl_image_tag(contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65, transformation: [ <%= cl_image_tag(contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65, transformation: [
{ gravity: "face:auto", width: 100, height: 100, radius: "max", crop: "crop" } { gravity: "face:auto", width: 500, height: 500, radius: "max", crop: "crop" }
])%> ])%>
<% end %> <% end %>
<div class="text text-color"> <div class="text text-color">
@ -42,7 +42,7 @@
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle modal-picture" width=150> <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 %> <% else %>
<%= cl_image_tag(contact.photo, class: "profile avatar dropdown-toggle img-circle modal-picture", width:150, transformation: [ <%= cl_image_tag(contact.photo, class: "profile avatar dropdown-toggle img-circle modal-picture", width:150, transformation: [
{ gravity: "face:auto", width: 100, height: 100, radius: "max", crop: "crop" }])%> { gravity: "face:auto", width: 500, height: 500, radius: "max", crop: "crop" }])%>
<% end %> <% end %>
<div class="modal-text"> <div class="modal-text">
<h4 class="modal-title" id="myModalLabel">Calling</h4> <h4 class="modal-title" id="myModalLabel">Calling</h4>

2
app/views/shared/_navbar.html.erb
View File

@ -16,7 +16,7 @@
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar dropdown-toggle img-circle"> <img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar dropdown-toggle img-circle">
<% else %> <% else %>
<%= cl_image_tag(current_user.photo, class: "avatar dropdown-toggle img-circle", transformation: [ <%= cl_image_tag(current_user.photo, class: "avatar dropdown-toggle img-circle", transformation: [
{ gravity: "face:auto", width: 100, height: 100, radius: "max", crop: "crop" } { gravity: "face:auto", width: 500, height: 500, radius: "max", crop: "crop" }
])%> ])%>
<% end %> <% end %>
</div> </div>