+ ` : ''}
${repeat(
this.notifications,
(notification) => notification.reference.signature, // key function
@@ -169,7 +187,6 @@ class NotificationBellGeneral extends connect(store)(LitElement) {
}
_toggleNotifications() {
- if (this.notifications.length === 0) return;
this.showNotifications = !this.showNotifications;
if (this.showNotifications) {
requestAnimationFrame(() => {
@@ -184,7 +201,6 @@ class NotificationBellGeneral extends connect(store)(LitElement) {
flex-direction: column;
align-items: center;
position: relative;
- margin-right: 20px;
}
.count {
diff --git a/core/src/components/notification-view/notification-bell.js b/core/src/components/notification-view/notification-bell.js
index f5d960c3..af7e4ec1 100644
--- a/core/src/components/notification-view/notification-bell.js
+++ b/core/src/components/notification-view/notification-bell.js
@@ -8,6 +8,8 @@ import '@polymer/iron-icons/iron-icons.js'
import { store } from '../../store.js'
import { setNewTab } from '../../redux/app/app-actions.js'
import { routes } from '../../plugins/routes.js'
+import '@material/mwc-icon';
+
import config from '../../notifications/config.js'
import '../../../../plugins/plugins/core/components/TimeAgo.js'
@@ -138,11 +140,29 @@ class NotificationBell extends connect(store)(LitElement) {
return html`
${this.notificationCount ? html`
-
this._toggleNotifications()} title="Q-Mail">
+
this._toggleNotifications()} id="notification-mail-icon" style="color: green;cursor:pointer;user-select:none"
+ >mail
+
+
+
` : html`
-
{
- this._openTabQmail()
- }} title="Q-Mail">
+
this._openTabQmail()} id="notification-mail-icon" style="color: var(--black); cursor:pointer;user-select:none"
+ >mail
+
+
+
`}
${this.notificationCount ? html`
@@ -218,8 +238,8 @@ class NotificationBell extends connect(store)(LitElement) {
.count {
position: absolute;
- top: 2px;
- right: 0px;
+ top: -5px;
+ right: -5px;
font-size: 12px;
background-color: red;
color: white;
@@ -229,6 +249,7 @@ class NotificationBell extends connect(store)(LitElement) {
display: flex;
align-items: center;
justify-content: center;
+ user-select: none;
}
.nocount {
diff --git a/core/src/components/notification-view/popover.js b/core/src/components/notification-view/popover.js
index 43e85a94..e44d2610 100644
--- a/core/src/components/notification-view/popover.js
+++ b/core/src/components/notification-view/popover.js
@@ -23,6 +23,8 @@ export class PopoverComponent extends LitElement {
margin-left: 10px;
color: var(--black)
}
+
+
`;
static properties = {
@@ -40,7 +42,6 @@ export class PopoverComponent extends LitElement {
}
attachToTarget(target) {
- console.log({target})
if (!this.popperInstance && target) {
this.popperInstance = createPopper(target, this, {
placement: 'bottom',
@@ -66,7 +67,8 @@ export class PopoverComponent extends LitElement {
render() {
return html`
close
-
info ${this.message}
+
info ${this.message}
+
`;
}
}
diff --git a/core/src/components/qort-theme-toggle.js b/core/src/components/qort-theme-toggle.js
index 02833cea..0a411080 100644
--- a/core/src/components/qort-theme-toggle.js
+++ b/core/src/components/qort-theme-toggle.js
@@ -114,7 +114,6 @@ class QortThemeToggle extends LitElement {
} else {
this.theme = 'light';
}
-
this.dispatchEvent(
new CustomEvent('qort-theme-change', {
bubbles: true,
diff --git a/core/src/components/show-plugin.js b/core/src/components/show-plugin.js
index c6ff4d34..266df4a2 100644
--- a/core/src/components/show-plugin.js
+++ b/core/src/components/show-plugin.js
@@ -26,11 +26,9 @@ import '@vaadin/grid'
import '@vaadin/text-field'
import '../custom-elements/frag-file-input.js'
-const chatLastSeen = localForage.createInstance({
- name: "chat-last-seen",
-})
-const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+export const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
class ShowPlugin extends connect(store)(LitElement) {
static get properties() {
@@ -435,9 +433,21 @@ class ShowPlugin extends connect(store)(LitElement) {
@click="${() => {
this.currentTab = index
}}"
+ @mousedown="${(event) => {
+ if (event.button === 1) {
+ event.preventDefault();
+ this.removeTab(index, tab.id);
+ }
+ }}"
>
- ${icon}
+ ${tab.myPlugObj && tab.myPlugObj.url === "myapp" ? html`
+
+ ` : html`
+ ${icon}
+ `}
+
+
${count ? html`
@@ -996,6 +1006,7 @@ class NavBar extends connect(store)(LitElement) {
border-top-right-radius: 20px;
border-bottom-left-radius: 20px;
border-bottom-right-radius: 10px;
+ position: relative;
}
.app-list .app-icon:hover .removeIcon {
@@ -1009,14 +1020,14 @@ class NavBar extends connect(store)(LitElement) {
}
.menuIconPos {
- position: relative;
right: -2px;
}
.removeIconPos {
position: absolute;
- top: -36px;
- left: 0;
+ top: -10px;
+ right: -10px;
+ z-index: 1;
}
.menuIconPos:hover .removeIcon {
@@ -1028,9 +1039,7 @@ class NavBar extends connect(store)(LitElement) {
color: var(--black);
--mdc-icon-size: 28px;
cursor: pointer;
- position: absolute;
- top: 30px;
- left: 123px;
+ position: relative;
z-index: 1;
}
@@ -1192,6 +1201,7 @@ class NavBar extends connect(store)(LitElement) {
this.myFollowedNamesList = []
this.searchContentString = ''
this.searchNameResources = []
+ this._updateMyMenuPlugins = this._updateMyMenuPlugins.bind(this)
}
render() {
@@ -1458,6 +1468,49 @@ class NavBar extends connect(store)(LitElement) {
await this.getMyFollowedNamesList()
}
+ async _updateMyMenuPlugins(event) {
+ await new Promise((res)=> {
+ setTimeout(() => {
+ res()
+ }, 1000);
+ })
+ const detail = event.detail
+ this.myMenuPlugins = detail
+ const addressInfo = this.addressInfo
+ const isMinter = addressInfo?.error !== 124 && +addressInfo?.level > 0
+ const isSponsor = +addressInfo?.level >= 5
+
+
+ if (!isMinter) {
+ this.newMenuList = this.myMenuPlugins.filter((minter) => {
+ return minter.url !== 'minting'
+ })
+ } else {
+ this.newMenuList = this.myMenuPlugins.filter((minter) => {
+ return minter.url !== 'become-minter'
+ })
+ }
+
+ if (!isSponsor) {
+ this.myMenuList = this.newMenuList.filter((sponsor) => {
+ return sponsor.url !== 'sponsorship-list'
+ })
+ } else {
+ this.myMenuList = this.newMenuList
+ }
+
+ this.requestUpdate()
+ }
+
+ connectedCallback() {
+ super.connectedCallback()
+ window.addEventListener('myMenuPlugs-event', this._updateMyMenuPlugins) }
+
+ disconnectedCallback() {
+ window.removeEventListener('myMenuPlugs-event', this._updateMyMenuPlugins)
+ super.disconnectedCallback()
+ }
+
openImportDialog() {
this.shadowRoot.getElementById('importTabMenutDialog').show()
}
@@ -1468,7 +1521,9 @@ class NavBar extends connect(store)(LitElement) {
localStorage.removeItem("myMenuPlugs")
myFile = file
const newTabMenu = JSON.parse((myFile) || "[]")
+ const copyPayload = [...newTabMenu]
localStorage.setItem("myMenuPlugs", JSON.stringify(newTabMenu))
+ this.saveSettingToTemp(copyPayload)
this.shadowRoot.getElementById('importTabMenutDialog').close()
this.myMenuPlugins = JSON.parse(localStorage.getItem("myMenuPlugs") || "[]")
this.firstUpdated()
@@ -1951,8 +2006,10 @@ class NavBar extends connect(store)(LitElement) {
if (myNameRes !== false) {
oldMenuPlugs.push(newMenuPlugsItem)
+ const copyPayload = [...oldMenuPlugs]
localStorage.setItem("myMenuPlugs", JSON.stringify(oldMenuPlugs))
+ this.saveSettingToTemp(copyPayload)
let myplugstring2 = get("walletpage.wchange52")
parentEpml.request('showSnackBar', `${myplugstring2}`)
@@ -2014,9 +2071,10 @@ class NavBar extends connect(store)(LitElement) {
if (myNameRes !== false) {
oldMenuPlugs.push(newMenuPlugsItem)
+ const copyPayload = [...oldMenuPlugs]
localStorage.setItem("myMenuPlugs", JSON.stringify(oldMenuPlugs))
-
+ this.saveSettingToTemp(copyPayload)
let myplugstring2 = get("walletpage.wchange52")
parentEpml.request('showSnackBar', `${myplugstring2}`)
@@ -2084,9 +2142,10 @@ class NavBar extends connect(store)(LitElement) {
}
oldMenuPlugs.push(newMenuPlugsItem)
+ const copyPayload = [...oldMenuPlugs]
localStorage.setItem("myMenuPlugs", JSON.stringify(oldMenuPlugs))
-
+ this.saveSettingToTemp(copyPayload)
let myplugstring2 = get("walletpage.wchange52")
parentEpml.request('showSnackBar', `${myplugstring2}`)
@@ -2149,11 +2208,20 @@ class NavBar extends connect(store)(LitElement) {
renderRemoveIcon(appurl, appicon, appname, appid, appplugin) {
return html`
-
+
+
`;
+ return html`
+