diff --git a/qortal-ui-core/src/components/login-view/create-account-section.js b/qortal-ui-core/src/components/login-view/create-account-section.js
index ad4b40c4..b285118f 100644
--- a/qortal-ui-core/src/components/login-view/create-account-section.js
+++ b/qortal-ui-core/src/components/login-view/create-account-section.js
@@ -1,7 +1,7 @@
import { LitElement, html, css } from 'lit'
import { connect } from 'pwa-helpers'
import { store } from '../../store.js'
-import { translate, translateUnsafeHTML } from 'lit-translate'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
import { createWallet } from '../../../../qortal-ui-crypto/api/createWallet.js'
import FileSaver from 'file-saver'
@@ -121,24 +121,27 @@ class CreateAccountSection extends connect(store)(LitElement) {
const rePassword = this.shadowRoot.getElementById('rePassword').value
if (password === '') {
+ let snackbar1string = get("login.pleaseenter")
snackbar.add({
- labelText: this.renderEnterPassText(),
+ labelText: `${snackbar1string}`,
dismiss: true
})
return
}
if (password != rePassword) {
+ let snackbar2string = get("login.notmatch")
snackbar.add({
- labelText: this.renderNotMatchText(),
+ labelText: `${snackbar2string}`,
dismiss: true
})
return
}
if (password.length < 8 && lastPassword !== password) {
+ let snackbar3string = get("login.lessthen8")
snackbar.add({
- labelText: this.renderLessText(),
+ labelText: `${snackbar3string}`,
dismiss: true
})
lastPassword = password
@@ -146,8 +149,9 @@ class CreateAccountSection extends connect(store)(LitElement) {
}
if (this.saveAccount === true && nameInput === '') {
+ let snackbar4string = get("login.entername")
snackbar.add({
- labelText: this.renderEnterNameText(),
+ labelText: `${snackbar4string}`,
dismiss: true
})
return
@@ -194,8 +198,9 @@ class CreateAccountSection extends connect(store)(LitElement) {
backup: {
next: e => {
if (!this.isDownloadedBackup) {
+ let snackbar5string = get("login.downloaded")
snackbar.add({
- labelText: this.renderBackupText(),
+ labelText: `${snackbar5string}`,
dismiss: true
})
} else {
@@ -494,30 +499,10 @@ class CreateAccountSection extends connect(store)(LitElement) {
return html`${translate("login.prepare")}`
}
- renderBackupText() {
- return html`${translate("login.downloaded")}`
- }
-
renderWelcomeText() {
return html`${translate("login.welmessage")}`
}
- renderEnterPassText() {
- return html`${translate("login.pleaseenter")}`
- }
-
- renderNotMatchText() {
- return html`${translate("login.notmatch")}`
- }
-
- renderLessText() {
- return html`${translate("login.lessthen8")}`
- }
-
- renderEnterNameText() {
- return html`${translate("login.entername")}`
- }
-
renderLoadingText() {
return html`${translate("login.loading")}`
}
diff --git a/qortal-ui-core/src/components/login-view/loading-ripple_old.js b/qortal-ui-core/src/components/login-view/loading-ripple_old.js
deleted file mode 100644
index c436beb8..00000000
--- a/qortal-ui-core/src/components/login-view/loading-ripple_old.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import { LitElement, html, css } from 'lit'
-import { connect } from 'pwa-helpers'
-import { store } from '../../store.js'
-
-const TRANSITION_EVENT_NAMES = ['transitionend', 'webkitTransitionEnd', 'oTransitionEnd', 'MSTransitionEnd']
-
-class LoadingRipple extends connect(store)(LitElement) {
- static get properties () {
- return {
- welcomeMessage: {
- type: String,
- attribute: 'welcome-message',
- reflectToAttribute: true
- },
- loadingMessage: {
- type: String,
- attribute: 'loading-message',
- reflectToAttribute: true
- }
- }
- }
-
- constructor () {
- super()
- this.welcomeMessage = ''
- this.loadingMessage = ''
- }
-
- static get styles () {
- return css`
- * {
- --paper-spinner-color: var(--mdc-theme-secondary);
- }
-
- `
- }
-
- render () {
- return html`
-
-
-
-
-
-
-
${this.welcomeMessage}
-
-
${this.loadingMessage}
-
-
-
-
- `
- }
-
- firstUpdated () {
- this._rippleWrapper = this.shadowRoot.getElementById('rippleWrapper')
- this._ripple = this.shadowRoot.getElementById('ripple')
- this._rippleContentWrapper = this.shadowRoot.getElementById('rippleContentWrapper')
- }
-
- // duh
- open (origin) {
- this._rippleWrapper.style.top = origin.y + 'px'
- this._rippleWrapper.style.left = origin.x + 'px'
- this._rippleContentWrapper.style.marginTop = -origin.y + 'px'
- this._rippleContentWrapper.style.marginLeft = -origin.x + 'px'
-
- return new Promise((resolve, reject) => {
- this._ripple.classList.add('activating')
- let isOpened = false
- const doneOpeningEvent = () => {
- if (isOpened) return
- // Clear events
- TRANSITION_EVENT_NAMES.forEach(name => this._ripple.removeEventListener(name, doneOpeningEvent))
- this._ripple.classList.add('activating-done')
- isOpened = true
- resolve()
- }
- TRANSITION_EVENT_NAMES.forEach(name => this._ripple.addEventListener(name, doneOpeningEvent))
- })
- }
-
- // Fades out
- fade () {
- return new Promise((resolve, reject) => {
- // CAN'T FADE OUT CAUSE THE STUPID THING GETS KILLED CAUSE OF STATE.APP.LOGGEEDIN
- // let rippleClosed = false
- this._ripple.classList.remove('activating')
- this._ripple.classList.remove('activating-done')
- this._ripple.classList.remove('disabling')
- resolve()
- })
- }
-
- // un-ripples...
- close () {
- return new Promise((resolve, reject) => {
- let rippleClosed = false
- this._ripple.classList.add('error')
- this._ripple.classList.remove('activating')
- this._ripple.classList.remove('activating-done')
- const rippleClosedEvent = () => {
- if (rippleClosed) return
- rippleClosed = true
- TRANSITION_EVENT_NAMES.forEach(name => this._ripple.removeEventListener(name, rippleClosedEvent))
- // Reset the ripple
- this._ripple.classList.remove('error')
- this.rippleIsOpen = false
- resolve()
- }
- TRANSITION_EVENT_NAMES.forEach(name => this._ripple.addEventListener(name, rippleClosedEvent))
- })
- }
-
- stateChanged (state) {
- }
-}
-
-window.customElements.define('loading-ripple', LoadingRipple)
diff --git a/qortal-ui-core/src/components/sidenav-menu.js b/qortal-ui-core/src/components/sidenav-menu.js
index 20c5f31b..3aa4bcf6 100644
--- a/qortal-ui-core/src/components/sidenav-menu.js
+++ b/qortal-ui-core/src/components/sidenav-menu.js
@@ -17,7 +17,6 @@ class SidenavMenu extends connect(store)(LitElement) {
urls: { type: Object },
theme: { type: String, reflect: true }
}
- this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
}
static get styles() {
@@ -50,6 +49,7 @@ class SidenavMenu extends connect(store)(LitElement) {
constructor() {
super()
this.urls = []
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
}
render() {
diff --git a/qortal-ui-core/src/functional-components/loading-ripple.js b/qortal-ui-core/src/functional-components/loading-ripple.js
index d6b51cb2..4f16b2f9 100644
--- a/qortal-ui-core/src/functional-components/loading-ripple.js
+++ b/qortal-ui-core/src/functional-components/loading-ripple.js
@@ -29,6 +29,8 @@ class LoadingRipple extends LitElement {
static get styles () {
return css`
* {
+ --mdc-theme-primary: rgb(3, 169, 244);
+ --mdc-theme-secondary: var(--mdc-theme-primary);
--paper-spinner-color: var(--mdc-theme-secondary);
}
@@ -53,7 +55,7 @@ class LoadingRipple extends LitElement {
height:200vmax;
width:200vmax;
overflow:hidden;
- background: var(--mdc-theme-primary);
+ background: var(--black);
transform: scale(0);
overflow:hidden;
}
@@ -62,7 +64,7 @@ class LoadingRipple extends LitElement {
background: var(--mdc-theme-error)
}
#rippleShader {
- background: var(--mdc-theme-surface);
+ background: var(--white);
opacity:0;
height:100%;
width:100%;
@@ -108,9 +110,9 @@ class LoadingRipple extends LitElement {
-
${this.welcomeMessage}
+
${this.welcomeMessage}
-
${this.loadingMessage}
+
${this.loadingMessage}
From e5c04eb20a8d2547df7dd9ac7783ff94a734fd94 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Wed, 11 May 2022 07:58:14 +0200
Subject: [PATCH 24/25] rollback for blank ui error
---
package.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index b1e3a754..40b25af6 100644
--- a/package.json
+++ b/package.json
@@ -31,17 +31,17 @@
"publish": "electron-builder -p always"
},
"dependencies": {
- "electron-updater": "5.0.1",
- "electron-log": "4.4.7"
+ "electron-updater": "4.6.5",
+ "electron-log": "4.4.6"
},
"devDependencies": {
- "electron": "17.4.3",
- "electron-builder": "23.0.3",
+ "electron": "17.1.2",
+ "electron-builder": "22.14.13",
"electron-notarize": "1.2.1",
- "electron-packager": "15.5.1",
+ "electron-packager": "15.4.0",
"shelljs": "0.8.5"
},
"engines": {
"node": ">=14.17.0"
}
-}
\ No newline at end of file
+}
From 8e763274d93453fac13d6c4063a88683560e0e46 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Wed, 11 May 2022 08:10:26 +0200
Subject: [PATCH 25/25] Bump version 1.9.2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 40b25af6..eaeb40d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "qortal-ui",
- "version": "1.9.1",
+ "version": "1.9.2",
"description": "Qortal Project - decentralize the world - Data storage, communications, web hosting, decentralized trading, complete infrastructure for the future blockchain-based Internet",
"keywords": [
"QORT",