diff --git a/qortal-ui-core/package.json b/qortal-ui-core/package.json index 03a89271..2f8180b8 100644 --- a/qortal-ui-core/package.json +++ b/qortal-ui-core/package.json @@ -19,22 +19,22 @@ "dependencies": { "@hapi/hapi": "20.2.2", "@hapi/inert": "6.0.5", - "sass": "1.51.0" + "sass": "1.52.1" }, "devDependencies": { - "@babel/core": "7.17.10", - "@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", + "@babel/core": "7.18.0", + "@material/mwc-button": "0.26.1", + "@material/mwc-checkbox": "0.26.1", + "@material/mwc-dialog": "0.26.1", + "@material/mwc-drawer": "0.26.1", + "@material/mwc-fab": "0.26.1", + "@material/mwc-formfield": "0.26.1", + "@material/mwc-icon": "0.26.1", + "@material/mwc-icon-button": "0.26.1", + "@material/mwc-list": "0.26.1", + "@material/mwc-select": "0.26.1", + "@material/mwc-snackbar": "0.26.1", + "@material/mwc-textfield": "0.26.1", "@polymer/app-layout": "3.1.0", "@polymer/iron-collapse": "3.0.1", "@polymer/iron-flex-layout": "3.0.1", @@ -58,21 +58,21 @@ "@rollup/plugin-commonjs": "22.0.0", "@rollup/plugin-node-resolve": "13.3.0", "@rollup/plugin-replace": "4.0.0", - "@vaadin/grid": "23.0.7", - "@vaadin/icons": "23.0.7", - "@vaadin/password-field": "23.0.7", + "@vaadin/grid": "23.0.10", + "@vaadin/icons": "23.0.10", + "@vaadin/password-field": "23.0.10", "asmcrypto.js": "2.3.2", "bcryptjs": "2.4.3", "epml": "0.3.3", "file-saver": "2.0.5", - "lit": "2.2.3", + "lit": "2.2.4", "lit-translate": "2.0.1", - "postcss": "8.4.13", + "postcss": "8.4.14", "pwa-helpers": "0.9.1", "random-sentence-generator": "0.0.8", "redux": "4.2.0", "redux-thunk": "2.4.1", - "rollup": "2.72.0", + "rollup": "2.74.1", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-progress": "1.1.2", diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index ea019706..069eb1e1 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -17,24 +17,24 @@ "author": "QORTAL ", "license": "GPL-3.0", "dependencies": { - "@material/mwc-list": "0.25.3", - "@material/mwc-select": "0.25.3", + "@material/mwc-list": "0.26.1", + "@material/mwc-select": "0.26.1", "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" }, "devDependencies": { - "@babel/core": "7.17.10", + "@babel/core": "7.18.0", "@github/time-elements": "3.1.2", - "@material/mwc-button": "0.25.3", - "@material/mwc-checkbox": "0.25.3", - "@material/mwc-dialog": "0.25.3", - "@material/mwc-formfield": "0.25.3", - "@material/mwc-icon": "0.25.3", - "@material/mwc-icon-button": "0.25.3", - "@material/mwc-slider": "0.25.3", - "@material/mwc-snackbar": "0.25.3", - "@material/mwc-tab": "0.25.3", - "@material/mwc-tab-bar": "0.25.3", - "@material/mwc-textfield": "0.25.3", + "@material/mwc-button": "0.26.1", + "@material/mwc-checkbox": "0.26.1", + "@material/mwc-dialog": "0.26.1", + "@material/mwc-formfield": "0.26.1", + "@material/mwc-icon": "0.26.1", + "@material/mwc-icon-button": "0.26.1", + "@material/mwc-slider": "0.26.1", + "@material/mwc-snackbar": "0.26.1", + "@material/mwc-tab": "0.26.1", + "@material/mwc-tab-bar": "0.26.1", + "@material/mwc-textfield": "0.26.1", "@polymer/iron-icons": "3.0.1", "@polymer/paper-icon-button": "3.0.2", "@polymer/paper-progress": "3.0.1", @@ -46,14 +46,14 @@ "@rollup/plugin-commonjs": "22.0.0", "@rollup/plugin-node-resolve": "13.3.0", "@rollup/plugin-replace": "4.0.0", - "@vaadin/button": "23.0.7", - "@vaadin/grid": "23.0.7", - "@vaadin/icons": "23.0.7", + "@vaadin/button": "23.0.10", + "@vaadin/grid": "23.0.10", + "@vaadin/icons": "23.0.10", "epml": "0.3.3", "html-escaper": "3.0.3", - "lit": "2.2.3", + "lit": "2.2.4", "lit-translate": "2.0.1", - "rollup": "2.72.0", + "rollup": "2.74.1", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-progress": "1.1.2", "rollup-plugin-terser": "7.0.2" diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js index 28060849..a5530237 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatPage.js +++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js @@ -10,6 +10,7 @@ registerTranslateConfig({ import { escape, unescape } from 'html-escaper'; import { inputKeyCodes } from '../../utils/keyCodes.js' import './ChatScroller.js' +import './LevelFounder.js' import './NameMenu.js' import './TimeAgo.js' import { EmojiPicker } from 'emoji-picker-js'; @@ -356,6 +357,8 @@ class ChatPage extends LitElement { chatMessageTemplate(messageObj) { let avatarImg = ''; let nameMenu = ''; + let levelFounder = ''; + if (messageObj.senderName) { const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]; const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port; @@ -369,10 +372,13 @@ class ChatPage extends LitElement { nameMenu = `` } + levelFounder = `` + return `
  • ${nameMenu} + ${levelFounder}
    ${avatarImg}
    diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js index 68b8b6c2..c970a7ee 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js +++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js @@ -2,6 +2,7 @@ import { LitElement, html, css } from 'lit' import { render } from 'lit/html.js' import { Epml } from '../../../epml.js' +import './LevelFounder.js' import './NameMenu.js' import '@material/mwc-button' @@ -76,6 +77,13 @@ class ChatScroller extends LitElement { cursor: pointer; } + .message-data-level { + color: #03a9f4; + font-size: 13px; + padding-left: 8px; + padding-bottom: 4px; + } + .message-data-time { color: #a8aab1; font-size: 13px; @@ -203,6 +211,8 @@ class ChatScroller extends LitElement { chatMessageTemplate(messageObj) { let avatarImg = ''; let nameMenu = ''; + let levelFounder = ''; + if (messageObj.senderName) { const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]; const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port; @@ -216,12 +226,14 @@ class ChatScroller extends LitElement { nameMenu = `` } + levelFounder = `` + return `
  • ${nameMenu} + ${levelFounder} -
    ${avatarImg}
    ${this.emojiPicker.parse(this.escapeHTML(messageObj.decodedMessage))}
    diff --git a/qortal-ui-plugins/plugins/core/components/NameMenu.js b/qortal-ui-plugins/plugins/core/components/NameMenu.js index 910dd7d4..d454171e 100644 --- a/qortal-ui-plugins/plugins/core/components/NameMenu.js +++ b/qortal-ui-plugins/plugins/core/components/NameMenu.js @@ -190,7 +190,7 @@ class NameMenu extends LitElement { return html`