diff --git a/app/assets/stylesheets/pages/_messages.scss b/app/assets/stylesheets/pages/_messages.scss index b767dd7..eab5dd0 100644 --- a/app/assets/stylesheets/pages/_messages.scss +++ b/app/assets/stylesheets/pages/_messages.scss @@ -101,3 +101,24 @@ select:not([multiple]) { box-shadow: none; } } + +.chat-information { + display:flex; + justify-content: space-between; + align-items: center; +} + +.input-group{ + width: 100%; +} + +.form-inline{ + width: 100%; +} + +.guyisbadass{ + width: 85%; +} +#chat-input { + +} diff --git a/app/javascript/packs/chatrooms.js b/app/javascript/packs/chatrooms.js index b43e61d..a377d25 100644 --- a/app/javascript/packs/chatrooms.js +++ b/app/javascript/packs/chatrooms.js @@ -51,6 +51,16 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({ messagesContainer.appendChild(messageDiv) } else if (data["chat_message"] && data["chat_message"]["userId"] != userId) { + // const callerName = document.getElementById('caller-name') + // callerName.innerText = data["chat_message"]["user_info"] + // console.log(data["chat_message"]["user_info"]["name"]) + + // const photo = data["chat_message"]["photo_url"] + // photo.height = '20px' + // photo.width = '20px' + // const chatInfo = document.querySelector('chat-information') + // chatInfo.insertBefore(photo, chatInfo.firstChild) + const chatMessage = data["chat_message"] const target = document.getElementById('language-1').value const message = `${chatMessage["message"]}` diff --git a/app/views/chat_rooms/show.html.erb b/app/views/chat_rooms/show.html.erb index d4b1216..9451eaa 100644 --- a/app/views/chat_rooms/show.html.erb +++ b/app/views/chat_rooms/show.html.erb @@ -20,28 +20,33 @@