diff --git a/electron.js b/electron.js index 0f02b952..df85e7d8 100644 --- a/electron.js +++ b/electron.js @@ -4,7 +4,7 @@ const server = require('./server.js'); const log = require('electron-log'); const path = require('path'); -// THOUGHTS: Make this APP more modularize and platform agnostic... +app.commandLine.appendSwitch('js-flags', '--max-old-space-size=512') process.env['APP_PATH'] = app.getAppPath(); diff --git a/package.json b/package.json index 4a6c7473..45c93c74 100644 --- a/package.json +++ b/package.json @@ -1,48 +1,48 @@ { - "name": "qortal-ui", - "version": "2.1.1", - "description": "Qortal Project - decentralize the world - Data storage, communications, web hosting, decentralized trading, complete infrastructure for the future blockchain-based Internet", - "keywords": [ - "QORT", - "QORTAL", - "DECENTRALIZED" - ], - "main": "electron.js", - "repository": { - "type": "git", - "url": "git+https://github.com/Qortal/qortal-ui.git" - }, - "homepage": "https://qortal.org", - "author": "QORTAL ", - "license": "GPL-3.0", - "scripts": { - "install_link:all": "(cd qortal-ui-core && yarn install && yarn link) && (cd qortal-ui-plugins && yarn install && yarn link) && (cd qortal-ui-crypto && yarn install && yarn link) && (yarn link qortal-ui-core && yarn link qortal-ui-plugins && yarn link qortal-ui-crypto)", - "dev": "node server.js", - "prebuild": "node -p \"'export const UI_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > qortal-ui-core/src/redux/app/version.js", - "build-dev": "node build.js", - "build": "NODE_ENV=production node build.js", - "server": "NODE_ENV=production node server.js", - "watch": "node watch.js", - "watch-inline": "node watch-inline.js", - "start-electron": "NODE_ENV=production electron .", - "build-electron": "electron-builder build --publish never", - "deploy-electron": "electron-builder build --win --publish never", - "release": "NODE_ENV=production electron-builder build --publish never", - "update-package-json": "node update-package-json.js", - "publish": "electron-builder -p always" - }, - "dependencies": { - "electron-updater": "5.2.1", - "electron-log": "4.4.8" - }, - "devDependencies": { - "electron": "21.0.1", - "electron-builder": "23.3.3", - "electron-notarize": "1.2.1", - "electron-packager": "16.0.0", - "shelljs": "0.8.5" - }, - "engines": { - "node": ">=14.17.0" - } + "name": "qortal-ui", + "version": "2.1.1", + "description": "Qortal Project - decentralize the world - Data storage, communications, web hosting, decentralized trading, complete infrastructure for the future blockchain-based Internet", + "keywords": [ + "QORT", + "QORTAL", + "DECENTRALIZED" + ], + "main": "electron.js", + "repository": { + "type": "git", + "url": "git+https://github.com/Qortal/qortal-ui.git" + }, + "homepage": "https://qortal.org", + "author": "QORTAL ", + "license": "GPL-3.0", + "scripts": { + "install_link:all": "(cd qortal-ui-core && yarn install && yarn link) && (cd qortal-ui-plugins && yarn install && yarn link) && (cd qortal-ui-crypto && yarn install && yarn link) && (yarn link qortal-ui-core && yarn link qortal-ui-plugins && yarn link qortal-ui-crypto)", + "dev": "node server.js", + "prebuild": "node -p \"'export const UI_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > qortal-ui-core/src/redux/app/version.js", + "build-dev": "node build.js", + "build": "NODE_ENV=production node build.js", + "server": "NODE_ENV=production node server.js", + "watch": "node watch.js", + "watch-inline": "node watch-inline.js", + "start-electron": "NODE_ENV=production electron .", + "build-electron": "electron-builder build --publish never", + "deploy-electron": "electron-builder build --win --publish never", + "release": "NODE_ENV=production electron-builder build --publish never", + "update-package-json": "node update-package-json.js", + "publish": "electron-builder -p always" + }, + "dependencies": { + "electron-log": "4.4.8", + "electron-updater": "5.2.1" + }, + "devDependencies": { + "electron": "21.1.1", + "electron-builder": "23.3.3", + "electron-notarize": "1.2.1", + "electron-packager": "16.0.0", + "shelljs": "0.8.5" + }, + "engines": { + "node": ">=16.15.0" + } } diff --git a/qortal-ui-core/config/default.styles.config.js b/qortal-ui-core/config/default.styles.config.js index ad0a5b04..17123264 100644 --- a/qortal-ui-core/config/default.styles.config.js +++ b/qortal-ui-core/config/default.styles.config.js @@ -1,7 +1,8 @@ const styles = { breakpoints: { - tablet: '', desktop: '', + laptop: '', + tablet: '', mobile: '' }, theme: { @@ -36,5 +37,4 @@ const styles = { ] } } - module.exports = styles diff --git a/qortal-ui-core/config/default.user.config.js b/qortal-ui-core/config/default.user.config.js index 6e8ba573..ee5b8a51 100644 --- a/qortal-ui-core/config/default.user.config.js +++ b/qortal-ui-core/config/default.user.config.js @@ -3,7 +3,7 @@ const path = require('path') const user = { node: 0, nodeSettings: { - pingInterval: 10 * 1000, // (10 secs) + pingInterval: 30 * 1000, }, server: { writeHosts: { @@ -27,7 +27,7 @@ const user = { }, }, constants: { - pollingInterval: 10000, // How long between checking for new unconfirmed transactions and new blocks (in milliseconds). + pollingInterval: 30 * 1000, // How long between checking for new unconfirmed transactions and new blocks (in milliseconds). workerURL: '/build/worker.js', }, @@ -43,5 +43,4 @@ const user = { }, }, } - module.exports = user diff --git a/qortal-ui-core/package.json b/qortal-ui-core/package.json index 84851fbc..b293210f 100644 --- a/qortal-ui-core/package.json +++ b/qortal-ui-core/package.json @@ -1,85 +1,85 @@ { - "name": "qortal-ui-core", - "version": "2.2.3", - "description": "QORTAL-UI Core", - "keywords": [ - "QORT", - "QORTAL", - "DECENTRALIZED" - ], - "homepage": "https://qortal.org", - "main": "ui-core.js", - "repository": { - "type": "git", - "url": "https://github.com/Qortal/qortal-ui.git", - "directory": "qortal-ui-core" - }, - "author": "QORTAL ", - "license": "GPL-3.0", - "dependencies": { - "@hapi/hapi": "20.2.2", - "@hapi/inert": "7.0.0", - "sass": "1.55.0" - }, - "devDependencies": { - "@babel/core": "7.19.3", - "@material/mwc-button": "0.27.0", - "@material/mwc-checkbox": "0.27.0", - "@material/mwc-dialog": "0.27.0", - "@material/mwc-drawer": "0.27.0", - "@material/mwc-fab": "0.27.0", - "@material/mwc-formfield": "0.27.0", - "@material/mwc-icon": "0.27.0", - "@material/mwc-icon-button": "0.27.0", - "@material/mwc-list": "0.27.0", - "@material/mwc-select": "0.27.0", - "@material/mwc-snackbar": "0.27.0", - "@material/mwc-textfield": "0.27.0", - "@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": "22.0.2", - "@rollup/plugin-node-resolve": "14.1.0", - "@rollup/plugin-replace": "4.0.0", - "@vaadin/grid": "23.2.3", - "@vaadin/icons": "23.2.3", - "@vaadin/password-field": "23.2.3", - "asmcrypto.js": "2.3.2", - "bcryptjs": "2.4.3", - "epml": "0.3.3", - "file-saver": "2.0.5", - "lit": "2.3.1", - "lit-translate": "2.0.1", - "postcss": "8.4.17", - "pwa-helpers": "0.9.1", - "random-sentence-generator": "0.0.8", - "redux": "4.2.0", - "redux-thunk": "2.4.1", - "rollup": "2.79.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" - } -} \ No newline at end of file + "name": "qortal-ui-core", + "version": "2.2.3", + "description": "QORTAL-UI Core", + "keywords": [ + "QORT", + "QORTAL", + "DECENTRALIZED" + ], + "homepage": "https://qortal.org", + "main": "ui-core.js", + "repository": { + "type": "git", + "url": "https://github.com/Qortal/qortal-ui.git", + "directory": "qortal-ui-core" + }, + "author": "QORTAL ", + "license": "GPL-3.0", + "dependencies": { + "@hapi/hapi": "20.2.2", + "@hapi/inert": "7.0.0", + "sass": "1.55.0" + }, + "devDependencies": { + "@babel/core": "7.19.3", + "@material/mwc-button": "0.27.0", + "@material/mwc-checkbox": "0.27.0", + "@material/mwc-dialog": "0.27.0", + "@material/mwc-drawer": "0.27.0", + "@material/mwc-fab": "0.27.0", + "@material/mwc-formfield": "0.27.0", + "@material/mwc-icon": "0.27.0", + "@material/mwc-icon-button": "0.27.0", + "@material/mwc-list": "0.27.0", + "@material/mwc-select": "0.27.0", + "@material/mwc-snackbar": "0.27.0", + "@material/mwc-textfield": "0.27.0", + "@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": "4.0.0", + "@rollup/plugin-babel": "6.0.0", + "@rollup/plugin-commonjs": "23.0.0", + "@rollup/plugin-node-resolve": "15.0.0", + "@rollup/plugin-replace": "5.0.0", + "@vaadin/grid": "23.2.5", + "@vaadin/icons": "23.2.5", + "@vaadin/password-field": "23.2.5", + "asmcrypto.js": "2.3.2", + "bcryptjs": "2.4.3", + "epml": "0.3.3", + "file-saver": "2.0.5", + "lit": "2.4.0", + "lit-translate": "2.0.1", + "postcss": "8.4.18", + "pwa-helpers": "0.9.1", + "random-sentence-generator": "0.0.8", + "redux": "4.2.0", + "redux-thunk": "2.4.1", + "rollup": "2.79.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": ">=16.15.0" + } +} diff --git a/qortal-ui-core/src/styles/styles.scss b/qortal-ui-core/src/styles/styles.scss index da6a76ae..8fff0d28 100644 --- a/qortal-ui-core/src/styles/styles.scss +++ b/qortal-ui-core/src/styles/styles.scss @@ -1,6 +1,7 @@ $mdc-layout-grid-breakpoints: ( - desktop: 960px, - tablet: 480px, + desktop: 1440px, + laptop: 1240px, + tablet: 600px, phone: 0px ); @@ -10,8 +11,6 @@ $mdc-layout-grid-breakpoints: ( --layout-breakpoint-mobile: #{map-get($mdc-layout-grid-breakpoints, phone)}; } -// @import '../../node_modules/@material/layout-grid/mdc-layout-grid.scss'; - iframe.pluginJSFrame { display:none; } diff --git a/qortal-ui-crypto/package.json b/qortal-ui-crypto/package.json index 683df9d6..b1814e00 100644 --- a/qortal-ui-crypto/package.json +++ b/qortal-ui-crypto/package.json @@ -1,28 +1,28 @@ { - "name": "qortal-ui-crypto", - "version": "2.2.3", - "description": "QORTAL-UI Crypto", - "keywords": [ - "QORT", - "QORTAL", - "DECENTRALIZED" - ], - "homepage": "https://qortal.org", - "main": "api.js", - "repository": { - "type": "git", - "url": "https://github.com/Qortal/qortal-ui.git", - "directory": "qortal-ui-crypto" - }, - "author": "QORTAL ", - "license": "GPL-3.0", - "dependencies": { - "asmcrypto.js": "2.3.2", - "buffer": "6.0.3", - "jssha": "3.2.0", - "lodash": "4.17.21" - }, - "engines": { - "node": ">=14.17.0" - } + "name": "qortal-ui-crypto", + "version": "2.2.3", + "description": "QORTAL-UI Crypto", + "keywords": [ + "QORT", + "QORTAL", + "DECENTRALIZED" + ], + "homepage": "https://qortal.org", + "main": "api.js", + "repository": { + "type": "git", + "url": "https://github.com/Qortal/qortal-ui.git", + "directory": "qortal-ui-crypto" + }, + "author": "QORTAL ", + "license": "GPL-3.0", + "dependencies": { + "asmcrypto.js": "2.3.2", + "buffer": "6.0.3", + "jssha": "3.2.0", + "lodash": "4.17.21" + }, + "engines": { + "node": ">=16.15.0" + } } diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index 53565cc9..39a9a740 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -1,65 +1,65 @@ { - "name": "qortal-ui-plugins", - "version": "2.2.3", - "description": "QORTAL-UI Plugins", - "keywords": [ - "QORT", - "QORTAL", - "DECENTRALIZED" - ], - "homepage": "https://qortal.org", - "main": "default-plugins.js", - "repository": { - "type": "git", - "url": "https://github.com/Qortal/qortal-ui.git", - "directory": "qortal-ui-plugins" - }, - "author": "QORTAL ", - "license": "GPL-3.0", - "dependencies": { - "@material/mwc-list": "0.27.0", - "@material/mwc-select": "0.27.0", - "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" - }, - "devDependencies": { - "@babel/core": "7.19.3", - "@github/time-elements": "3.1.2", - "@material/mwc-button": "0.27.0", - "@material/mwc-checkbox": "0.27.0", - "@material/mwc-dialog": "0.27.0", - "@material/mwc-formfield": "0.27.0", - "@material/mwc-icon": "0.27.0", - "@material/mwc-icon-button": "0.27.0", - "@material/mwc-slider": "0.27.0", - "@material/mwc-snackbar": "0.27.0", - "@material/mwc-tab": "0.27.0", - "@material/mwc-tab-bar": "0.27.0", - "@material/mwc-textfield": "0.27.0", - "@polymer/iron-icons": "3.0.1", - "@polymer/paper-icon-button": "3.0.2", - "@polymer/paper-progress": "3.0.1", - "@polymer/paper-slider": "3.0.1", - "@polymer/paper-spinner": "3.0.2", - "@polymer/paper-tooltip": "3.0.1", - "@rollup/plugin-alias": "3.1.9", - "@rollup/plugin-babel": "5.3.1", - "@rollup/plugin-commonjs": "22.0.2", - "@rollup/plugin-node-resolve": "14.1.0", - "@rollup/plugin-replace": "4.0.0", - "@vaadin/button": "23.2.3", - "@vaadin/grid": "23.2.3", - "@vaadin/icons": "23.2.3", - "epml": "0.3.3", - "file-saver": "2.0.5", - "html-escaper": "3.0.3", - "lit": "2.3.1", - "lit-translate": "2.0.1", - "rollup": "2.79.1", - "rollup-plugin-node-globals": "1.4.0", - "rollup-plugin-progress": "1.1.2", - "rollup-plugin-terser": "7.0.2" - }, - "engines": { - "node": ">=14.17.0" - } -} \ No newline at end of file + "name": "qortal-ui-plugins", + "version": "2.2.3", + "description": "QORTAL-UI Plugins", + "keywords": [ + "QORT", + "QORTAL", + "DECENTRALIZED" + ], + "homepage": "https://qortal.org", + "main": "default-plugins.js", + "repository": { + "type": "git", + "url": "https://github.com/Qortal/qortal-ui.git", + "directory": "qortal-ui-plugins" + }, + "author": "QORTAL ", + "license": "GPL-3.0", + "dependencies": { + "@material/mwc-list": "0.27.0", + "@material/mwc-select": "0.27.0", + "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" + }, + "devDependencies": { + "@babel/core": "7.19.3", + "@github/time-elements": "3.1.2", + "@material/mwc-button": "0.27.0", + "@material/mwc-checkbox": "0.27.0", + "@material/mwc-dialog": "0.27.0", + "@material/mwc-formfield": "0.27.0", + "@material/mwc-icon": "0.27.0", + "@material/mwc-icon-button": "0.27.0", + "@material/mwc-slider": "0.27.0", + "@material/mwc-snackbar": "0.27.0", + "@material/mwc-tab": "0.27.0", + "@material/mwc-tab-bar": "0.27.0", + "@material/mwc-textfield": "0.27.0", + "@polymer/iron-icons": "3.0.1", + "@polymer/paper-icon-button": "3.0.2", + "@polymer/paper-progress": "3.0.1", + "@polymer/paper-slider": "3.0.1", + "@polymer/paper-spinner": "3.0.2", + "@polymer/paper-tooltip": "3.0.1", + "@rollup/plugin-alias": "4.0.0", + "@rollup/plugin-babel": "6.0.0", + "@rollup/plugin-commonjs": "23.0.0", + "@rollup/plugin-node-resolve": "15.0.0", + "@rollup/plugin-replace": "5.0.0", + "@vaadin/button": "23.2.5", + "@vaadin/grid": "23.2.5", + "@vaadin/icons": "23.2.5", + "epml": "0.3.3", + "file-saver": "2.0.5", + "html-escaper": "3.0.3", + "lit": "2.4.0", + "lit-translate": "2.0.1", + "rollup": "2.79.1", + "rollup-plugin-node-globals": "1.4.0", + "rollup-plugin-progress": "1.1.2", + "rollup-plugin-terser": "7.0.2" + }, + "engines": { + "node": ">=16.15.0" + } +}