Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/resources/static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,15 @@ button.accent {
color: #43464b;
}

.linkify{
color: rgb(67, 84, 209);
text-decoration: none;
cursor: pointer;
}
a:hover{text-decoration: underline;}
a:visited{color: rgb(88, 14, 137);}


#messageForm .input-group input {
float: left;
width: calc(100% - 85px);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Sorry! Your browser doesn't support Javascript</h2>
<h1 class="title">Type your username</h1>
<form id="usernameForm" name="usernameForm">
<div class="form-group">
<input type="text" id="name" placeholder="Username" autocomplete="off" class="form-control" />
<input type="text" id="name" placeholder="Username" autocomplete="off" autofocus class="form-control" />
</div>
<div class="form-group">
<button type="submit" class="accent username-submit">Start Chatting</button>
Expand Down
31 changes: 25 additions & 6 deletions src/main/resources/static/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ function sendMessage(event) {
event.preventDefault();
}


function onMessageReceived(payload) {
var message = JSON.parse(payload.body);

Expand All @@ -82,22 +81,38 @@ function onMessageReceived(payload) {
message.content = message.sender + ' left!';
} else {
messageElement.classList.add('chat-message');

var avatarElement = document.createElement('i');
var avatarText = document.createTextNode(message.sender[0]);
avatarElement.appendChild(avatarText);
avatarElement.style['background-color'] = getAvatarColor(message.sender);

messageElement.appendChild(avatarElement);

var usernameElement = document.createElement('span');
var usernameText = document.createTextNode(message.sender);
usernameElement.appendChild(usernameText);
messageElement.appendChild(usernameElement);
}

var textElement = document.createElement('p');
var messageText = document.createTextNode(message.content);
var messageText;

if(isURL(message.content)){
var hyperlink = message.content;
if(!hyperlink.match(/^https?:\/\//i)){
hyperlink = 'http://' + hyperlink;
}
messageText = document.createElement("a");
messageText.classList.add('linkify');
messageText.href = hyperlink;
messageText.target = "_blank";
messageText.innerHTML = message.content;
}
else{
messageText = document.createTextNode(message.content);
}

textElement.appendChild(messageText);

messageElement.appendChild(textElement);
Expand All @@ -106,6 +121,10 @@ function onMessageReceived(payload) {
messageArea.scrollTop = messageArea.scrollHeight;
}

function isURL(text){
const urlPattern = /^(https?:\/\/)?(([a-zA-Z0-9]+\.)+[a-zA-Z]{2,})((\/[^\s]*)*)$/i;
return urlPattern.test(text.trim());
}

function getAvatarColor(messageSender) {
var hash = 0;
Expand Down