From 6fe6fc180d85aa23bc835ad563ff29e62d87593e Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sun, 1 Dec 2024 16:27:59 -0500 Subject: [PATCH] ssb: New theme, better load, remove debug prints. --- apps/ssb.json | 2 +- apps/ssb/tf-app.js | 7 +++---- apps/ssb/tf-news.js | 2 -- apps/ssb/tf-styles.js | 42 +++++++++++++++++++++--------------------- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/apps/ssb.json b/apps/ssb.json index 92f3946f..944fe64c 100644 --- a/apps/ssb.json +++ b/apps/ssb.json @@ -1,5 +1,5 @@ { "type": "tildefriends-app", "emoji": "🐌", - "previous": "&rSi+8iIn1Q/dKk4ptu4z8cX2tc3xPvqJBeFkoSpdYvM=.sha256" + "previous": "&HvktcPAoPEAMafJDMGKe7PQQID9wMsAEpSLeoG75hJk=.sha256" } diff --git a/apps/ssb/tf-app.js b/apps/ssb/tf-app.js index ecc4f318..7e9e9283 100644 --- a/apps/ssb/tf-app.js +++ b/apps/ssb/tf-app.js @@ -254,9 +254,9 @@ class TfElement extends LitElement { UNION SELECT '' AS channel, MAX(messages.rowid) AS rowid FROM messages JOIN json_each(?2) AS following ON messages.author = following.value + WHERE messages.content ->> 'type' = 'post' `, [JSON.stringify(this.channels), JSON.stringify(Object.keys(following))]); this.channels_unread = JSON.parse((await tfrpc.rpc.databaseGet('unread')) ?? '{}'); - console.log(by_count.sort((x, y) => y.count - x.count).slice(0, 20)); let start_time = new Date(); users = await this.fetch_about(Object.keys(following).sort(), users); console.log( @@ -266,9 +266,10 @@ class TfElement extends LitElement { Object.keys(users).length, 'users' ); + start_time = new Date(); channels = await channels; + console.log('channels took', (new Date() - start_time) / 1000.0); this.channels_latest = Object.fromEntries(channels.map(x => [x.channel, x.rowid])); - console.log('CHANNELS', channels); this.following = Object.keys(following); this.users = users; console.log(`load finished ${whoami} => ${this.whoami}`); @@ -277,10 +278,8 @@ class TfElement extends LitElement { } channel_set_unread(event) { - console.log(event.detail.channel ?? '', event.detail.unread); this.channels_unread[event.detail.channel ?? ''] = event.detail.unread; this.channels_unread = Object.assign({}, this.channels_unread); - console.log(this.channels_unread); tfrpc.rpc.databaseSet('unread', JSON.stringify(this.channels_unread)); } diff --git a/apps/ssb/tf-news.js b/apps/ssb/tf-news.js index 39d400e9..9ea9d364 100644 --- a/apps/ssb/tf-news.js +++ b/apps/ssb/tf-news.js @@ -184,12 +184,10 @@ class TfNewsElement extends LitElement { let unread_rowid = -1; for (let message of final_messages) { if (message.rowid < this.channel_unread) { - console.log(message.rowid, this.channel_unread); unread_rowid = message.rowid; break; } } - console.log(unread_rowid); return html`
${final_messages.map( diff --git a/apps/ssb/tf-styles.js b/apps/ssb/tf-styles.js index 73e041f8..e29ba61c 100644 --- a/apps/ssb/tf-styles.js +++ b/apps/ssb/tf-styles.js @@ -286,29 +286,29 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} `; // prettier-ignore -const w3_2016_riverside = css` -.w3-theme-l5 {color:#000 !important; background-color:#f4f6f9 !important} -.w3-theme-l4 {color:#000 !important; background-color:#d9e1ec !important} -.w3-theme-l3 {color:#000 !important; background-color:#b4c3d8 !important} -.w3-theme-l2 {color:#fff !important; background-color:#8ea6c5 !important} -.w3-theme-l1 {color:#fff !important; background-color:#6888b1 !important} -.w3-theme-d1 {color:#fff !important; background-color:#456185 !important} -.w3-theme-d2 {color:#fff !important; background-color:#3d5676 !important} -.w3-theme-d3 {color:#fff !important; background-color:#354b68 !important} -.w3-theme-d4 {color:#fff !important; background-color:#2e4059 !important} -.w3-theme-d5 {color:#fff !important; background-color:#26364a !important} +const w3_2016_snorkel_blue = css` +.w3-theme-l5 {color:#000 !important; background-color:#e9f5ff !important} +.w3-theme-l4 {color:#000 !important; background-color:#b5dffd !important} +.w3-theme-l3 {color:#000 !important; background-color:#6bc0fc !important} +.w3-theme-l2 {color:#fff !important; background-color:#21a0fa !important} +.w3-theme-l1 {color:#fff !important; background-color:#0479cc !important} +.w3-theme-d1 {color:#fff !important; background-color:#024575 !important} +.w3-theme-d2 {color:#fff !important; background-color:#023e68 !important} +.w3-theme-d3 {color:#fff !important; background-color:#02365b !important} +.w3-theme-d4 {color:#fff !important; background-color:#022e4e !important} +.w3-theme-d5 {color:#fff !important; background-color:#012641 !important} -.w3-theme-light {color:#000 !important; background-color:#f4f6f9 !important} -.w3-theme-dark {color:#fff !important; background-color:#26364a !important} -.w3-theme-action {color:#fff !important; background-color:#26364a !important} +.w3-theme-light {color:#000 !important; background-color:#e9f5ff !important} +.w3-theme-dark {color:#fff !important; background-color:#012641 !important} +.w3-theme-action {color:#fff !important; background-color:#012641 !important} -.w3-theme {color:#fff !important; background-color:#4c6a92 !important} -.w3-text-theme {color:#4c6a92 !important} -.w3-border-theme {border-color:#4c6a92 !important} +.w3-theme {color:#fff !important; background-color:#034f84 !important} +.w3-text-theme {color:#034f84 !important} +.w3-border-theme {border-color:#034f84 !important} -.w3-hover-theme:hover {color:#fff !important; background-color:#4c6a92 !important} -.w3-hover-text-theme:hover {color:#4c6a92 !important} -.w3-hover-border-theme:hover {border-color:#4c6a92 !important} +.w3-hover-theme:hover {color:#fff !important; background-color:#034f84 !important} +.w3-hover-text-theme:hover {color:#034f84 !important} +.w3-hover-border-theme:hover {border-color:#034f84 !important} `; -export let styles = [tf, w3, w3_2016_riverside]; +export let styles = [tf, w3, w3_2016_snorkel_blue];