From 35b71ea31125ba9b9cdb68939aa2424294096345 Mon Sep 17 00:00:00 2001 From: PhilReact Date: Tue, 10 Oct 2023 22:06:44 -0500 Subject: [PATCH] added color for new feed --- core/src/components/app-view.js | 3 +- .../friends-view/add-friends-modal.js | 2 - core/src/components/friends-view/feed-item.js | 2 - .../components/friends-view/friends-feed.js | 45 ++++---------- .../friends-view/friends-side-panel-parent.js | 16 ++++- .../friends-view/friends-side-panel.js | 5 +- .../components/friends-view/friends-view.js | 3 - .../friends-view/save-settings-qdn.js | 60 +++++++++++++++++++ .../core/messaging/q-chat/q-chat.src.js | 2 - 9 files changed, 88 insertions(+), 50 deletions(-) create mode 100644 core/src/components/friends-view/save-settings-qdn.js diff --git a/core/src/components/app-view.js b/core/src/components/app-view.js index 814a18b9..cb12b505 100644 --- a/core/src/components/app-view.js +++ b/core/src/components/app-view.js @@ -44,7 +44,7 @@ import './start-minting.js' import './notification-view/notification-bell.js' import './notification-view/notification-bell-general.js' import './friends-view/friends-side-panel-parent.js' - +import './friends-view/save-settings-qdn.js' const parentEpml = new Epml({ type: 'WINDOW', source: window.parent }) @@ -560,6 +560,7 @@ class AppView extends connect(store)(LitElement) {
+ diff --git a/core/src/components/friends-view/add-friends-modal.js b/core/src/components/friends-view/add-friends-modal.js index eabe0adb..8d353d67 100644 --- a/core/src/components/friends-view/add-friends-modal.js +++ b/core/src/components/friends-view/add-friends-modal.js @@ -137,7 +137,6 @@ class AddFriendsModal extends LitElement { async updated(changedProperties) { if (changedProperties && changedProperties.has('editContent') && this.editContent) { - console.log('this.editedContent', this.editContent) this.userSelected = { name: this.editContent.name ?? '', } @@ -150,7 +149,6 @@ class AddFriendsModal extends LitElement { } render() { - console.log('hello2', this.editContent) return html`
diff --git a/core/src/components/friends-view/feed-item.js b/core/src/components/friends-view/feed-item.js index ab67d17e..12e72518 100644 --- a/core/src/components/friends-view/feed-item.js +++ b/core/src/components/friends-view/feed-item.js @@ -330,7 +330,6 @@ getMyNode(){ async goToFeedLink(){ try { - console.log('this.link', this.link) let newQuery = this.link if (newQuery.endsWith('/')) { newQuery = newQuery.slice(0, -1) @@ -423,7 +422,6 @@ getMyNode(){ render() { - console.log('this.feedItem', this.feedItem) let avatarImg const avatarUrl = `${this.nodeUrl}/arbitrary/THUMBNAIL/${this.resource.name}/qortal_avatar?async=true&apiKey=${this.myNode.apiKey}`; avatarImg = html` { return { ...this.endpoints[endpointIndex], @@ -248,6 +244,13 @@ this.loadAndMergeData(); this.feed = [...allData] this.feedToRender = this.feed.slice(0,20) this.hasInitialFetch = true + if(allData.length > 0){ + const created = allData[0].created + let value = localStorage.getItem('lastSeenFeed') + if (((+value || 0) < created)) { + this.setHasNewFeed(true) + } + } } @@ -255,7 +258,6 @@ this.loadAndMergeData(); render() { - console.log('ron', this.feed) return html`
@@ -368,10 +370,8 @@ function executeMethodInWorker(methodString, externalArgs) { export async function updateCustomParamsWithMethods(schema,resource) { - console.log({schema, resource}) for (const key in schema.customParams) { const value = schema.customParams[key]; - console.log({value}) if (value.startsWith("**methods.") && value.endsWith("**")) { const methodInvocation = value.slice(10, -2).split('('); const methodName = methodInvocation[0]; @@ -382,9 +382,7 @@ export async function updateCustomParamsWithMethods(schema,resource) { name: resource.name, service: resource.service } - console.log({newResource}) const methodResult = await executeMethodInWorker(schema.methods[methodName], newResource); - console.log({methodResult}) schema.customParams[key] = methodResult; } } @@ -443,31 +441,8 @@ export function replacePlaceholders(template, resource, customParams) { "getShortId": "return resource.identifier.split('-post-')[1];", "getBlogId": "const arr = resource.identifier.split('-post-'); const id = arr[0]; return id.startsWith('q-blog-') ? id.substring(7) : id;" } - // methods: { - // getShortId: function(resource) { - // console.log({resource}) - // const str = resource.identifier - // const arr = str.split('-post-') - // const shortIdentifier = arr[1] - - // return shortIdentifier - // }, - // getBlogId: function(resource) { - // console.log({resource}) - // const str = resource.identifier - // const arr = str.split('-post-') - // const id = arr[0] - // let blogId = "" - // if (id.startsWith('q-blog-')) { - // blogId = id.substring(7); - // } else { - // blogId= id; - // } - // return blogId - // } - // } + } ] } -// export const schema = JSON.stringify(schema2, null, 2); // 2 spaces indentation diff --git a/core/src/components/friends-view/friends-side-panel-parent.js b/core/src/components/friends-view/friends-side-panel-parent.js index a31ac737..91812664 100644 --- a/core/src/components/friends-view/friends-side-panel-parent.js +++ b/core/src/components/friends-view/friends-side-panel-parent.js @@ -4,7 +4,8 @@ import './friends-side-panel.js'; class FriendsSidePanelParent extends LitElement { static get properties() { return { - isOpen: {type: Boolean} + isOpen: {type: Boolean}, + hasNewFeed: {type: Boolean} }; } @@ -12,6 +13,7 @@ class FriendsSidePanelParent extends LitElement { constructor() { super(); this.isOpen = false + this.hasNewFeed = false } static styles = css` .header { @@ -42,14 +44,22 @@ class FriendsSidePanelParent extends LitElement { } `; + setHasNewFeed(val){ + this.hasNewFeed = val + } render() { return html` { this.isOpen = !this.isOpen - }} style="color: var(--black); cursor:pointer;user-select:none" + if(this.isOpen && this.hasNewFeed){ + localStorage.setItem('lastSeenFeed', Date.now()); + this.hasNewFeed = false + this.shadowRoot.querySelector("friends-side-panel").selected = 'feed' + } + }} style="color: ${this.hasNewFeed ? 'green' : 'var(--black)'}; cursor:pointer;user-select:none" >group - this.isOpen = val}> + this.setHasNewFeed(val)} ?isOpen=${this.isOpen} .setIsOpen=${(val)=> this.isOpen = val}> `; } diff --git a/core/src/components/friends-view/friends-side-panel.js b/core/src/components/friends-view/friends-side-panel.js index 76740d5c..c32e1f64 100644 --- a/core/src/components/friends-view/friends-side-panel.js +++ b/core/src/components/friends-view/friends-side-panel.js @@ -8,7 +8,8 @@ class FriendsSidePanel extends LitElement { return { setIsOpen: { attribute: false}, isOpen: {type: Boolean}, - selected: {type: String} + selected: {type: String}, + setHasNewFeed: {attribute: false} }; } @@ -115,7 +116,7 @@ class FriendsSidePanel extends LitElement {
- + this.setHasNewFeed(val)}>