From f4286e8476718f1fafd44490248691fe5011df7e Mon Sep 17 00:00:00 2001 From: creep Date: Thu, 2 Nov 2023 19:08:57 +0800 Subject: [PATCH 1/8] docs: typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e26f6ba..238af35 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # emo -I wish to develop **emo** as an **all in one** application. Now, it includes the follow apps: +I wish to develop **emo** as an **all in one** application. Now, it includes the following apps: - **Reader** - A rss reader. ## Features From 2056a7e57f0040015cd704c00e0c55166d2bd0e2 Mon Sep 17 00:00:00 2001 From: creep Date: Thu, 2 Nov 2023 19:19:09 +0800 Subject: [PATCH 2/8] chore: remove prefix of release name --- forge.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/forge.config.js b/forge.config.js index 5bc6916..2009130 100644 --- a/forge.config.js +++ b/forge.config.js @@ -52,6 +52,7 @@ module.exports = { }, prerelease: true, draft: true, + tagPrefix: '', }, }, ], From 20ada557cf0774b74665f7aba584cc84276b18e5 Mon Sep 17 00:00:00 2001 From: creep Date: Thu, 2 Nov 2023 19:24:54 +0800 Subject: [PATCH 3/8] docs: improve presentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 238af35..601bd80 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # emo -I wish to develop **emo** as an **all in one** application. Now, it includes the following apps: +I wish to develop **emo** as an **all in one** desktop application. Now, it includes the following apps: - **Reader** - A rss reader. ## Features From ae8d9400631875dca0d671f9e5e9d9073b924700 Mon Sep 17 00:00:00 2001 From: creep Date: Fri, 3 Nov 2023 10:31:54 +0800 Subject: [PATCH 4/8] fix(reader): fix get all feeds sql, move a.reader = 0 from where to on clause --- src/main/reader/services/feed.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/reader/services/feed.ts b/src/main/reader/services/feed.ts index e2ba230..002b0c6 100644 --- a/src/main/reader/services/feed.ts +++ b/src/main/reader/services/feed.ts @@ -33,10 +33,9 @@ export const getByUrl = async (url: string) => { export const getAll = async (): Promise => { const sql = ` - select f.*, count(*) as count + select f.*, count(a.id) as count from feeds as f left outer join articles as a - on f.id = a.feedId - where a.read = 0 + on f.id = a.feedId and a.read = 0 group by f.id order by createTime desc; ` From 63f214f2f7666662a3be5aa953084770e56249c5 Mon Sep 17 00:00:00 2001 From: creep Date: Fri, 3 Nov 2023 10:38:23 +0800 Subject: [PATCH 5/8] 0.1.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57aafdc..09bf24f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "emo", - "version": "0.1.0", + "version": "0.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "emo", - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "dependencies": { "@fluentui/react-components": "^9.30.1", diff --git a/package.json b/package.json index d8e0ce0..b4a6e3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "emo", - "version": "0.1.0", + "version": "0.1.1", "description": "An all in one application, includes Reader-a rss reader", "main": "./dist/main.js", "scripts": { From ec57cebfd694aff1d8c6bd0545bc1a5d08da0287 Mon Sep 17 00:00:00 2001 From: creep Date: Fri, 3 Nov 2023 11:14:54 +0800 Subject: [PATCH 6/8] feat(Reader): add style for link in article content --- .../apps/reader/MainPanel/Article/content.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/renderer/apps/reader/MainPanel/Article/content.tsx b/src/renderer/apps/reader/MainPanel/Article/content.tsx index 528a402..119b458 100644 --- a/src/renderer/apps/reader/MainPanel/Article/content.tsx +++ b/src/renderer/apps/reader/MainPanel/Article/content.tsx @@ -34,6 +34,21 @@ const useStyles = makeStyles({ fontSize: tokens.fontSizeBase400, lineHeight: 1.2, }, + + '& a': { + color: tokens.colorBrandForegroundLink, + textDecorationLine: 'underline', + + ':hover': { + color: tokens.colorBrandForegroundLinkHover, + }, + ':active': { + color: tokens.colorBrandForegroundLinkSelected, + }, + ':visited': { + color: tokens.colorBrandForegroundLinkPressed, + }, + }, }, }) From 339f70d0e55dccab1f980affa00e5e96ee950a75 Mon Sep 17 00:00:00 2001 From: creep Date: Fri, 3 Nov 2023 11:50:37 +0800 Subject: [PATCH 7/8] fix(Reader): open link in browser --- .../apps/reader/MainPanel/Article/content.tsx | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/renderer/apps/reader/MainPanel/Article/content.tsx b/src/renderer/apps/reader/MainPanel/Article/content.tsx index 119b458..b40d9ca 100644 --- a/src/renderer/apps/reader/MainPanel/Article/content.tsx +++ b/src/renderer/apps/reader/MainPanel/Article/content.tsx @@ -1,9 +1,10 @@ /* eslint-disable react/no-danger */ - +import { useEffect, useRef } from 'react' import { makeStyles, tokens } from '@fluentui/react-components' import { observer } from 'mobx-react-lite' import { store } from '@/renderer/store' import { format as formatTime } from '@/utils/common/date' +import { openExternal } from '@/utils/browser/shell' const { readerStore } = store @@ -68,6 +69,27 @@ function Content() { } = activeArticle const feed = feeds.find((v) => v.id === feedId)! + const containerRef = useRef(null) + + useEffect(() => { + const el = containerRef.current + const handler = (e: MouseEvent) => { + const { target } = e + if (!(target instanceof HTMLAnchorElement) || !target.href) { + return + } + + e.preventDefault() + openExternal(target.href) + } + + el?.addEventListener('click', handler) + + return () => { + el?.removeEventListener('click', handler) + } + }, [containerRef.current]) + return (

@@ -85,6 +107,7 @@ function Content() {

From a56829b21cb7f111c71467139038c7a02680ce22 Mon Sep 17 00:00:00 2001 From: creep Date: Fri, 3 Nov 2023 12:56:03 +0800 Subject: [PATCH 8/8] 0.1.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09bf24f..62fb67f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "emo", - "version": "0.1.1", + "version": "0.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "emo", - "version": "0.1.1", + "version": "0.1.2", "license": "MIT", "dependencies": { "@fluentui/react-components": "^9.30.1", diff --git a/package.json b/package.json index b4a6e3e..0759e95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "emo", - "version": "0.1.1", + "version": "0.1.2", "description": "An all in one application, includes Reader-a rss reader", "main": "./dist/main.js", "scripts": {