diff --git a/README.md b/README.md index 3466940e0..14f3f486a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

-RSSHub +RSSHub

-

ReadOK

+

Follow

> [WIP] Next generation information browser diff --git a/dev-app-update.yml b/dev-app-update.yml index 3ab287340..8fa9a85a5 100644 --- a/dev-app-update.yml +++ b/dev-app-update.yml @@ -1,3 +1,3 @@ provider: generic url: https://example.com/auto-updates -updaterCacheDirName: readok-updater +updaterCacheDirName: follow-updater diff --git a/docker-compose.deps.yml b/docker-compose.deps.yml index be7fb1e50..bf8479759 100644 --- a/docker-compose.deps.yml +++ b/docker-compose.deps.yml @@ -11,5 +11,5 @@ services: - IMGPROXY_ENABLE_AVIF_DETECTION=true - IMGPROXY_READ_TIMEOUT=30 - IMGPROXY_DOWNLOAD_TIMEOUT=30 - - IMGPROXY_TRUSTED_SIGNATURES=readok + - IMGPROXY_TRUSTED_SIGNATURES=follow - IMGPROXY_IGNORE_SSL_VERIFICATION=true diff --git a/electron-builder.yml b/electron-builder.yml index adab2ee14..fc2e72207 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,5 @@ -appId: io.readok -productName: readok +appId: io.follow +productName: follow directories: buildResources: build files: @@ -12,7 +12,7 @@ files: asarUnpack: - resources/** win: - executableName: readok + executableName: follow nsis: artifactName: ${name}-${version}-setup.${ext} shortcutName: ${productName} @@ -42,7 +42,7 @@ publish: provider: generic url: https://example.com/auto-updates protocols: - name: ReadOK + name: Follow schemes: - - readok + - follow - feed diff --git a/package.json b/package.json index 17ee5c3b6..d91e99e83 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "readok", + "name": "follow", "version": "0.0.1", "description": "An Electron application with React and TypeScript", "main": "./out/main/index.js", diff --git a/src/main/index.ts b/src/main/index.ts index 1c4dc424b..036cac201 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -6,12 +6,12 @@ import { createWindow } from "./window" if (process.defaultApp) { if (process.argv.length >= 2) { - app.setAsDefaultProtocolClient("readok", process.execPath, [ + app.setAsDefaultProtocolClient("follow", process.execPath, [ path.resolve(process.argv[1]), ]) } } else { - app.setAsDefaultProtocolClient("readok") + app.setAsDefaultProtocolClient("follow") } app.dock.setIcon(path.join(__dirname, "../../resources/icon.png")) @@ -21,7 +21,7 @@ app.dock.setIcon(path.join(__dirname, "../../resources/icon.png")) // Some APIs can only be used after this event occurs. app.whenReady().then(() => { // Set app user model id for windows - electronApp.setAppUserModelId("io.readok") + electronApp.setAppUserModelId("re.follow") // Default open or close DevTools by F12 in development // and ignore CommandOrControl + R in production. diff --git a/src/renderer/index.html b/src/renderer/index.html index 187e75dad..97192d472 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -3,7 +3,7 @@ - ReadOK + Follow
diff --git a/src/renderer/src/components/feed-column/index.tsx b/src/renderer/src/components/feed-column/index.tsx index 694797967..3816ce676 100644 --- a/src/renderer/src/components/feed-column/index.tsx +++ b/src/renderer/src/components/feed-column/index.tsx @@ -75,7 +75,7 @@ export function FeedColumn({
logo - ReadOK + Follow
diff --git a/src/renderer/src/components/subscribe/readok-user-form.tsx b/src/renderer/src/components/subscribe/follow-user-form.tsx similarity index 88% rename from src/renderer/src/components/subscribe/readok-user-form.tsx rename to src/renderer/src/components/subscribe/follow-user-form.tsx index a434aba37..c6a767fc4 100644 --- a/src/renderer/src/components/subscribe/readok-user-form.tsx +++ b/src/renderer/src/components/subscribe/follow-user-form.tsx @@ -17,7 +17,7 @@ const formSchema = z.object({ url: z.string().min(1), }) -export function ReadOKUserForm() { +export function FollowUserForm() { const form = useForm>({ resolver: zodResolver(formSchema), defaultValues: { @@ -30,9 +30,9 @@ export function ReadOKUserForm() { const url = form.watch("url") useEffect(() => { - if (!url.startsWith("readok://")) { - form.setValue("url", "readok://") - } else if (url.startsWith("readok://readok://")) { + if (!url.startsWith("follow://")) { + form.setValue("url", "follow://") + } else if (url.startsWith("follow://follow://")) { form.setValue("url", url.slice(9)) } }, [url]) diff --git a/src/renderer/src/lib/img-proxy.ts b/src/renderer/src/lib/img-proxy.ts index f2d9ab00f..0732e6a16 100644 --- a/src/renderer/src/lib/img-proxy.ts +++ b/src/renderer/src/lib/img-proxy.ts @@ -7,5 +7,5 @@ export const getProxyUrl = ({ width: number height: number }) => { - return `https://img.readok.local/readok/rs:fill:${width}:${height}/plain/${url}` + return `https://img.follow.local/follow/rs:fill:${width}:${height}/plain/${url}` } diff --git a/src/renderer/src/pages/(main)/subscribe/index.tsx b/src/renderer/src/pages/(main)/subscribe/index.tsx index 7999c964e..5c6536e74 100644 --- a/src/renderer/src/pages/(main)/subscribe/index.tsx +++ b/src/renderer/src/pages/(main)/subscribe/index.tsx @@ -7,7 +7,7 @@ import { import { Recommendations } from "@renderer/components/subscribe/recommendations" import { RSSForm } from "@renderer/components/subscribe/rss-form" import { RSSHubForm } from "@renderer/components/subscribe/rsshub-form" -import { ReadOKUserForm } from "@renderer/components/subscribe/readok-user-form" +import { FollowUserForm } from "@renderer/components/subscribe/follow-user-form" export function Component() { const tabs = [ @@ -20,8 +20,8 @@ export function Component() { content: , }, { - name: "ReadOK User", - content: , + name: "Follow User", + content: , }, { name: "RSS3", diff --git a/src/renderer/src/pages/login.tsx b/src/renderer/src/pages/login.tsx index e6eff90c8..a3f9bd3ed 100644 --- a/src/renderer/src/pages/login.tsx +++ b/src/renderer/src/pages/login.tsx @@ -2,12 +2,12 @@ import { Button } from "@renderer/components/ui/button" import { signIn } from "@hono/auth-js/react" export function Component() { - const callbackUrl = `${import.meta.env.VITE_ELECTRON_REMOTE_URL}/redirect?app=readok` + const callbackUrl = `${import.meta.env.VITE_ELECTRON_REMOTE_URL}/redirect?app=follow` return (
logo -

Log in to ReadOK

+

Log in to Follow

)