malhuda/fictioneer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 112 Wiki Activity

Improve notices for URL params

Browse Source 
No need to check each one if there are no params.
This commit is contained in:
Tetrakern 2024-05-21 01:51:09 +02:00
parent 4e165413eb
commit df05862c9a
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/application.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
js/complete.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
src/js/application.js
View File

@ -651,32 +651,35 @@ function fcn_showNotification(message, duration = 3, type = 'base') {
setTimeout(() => { node.style.opacity = 0; }, 100);
}
// Show OAuth 2.0 registration error notice (if any)
if (fcn_urlParams['failure'] === 'oauth_email_taken') {
fcn_showNotification(fictioneer_tl.notification.oauthEmailTaken, 5, 'warning');
}
// Show notices based on URL params (if any)
if (fcn_urlParams) {
// Show OAuth 2.0 registration error notice (if any)
if (fcn_urlParams['failure'] === 'oauth_email_taken') {
fcn_showNotification(fictioneer_tl.notification.oauthEmailTaken, 5, 'warning');
}
// Show OAuth 2.0 link error notice (if any)
if (fcn_urlParams['failure'] === 'oauth_already_linked') {
fcn_showNotification(fictioneer_tl.notification.oauthAccountAlreadyLinked, 5, 'warning');
}
// Show OAuth 2.0 link error notice (if any)
if (fcn_urlParams['failure'] === 'oauth_already_linked') {
fcn_showNotification(fictioneer_tl.notification.oauthAccountAlreadyLinked, 5, 'warning');
}
// Show new subscriber notice (if any)
if (fcn_urlParams['success'] === 'oauth_new') {
fcn_showNotification(fictioneer_tl.notification.oauthNew, 10);
}
// Show new subscriber notice (if any)
if (fcn_urlParams['success'] === 'oauth_new') {
fcn_showNotification(fictioneer_tl.notification.oauthNew, 10);
}
// Show OAuth 2.0 account merge notice (if any)
if (fcn_urlParams['success']?.includes('oauth_merged_')) {
fcn_showNotification(fictioneer_tl.notification.oauthAccountLinked, 3, 'success');
}
// Show OAuth 2.0 account merge notice (if any)
if (fcn_urlParams['success']?.includes('oauth_merged_')) {
fcn_showNotification(fictioneer_tl.notification.oauthAccountLinked, 3, 'success');
}
// Generic messages
if (fcn_urlParams['fictioneer-notice'] && fcn_urlParams['fictioneer-notice'] !== '') {
let type = fcn_urlParams['failure'] === '1' ? 'warning' : 'base';
type = fcn_urlParams['success'] === '1' ? 'success' : type;
// Generic messages
if (fcn_urlParams['fictioneer-notice'] && fcn_urlParams['fictioneer-notice'] !== '') {
let type = fcn_urlParams['failure'] === '1' ? 'warning' : 'base';
type = fcn_urlParams['success'] === '1' ? 'success' : type;
fcn_showNotification(fcn_sanitizeHTML(fcn_urlParams['fictioneer-notice']), 3, type);
fcn_showNotification(fcn_sanitizeHTML(fcn_urlParams['fictioneer-notice']), 3, type);
}
}
// =============================================================================