From 3868691d52755572753df21a1cecaae4d2536c54 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sat, 9 Apr 2022 21:58:09 +0200 Subject: [PATCH] make it .... --- electron-builder.yml | 6 +- electron.js | 1 + qortal-ui-core/package.json | 119 +++++++++++---------- qortal-ui-core/src/styles/switch-theme.css | 2 + qortal-ui-crypto/package.json | 11 +- qortal-ui-plugins/package.json | 2 +- 6 files changed, 72 insertions(+), 69 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 23303743..4ac27bb7 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -103,17 +103,15 @@ linux: target: - "deb" - "AppImage" - - "snap" - - "rpm" deb: - artifactName: "Qortal-Setup-amd64.${ext}" + artifactName: "Qortal-Setup-arm64.${ext}" synopsis: "Qortal UI for Linux" afterInstall: "./scripts/add-debian-apt-repo.sh" afterRemove: "./scripts/uninstall-debian-conf.sh" appImage: - artifactName: "Qortal-Setup-amd64.${ext}" + artifactName: "Qortal-Setup-arm64.${ext}" snap: artifactName: "Qortal-Setup-amd64.${ext}" diff --git a/electron.js b/electron.js index 1a9c25c6..c681af40 100644 --- a/electron.js +++ b/electron.js @@ -62,6 +62,7 @@ function createWindow() { nodeIntegration: false, partition: 'persist:webviewsession', enableRemoteModule: false, + nativeWindowOpen: false, sandbox: true }, show: false diff --git a/qortal-ui-core/package.json b/qortal-ui-core/package.json index 5331e1a2..21e35795 100644 --- a/qortal-ui-core/package.json +++ b/qortal-ui-core/package.json @@ -1,6 +1,6 @@ { "name": "qortal-ui-core", - "version": "2.2.0", + "version": "2.2.1", "description": "QORTAL-UI Core", "keywords": [ "QORT", @@ -17,66 +17,67 @@ "author": "QORTAL ", "license": "GPL-3.0", "dependencies": { - "@hapi/hapi": "^20.2.1", - "@hapi/inert": "^6.0.5", - "sass": "^1.49.9" + "@hapi/hapi": "20.2.1", + "@hapi/inert": "6.0.5", + "sass": "1.50.0" }, "devDependencies": { - "@babel/core": "^7.17.8", - "@material/mwc-button": "^0.25.3", - "@material/mwc-checkbox": "^0.25.3", - "@material/mwc-dialog": "^0.25.3", - "@material/mwc-drawer": "^0.25.3", - "@material/mwc-fab": "^0.25.3", - "@material/mwc-formfield": "^0.25.3", - "@material/mwc-icon": "^0.25.3", - "@material/mwc-icon-button": "^0.25.3", - "@material/mwc-list": "^0.25.3", - "@material/mwc-select": "^0.25.3", - "@material/mwc-snackbar": "^0.25.3", - "@material/mwc-textfield": "^0.25.3", - "@polymer/app-layout": "^3.1.0", - "@polymer/iron-collapse": "^3.0.1", - "@polymer/iron-flex-layout": "^3.0.1", - "@polymer/iron-icons": "^3.0.1", - "@polymer/iron-pages": "^3.0.1", - "@polymer/paper-button": "^3.0.1", - "@polymer/paper-checkbox": "^3.1.0", - "@polymer/paper-dialog": "^3.0.1", - "@polymer/paper-dropdown-menu": "^3.2.0", - "@polymer/paper-icon-button": "^3.0.2", - "@polymer/paper-input": "^3.2.1", - "@polymer/paper-item": "^3.0.1", - "@polymer/paper-listbox": "^3.0.1", - "@polymer/paper-progress": "^3.0.1", - "@polymer/paper-ripple": "^3.0.2", - "@polymer/paper-spinner": "^3.0.2", - "@polymer/paper-toast": "^3.0.1", - "@polymer/paper-tooltip": "^3.0.1", - "@rollup/plugin-alias": "^3.1.9", - "@rollup/plugin-babel": "^5.3.1", - "@rollup/plugin-commonjs": "^21.0.2", - "@rollup/plugin-node-resolve": "^13.1.3", - "@rollup/plugin-replace": "^4.0.0", - "@vaadin/grid": "^23.0.2", - "@vaadin/icons": "^23.0.2", - "@vaadin/password-field": "^23.0.2", - "asmcrypto.js": "^2.3.2", - "bcryptjs": "^2.4.3", - "epml": "^0.3.3", - "file-saver": "^2.0.5", - "lit": "^2.2.1", - "postcss": "^8.4.12", - "pwa-helpers": "^0.9.1", - "random-sentence-generator": "^0.0.8", - "redux": "^4.1.2", - "redux-thunk": "^2.4.1", - "rollup": "^2.70.1", - "rollup-plugin-node-globals": "^1.4.0", - "rollup-plugin-postcss": "^4.0.2", - "rollup-plugin-progress": "^1.1.2", - "rollup-plugin-scss": "^3.0.0", - "rollup-plugin-terser": "^7.0.2" + "@babel/core": "7.17.9", + "@material/mwc-button": "0.25.3", + "@material/mwc-checkbox": "0.25.3", + "@material/mwc-dialog": "0.25.3", + "@material/mwc-drawer": "0.25.3", + "@material/mwc-fab": "0.25.3", + "@material/mwc-formfield": "0.25.3", + "@material/mwc-icon": "0.25.3", + "@material/mwc-icon-button": "0.25.3", + "@material/mwc-list": "0.25.3", + "@material/mwc-select": "0.25.3", + "@material/mwc-snackbar": "0.25.3", + "@material/mwc-textfield": "0.25.3", + "@polymer/app-layout": "3.1.0", + "@polymer/iron-collapse": "3.0.1", + "@polymer/iron-flex-layout": "3.0.1", + "@polymer/iron-icons": "3.0.1", + "@polymer/iron-pages": "3.0.1", + "@polymer/paper-button": "3.0.1", + "@polymer/paper-checkbox": "3.1.0", + "@polymer/paper-dialog": "3.0.1", + "@polymer/paper-dropdown-menu": "3.2.0", + "@polymer/paper-icon-button": "3.0.2", + "@polymer/paper-input": "3.2.1", + "@polymer/paper-item": "3.0.1", + "@polymer/paper-listbox": "3.0.1", + "@polymer/paper-progress": "3.0.1", + "@polymer/paper-ripple": "3.0.2", + "@polymer/paper-spinner": "3.0.2", + "@polymer/paper-toast": "3.0.1", + "@polymer/paper-tooltip": "3.0.1", + "@rollup/plugin-alias": "3.1.9", + "@rollup/plugin-babel": "5.3.1", + "@rollup/plugin-commonjs": "21.0.3", + "@rollup/plugin-node-resolve": "13.1.3", + "@rollup/plugin-replace": "4.0.0", + "@vaadin/grid": "23.0.5", + "@vaadin/icons": "23.0.5", + "@vaadin/password-field": "23.0.5", + "asmcrypto.js": "2.3.2", + "bcryptjs": "2.4.3", + "epml": "0.3.3", + "file-saver": "2.0.5", + "lit": "2.2.2", + "lit-translate": "2.0.0-rc.1", + "postcss": "8.4.12", + "pwa-helpers": "0.9.1", + "random-sentence-generator": "0.0.8", + "redux": "4.1.2", + "redux-thunk": "2.4.1", + "rollup": "2.70.1", + "rollup-plugin-node-globals": "1.4.0", + "rollup-plugin-postcss": "4.0.2", + "rollup-plugin-progress": "1.1.2", + "rollup-plugin-scss": "3.0.0", + "rollup-plugin-terser": "7.0.2" }, "engines": { "node": ">=14.17.0" diff --git a/qortal-ui-core/src/styles/switch-theme.css b/qortal-ui-core/src/styles/switch-theme.css index 993e68f3..45fb525b 100644 --- a/qortal-ui-core/src/styles/switch-theme.css +++ b/qortal-ui-core/src/styles/switch-theme.css @@ -30,6 +30,7 @@ html { --nav-icon-color: #080808; --nav-border-color: #eeeeee; --nav-border-selected-color: #03a9f4; + --background: url("/img/qortal_background_light_.jpg"); } html[theme="dark"] { @@ -64,4 +65,5 @@ html[theme="dark"] { --nav-icon-color: #008fd5; --nav-border-color: #0b305e; --nav-border-selected-color: #76c8f5; + --background: url("/img/qortal_background_dark_.jpg"); } diff --git a/qortal-ui-crypto/package.json b/qortal-ui-crypto/package.json index ed80256b..7597cfcb 100644 --- a/qortal-ui-crypto/package.json +++ b/qortal-ui-crypto/package.json @@ -1,6 +1,6 @@ { "name": "qortal-ui-crypto", - "version": "2.1.3", + "version": "2.2.1", "description": "QORTAL-UI Crypto", "keywords": [ "QORT", @@ -17,10 +17,11 @@ "author": "QORTAL ", "license": "GPL-3.0", "dependencies": { - "asmcrypto.js": "^2.3.2", - "buffer": "^6.0.3", - "jssha": "^3.2.0", - "lodash": "^4.17.21" + "asmcrypto.js": "2.3.2", + "buffer": "6.0.3", + "jssha": "3.2.0", + "lodash": "4.17.21", + "lit-translate": "2.0.0-rc.1" }, "engines": { "node": ">=14.17.0" diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index f0416749..d3ee70e0 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -22,7 +22,7 @@ "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" }, "devDependencies": { - "@babel/core": "^7.17.9", + "@babel/core": "7.17.9", "@github/time-elements": "3.1.2", "@material/mwc-button": "0.25.3", "@material/mwc-checkbox": "0.25.3",