mirror of
https://github.com/beatriceo/polyglot.git
synced 2025-10-26 03:02:12 +00:00
Revert "Revert "Chat css""
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import ActionCable from 'actioncable'
|
||||
|
||||
// import { scrollLastMessageIntoView } from './chatrooms'
|
||||
// create App object with key cable == new cosumer
|
||||
(function() {
|
||||
window.App || (window.App = {});
|
||||
@@ -24,14 +24,35 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({
|
||||
const chatMessage = data["chat_message"]
|
||||
const message = `${chatMessage["message"]}`
|
||||
const messagesContainer = document.getElementById('messages-container')
|
||||
|
||||
// Div Settings
|
||||
const messageDiv = document.createElement("div")
|
||||
messageDiv.classList.add("messageDiv")
|
||||
messageDiv.classList.add("right")
|
||||
|
||||
// Photo Settings
|
||||
const photo = document.createElement("img")
|
||||
photo.src = chatMessage["photo_url"]
|
||||
photo.classList.add("img-circle")
|
||||
photo.classList.add("avatar-sm")
|
||||
photo.classList.add("margin-left")
|
||||
|
||||
// Text Settings
|
||||
const messageElement = document.createElement("p")
|
||||
messageElement.classList.add("message")
|
||||
messageElement.classList.add("no-margin")
|
||||
messageElement.innerText = message
|
||||
messagesContainer.appendChild(messageElement)
|
||||
}
|
||||
else if (data["chat_message"] && data["chat_message"]["userId"] != userId) {
|
||||
|
||||
// Add message and photo to div
|
||||
messageDiv.appendChild(photo)
|
||||
messageDiv.appendChild(messageElement)
|
||||
|
||||
// Add message to container
|
||||
messagesContainer.appendChild(messageDiv)
|
||||
|
||||
} else if (data["chat_message"] && data["chat_message"]["userId"] != userId) {
|
||||
const chatMessage = data["chat_message"]
|
||||
const target = document.getElementById('language-1').value
|
||||
|
||||
const message = `${chatMessage["message"]}`
|
||||
|
||||
fetch(`/chat_rooms/${chatroomId}/translate_message` , {
|
||||
@@ -39,21 +60,33 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({
|
||||
body: JSON.stringify({
|
||||
message: message,
|
||||
target: target,
|
||||
userId: userId
|
||||
userId: userId,
|
||||
photo_url: chatMessage["photo_url"]
|
||||
}),
|
||||
headers: { "content-type": "application/json", "X-CSRF-Token": document.querySelector('meta[name=csrf-token]').content }
|
||||
})
|
||||
} else if (data["translation"] && data["userId"] == userId) {
|
||||
if (data["input"] == 1) {
|
||||
document.getElementById('language-2-input').value = data["translation"].text
|
||||
} else {
|
||||
document.getElementById('language-1-input').value = data["translation"].text
|
||||
}
|
||||
} else if (data["translated_message"] && data["userId"] == userId) {
|
||||
const messagesContainer = document.getElementById('messages-container')
|
||||
const message = document.createElement("p")
|
||||
message.innerText = data["translated_message"]
|
||||
messagesContainer.appendChild(message)
|
||||
|
||||
const messageDiv = document.createElement("div")
|
||||
messageDiv.classList.add("messageDiv")
|
||||
|
||||
const photo = document.createElement("img")
|
||||
photo.src = data["photo_url"]
|
||||
photo.classList.add("img-circle")
|
||||
photo.classList.add("avatar-sm")
|
||||
photo.classList.add("margin-right")
|
||||
|
||||
const messageElement = document.createElement("p")
|
||||
messageElement.classList.add("message")
|
||||
messageElement.classList.add("message")
|
||||
messageElement.classList.add("no-margin")
|
||||
messageElement.innerText = data["translated_message"]
|
||||
|
||||
messageDiv.appendChild(photo)
|
||||
messageDiv.appendChild(messageElement)
|
||||
|
||||
messagesContainer.appendChild(messageDiv)
|
||||
} else {
|
||||
// console.log(data)
|
||||
}
|
||||
|
||||
10
app/javascript/packs/scroll.js
Normal file
10
app/javascript/packs/scroll.js
Normal file
@@ -0,0 +1,10 @@
|
||||
function scrollLastMessageIntoView() {
|
||||
const messages = document.querySelectorAll('.message');
|
||||
const lastMessage = messages[messages.length - 1];
|
||||
|
||||
if (lastMessage !== undefined) {
|
||||
lastMessage.scrollIntoView();
|
||||
}
|
||||
}
|
||||
|
||||
export { scrollLastMessageIntoView }
|
||||
Reference in New Issue
Block a user