Skip to content

Fix message badges and layout #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aboldguess wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix message badges and layout #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
257e641
Fix unread badge reset
aboldguess Jul 22, 2025
e11d69a
Fix message username styling
aboldguess Jul 22, 2025
b1d34f4
Fix merge conflict by reverting user style
aboldguess Jul 22, 2025
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
6 changes: 6 additions & 0 deletions frontend/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ button {
border-radius: 50%;
}

/* Display sender name in bold with spacing before the message text */
.message .user {
font-weight: bold;
margin-right: 0.25rem;
}

.message .text {
/* Allow the message body to consume remaining space so the
timestamp and read receipt align to the right */
Expand Down
39 changes: 24 additions & 15 deletions frontend/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,15 @@ function appendDirectMessage(m) {
// delivered.
const outgoing = m.from === currentUser.username;
const receipt = outgoing
? `<span class="read${m.isRead ? ' read-true' : ''}">${m.isRead ? '✔✔' : (m.isDelivered ? '✔' : '')}</span>`
// Use HTML entities so the ticks render consistently across fonts
? `<span class="read${m.isRead ? ' read-true' : ''}">${m.isRead ? '&#10004;&#10004;' : (m.isDelivered ? '&#10004;' : '')}</span>`
: '';

// Place the timestamp and read receipt at the end of the flex container so
// the layout resembles common chat apps.
div.innerHTML = `
<img class="avatar" src="${getGravatarUrl(m.from)}" alt="avatar">
<span class="user">${m.from}</span>
<span class="user">${m.from}:</span>
<span class="text">${m.text}</span>
<span class="time">${time}</span>${receipt}`;
list.appendChild(div);
Expand Down Expand Up @@ -303,18 +304,18 @@ function loadUnreadCounts() {
.then(r => r.json())
.then(counts => {
unreadCounts = counts;
Object.keys(counts).forEach(user => {
const li = document.querySelector(`#userList li[data-user="${user}"]`);
if (li) {
const badge = li.querySelector('.badge');
if (counts[user] > 0) {
badge.textContent = counts[user];
badge.classList.remove('hidden');
li.classList.add('unread');
} else {
badge.classList.add('hidden');
li.classList.remove('unread');
}
// Update every listed user so badges reset when a conversation is read
document.querySelectorAll('#userList li').forEach(li => {
const user = li.dataset.user;
const badge = li.querySelector('.badge');
const count = counts[user] || 0;
if (count > 0) {
badge.textContent = count;
badge.classList.remove('hidden');
li.classList.add('unread');
} else {
badge.classList.add('hidden');
li.classList.remove('unread');
}
});
});
Expand All @@ -327,7 +328,13 @@ function markMessagesRead(user) {
fetch(`${API_BASE_URL}/api/users/read/${user}`, {
method: 'POST',
headers: { Authorization: `Bearer ${currentUser.token}` }
}).then(() => loadUnreadCounts());
}).then(() => {
// Explicitly clear the local badge right away in case the
// network request fails so counts never linger incorrectly.
clearUnread(user);
// Refresh counts from the server to ensure both sides stay in sync
loadUnreadCounts();
});
}

// Increase the unread counter for a given user and update the badge
Expand Down Expand Up @@ -367,6 +374,8 @@ function selectUser(name) {
currentChannel = null; // hide channel context
clearUnread(name);
loadMessages();
// Explicitly notify the server that all messages are now read
markMessagesRead(name);
}

// Verify the user is logged in before showing the dashboard
Expand Down