From df2bbacffcffc5dfd987b6564e6e544dfc10d9d9 Mon Sep 17 00:00:00 2001 From: 10G Meow <10gmeow@gmail.com> Date: Wed, 11 May 2022 14:08:45 +0000 Subject: [PATCH] Resolve "Improve UX/UI of new room (with no remembered identity)" --- src/assets/css/join.scss | 6 - src/assets/translations/bo.json | 3 +- src/assets/translations/de.json | 3 +- src/assets/translations/en.json | 5 +- src/assets/translations/es.json | 3 +- src/assets/translations/fi.json | 3 +- src/assets/translations/fr.json | 3 +- src/assets/translations/it.json | 3 +- src/assets/translations/nb_NO.json | 3 +- src/assets/translations/pt_BR.json | 3 +- src/assets/translations/ro.json | 3 +- src/assets/translations/ug.json | 3 +- src/assets/translations/zh_Hans.json | 3 +- src/components/CreateRoom.vue | 181 ++++++++++++++++----------- src/components/Join.vue | 19 ++- src/components/Login.vue | 13 +- src/components/rememberMeMixin.js | 12 ++ 17 files changed, 161 insertions(+), 108 deletions(-) create mode 100644 src/components/rememberMeMixin.js diff --git a/src/assets/css/join.scss b/src/assets/css/join.scss index ab1d755..b9a0d0a 100644 --- a/src/assets/css/join.scss +++ b/src/assets/css/join.scss @@ -37,12 +37,6 @@ background: white; box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.08); - .join-user-info { - display: flex; - flex-wrap: nowrap; - max-width: 500px; - } - @media #{map-get($display-breakpoints, 'sm-and-down')} { padding: 20px; } diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json index 9267c66..ae61b38 100644 --- a/src/assets/translations/bo.json +++ b/src/assets/translations/bo.json @@ -222,7 +222,8 @@ "remember_me": "ང་དྲན་པར་བྱོས།", "user_name_label": "སྤྱོད་མིང་།", "title": "ཁྱེད་རང་ནང་དུ་ཞུགས་པར་དགའ་བསུ་ཞུ།", - "join_failed": "ཁ་བརྡ་ཁང་དུ་འཛུལ་ཐུབ་མ་སོང་།" + "join_failed": "ཁ་བརྡ་ཁང་དུ་འཛུལ་ཐུབ་མ་སོང་།", + "choose_name": "" }, "profile_info_popup": { "powered_by": "ཁ་བརྡ་ཁང་འདི་{product} ནུས་ཤུགས་བསྩལ་ཡོད། {productLink} ནས་དེ་ལས་མང་བ་སྦྱོང་ཆོག་ལ། མདུན་དུ་བསྐྱོད་དེ་ཁ་བརྡ་ཁང་གཞན་ཞིག་བསྐྲུན་ཆོག", diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json index f0ec7fd..694de5d 100644 --- a/src/assets/translations/de.json +++ b/src/assets/translations/de.json @@ -144,7 +144,8 @@ "status_logging_in": "Wird angemeldet …", "status_joining": "Raum beitreten …", "join_failed": "Beitritt zum Raum fehlgeschlagen.", - "title": "Willkommen in {roomName}" + "title": "Willkommen in {roomName}", + "choose_name": "" }, "invite": { "title": "Freunde hinzufügen", diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json index 5ba50a9..268b342 100644 --- a/src/assets/translations/en.json +++ b/src/assets/translations/en.json @@ -90,7 +90,7 @@ "new_room": "New Room", "create": "Create", "next": "Next", - "name_room": "Name room", + "name_room": "Room name", "room_topic": "Add a description if you like", "join_permissions": "Join permissions", "set_join_permissions": "Set Join Permissions", @@ -158,7 +158,8 @@ "enter_room": "Enter room", "status_logging_in": "Logging in...", "status_joining": "Joining room...", - "join_failed": "Failed to join room." + "join_failed": "Failed to join room.", + "choose_name": "Choose a name to use" }, "invite": { "title": "Add Friends", diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json index 44efa99..6a7b96d 100644 --- a/src/assets/translations/es.json +++ b/src/assets/translations/es.json @@ -63,7 +63,8 @@ "remember_me": "Recordarme", "user_name_label": "Nombre de usuario", "title": "Bienvenido has sido invitado a unirte", - "join_failed": "No se pudo unir a la sala." + "join_failed": "No se pudo unir a la sala.", + "choose_name": "" }, "profile": { "display_name": "Nombre para mostrar", diff --git a/src/assets/translations/fi.json b/src/assets/translations/fi.json index 79691d9..e741ed1 100644 --- a/src/assets/translations/fi.json +++ b/src/assets/translations/fi.json @@ -72,7 +72,8 @@ "user_name_label": "Käyttäjätunnus", "status_joining": "Liittyminen huoneeseen…", "status_logging_in": "Kirjautuminen sisään…", - "join_failed": "Huoneeseen liittyminen epäonnistui." + "join_failed": "Huoneeseen liittyminen epäonnistui.", + "choose_name": "" }, "leave": { "title_public": "Näkemiin, {user}", diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json index 4349670..6748b43 100644 --- a/src/assets/translations/fr.json +++ b/src/assets/translations/fr.json @@ -144,7 +144,8 @@ "status_joining": "Adhésion au salon…", "join_failed": "Impossible de rejoindre le salon.", "joining_as": "Vous rejoignez en tant que :", - "join_guest": "Rejoindre comme invité·e" + "join_guest": "Rejoindre comme invité·e", + "choose_name": "" }, "invite": { "title": "Ajouter des amis", diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json index 9c53650..9546ba7 100644 --- a/src/assets/translations/it.json +++ b/src/assets/translations/it.json @@ -143,7 +143,8 @@ "join_guest": "Unisciti come ospite", "status_joining": "Unendosi alla stanza…", "join_failed": "Impossibile unirsi alla stanza.", - "status_logging_in": "Accesso in corso…" + "status_logging_in": "Accesso in corso…", + "choose_name": "" }, "invite": { "title": "Aggiungi amici", diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json index a182382..34f7bf3 100644 --- a/src/assets/translations/nb_NO.json +++ b/src/assets/translations/nb_NO.json @@ -75,7 +75,8 @@ "status_joining": "Tar del i rom…", "status_logging_in": "Logger inn …", "enter_room": "", - "title": "Velkommen til {roomName}" + "title": "Velkommen til {roomName}", + "choose_name": "" }, "profile_info_popup": { "identity_temporary": "{displayName}", diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json index cd59e57..6c02dfc 100644 --- a/src/assets/translations/pt_BR.json +++ b/src/assets/translations/pt_BR.json @@ -169,7 +169,8 @@ "enter_room": "Entre na sala", "status_logging_in": "Fazendo login...", "status_joining": "Entrando na sala...", - "join_failed": "Houve uma falha ao entrar na sala." + "join_failed": "Houve uma falha ao entrar na sala.", + "choose_name": "" }, "leave": { "title_public": "Adeus, {user}", diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json index bccfe04..833c2cd 100644 --- a/src/assets/translations/ro.json +++ b/src/assets/translations/ro.json @@ -99,7 +99,8 @@ "joining_as": "Vă înscrieți ca:", "remember_me": "Amintește-ți de mine", "user_name_label": "Numele utilizatorului", - "title": "Bine ați venit, ați fost invitat să vă alăturați" + "title": "Bine ați venit, ați fost invitat să vă alăturați", + "choose_name": "" }, "profile_info_popup": { "new_room": "+ Cameră nouă", diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json index 37aab23..2ac6d95 100644 --- a/src/assets/translations/ug.json +++ b/src/assets/translations/ug.json @@ -114,7 +114,8 @@ "joining_as": "سىز تۆۋەندىكىدەك قاتنىشىۋاتىسىز:", "remember_me": "", "user_name_label": "قوللانغۇچى ئىسمى", - "title": "{ياتاق ئىسمى} غا خۇش كەپسىز" + "title": "{ياتاق ئىسمى} غا خۇش كەپسىز", + "choose_name": "" }, "room_welcome": { "info_permissions": "ياتاق تەڭشىكىدە خالىغان ۋاقىتتا «قوشۇلۇش ئىجازەتنامىسى» نى ئۆزگەرتەلەيسىز.", diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json index a5afc2b..ca37d81 100644 --- a/src/assets/translations/zh_Hans.json +++ b/src/assets/translations/zh_Hans.json @@ -174,7 +174,8 @@ "remember_me": "记得我", "user_name_label": "用户名", "title": "欢迎您被邀请加入", - "join_failed": "加入聊天室失败。" + "join_failed": "加入聊天室失败。", + "choose_name": "" }, "profile": { "display_name": "显示名称", diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue index a75836d..197a10f 100644 --- a/src/components/CreateRoom.vue +++ b/src/components/CreateRoom.vue @@ -20,7 +20,7 @@ !roomName || (step != steps.INITIAL && step != steps.CREATED) " class="header-button-right" - @click.stop="next" + @click.stop="onCreate" > {{ step == steps.CREATED ? $t("new_room.done") : $t("new_room.next") @@ -28,54 +28,6 @@ --> - - - - - - - - - - - - - - - - @@ -86,34 +38,47 @@ - - + + +
{{ $t("new_room.name_room") }}
+
{{ $t("new_room.room_topic") }}
{{ $t("new_room.create") }} + @click.stop="onCreate" + :disabled="status ? true : roomName.length == 0" + > +
+ {{ status }} + +
+ {{ $t("new_room.create") }} + @@ -192,7 +157,7 @@ {{ $t("new_room.link_copied") }} --> -
+ + + + + + +
{{ $t("join.choose_name") }}
+ + + + + + + + + + + + + + + + + + {{ $t("join.enter_room") }} + + + +