From 680383b08f0554b6169c5abc34b5d3c0c44520da Mon Sep 17 00:00:00 2001
From: 10G Meow <10gmeow@gmail.com>
Date: Thu, 27 Jan 2022 11:35:20 +0000
Subject: [PATCH 1/7] fixed: direct chat with person avatar profile
---
src/components/ChatHeader.vue | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/components/ChatHeader.vue b/src/components/ChatHeader.vue
index a8c089a..20097c9 100644
--- a/src/components/ChatHeader.vue
+++ b/src/components/ChatHeader.vue
@@ -8,7 +8,7 @@
@click.stop="onHeaderClicked"
>
-
+
@@ -88,8 +88,27 @@ export default {
room() {
return this.$matrix.currentRoom;
},
+ memberAvatar() {
+ let roomMember;
+ if (this.room) {
+ this.room.getMembers().forEach(member => {
+ if(this.room.name === member.name) {
+ roomMember = member;
+ }
+ });
+ if (roomMember) {
+ return roomMember.getAvatarUrl(
+ this.$matrix.matrixClient.getHomeserverUrl(),
+ 40,
+ 40,
+ "scale",
+ true
+ );
+ }
+ }
+ return null;
+ }
},
-
watch: {
room: {
handler(newVal, ignoredOldVal) {
From a3b365d7acffedaf79bd67df008543467ee82739 Mon Sep 17 00:00:00 2001
From: 10G Meow <10gmeow@gmail.com>
Date: Thu, 27 Jan 2022 11:40:56 +0000
Subject: [PATCH 2/7] fixed: Login error message improved and necessary
translation string added
---
src/assets/translations/bo.json | 3 ++-
src/assets/translations/de.json | 3 ++-
src/assets/translations/en.json | 3 ++-
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/si.json | 3 +++
src/assets/translations/ug.json | 3 ++-
src/assets/translations/zh_Hans.json | 3 ++-
src/components/Login.vue | 22 +++++++++-------------
14 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json
index 0fa658c..91bafdf 100644
--- a/src/assets/translations/bo.json
+++ b/src/assets/translations/bo.json
@@ -47,7 +47,8 @@
"password_required": "གསང་ཚིག་དགོས་ཀྱི་ཡོད།",
"username_required": "སྤྱོད་མིང་དགོས་ཀྱི་ཡོད།",
"create_room": "ཐོ་འགོད་དང་ཁ་བརྡ་ཁང་གསར་སྐྲུན།",
- "or": "ཡང་ན།"
+ "or": "ཡང་ན།",
+ "invalid_message": ""
},
"new_room": {
"next": "རྗེས་མ།",
diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json
index b182c64..f0ec7fd 100644
--- a/src/assets/translations/de.json
+++ b/src/assets/translations/de.json
@@ -110,7 +110,8 @@
"password_required": "Das Passwort ist erforderlich",
"login": "Anmelden",
"create_room": "Registrieren und Raum erstellen",
- "or": "ODER"
+ "or": "ODER",
+ "invalid_message": ""
},
"profile": {
"title": "Mein Profil",
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index e9f60d1..a58777f 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -115,7 +115,8 @@
"password_required": "Password is required",
"login": "Login",
"create_room": "Register & Create Room",
- "or": "OR"
+ "or": "OR",
+ "invalid_message": "Invalid username or password"
},
"profile": {
"title": "My Profile",
diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json
index 31278b9..8e7d9de 100644
--- a/src/assets/translations/es.json
+++ b/src/assets/translations/es.json
@@ -76,7 +76,8 @@
"username": "Nombre de Usuario",
"title": "Iniciar sesión",
"create_room": "",
- "or": ""
+ "or": "",
+ "invalid_message": ""
},
"device_list": {
"not_verified": "No ha sido Verificado",
diff --git a/src/assets/translations/fi.json b/src/assets/translations/fi.json
index 1e4b4f0..79691d9 100644
--- a/src/assets/translations/fi.json
+++ b/src/assets/translations/fi.json
@@ -60,7 +60,8 @@
"login": "Kirjaudu sisään",
"password": "Anna salasana",
"password_required": "Salasana vaaditaan",
- "create_room": "Rekisteröidy ja luo huone"
+ "create_room": "Rekisteröidy ja luo huone",
+ "invalid_message": ""
},
"join": {
"joining_as": "Liityt jäsenenä:",
diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json
index e19a604..4349670 100644
--- a/src/assets/translations/fr.json
+++ b/src/assets/translations/fr.json
@@ -110,7 +110,8 @@
"password_required": "Le mot de passe est obligatoire",
"create_room": "S’inscrire et créer un salon",
"or": "OU",
- "login": "Se connecter"
+ "login": "Se connecter",
+ "invalid_message": ""
},
"profile": {
"temporary_identity": "Cette identité est temporaire. Définissez un mot de passe pour l’utiliser à nouveau",
diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json
index 4470c8b..9c53650 100644
--- a/src/assets/translations/it.json
+++ b/src/assets/translations/it.json
@@ -109,7 +109,8 @@
"login": "Accedi",
"create_room": "Registrati e crea una stanza",
"or": "O",
- "username_required": "Il nome utente è richiesto"
+ "username_required": "Il nome utente è richiesto",
+ "invalid_message": ""
},
"profile": {
"title": "Il mio profilo",
diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json
index 0921857..afddc9b 100644
--- a/src/assets/translations/nb_NO.json
+++ b/src/assets/translations/nb_NO.json
@@ -102,7 +102,8 @@
"password": "Passord",
"username": "Brukernavn",
"create_room": "",
- "or": ""
+ "or": "",
+ "invalid_message": ""
},
"new_room": {
"add_people": "Legg til folk",
diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json
index c2530dd..0077600 100644
--- a/src/assets/translations/pt_BR.json
+++ b/src/assets/translations/pt_BR.json
@@ -128,7 +128,8 @@
"password_required": "A senha é obrigatória",
"login": "Entrar",
"create_room": "Cadastre-se e crie uma sala",
- "or": "OU"
+ "or": "OU",
+ "invalid_message": ""
},
"profile": {
"title": "Meu perfil",
diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json
index d167c07..4ab741e 100644
--- a/src/assets/translations/ro.json
+++ b/src/assets/translations/ro.json
@@ -135,7 +135,8 @@
"username": "Nume utilizator (ex: marta)",
"title": "Autentificare",
"create_room": "",
- "or": ""
+ "or": "",
+ "invalid_message": ""
},
"device_list": {
"not_verified": "Nu a fost verificat",
diff --git a/src/assets/translations/si.json b/src/assets/translations/si.json
index deca16d..817bbdc 100644
--- a/src/assets/translations/si.json
+++ b/src/assets/translations/si.json
@@ -23,5 +23,8 @@
"download_progress": "{percentage}% බාගත වී ඇත",
"file_prefix": "ගොනුව: ",
"you": "ඔබ"
+ },
+ "login": {
+ "invalid_message": ""
}
}
\ No newline at end of file
diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json
index c444844..7c78103 100644
--- a/src/assets/translations/ug.json
+++ b/src/assets/translations/ug.json
@@ -221,7 +221,8 @@
"username": "قوللانغۇچى ئىسمى (مەسىلەن: marta)",
"title": "كىرىش",
"create_room": "",
- "or": ""
+ "or": "",
+ "invalid_message": ""
},
"device_list": {
"not_verified": "دەلىللەنمىدى",
diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json
index fb4d61c..e7f5dbe 100644
--- a/src/assets/translations/zh_Hans.json
+++ b/src/assets/translations/zh_Hans.json
@@ -50,7 +50,8 @@
"username_required": "需要用户名",
"username": "用户名 (如: marta)",
"create_room": "",
- "or": ""
+ "or": "",
+ "invalid_message": ""
},
"device_list": {
"title": "设备",
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 07ea475..5184455 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -37,6 +37,7 @@
:error-messages="userErrorMessage"
required
v-on:keyup.enter="$refs.password.focus()"
+ v-on:keydown="hasError=false"
>
+
{{ this.message }}
Date: Thu, 27 Jan 2022 11:59:25 +0000
Subject: [PATCH 3/7] Delete popup width fixed
---
src/components/PurgeRoomDialog.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/PurgeRoomDialog.vue b/src/components/PurgeRoomDialog.vue
index 14f036d..8c8f6b9 100644
--- a/src/components/PurgeRoomDialog.vue
+++ b/src/components/PurgeRoomDialog.vue
@@ -1,10 +1,14 @@
-
+
{{ $t("purge_room.title") }}
-
+
{{ $t("purge_room.info") }}
From 6ecb70176c76a686158f18968b118e7c26647c87 Mon Sep 17 00:00:00 2001
From: 10G Meow <10gmeow@gmail.com>
Date: Thu, 27 Jan 2022 12:09:33 +0000
Subject: [PATCH 4/7] joined link text overflow fixed
---
src/assets/css/chat.scss | 2 ++
src/components/CreatedRoomWelcomeHeader.vue | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss
index 2751361..653c22c 100644
--- a/src/assets/css/chat.scss
+++ b/src/assets/css/chat.scss
@@ -487,6 +487,8 @@ $admin-fg: white;
text-align: center;
margin: 20px;
user-select: text;
+ overflow-wrap: break-word;
+ word-break: break-word;
}
.notice {
diff --git a/src/components/CreatedRoomWelcomeHeader.vue b/src/components/CreatedRoomWelcomeHeader.vue
index 0dfacfa..8f97574 100644
--- a/src/components/CreatedRoomWelcomeHeader.vue
+++ b/src/components/CreatedRoomWelcomeHeader.vue
@@ -4,7 +4,7 @@
From 7a50e2247154ec10bd9cf255b7bda90364472b4c Mon Sep 17 00:00:00 2001
From: N Pex
Date: Thu, 27 Jan 2022 14:56:48 +0000
Subject: [PATCH 5/7] Resolve "set fields to use meaningful ID names for
automated test"
---
src/components/Chat.vue | 13 ++++++++++++-
src/components/ChatHeader.vue | 2 +-
src/components/CreateRoom.vue | 4 ++++
src/components/CreatedRoomWelcomeHeader.vue | 2 +-
src/components/Invite.vue | 1 +
src/components/Join.vue | 5 ++++-
src/components/LeaveRoomDialog.vue | 2 ++
src/components/Login.vue | 5 ++++-
src/components/Profile.vue | 10 +++++++---
src/components/ProfileInfoPopup.vue | 2 +-
src/components/PurgeRoomDialog.vue | 3 +++
src/components/QuoteView.vue | 2 ++
src/components/RoomInfo.vue | 5 +++++
src/components/RoomInfoBottomSheet.vue | 1 +
src/components/RoomList.vue | 2 ++
src/components/SelectLanguageDialog.vue | 1 +
src/components/VoiceRecorder.vue | 11 +++++++----
src/components/messages/AudioPlayer.vue | 4 ++--
src/components/messages/AvatarOperations.vue | 2 +-
src/components/messages/MessageIncoming.vue | 2 +-
src/components/messages/MessageOperations.vue | 6 +++---
src/components/messages/MessageOperationsPicker.vue | 8 ++++----
src/components/messages/MessageOutgoing.vue | 2 +-
23 files changed, 70 insertions(+), 25 deletions(-)
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 80744d3..4b06a3f 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -122,6 +122,7 @@
add_circle_outline
- {{
+ {{
$t("menu.cancel")
}}
{{ $tc("room.members", memberCount) }}
- {{
+ {{
$t("room.leave")
}}
diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index 2a6cc9a..f2867ff 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -4,6 +4,7 @@
{{ $t("new_room.new_room") }}
-->
- {{
+ {{
$t("menu.logout")
}}
@@ -101,10 +103,11 @@
- {{
+ {{
$t("menu.cancel")
}}
- {{
+ {{
$t("menu.cancel")
}}
- {{
+ {{
$t("profile_info_popup.new_room")
}}
diff --git a/src/components/PurgeRoomDialog.vue b/src/components/PurgeRoomDialog.vue
index 8c8f6b9..6f89b6e 100644
--- a/src/components/PurgeRoomDialog.vue
+++ b/src/components/PurgeRoomDialog.vue
@@ -19,6 +19,7 @@
{{ $t("room_info.title") }}
-
+
close
@@ -97,12 +100,12 @@
- {{
+ {{
$t("menu.cancel")
}}
- stop
@@ -124,7 +127,7 @@
-
+
close
diff --git a/src/components/messages/AudioPlayer.vue b/src/components/messages/AudioPlayer.vue
index 8f5e7fd..7a7b940 100644
--- a/src/components/messages/AudioPlayer.vue
+++ b/src/components/messages/AudioPlayer.vue
@@ -3,10 +3,10 @@
- pause
- play_arrow
diff --git a/src/components/messages/AvatarOperations.vue b/src/components/messages/AvatarOperations.vue
index 4e4bd08..509ce2d 100644
--- a/src/components/messages/AvatarOperations.vue
+++ b/src/components/messages/AvatarOperations.vue
@@ -6,7 +6,7 @@
outgoing: !incoming,
}"
>
- {{ $t("menu.start_private_chat") }}
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index f328848..3f11f2b 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -16,7 +16,7 @@
- more_vert
diff --git a/src/components/messages/MessageOperations.vue b/src/components/messages/MessageOperations.vue
index bd70ba1..8e48215 100644
--- a/src/components/messages/MessageOperations.vue
+++ b/src/components/messages/MessageOperations.vue
@@ -1,14 +1,14 @@
-
+
{{ item.data }}
-
+
reply
-
+
more_horiz
diff --git a/src/components/messages/MessageOperationsPicker.vue b/src/components/messages/MessageOperationsPicker.vue
index 00c4f27..d1b80fb 100644
--- a/src/components/messages/MessageOperationsPicker.vue
+++ b/src/components/messages/MessageOperationsPicker.vue
@@ -9,25 +9,25 @@
-
+
reply
{{$t('menu.reply')}}
-
+
edit
{{$t('menu.edit')}}
-
+
delete
{{$t('menu.delete')}}
-
+
get_app
{{$t('menu.download')}}
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index f40f520..c14d2c9 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -10,7 +10,7 @@
-
From 41c9f53484602607cd45b393e947efe2c8897f31 Mon Sep 17 00:00:00 2001
From: 10G Meow <10gmeow@gmail.com>
Date: Sat, 29 Jan 2022 11:06:48 +0200
Subject: [PATCH 6/7] Identity popover cut off fixed
---
src/components/ProfileInfoPopup.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/components/ProfileInfoPopup.vue b/src/components/ProfileInfoPopup.vue
index a3c28f0..8ca1860 100644
--- a/src/components/ProfileInfoPopup.vue
+++ b/src/components/ProfileInfoPopup.vue
@@ -3,7 +3,6 @@
v-model="showDialog"
content-class="profile-info-popup"
class="ma-0 pa-0"
- :width="$vuetify.breakpoint.smAndUp ? '940px' : '95%'"
>
@@ -149,6 +148,8 @@ export default {
left: 10px;
}
border-radius: 40px;
+ width: 95%;
+
&::before {
content: "▲";
position: fixed;
@@ -183,12 +184,18 @@ export default {
font-size: 13 * $chat-text-size !important;
}
}
+
+ @media #{map-get($display-breakpoints, 'sm-and-up')} {
+ width: 70%;
+ }
+
@media #{map-get($display-breakpoints, 'lg-and-up')} {
overflow: unset;
width: $main-desktop-width;;
position: absolute;
top: 70px;
right: unset;
+ width: $dialog-desktop-width;
&::before {
position: absolute;
From 167ef171ca009ce6d331d8a87987c9cfe720bb84 Mon Sep 17 00:00:00 2001
From: N Pex
Date: Wed, 2 Feb 2022 12:49:57 +0000
Subject: [PATCH 7/7] Resolve "Nothing happens on clicking on the room icon on
the right top side when we again visit the IM without deleting the browser
cookies"
---
src/components/CreateRoom.vue | 4 ++--
src/components/Join.vue | 4 ++--
src/components/Login.vue | 4 ++--
src/components/ProfileInfoPopup.vue | 2 +-
src/components/YouAre.vue | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index f2867ff..d745d02 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -293,10 +293,10 @@ export default {
},
rememberMe: {
get: function () {
- return !this.$store.state.useLocalStorage;
+ return this.$store.state.useLocalStorage;
},
set: function (rememberMe) {
- this.$store.commit("setUseLocalStorage", !rememberMe);
+ this.$store.commit("setUseLocalStorage", rememberMe);
},
},
},
diff --git a/src/components/Join.vue b/src/components/Join.vue
index f94aca3..eb2452e 100644
--- a/src/components/Join.vue
+++ b/src/components/Join.vue
@@ -196,10 +196,10 @@ export default {
},
rememberMe: {
get: function () {
- return !this.$store.state.useLocalStorage;
+ return this.$store.state.useLocalStorage;
},
set: function (rememberMe) {
- this.$store.commit("setUseLocalStorage", !rememberMe);
+ this.$store.commit("setUseLocalStorage", rememberMe);
},
},
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 2f4cb6c..0bd2679 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -123,10 +123,10 @@ export default {
},
rememberMe: {
get: function () {
- return !this.$store.state.useLocalStorage;
+ return this.$store.state.useLocalStorage;
},
set: function (rememberMe) {
- this.$store.commit("setUseLocalStorage", !rememberMe);
+ this.$store.commit("setUseLocalStorage", rememberMe);
},
},
},
diff --git a/src/components/ProfileInfoPopup.vue b/src/components/ProfileInfoPopup.vue
index 8ca1860..24bb16a 100644
--- a/src/components/ProfileInfoPopup.vue
+++ b/src/components/ProfileInfoPopup.vue
@@ -30,7 +30,7 @@
class="avatar-32"
size="32"
color="#e0e0e0"
- @click.stop="showProfileInfo = true"
+ @click.stop="viewProfile"
>
{{ userAvatarLetter }}
diff --git a/src/components/YouAre.vue b/src/components/YouAre.vue
index 35112a8..5745c0e 100644
--- a/src/components/YouAre.vue
+++ b/src/components/YouAre.vue
@@ -22,7 +22,7 @@
-
+
{{ userAvatarLetter }}