Merge branch 'master' into scrollbar

app/javascript/packs/application.js

@@ -100,3 +100,4 @@ if (acceptButton) {
     document.getElementById('chat-room-id').value = chatRoomId
   })
 }
+

app/javascript/packs/webrtc.js

@@ -220,3 +220,18 @@ setTimeout(function() {
   window.__proto__.reload = () => { window.location = window.location }
 })();
 
+
+// // have enter with JS
+// const form = document.getElementById("chat-form")
+// document.getElementById("chat-input").addEventListener("keyup", event => {
+//       if(event == "Enter"){
+//            form.submit();
+//        }
+//     });
+
+
+document.getElementById("chat-form").addEventListener("click", function(event){
+    event.preventDefault()
+});
+
+

app/uploaders/photo_uploader.rb

@@ -1,3 +1,6 @@
 class PhotoUploader < CarrierWave::Uploader::Base
   include Cloudinary::CarrierWave
+
+  process convert: "jpg"
+  process tags: ["profile_picture"]
 end

app/views/chat_rooms/show.html.erb

@@ -31,16 +31,17 @@
                 <option value="<%= language.code %>"><%= language.name %></option>
               <% end %>
             </select>
-            <span class="input-group-addon" style="width:0px; padding-left:0px; padding-right:0px; border:none;"></span>
+
-            <input type="text" class="form-control input-transparent" name="chat-input" id="chat-input" value="" placeholder="Type something...">
+            <form class="form-inline" id="chat-form">
-            <span class="input-group-btn">
+              <span class="input-group-addon" style="width:0px; padding-left:0px; padding-right:0px; border:none;"></span>
-              <button class="form-control send-button" id="send-btn" type="submit" remote: true>
+              <input type="text" class="form-control input-transparent" name="chat-input" id="chat-input" value="" placeholder="Type something...">
-                <i class="fas fa-paper-plane"></i>
+              <span class="input-group-btn">
-              </button>
+                <button class="form-control send-button" id="send-btn" type="submit" remote: true>
-            </span>
+                  <i class="fas fa-paper-plane"></i>
-            <!-- <span class="input-group-btn">
+                </button>
-              <button class="btn btn-danger form-control" id="original-btn" type="submit" remote: true>Show Original</button>
+              </span>
-            </span> -->
+            </form>
+
           </div>
         </div>
       </div>

app/views/pages/_contact.html.erb

@@ -3,7 +3,9 @@
     <% 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" width=65>
     <% else %>
-      <%= cl_image_tag contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65%>
+      <%= 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" }
+        ])%>
     <% end %>
     <div class="text text-color">
       <% if contact.first_name.nil? || contact.last_name.nil? %>
@@ -39,7 +41,8 @@
               <% 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%>
+                <%= 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" }])%>
               <% end %>
               <div class="modal-text">
                 <h4 class="modal-title" id="myModalLabel">Calling</h4>

app/views/shared/_navbar.html.erb

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