From d3bb8ad0eee242aa8cf5f9303e74a69dd0d308b1 Mon Sep 17 00:00:00 2001 From: Carlo Herrerra <18-10451@usb.ve> Date: Fri, 4 Oct 2024 07:00:51 -0400 Subject: [PATCH 1/6] Change username-taken error message (first steps) --- public/language/es/error.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/es/error.json b/public/language/es/error.json index c9a2e45..5f5d0fa 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -31,7 +31,7 @@ "invalid-path": "Invalid path", "folder-exists": "Folder exists", "invalid-pagination-value": "Número de página inválido, debe estar entre %1 y %2", - "username-taken": "Nombre de usuario ocupado", + "username-taken": "Nombre de usuario ya en uso. Pruebe utilizando octocat_ci3715.", "email-taken": "Email address is already taken.", "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", From 840a1348f337e863d5f93aba09f723c9ea9d8630 Mon Sep 17 00:00:00 2001 From: Carlo Herrerra <18-10451@usb.ve> Date: Fri, 4 Oct 2024 07:23:03 -0400 Subject: [PATCH 2/6] change username taken error mesage in en-US --- public/language/en-US/error.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index f12e15c..5b36809 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -31,7 +31,7 @@ "invalid-path": "Invalid path", "folder-exists": "Folder exists", "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", - "username-taken": "Username taken", + "username-taken": "The username is already taken. Try octocat_ci3715.", "email-taken": "Email address is already taken.", "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", From 1a0240cde5dc19b2bf55180296990ce7c2451be0 Mon Sep 17 00:00:00 2001 From: neonhh Date: Fri, 4 Oct 2024 21:46:58 -0400 Subject: [PATCH 3/6] adds exampleUsernameInput --- public/src/client/register.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index d8144d2..7632cb9 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -135,7 +135,11 @@ define('forum/register', [ if (results.every(obj => obj.status === 'rejected')) { showSuccess(usernameInput, username_notify, successIcon); } else { - showError(usernameInput, username_notify, '[[error:username-taken]]'); + + let exampleUsernameInput = username.concat('0','_ci3715'); + //showError(usernameInput, username_notify, '[[error:username-taken]]'); + //showError(usernameInput, username_notify, 'Bro wassup?'); + showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsernameInput} instead?`); } callback(); From aa62276b1579321c72ded1493ecae0ed17c35650 Mon Sep 17 00:00:00 2001 From: neonhh Date: Fri, 4 Oct 2024 22:16:55 -0400 Subject: [PATCH 4/6] adds usernameSuffix --- public/src/client/register.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index 7632cb9..5b989f8 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -136,7 +136,8 @@ define('forum/register', [ showSuccess(usernameInput, username_notify, successIcon); } else { - let exampleUsernameInput = username.concat('0','_ci3715'); + let usernameSuffix = 0; + let exampleUsernameInput = username.concat(usernameSuffix.toString(),'_ci3715'); //showError(usernameInput, username_notify, '[[error:username-taken]]'); //showError(usernameInput, username_notify, 'Bro wassup?'); showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsernameInput} instead?`); From c845c6882cab78cce0d7f3fa40e68edbd9b85dac Mon Sep 17 00:00:00 2001 From: neonhh Date: Fri, 4 Oct 2024 22:27:19 -0400 Subject: [PATCH 5/6] Adds checkUsernameNotTaken function --- public/src/client/register.js | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index 5b989f8..a465308 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -114,6 +114,27 @@ define('forum/register', [ $('#username').trigger('focus'); }; + function checkUsernameNotTaken(username, callback, username_notify, usernameInput, userslug){ + Promise.allSettled([ + api.head(`/users/bySlug/${userslug}`, {}), + api.head(`/groups/${username}`, {}), + ]).then((results) => { + if (results.every(obj => obj.status === 'rejected')) { + showSuccess(usernameInput, username_notify, successIcon); + } else { + + let usernameSuffix = 0; + let exampleUsernameInput = username.concat(usernameSuffix.toString(),'_ci3715'); + + //showError(usernameInput, username_notify, '[[error:username-taken]]'); + + showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsernameInput} instead?`); + } + + callback(); + }); + } + function validateUsername(username, callback) { callback = callback || function () {}; @@ -128,6 +149,8 @@ define('forum/register', [ } else if (!utils.isUserNameValid(username) || !userslug) { showError(usernameInput, username_notify, '[[error:invalid-username]]'); } else { + checkUsernameNotTaken(username, callback, username_notify, usernameInput, userslug); + /* Promise.allSettled([ api.head(`/users/bySlug/${userslug}`, {}), api.head(`/groups/${username}`, {}), @@ -138,13 +161,15 @@ define('forum/register', [ let usernameSuffix = 0; let exampleUsernameInput = username.concat(usernameSuffix.toString(),'_ci3715'); + //showError(usernameInput, username_notify, '[[error:username-taken]]'); - //showError(usernameInput, username_notify, 'Bro wassup?'); + showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsernameInput} instead?`); } callback(); }); + */ } } From 1983df7a068b3a2afe0b52794aefd70b637c6aa9 Mon Sep 17 00:00:00 2001 From: neonhh Date: Fri, 4 Oct 2024 23:36:47 -0400 Subject: [PATCH 6/6] updates checkUsernameNotTaken --- public/src/client/register.js | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index a465308..790af2c 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -114,24 +114,18 @@ define('forum/register', [ $('#username').trigger('focus'); }; - function checkUsernameNotTaken(username, callback, username_notify, usernameInput, userslug){ + function checkUsernameNotTaken(username, callback){ + + const username_notify = $('#username-notify'); + username_notify.text(''); + const usernameInput = $('#username'); + const userslug = slugify(username); + Promise.allSettled([ api.head(`/users/bySlug/${userslug}`, {}), api.head(`/groups/${username}`, {}), ]).then((results) => { - if (results.every(obj => obj.status === 'rejected')) { - showSuccess(usernameInput, username_notify, successIcon); - } else { - - let usernameSuffix = 0; - let exampleUsernameInput = username.concat(usernameSuffix.toString(),'_ci3715'); - - //showError(usernameInput, username_notify, '[[error:username-taken]]'); - - showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsernameInput} instead?`); - } - - callback(); + return (results.every(obj => obj.status === 'rejected')) }); } @@ -149,27 +143,33 @@ define('forum/register', [ } else if (!utils.isUserNameValid(username) || !userslug) { showError(usernameInput, username_notify, '[[error:invalid-username]]'); } else { - checkUsernameNotTaken(username, callback, username_notify, usernameInput, userslug); - /* - Promise.allSettled([ - api.head(`/users/bySlug/${userslug}`, {}), - api.head(`/groups/${username}`, {}), - ]).then((results) => { - if (results.every(obj => obj.status === 'rejected')) { + + if (checkUsernameNotTaken(username, callback)) { showSuccess(usernameInput, username_notify, successIcon); } else { let usernameSuffix = 0; - let exampleUsernameInput = username.concat(usernameSuffix.toString(),'_ci3715'); + let exampleUsername = username.concat(usernameSuffix.toString(),'_ci3715'); + + //placeholder para el codigo que revisaria que el nuevo username generado + // no este ya tomado tambien, y pueda calcularse otro si ese es el caso + //(ahorita esto genera un loop infinito, y yo no c hacer llamadas al backend por ahora) + /* + while(!checkUsernameNotTaken(exampleUsername, callback)){ + exampleUsername = username.concat(usernameSuffix.toString(),'_ci3715'); + usernameSuffix ++; + } + */ //showError(usernameInput, username_notify, '[[error:username-taken]]'); - - showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsernameInput} instead?`); + // aqui hay que agregar un link con los error.json en los idiomas correspondientes que use lo que se calculo + //para los mensajes de error + showError(usernameInput, username_notify, `${username}?, really?!, why not ${exampleUsername} instead?`); } callback(); - }); - */ + + } }