Qortal/qortal-ui
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-03-28 00:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for new resource cache

Browse Source
This commit is contained in:
AlphaX-Projects 2023-11-04 08:14:15 +01:00
parent 336cdfe6a1
commit 504fb5fb13
2 changed files with 118 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/plugins/core/q-app/q-apps.src.js
View File

@ -579,7 +579,7 @@ class QApps extends LitElement {
url: `/arbitrary/relaymode?apiKey=${this.getApiKey()}` url: `/arbitrary/relaymode?apiKey=${this.getApiKey()}`
}) })
this.relayMode = relayMode; this.relayMode = relayMode
setTimeout(getRelayMode, 600000) setTimeout(getRelayMode, 600000)
} }
@ -645,9 +645,9 @@ class QApps extends LitElement {
changeTheme() { changeTheme() {
const checkTheme = localStorage.getItem('qortalTheme') const checkTheme = localStorage.getItem('qortalTheme')
if (checkTheme === 'dark') { if (checkTheme === 'dark') {
this.theme = 'dark'; this.theme = 'dark'
} else { } else {
this.theme = 'light'; this.theme = 'light'
} }
document.querySelector('html').setAttribute('theme', this.theme) document.querySelector('html').setAttribute('theme', this.theme)
} }
@ -784,7 +784,7 @@ class QApps extends LitElement {
this.pages.forEach((pageNumber) => { this.pages.forEach((pageNumber) => {
const pageBtn = document.createElement('button') const pageBtn = document.createElement('button')
pageBtn.textContent = pageNumber pageBtn.textContent = pageNumber
let offset = 0; let offset = 0
pageBtn.addEventListener('click', (e) => { pageBtn.addEventListener('click', (e) => {
if (parseInt(e.target.textContent) > 1) { if (parseInt(e.target.textContent) > 1) {
offset = (parseInt(e.target.textContent) - 1) * 20 offset = (parseInt(e.target.textContent) - 1) * 20
@ -910,12 +910,14 @@ class QApps extends LitElement {
} }
renderDownload(downObj) { renderDownload(downObj) {
if (downObj.status != null) {
if (downObj.status.description === "Published but not yet downloaded" || downObj.status.status === "MISSING_DATA") { if (downObj.status.description === "Published but not yet downloaded" || downObj.status.status === "MISSING_DATA") {
return html`<mwc-button ?disabled="${this.btnDisabled}" dense unelevated label="${translate("appspage.schange36")}" icon="download" @click=${() => this.downloadApp(downObj)}></mwc-button>` return html`<mwc-button ?disabled="${this.btnDisabled}" dense unelevated label="${translate("appspage.schange36")}" icon="download" @click=${() => this.downloadApp(downObj)}></mwc-button>`
} else if (downObj.status.description === "Ready" || downObj.status.status === "DOWNLOADED") { } else if (downObj.status.description === "Ready" || downObj.status.status === "DOWNLOADED") {
return html`<a class="visitSite" href="../qdn/browser/index.html?name=${downObj.name}&service=${this.service}"><mwc-button class="green" dense unelevated label="${translate("appspage.schange39")}" icon="open_in_browser"></mwc-button></a>` return html`<a class="visitSite" href="../qdn/browser/index.html?name=${downObj.name}&service=${this.service}"><mwc-button class="green" dense unelevated label="${translate("appspage.schange39")}" icon="open_in_browser"></mwc-button></a>`
}
} else { } else {
return html`` return html`<mwc-button ?disabled="${this.btnDisabled}" dense unelevated label="${translate("appspage.schange36")}" icon="download" @click=${() => this.downloadApp(downObj)}></mwc-button>`
} }
} }
@ -1183,42 +1185,47 @@ class QApps extends LitElement {
let title = name let title = name
let description = "" let description = ""
let categoryName = this.renderCatText() let categoryName = this.renderCatText()
let tags = ""; let tags = ""
let sizeReadable = "" let sizeReadable = ""
if (appObj.metadata != null) { if (appObj.metadata != null) {
title = appObj.metadata.title; title = appObj.metadata.title
description = appObj.metadata.description; description = appObj.metadata.description
categoryName = appObj.metadata.categoryName; categoryName = appObj.metadata.categoryName
if (appObj.metadata.tags != null && appObj.metadata.tags.length > 0) { if (appObj.metadata.tags != null && appObj.metadata.tags.length > 0) {
tags = "Tags: " + appObj.metadata.tags.join(", ") tags = "Tags: " + appObj.metadata.tags.join(", ")
} }
} }
if (appObj.size != null) { if (appObj.size != null) {
sizeReadable = this.bytesToSize(appObj.size); sizeReadable = this.bytesToSize(appObj.size)
} }
return html` return html`
<div class="resourceTitle"> <div class="resourceTitle">${title}</div>
${title} <div class="resourceDescription">${description}</div>
</div>
<div class="resourceDescription">
${description}
</div>
<div class="resourceCategoryTags"> <div class="resourceCategoryTags">
${categoryName}&nbsp; ${categoryName}&nbsp;
${tags.length > 0 ? " | " : ""} ${tags.length > 0 ? " | " : ""}&nbsp;
&nbsp;${tags}&nbsp; ${tags}&nbsp;
${sizeReadable.length > 0 ? " | " : ""} ${sizeReadable.length > 0 ? " | " : ""}&nbsp;
&nbsp;${translate("appspage.schange27")}: ${sizeReadable} ${translate("appspage.schange27")}: ${sizeReadable}
</div> </div>
` `
} }
renderPublishedBy(appObj) { renderPublishedBy(appObj) {
return html`<div class="resourceRegisteredName">${appObj.name}</div> if (appObj.status != null) {
<div class="resourceStatus">${translate("appspage.schange28")}: <span title="${appObj.status.description}">${appObj.status.title}</span></div>` return html`
<div class="resourceRegisteredName">${appObj.name}</div>
<div class="resourceStatus">${translate("appspage.schange28")}: <span title="${appObj.status.description}">${appObj.status.title}</span></div>
`
} else {
return html`
<div class="resourceRegisteredName">${appObj.name}</div>
<div class="resourceStatus">${translate("appspage.schange28")}: <span title="Published but not yet downloaded">Published</span></div>
`
}
} }
renderSize(appObj) { renderSize(appObj) {

43
plugins/plugins/core/qdn/websites.src.js
View File

@ -428,7 +428,7 @@ class Websites extends LitElement {
url: `/arbitrary/relaymode?apiKey=${this.getApiKey()}` url: `/arbitrary/relaymode?apiKey=${this.getApiKey()}`
}) })
this.relayMode = relayMode; this.relayMode = relayMode
setTimeout(getRelayMode, 600000) setTimeout(getRelayMode, 600000)
} }
@ -494,9 +494,9 @@ class Websites extends LitElement {
changeTheme() { changeTheme() {
const checkTheme = localStorage.getItem('qortalTheme') const checkTheme = localStorage.getItem('qortalTheme')
if (checkTheme === 'dark') { if (checkTheme === 'dark') {
this.theme = 'dark'; this.theme = 'dark'
} else { } else {
this.theme = 'light'; this.theme = 'light'
} }
document.querySelector('html').setAttribute('theme', this.theme) document.querySelector('html').setAttribute('theme', this.theme)
} }
@ -619,7 +619,7 @@ class Websites extends LitElement {
} else { } else {
offset = 0 offset = 0
} }
this.getData(offset); this.getData(offset)
const selectedPage = parseInt(this.pagesControl.querySelector('[selected]').textContent) const selectedPage = parseInt(this.pagesControl.querySelector('[selected]').textContent)
this.updateItemsFromPage(selectedPage - 1) this.updateItemsFromPage(selectedPage - 1)
}) })
@ -628,14 +628,14 @@ class Websites extends LitElement {
this.pages.forEach((pageNumber) => { this.pages.forEach((pageNumber) => {
const pageBtn = document.createElement('button') const pageBtn = document.createElement('button')
pageBtn.textContent = pageNumber pageBtn.textContent = pageNumber
let offset = 0; let offset = 0
pageBtn.addEventListener('click', (e) => { pageBtn.addEventListener('click', (e) => {
if (parseInt(e.target.textContent) > 1) { if (parseInt(e.target.textContent) > 1) {
offset = (parseInt(e.target.textContent) - 1) * 20 offset = (parseInt(e.target.textContent) - 1) * 20
} else { } else {
offset = 0 offset = 0
} }
this.getData(offset); this.getData(offset)
this.updateItemsFromPage(parseInt(e.target.textContent)) this.updateItemsFromPage(parseInt(e.target.textContent))
}) })
if (pageNumber === page) { if (pageNumber === page) {
@ -652,7 +652,7 @@ class Websites extends LitElement {
} else { } else {
offset = 0 offset = 0
} }
this.getData(offset); this.getData(offset)
const selectedPage = parseInt(this.pagesControl.querySelector('[selected]').textContent) const selectedPage = parseInt(this.pagesControl.querySelector('[selected]').textContent)
this.updateItemsFromPage(selectedPage + 1) this.updateItemsFromPage(selectedPage + 1)
}) })
@ -992,7 +992,7 @@ class Websites extends LitElement {
let title = name let title = name
let description = "" let description = ""
let categoryName = this.renderCatText() let categoryName = this.renderCatText()
let tags = ""; let tags = ""
let sizeReadable = "" let sizeReadable = ""
if (websiteObj.metadata != null) { if (websiteObj.metadata != null) {
@ -1005,29 +1005,36 @@ class Websites extends LitElement {
} }
if (websiteObj.size != null) { if (websiteObj.size != null) {
sizeReadable = this.bytesToSize(websiteObj.size); sizeReadable = this.bytesToSize(websiteObj.size)
} }
return html` return html`
<div class="resourceTitle"> <div class="resourceTitle">
<a class="visitSite" href="browser/index.html?name=${name}&service=${this.service}">${title}</a> <a class="visitSite" href="browser/index.html?name=${name}&service=${this.service}">${title}</a>
</div> </div>
<div class="resourceDescription"> <div class="resourceDescription">${description}</div>
${description}
</div>
<div class="resourceCategoryTags"> <div class="resourceCategoryTags">
${categoryName}&nbsp; ${categoryName}&nbsp;
${tags.length > 0 ? " | " : ""} ${tags.length > 0 ? " | " : ""}&nbsp;
&nbsp;${tags}&nbsp; ${tags}&nbsp;
${sizeReadable.length > 0 ? " | " : ""} ${sizeReadable.length > 0 ? " | " : ""}&nbsp;
&nbsp;${translate("websitespage.schange27")}: ${sizeReadable} ${translate("websitespage.schange27")}: ${sizeReadable}
</div> </div>
` `
} }
renderPublishedBy(websiteObj) { renderPublishedBy(websiteObj) {
return html`<div class="resourceRegisteredName">${websiteObj.name}</div> if (websiteObj.status != null) {
<div class="resourceStatus">${translate("websitespage.schange28")}: <span title="${websiteObj.status.description}">${websiteObj.status.title}</span></div>` return html`
<div class="resourceRegisteredName">${websiteObj.name}</div>
<div class="resourceStatus">${translate("websitespage.schange28")}: <span title="${websiteObj.status.description}">${websiteObj.status.title}</span></div>
`
} else {
return html`
<div class="resourceRegisteredName">${websiteObj.name}</div>
<div class="resourceStatus">${translate("websitespage.schange28")}: <span title="Published but not yet downloaded">Published</span></div>
`
}
} }
renderSize(websiteObj) { renderSize(websiteObj) {