Skip to content

Commit

Permalink
Merge pull request #6 from greyli/messages
Browse files Browse the repository at this point in the history 
Improve flash messages
  • Loading branch information
@greyli
greyli authored Sep 16, 2024
2 parents a2a72f5 + b5f836e commit da5a8e5
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 40 deletions.
8 changes: 4 additions & 4 deletions moments/blueprints/auth.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ def register():
login_user(user)
token = generate_token(user=user, operation=Operations.CONFIRM)
send_confirmation_email(user=user, token=token)
flash('Confirm email sent, check your inbox.', 'info')
return redirect(url_for('main.index'))
flash('Confirmation email sent, please check your inbox.', 'info')
return redirect(url_for('.login'))
return render_template('auth/register.html', form=form)


Expand Down Expand Up @@ -100,7 +100,7 @@ def resend_confirmation_email():

token = generate_token(user=current_user, operation=Operations.CONFIRM)
send_confirmation_email(user=current_user, token=token)
flash('New email sent, check your inbox.', 'info')
flash('New email sent, please check your inbox.', 'info')
return redirect(url_for('main.index'))


Expand All @@ -116,7 +116,7 @@ def forget_password():
if user:
token = generate_token(user=user, operation=Operations.RESET_PASSWORD)
send_reset_password_email(user=user, token=token)
flash('Password reset email sent, check your inbox.', 'info')
flash('Password reset email sent, please check your inbox.', 'info')
return redirect(url_for('.login'))
flash('Invalid email.', 'warning')
return redirect(url_for('.forget_password'))
Expand Down
2 changes: 1 addition & 1 deletion moments/blueprints/user.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def change_email_request():
if form.validate_on_submit():
token = generate_token(user=current_user, operation=Operations.CHANGE_EMAIL, new_email=form.email.data.lower())
send_change_email_email(to=form.email.data, user=current_user, token=token)
flash('Confirm email sent, check your inbox.', 'info')
flash('Confirmation email sent, please check your inbox.', 'info')
return redirect(url_for('.index', username=current_user.username))
return render_template('user/settings/change_email.html', form=form)

Expand Down
62 changes: 30 additions & 32 deletions moments/static/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ document.addEventListener('DOMContentLoaded', () => {
}

function toast(message, category) {
const toastElem = document.getElementById('mainToast')
const toast = bootstrap.Toast.getOrCreateInstance(toastElem)
toastElem.querySelector('.toast-body').textContent = message
const toastElem = document.getElementById('mainToast');
const toast = bootstrap.Toast.getOrCreateInstance(toastElem);
toastElem.querySelector('.toast-body').textContent = message;

if (category === 'error') {
toastElem.classList.replace('text-bg-secondary', 'text-bg-danger')
toastElem.classList.replace('text-bg-secondary', 'text-bg-danger');
} else {
toastElem.classList.replace('text-bg-danger', 'text-bg-secondary')
toastElem.classList.replace('text-bg-danger', 'text-bg-secondary');
}
toast.show()
toast.show();
}

function showProfilePopover(event) {
Expand All @@ -36,7 +36,7 @@ document.addEventListener('DOMContentLoaded', () => {
content: data,
html: true,
sanitize: false,
trigger: 'manual'
trigger: 'manual',
});
popover.setContent({
'.popover-body': data
Expand All @@ -48,9 +48,7 @@ document.addEventListener('DOMContentLoaded', () => {
}, 200);
});
})
.catch(error => {
handleFetchError(error);
});
.catch(handleFetchError);
}, 500);
}

Expand Down Expand Up @@ -120,7 +118,7 @@ document.addEventListener('DOMContentLoaded', () => {
fetch(elem.dataset.href, {
method: 'POST',
headers: {
'X-CSRFToken': csrfToken
'X-CSRFToken': csrfToken,
}
})
.then(response => response.json())
Expand All @@ -139,7 +137,7 @@ document.addEventListener('DOMContentLoaded', () => {
fetch(elem.dataset.href, {
method: 'POST',
headers: {
'X-CSRFToken': csrfToken
'X-CSRFToken': csrfToken,
}
})
.then(response => response.json())
Expand All @@ -161,7 +159,7 @@ document.addEventListener('DOMContentLoaded', () => {
fetch(elem.dataset.href, {
method: 'POST',
headers: {
'X-CSRFToken': csrfToken
'X-CSRFToken': csrfToken,
}
})
.then(response => response.json())
Expand All @@ -183,7 +181,7 @@ document.addEventListener('DOMContentLoaded', () => {
fetch(elem.dataset.href, {
method: 'POST',
headers: {
'X-CSRFToken': csrfToken
'X-CSRFToken': csrfToken,
}
})
.then(response => response.json())
Expand All @@ -202,26 +200,26 @@ document.addEventListener('DOMContentLoaded', () => {

function renderAllDatetime() {
// render normal time
const elements = document.querySelectorAll('.dayjs')
const elements = document.querySelectorAll('.dayjs');
elements.forEach(elem => {
const date = dayjs.utc(elem.innerHTML)
const format = elem.dataset.format ?? 'LL'
elem.innerHTML = date.local().format(format)
})
const date = dayjs.utc(elem.innerHTML);
const format = elem.dataset.format ?? 'LL';
elem.innerHTML = date.local().format(format);
});
// render from now time
const fromNowElements = document.querySelectorAll('.dayjs-from-now')
const fromNowElements = document.querySelectorAll('.dayjs-from-now');
fromNowElements.forEach(elem => {
const date = dayjs.utc(elem.innerHTML)
elem.innerHTML = date.local().fromNow()
})
const date = dayjs.utc(elem.innerHTML);
elem.innerHTML = date.local().fromNow();
});
// render tooltip time
const toolTipElements = document.querySelectorAll('.dayjs-tooltip')
const toolTipElements = document.querySelectorAll('.dayjs-tooltip');
toolTipElements.forEach(elem => {
const date = dayjs.utc(elem.dataset.timestamp)
const format = elem.dataset.format ?? 'LLL'
elem.dataset.bsTitle = date.local().format(format)
const tooltip = new bootstrap.Tooltip(elem)
})
const date = dayjs.utc(elem.dataset.timestamp);
const format = elem.dataset.format ?? 'LLL';
elem.dataset.bsTitle = date.local().format(format);
const tooltip = new bootstrap.Tooltip(elem);
});
}

document.addEventListener('click', event => {
Expand Down Expand Up @@ -290,10 +288,10 @@ document.addEventListener('DOMContentLoaded', () => {
setInterval(updateNotificationsCount, 30000);
}

const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
const tooltipList = tooltipTriggerList.map(tooltipTriggerElem => {
return new bootstrap.Tooltip(tooltipTriggerElem)
return new bootstrap.Tooltip(tooltipTriggerElem);
});

renderAllDatetime()
renderAllDatetime();
});
2 changes: 1 addition & 1 deletion moments/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def resize_image(image, filename, base_width):


def validate_image(filename):
ext = Path(filename).suffix
ext = Path(filename).suffix.lower()
allowed_extensions = current_app.config['DROPZONE_ALLOWED_FILE_TYPE'].split(',')
return '.' in filename and ext in allowed_extensions

Expand Down
4 changes: 2 additions & 2 deletions tests/test_auth.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_register_account(self):
follow_redirects=True,
)
data = response.get_data(as_text=True)
self.assertIn('Confirm email sent, check your inbox.', data)
self.assertIn('Confirmation email sent, please check your inbox.', data)

def test_confirm_account(self):
user = User.query.filter_by(email='[email protected]').first()
Expand Down Expand Up @@ -85,7 +85,7 @@ def test_reset_password(self):
follow_redirects=True,
)
data = response.get_data(as_text=True)
self.assertIn('Password reset email sent, check your inbox.', data)
self.assertIn('Password reset email sent, please check your inbox.', data)
user = User.query.filter_by(email='[email protected]').first()
self.assertTrue(user.validate_password('123'))

Expand Down

0 comments on commit da5a8e5

Please sign in to comment.