From db1c780c9ecafe66670240349abc9fd3468ae0d4 Mon Sep 17 00:00:00 2001
From: 10G Meow <10gmeow@gmail.com>
Date: Sun, 13 Nov 2022 15:08:23 +0200
Subject: [PATCH] Edit profile name and set password improvements
---
src/assets/translations/bo.json | 8 +++++-
src/assets/translations/de.json | 8 +++++-
src/assets/translations/en.json | 8 +++++-
src/assets/translations/es.json | 8 +++++-
src/assets/translations/fi.json | 8 +++++-
src/assets/translations/fr.json | 8 +++++-
src/assets/translations/it.json | 8 +++++-
src/assets/translations/nb_NO.json | 8 +++++-
src/assets/translations/pt_BR.json | 8 +++++-
src/assets/translations/ro.json | 8 +++++-
src/assets/translations/ug.json | 8 +++++-
src/assets/translations/zh_Hans.json | 8 +++++-
src/components/Profile.vue | 37 +++++++++++++++++++++++-----
13 files changed, 115 insertions(+), 18 deletions(-)
diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json
index 0ad9610..3d3fdd0 100644
--- a/src/assets/translations/bo.json
+++ b/src/assets/translations/bo.json
@@ -3,6 +3,11 @@
"name": "འདུ་འཛོམས།",
"tag_line": "འབྲེལ་མཐུད་བྱོས།"
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"fallbacks": {
"download_name": "ཕབ་ལེན།",
"original_text": "<མ་ཡིག>",
@@ -106,7 +111,8 @@
"set_language": "སྐད་ཡིག་བརྗེ་སྒྱུར།",
"language_description": "འདུ་འཛོམས་སྐད་ཡིག་མང་པོའི་ནང་དུ་ཡོད།",
"dont_see_yours": "ཁྱེད་ཀྱི་མིང་མཐོང་གི་མི་འདུག་གམ།",
- "tell_us": "ང་ཚོར་ཤོོད།"
+ "tell_us": "ང་ཚོར་ཤོོད།",
+ "display_name_required": ""
},
"device_list": {
"not_verified": "ར་སྤྲོད་བྱས་མི་འདུག",
diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json
index 5af960b..5ce8d56 100644
--- a/src/assets/translations/de.json
+++ b/src/assets/translations/de.json
@@ -1,5 +1,10 @@
{
"language_display_name": "Deutsch",
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"menu": {
"start_private_chat": "Private Diskussion mit diesem Benutzer",
"reply": "Antworten",
@@ -126,7 +131,8 @@
"password_old": "Altes Passwort",
"password_new": "Neues Kennwort",
"password_repeat": "Wiederhole das neue Passwort",
- "display_name": "Anzeigename"
+ "display_name": "Anzeigename",
+ "display_name_required": ""
},
"profile_info_popup": {
"you_are": "Du bist",
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index 5a3fa1a..c8cfb26 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -4,6 +4,11 @@
"name": "Convene",
"tag_line": "Simply connect"
},
+ "global": {
+ "save": "Save",
+ "password_didnot_match": "Password didn't match",
+ "password_hint": "Minimum 12 character containing atleast one numeric, one uppercase and one lowercase letter"
+ },
"menu": {
"start_private_chat": "Private chat with this user",
"reply": "Reply",
@@ -140,7 +145,8 @@
"password_old": "Old password",
"password_new": "New password",
"password_repeat": "Repeat new password",
- "display_name": "Display name"
+ "display_name": "Display name",
+ "display_name_required": "Display name is required"
},
"profile_info_popup": {
"you_are": "You are",
diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json
index ce9a3e6..2c031e5 100644
--- a/src/assets/translations/es.json
+++ b/src/assets/translations/es.json
@@ -4,6 +4,11 @@
"name": "Convene",
"tag_line": "Simplemente conectar"
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"room_info": {
"identity": "Has iniciado sesión como {displayName}.",
"my_profile": "Mi perfil",
@@ -83,7 +88,8 @@
"set_language": "Establece tu Idioma",
"language_description": "Convine esta disponible en varios Idiomas.",
"dont_see_yours": "¿No ves el tuyo?",
- "tell_us": "Dinos."
+ "tell_us": "Dinos.",
+ "display_name_required": ""
},
"login": {
"login": "Iniciar sesión",
diff --git a/src/assets/translations/fi.json b/src/assets/translations/fi.json
index d1f274b..29befa3 100644
--- a/src/assets/translations/fi.json
+++ b/src/assets/translations/fi.json
@@ -1,4 +1,9 @@
{
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"menu": {
"back": "TAKAISIN",
"start_private_chat": "Yksityinen keskustelu tämän käyttäjän kanssa",
@@ -125,7 +130,8 @@
"set_password": "Aseta salasana",
"select_language": "Kieli",
"password_old": "Vanha salasana",
- "display_name": "Näyttönimi"
+ "display_name": "Näyttönimi",
+ "display_name_required": ""
},
"profile_info_popup": {
"want_more": "Haluatko lisää?",
diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json
index 6cd2c6e..63b356e 100644
--- a/src/assets/translations/fr.json
+++ b/src/assets/translations/fr.json
@@ -1,4 +1,9 @@
{
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"menu": {
"edit": "Modifier",
"start_private_chat": "Discussion privée avec cet utilisateur",
@@ -126,7 +131,8 @@
"display_name": "Nom d’affichage",
"title": "Mon profil",
"set_password": "Définir un mot de passe",
- "password_new": "Nouveau mot de passe"
+ "password_new": "Nouveau mot de passe",
+ "display_name_required": ""
},
"profile_info_popup": {
"you_are": "Vous êtes",
diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json
index 6bfcc62..bdcef3a 100644
--- a/src/assets/translations/it.json
+++ b/src/assets/translations/it.json
@@ -1,4 +1,9 @@
{
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"message": {
"file_prefix": "File: ",
"unread_messages": "Messaggi non letti",
@@ -125,7 +130,8 @@
"display_name": "Nome visualizzato",
"change_name": "Cambia il nome",
"change_password": "Cambia la password",
- "password_new": "Nuova password"
+ "password_new": "Nuova password",
+ "display_name_required": ""
},
"profile_info_popup": {
"you_are": "Sei",
diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json
index a8f00b5..d747b7e 100644
--- a/src/assets/translations/nb_NO.json
+++ b/src/assets/translations/nb_NO.json
@@ -3,6 +3,11 @@
"name": "Convene",
"tag_line": ""
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"message": {
"user_changed_guest_access_open": "{user} tillot gjester å ta del i rommet",
"user_powerlevel_change_from_to": "{user} fra {powerOld} til {powerNew}",
@@ -98,7 +103,8 @@
"set_password": "Sett passord",
"title": "Min profil",
"display_name": "Visningsnavn",
- "password_repeat": "Gjenta nytt passord"
+ "password_repeat": "Gjenta nytt passord",
+ "display_name_required": ""
},
"login": {
"password_required": "Passord kreves",
diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json
index c322a1e..cda286f 100644
--- a/src/assets/translations/pt_BR.json
+++ b/src/assets/translations/pt_BR.json
@@ -3,6 +3,11 @@
"name": "Convocar",
"tag_line": "Basta conectar"
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"invite": {
"title": "Adiciona amigos",
"done": "Feito",
@@ -153,7 +158,8 @@
"password_old": "Senha antiga",
"password_new": "Nova senha",
"password_repeat": "Repita a nova senha",
- "display_name": "Nome de exibição"
+ "display_name": "Nome de exibição",
+ "display_name_required": ""
},
"profile_info_popup": {
"you_are": "Você é",
diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json
index e8c59b9..16d8bff 100644
--- a/src/assets/translations/ro.json
+++ b/src/assets/translations/ro.json
@@ -3,6 +3,11 @@
"name": "Convene",
"tag_line": "Conectați pur și simplu"
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"menu": {
"ok": "OK",
"done": "Realizat",
@@ -129,7 +134,8 @@
"change_name": "Schimbă numele",
"set_password": "Setați parola",
"temporary_identity": "Această identitate este temporară. Setați o parolă pentru a o utiliza din nou",
- "title": "Profilul meu"
+ "title": "Profilul meu",
+ "display_name_required": ""
},
"login": {
"login": "Autentificare",
diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json
index 339ab19..df724cb 100644
--- a/src/assets/translations/ug.json
+++ b/src/assets/translations/ug.json
@@ -3,6 +3,11 @@
"name": "Convene",
"tag_line": ""
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"language_is_rtl": true,
"menu": {
"ok": "تامام",
@@ -221,7 +226,8 @@
"change_name": "ئىسىم ئۆزگەرتىش",
"set_password": "پارول بەلگىلەڭ",
"temporary_identity": "بۇ كىملىك ۋاقىتلىق. قايتا ئىشلىتىش ئۈچۈن پارول بەلگىلەڭ",
- "title": "مېنىڭ ئارخىپىم"
+ "title": "مېنىڭ ئارخىپىم",
+ "display_name_required": ""
},
"login": {
"login": "كىرىش",
diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json
index d83e981..f096cb5 100644
--- a/src/assets/translations/zh_Hans.json
+++ b/src/assets/translations/zh_Hans.json
@@ -3,6 +3,11 @@
"name": "Convene",
"tag_line": "只需连接"
},
+ "global": {
+ "save": "",
+ "password_didnot_match": "",
+ "password_hint": ""
+ },
"fallbacks": {
"download_name": "下载",
"original_text": "<原文>",
@@ -195,7 +200,8 @@
"set_language": "设置您的语言",
"language_description": "Convene 提供多种语言.",
"dont_see_yours": "看不到你的？",
- "tell_us": "告诉我们。"
+ "tell_us": "告诉我们。",
+ "display_name_required": ""
},
"new_room": {
"status_avatar": "正在上传头像：{count}",
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index daa30cf..69f2435 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -103,13 +103,25 @@
/>
{{ passwordErrorMessage }}
@@ -134,7 +146,7 @@
newPassword1
)
"
- >{{ $t("menu.ok") }}{{ $t("global.save") }}
@@ -149,7 +161,11 @@
{{ $t("profile.display_name") }}
-
+
@@ -165,7 +181,8 @@
updateDisplayName(editValue);
showEditDisplaynameDialog = false;
"
- >{{ $t("menu.ok") }}{{ $t("global.save") }}
@@ -205,12 +222,16 @@ export default {
showLogoutPopup: false,
editValue: null,
password: null,
+ showPassword1: false,
+ showPassword2: false,
+ passwordValidation: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{12,20}$/,
newPassword1: null,
newPassword2: null,
settingPassword: false,
passwordErrorMessage: null,
isAvatarLoaded: true,
- loadValue: 0
+ loadValue: 0,
+ newPasswordHasError: false
};
},
@@ -253,6 +274,7 @@ export default {
passwordsMatch() {
return (
+ !this.newPasswordHasError &&
this.newPassword1 &&
this.newPassword2 &&
this.newPassword1 == this.newPassword2
@@ -261,6 +283,9 @@ export default {
},
methods: {
+ updateErrorState(errorState) {
+ this.newPasswordHasError = errorState
+ },
setPassword(oldPassword, newPassword) {
this.settingPassword = true;
this.passwordErrorMessage = null;