forked from Qortal/qortal-ui
fix followed and blocked names tab
This commit is contained in:
AlphaX-Projects
parent
69972c0b90
commit
512bdc1cae
@ -310,10 +310,10 @@ class Websites extends LitElement {
|
||||
<div id="pages"></div>
|
||||
${this.pageRes == null ? html`
|
||||
Loading...
|
||||
`: ''}
|
||||
` : ''}
|
||||
${this.isEmptyArray(this.pageRes) ? html`
|
||||
<span style="color: var(--black);">${translate("websitespage.schange10")}</span>
|
||||
`: ''}
|
||||
` : ''}
|
||||
</div>
|
||||
${this.renderRelayModeText()}
|
||||
</div>
|
||||
@ -348,10 +348,10 @@ class Websites extends LitElement {
|
||||
</vaadin-grid>
|
||||
${this.followedResources == null ? html`
|
||||
Loading...
|
||||
`: ''}
|
||||
` : ''}
|
||||
${this.isEmptyArray(this.followedResources) ? html`
|
||||
<span style="color: var(--black);">${translate("websitespage.schange13")}</span>
|
||||
`: ''}
|
||||
` : ''}
|
||||
</div>
|
||||
${this.renderRelayModeText()}
|
||||
</div>
|
||||
@ -386,10 +386,10 @@ class Websites extends LitElement {
|
||||
</vaadin-grid>
|
||||
${this.blockedResources == null ? html`
|
||||
Loading...
|
||||
`: ''}
|
||||
` : ''}
|
||||
${this.isEmptyArray(this.blockedResources) ? html`
|
||||
<span style="color: var(--black);">${translate("websitespage.schange16")}</span>
|
||||
`: ''}
|
||||
` : ''}
|
||||
</div>
|
||||
${this.renderRelayModeText()}
|
||||
</div>
|
||||
@ -414,16 +414,15 @@ class Websites extends LitElement {
|
||||
})
|
||||
|
||||
this.followedNames = followedNames
|
||||
setTimeout(getFollowedNames, 600000)
|
||||
setTimeout(getFollowedNames, 60000)
|
||||
}
|
||||
|
||||
const getBlockedNames = async () => {
|
||||
let blockedNames = await parentEpml.request('apiCall', {
|
||||
url: `/lists/blockedNames?apiKey=${this.getApiKey()}`
|
||||
})
|
||||
|
||||
this.blockedNames = blockedNames
|
||||
setTimeout(getBlockedNames, 600000)
|
||||
setTimeout(getBlockedNames, 60000)
|
||||
}
|
||||
|
||||
const getRelayMode = async () => {
|
||||
@ -478,6 +477,8 @@ class Websites extends LitElement {
|
||||
setTimeout(getFollowedNames, 1)
|
||||
setTimeout(getBlockedNames, 1)
|
||||
setTimeout(getRelayMode, 1)
|
||||
setTimeout(this.getFollowedNamesResource, 1)
|
||||
setTimeout(this.getBlockedNamesResource, 1)
|
||||
setInterval(this.getArbitraryResources, 600000)
|
||||
configLoaded = true
|
||||
}
|
||||
@ -499,7 +500,7 @@ class Websites extends LitElement {
|
||||
} else {
|
||||
this.theme = 'light';
|
||||
}
|
||||
document.querySelector('html').setAttribute('theme', this.theme);
|
||||
document.querySelector('html').setAttribute('theme', this.theme)
|
||||
}
|
||||
|
||||
changeLanguage() {
|
||||
@ -528,7 +529,7 @@ class Websites extends LitElement {
|
||||
|
||||
searchListener(e) {
|
||||
if (e.key === 'Enter') {
|
||||
this.doSearch(e);
|
||||
this.doSearch(e)
|
||||
}
|
||||
}
|
||||
|
||||
@ -539,26 +540,38 @@ class Websites extends LitElement {
|
||||
}
|
||||
|
||||
getArbitraryResources = async () => {
|
||||
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
|
||||
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
|
||||
const followedNamesUrl = `${nodeUrl}/lists/followedNames?apiKey=${this.getApiKey()}`
|
||||
const blockedNamesUrl = `${nodeUrl}/lists/blockedNames?apiKey=${this.getApiKey()}`
|
||||
|
||||
const resources = await parentEpml.request('apiCall', {
|
||||
url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=false&includemetadata=false`
|
||||
})
|
||||
|
||||
this.resources = resources
|
||||
}
|
||||
|
||||
const followedResponse = await fetch(followedNamesUrl)
|
||||
const followednames = await followedResponse.json()
|
||||
let followedres = resources.filter((elm) => followednames.includes(elm.name))
|
||||
this.followedResources = followedres
|
||||
getFollowedNamesResource = async () => {
|
||||
const followedRes = await parentEpml.request('apiCall', {
|
||||
url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=true&includemetadata=true&namefilter=followedNames`
|
||||
})
|
||||
this.followedResources = followedRes
|
||||
}
|
||||
|
||||
const blockedResponse = await fetch(blockedNamesUrl)
|
||||
const blockednames = await blockedResponse.json()
|
||||
let blockedres = resources.filter((elm) => blockednames.includes(elm.name))
|
||||
this.blockedResources = blockedres
|
||||
getFollowedNamesRefresh = async () => {
|
||||
let followedNames = await parentEpml.request('apiCall', {
|
||||
url: `/lists/followedNames?apiKey=${this.getApiKey()}`
|
||||
})
|
||||
this.followedNames = followedNames
|
||||
}
|
||||
|
||||
getBlockedNamesResource = async () => {
|
||||
const blockedRes = await parentEpml.request('apiCall', {
|
||||
url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=true&includemetadata=true&namefilter=blockedNames`
|
||||
})
|
||||
this.blockedResources = blockedRes
|
||||
}
|
||||
|
||||
getBlockedNamesRefresh = async () => {
|
||||
let blockedNames = await parentEpml.request('apiCall', {
|
||||
url: `/lists/blockedNames?apiKey=${this.getApiKey()}`
|
||||
})
|
||||
this.blockedNames = blockedNames
|
||||
}
|
||||
|
||||
async getData(offset) {
|
||||
@ -582,15 +595,15 @@ class Websites extends LitElement {
|
||||
return index + 1
|
||||
})
|
||||
|
||||
let offset = 0;
|
||||
let offset = 0
|
||||
|
||||
const prevBtn = document.createElement('button')
|
||||
prevBtn.textContent = '<'
|
||||
prevBtn.addEventListener('click', () => {
|
||||
if (parseInt(this.pagesControl.querySelector('[selected]').textContent) > 1) {
|
||||
offset = (parseInt(this.pagesControl.querySelector('[selected]').textContent) - 2) * 20;
|
||||
offset = (parseInt(this.pagesControl.querySelector('[selected]').textContent) - 2) * 20
|
||||
} else {
|
||||
offset = 0;
|
||||
offset = 0
|
||||
}
|
||||
this.getData(offset);
|
||||
const selectedPage = parseInt(this.pagesControl.querySelector('[selected]').textContent)
|
||||
@ -604,9 +617,9 @@ class Websites extends LitElement {
|
||||
let offset = 0;
|
||||
pageBtn.addEventListener('click', (e) => {
|
||||
if (parseInt(e.target.textContent) > 1) {
|
||||
offset = (parseInt(e.target.textContent) - 1) * 20;
|
||||
offset = (parseInt(e.target.textContent) - 1) * 20
|
||||
} else {
|
||||
offset = 0;
|
||||
offset = 0
|
||||
}
|
||||
this.getData(offset);
|
||||
this.updateItemsFromPage(parseInt(e.target.textContent))
|
||||
@ -621,9 +634,9 @@ class Websites extends LitElement {
|
||||
nextBtn.textContent = '>'
|
||||
nextBtn.addEventListener('click', () => {
|
||||
if (parseInt(this.pagesControl.querySelector('[selected]').textContent) >= 1) {
|
||||
offset = ((parseInt(this.pagesControl.querySelector('[selected]').textContent) + 1) * 20) - 20;
|
||||
offset = ((parseInt(this.pagesControl.querySelector('[selected]').textContent) + 1) * 20) - 20
|
||||
} else {
|
||||
offset = 0;
|
||||
offset = 0
|
||||
}
|
||||
this.getData(offset);
|
||||
const selectedPage = parseInt(this.pagesControl.querySelector('[selected]').textContent)
|
||||
@ -689,18 +702,18 @@ class Websites extends LitElement {
|
||||
let name = websiteObj.name
|
||||
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
|
||||
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
|
||||
const url = `${nodeUrl}/arbitrary/THUMBNAIL/${name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`;
|
||||
const url = `${nodeUrl}/arbitrary/THUMBNAIL/${name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`
|
||||
return html`<a class="visitSite" href="browser/index.html?name=${name}&service=${this.service}"><img src="${url}" onerror="this.src='/img/incognito.png';"></a>`
|
||||
}
|
||||
|
||||
renderRelayModeText() {
|
||||
if (this.relayMode === true) {
|
||||
return html`<div class="relay-mode-notice">${translate("websitespage.schange18")} <strong>"relayModeEnabled": false</strong> ${translate("websitespage.schange19")} settings.json</div>`;
|
||||
return html`<div class="relay-mode-notice">${translate("websitespage.schange18")} <strong>"relayModeEnabled": false</strong> ${translate("websitespage.schange19")} settings.json</div>`
|
||||
}
|
||||
else if (this.relayMode === false) {
|
||||
return html`<div class="relay-mode-notice">${translate("websitespage.schange20")} <strong>"relayModeEnabled": true</strong> ${translate("websitespage.schange19")} settings.json</div>`;
|
||||
return html`<div class="relay-mode-notice">${translate("websitespage.schange20")} <strong>"relayModeEnabled": true</strong> ${translate("websitespage.schange19")} settings.json</div>`
|
||||
}
|
||||
return html``;
|
||||
return html``
|
||||
}
|
||||
|
||||
renderPublishButton() {
|
||||
@ -738,15 +751,15 @@ class Websites extends LitElement {
|
||||
// immediately, as apposed to only adding if it doesn't already exist
|
||||
this.followedNames = this.followedNames.filter(item => item != name)
|
||||
this.followedNames.push(name)
|
||||
this.getFollowedNamesRefresh()
|
||||
this.getFollowedNamesResource()
|
||||
this.getArbitraryResources()
|
||||
window.location.reload()
|
||||
}
|
||||
else {
|
||||
this.updateComplete.then(() => this.requestUpdate())
|
||||
} else {
|
||||
let err3string = get("websitespage.schange22")
|
||||
parentEpml.request('showSnackBar', `${err3string}`)
|
||||
}
|
||||
return ret
|
||||
this.displayTabContent('followed')
|
||||
}
|
||||
|
||||
async unfollowName(websiteObj) {
|
||||
@ -768,15 +781,15 @@ class Websites extends LitElement {
|
||||
if (ret === true) {
|
||||
// Successfully unfollowed - remove from local list
|
||||
this.followedNames = this.followedNames.filter(item => item != name)
|
||||
this.getFollowedNamesRefresh()
|
||||
this.getFollowedNamesResource()
|
||||
this.getArbitraryResources()
|
||||
window.location.reload()
|
||||
}
|
||||
else {
|
||||
this.updateComplete.then(() => this.requestUpdate())
|
||||
} else {
|
||||
let err4string = get("websitespage.schange23")
|
||||
parentEpml.request('showSnackBar', `${err4string}`)
|
||||
}
|
||||
return ret
|
||||
this.displayTabContent('followed')
|
||||
}
|
||||
|
||||
async blockName(websiteObj) {
|
||||
@ -801,15 +814,15 @@ class Websites extends LitElement {
|
||||
// immediately, as apposed to only adding if it doesn't already exist
|
||||
this.blockedNames = this.blockedNames.filter(item => item != name)
|
||||
this.blockedNames.push(name)
|
||||
this.getBlockedNamesRefresh()
|
||||
this.getBlockedNamesResource()
|
||||
this.getArbitraryResources()
|
||||
window.location.reload()
|
||||
}
|
||||
else {
|
||||
this.updateComplete.then(() => this.requestUpdate())
|
||||
} else {
|
||||
let err5string = get("websitespage.schange24")
|
||||
parentEpml.request('showSnackBar', `${err5string}`)
|
||||
}
|
||||
return ret
|
||||
this.displayTabContent('blocked')
|
||||
}
|
||||
|
||||
async unblockName(websiteObj) {
|
||||
@ -831,33 +844,34 @@ class Websites extends LitElement {
|
||||
if (ret === true) {
|
||||
// Successfully unblocked - remove from local list
|
||||
this.blockedNames = this.blockedNames.filter(item => item != name)
|
||||
this.getBlockedNamesRefresh()
|
||||
this.getBlockedNamesResource()
|
||||
this.getArbitraryResources()
|
||||
window.location.reload()
|
||||
}
|
||||
else {
|
||||
this.updateComplete.then(() => this.requestUpdate())
|
||||
} else {
|
||||
let err6string = get("websitespage.schange25")
|
||||
parentEpml.request('showSnackBar', `${err6string}`)
|
||||
}
|
||||
return ret
|
||||
this.displayTabContent('blocked')
|
||||
}
|
||||
|
||||
renderInfo(websiteObj) {
|
||||
let name = websiteObj.name
|
||||
let title = name;
|
||||
let description = "";
|
||||
let categoryName = this.renderCatText();
|
||||
let title = name
|
||||
let description = ""
|
||||
let categoryName = this.renderCatText()
|
||||
let tags = "";
|
||||
let sizeReadable = "";
|
||||
let sizeReadable = ""
|
||||
|
||||
if (websiteObj.metadata != null) {
|
||||
title = websiteObj.metadata.title;
|
||||
description = websiteObj.metadata.description;
|
||||
categoryName = websiteObj.metadata.categoryName;
|
||||
if (websiteObj.metadata.tags != null && websiteObj.metadata.tags.length > 0) {
|
||||
tags = "Tags: " + websiteObj.metadata.tags.join(", ");
|
||||
tags = "Tags: " + websiteObj.metadata.tags.join(", ")
|
||||
}
|
||||
}
|
||||
|
||||
if (websiteObj.size != null) {
|
||||
sizeReadable = this.bytesToSize(websiteObj.size);
|
||||
}
|
||||
@ -875,19 +889,20 @@ class Websites extends LitElement {
|
||||
${tags}
|
||||
${sizeReadable.length > 0 ? " | " : ""}
|
||||
${translate("websitespage.schange27")}: ${sizeReadable}
|
||||
</div>`;
|
||||
</div>
|
||||
`
|
||||
}
|
||||
|
||||
renderPublishedBy(websiteObj) {
|
||||
return html`<div class="resourceRegisteredName">${websiteObj.name}</div>
|
||||
<div class="resourceStatus">${translate("websitespage.schange28")}: <span title="${websiteObj.status.description}">${websiteObj.status.title}</span></div>`;
|
||||
<div class="resourceStatus">${translate("websitespage.schange28")}: <span title="${websiteObj.status.description}">${websiteObj.status.title}</span></div>`
|
||||
}
|
||||
|
||||
renderSize(websiteObj) {
|
||||
if (websiteObj.size === null) {
|
||||
return html``
|
||||
}
|
||||
let sizeReadable = this.bytesToSize(websiteObj.size);
|
||||
let sizeReadable = this.bytesToSize(websiteObj.size)
|
||||
return html`<span>${sizeReadable}</span>`
|
||||
}
|
||||
|
||||
@ -928,10 +943,10 @@ class Websites extends LitElement {
|
||||
}
|
||||
|
||||
bytesToSize(bytes) {
|
||||
var sizes = ['bytes', 'KB', 'MB', 'GB', 'TB'];
|
||||
if (bytes == 0) return '0 bytes';
|
||||
var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
|
||||
return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
|
||||
var sizes = ['bytes', 'KB', 'MB', 'GB', 'TB']
|
||||
if (bytes == 0) return '0 bytes'
|
||||
var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)))
|
||||
return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i]
|
||||
}
|
||||
|
||||
_textMenu(event) {
|
||||
@ -942,7 +957,7 @@ class Websites extends LitElement {
|
||||
} else if (typeof this.shadowRoot.selection != "undefined" && this.shadowRoot.selection.type == "Text") {
|
||||
text = this.shadowRoot.selection.createRange().text;
|
||||
}
|
||||
return text;
|
||||
return text
|
||||
}
|
||||
|
||||
const checkSelectedTextAndShowMenu = () => {
|
||||
@ -957,9 +972,9 @@ class Websites extends LitElement {
|
||||
}
|
||||
|
||||
getApiKey() {
|
||||
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
|
||||
let apiKey = myNode.apiKey;
|
||||
return apiKey;
|
||||
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
|
||||
let apiKey = myNode.apiKey
|
||||
return apiKey
|
||||
}
|
||||
|
||||
clearSelection() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user