Qortal/qortal-ui
1
0
Fork 1
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-08-01 14:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/tour

Browse Source
This commit is contained in:
AlphaX-Projects
2023-12-29 11:59:30 +01:00
committed by GitHub
parent de7ae88ba4 84a10bd929
commit 7baf48b031
29 changed files with 1319 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/components/login-view/login-section.js
View File

@@ -336,7 +336,7 @@ class LoginSection extends connect(store)(LitElement) {
<div style="padding:0;">
<div style="display:flex;">
<mwc-icon style="padding: 10px; padding-left: 0; padding-top: 42px; color: var(--black);">short_text</mwc-icon>
<vaadin-password-field style="width:100%;" label="${translate("login.seed")}" id="existingSeedPhraseInput" autofocus></vaadin-password-field>
<vaadin-password-field style="width:100%;" label="${translate("login.seed")}" id="existingSeedPhraseInput" @keydown="${e => this.seedListener(e)}" autofocus></vaadin-password-field>
</div>
</div>
</div>
@@ -345,7 +345,7 @@ class LoginSection extends connect(store)(LitElement) {
<div>
<div style="display: flex;">
<mwc-icon style="padding: 10px; padding-left: 0; padding-top: 42px; color: var(--black);">clear_all</mwc-icon>
<vaadin-password-field style="width: 100%;" label="${translate("login.qora")}" id="v1SeedInput" autofocus></vaadin-password-field>
<vaadin-password-field style="width: 100%;" label="${translate("login.qora")}" id="v1SeedInput" @keydown="${e => this.seedListener(e)}" autofocus></vaadin-password-field>
</div>
</div>
</div>
@@ -378,6 +378,7 @@ class LoginSection extends connect(store)(LitElement) {
<vaadin-text-field style="width:100%;" label="${translate("login.name")}" id="nameInput"></vaadin-text-field>
</div>
</iron-collapse>
<iron-collapse style="" ?opened=${this.showPassword(this.selectedPage)} id="passwordCollapse">
<div style="display:flex;">
<mwc-icon style="padding: 10px; padding-left: 0; padding-top: 42px; color: var(--black);">password</mwc-icon>
@@ -487,6 +488,12 @@ class LoginSection extends connect(store)(LitElement) {
this.nodeConfig = state.app.nodeConfig
}
seedListener(e) {
if (e.key === 'Enter') {
this.emitNext(e)
}
}
keyupEnter(e, action) {
if (e.keyCode === 13) {
e.preventDefault()

36
core/src/components/settings-view/security-view.js
View File

@@ -53,15 +53,15 @@ class SecurityView extends connect(store)(LitElement) {
text-align: center;
}
.checkbox-row {
.checkbox-row {
position: relative;
display: flex;
align-items: center;
align-content: center;
font-family: Montserrat, sans-serif;
font-weight: 600;
color: var(--black);
}
display: flex;
align-items: center;
align-content: center;
font-family: Montserrat, sans-serif;
font-weight: 600;
color: var(--black);
}
.q-button {
display: inline-flex;
@@ -128,6 +128,15 @@ class SecurityView extends connect(store)(LitElement) {
>
</vaadin-password-field>
</div>
<div style="max-width: 500px; display: flex; justify-content: center; margin: auto;">
<mwc-icon style="padding: 10px; padding-left:0; padding-top: 42px;">password</mwc-icon>
<vaadin-password-field
style="width: 100%; color: var(--black);"
label="${translate("login.confirmpass")}"
id="rePassword"
>
</vaadin-password-field>
</div>
<div style="text-align: center; color: var(--mdc-theme-error); text-transform: uppercase; font-size: 15px;">
${this.backupErrorMessage}
</div>
@@ -176,6 +185,7 @@ class SecurityView extends connect(store)(LitElement) {
store.dispatch(allowQAPPAutoAuth(true))
}
}
checkForLists(e) {
if (e.target.checked) {
store.dispatch(removeQAPPAutoLists(false))
@@ -194,10 +204,14 @@ class SecurityView extends connect(store)(LitElement) {
checkForDownload() {
const checkPass = this.shadowRoot.getElementById('downloadBackupPassword').value
const rePass = this.shadowRoot.getElementById('rePassword').value
if (checkPass === '') {
this.backupErrorMessage = get("login.pleaseenter")
} else if (checkPass.length < 8) {
} else if (checkPass.length < 5) {
this.backupErrorMessage = get("login.lessthen8-2")
} else if (checkPass != rePass) {
this.backupErrorMessage = get("login.notmatch")
} else {
this.downloadBackup()
}
@@ -239,11 +253,15 @@ class SecurityView extends connect(store)(LitElement) {
labelText: `${snack4string} ${fileName} ✅`,
dismiss: true
})
this.shadowRoot.getElementById('downloadBackupPassword').value = ''
this.shadowRoot.getElementById('rePassword').value = ''
} catch (error) {
if (error.name === 'AbortError') {
return
}
FileSaver.saveAs(blob, fileName)
this.shadowRoot.getElementById('downloadBackupPassword').value = ''
this.shadowRoot.getElementById('rePassword').value = ''
}
}
}

9
core/src/notifications/notification-actions/new-message.js
View File

@@ -33,6 +33,9 @@ export const newMessage = (data) => {
store.dispatch(doPageUrl(pageUrl))
}
}
// If sounds are enabled, but notifications are not
} else if (store.getState().user.notifications.q_chat.playSound) {
alert.play()
}
}
@@ -102,6 +105,9 @@ export const newMessageNotificationQapp = (data) => {
}
}
}
// If sounds are enabled, but notifications are not
} else if (store.getState().user.notifications.q_chat.playSound) {
alert.play()
}
}
@@ -253,6 +259,9 @@ export const newMessageNotificationQappLocal = (data) => {
}
}
// If sounds are enabled, but notifications are not
} else if (store.getState().user.notifications.q_chat.playSound) {
alert.play()
}
}