From b42c3103f1c62f2eb4151ded7f3025b25ff26c4c Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Fri, 5 Jan 2024 20:11:29 +0100 Subject: [PATCH] Feature/rebrand to suwayomi (#500) * Rename "Tachidesk-WebUI" to "Suwayomi-WebUI" * Rename "Tachidesk-Server" to "Suwayomi-Server" * Rename "Tachidesk" to "Suwayomi" * Rename variables --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/workflows/build_push_master.yml | 6 +++--- CONTRIBUTING.md | 4 ++-- README.md | 18 +++++++++--------- index.html | 2 +- package.json | 2 +- public/manifest.json | 4 ++-- src/components/context/NavbarContext.tsx | 2 +- .../navbar/NavBarContextProvider.tsx | 4 ++-- .../reader/pager/HorizontalPager.tsx | 2 +- src/components/reader/pager/VerticalPager.tsx | 2 +- src/screens/Settings.tsx | 2 +- src/screens/SourceMangas.tsx | 2 +- src/screens/settings/About.tsx | 4 ++-- src/theme.ts | 4 ++-- tools/scripts/createReleaseChangelog.ts | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 52841103..d4023547 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -23,7 +23,7 @@ Note that the issue will be automatically closed if you do not fill out the titl --- ## Device information -- Tachidesk version: (Example: v0.2.3-r255-win32) +- Suwayomi version: (Example: v0.2.3-r255-win32) - Server Operating System: (Example: Ubuntu 20.04) - Server Desktop Environment: N/A or (Example: Gnome 40) - Server JVM version: bundled with win32 or (Example: Java 8 Update 281 or OpenJDK 8u281) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index a59f2812..e6cd027e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -22,7 +22,7 @@ Note that the issue will be automatically closed if you do not fill out the titl --- -## What feature should be added to Tachidesk? +## What feature should be added to Suwayomi? Explain What the feature is and how it should work in detail. Remove this line after you are done. ## Why/Project's Benefit/Existing Problem diff --git a/.github/workflows/build_push_master.yml b/.github/workflows/build_push_master.yml index 8c41bc97..623c9b4b 100644 --- a/.github/workflows/build_push_master.yml +++ b/.github/workflows/build_push_master.yml @@ -51,7 +51,7 @@ jobs: - name: Checkout preview branch uses: actions/checkout@v2 with: - repository: "Suwayomi/Tachidesk-WebUI-preview" + repository: "Suwayomi/Suwayomi-WebUI-preview" ref: main path: preview token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }} @@ -77,13 +77,13 @@ jobs: token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }} artifacts: "master/buildZip/*" owner: "Suwayomi" - repo: "Tachidesk-WebUI-preview" + repo: "Suwayomi-WebUI-preview" tag: ${{ steps.GenTagName.outputs.value }} - name: Checkout github pages repo uses: actions/checkout@v2 with: - repository: "Tachidesk-WebUI-preview/tachidesk-webui-preview.github.io" + repository: "Suwayomi-WebUI-preview/suwayomi-webui-preview.github.io" ref: main path: gh-pages token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff2600ec..fa3ee087 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing ## Where should I start? -Everything from https://github.com/Suwayomi/Tachidesk-Server/blob/master/CONTRIBUTING.md#where-should-i-start applies here. +Everything from https://github.com/Suwayomi/Suwayomi-Server/blob/master/CONTRIBUTING.md#where-should-i-start applies here. ## About this project @@ -16,7 +16,7 @@ See [BUILDING.md](./BUILDING.md) for more information 2. Update the [version to server version mapping file](versionToServerVersionMapping.json) 1. See [wWen to update](#when-to-update) -## WebUI to [Server](https://github.com/Suwayomi/Tachidesk-Server) mapping +## WebUI to [Server](https://github.com/Suwayomi/Suwayomi-Server) mapping ### Explanation For the server to be able to automatically download the latest compatible WebUI version, the [version to server version mapping file](versionToServerVersionMapping.json) has to be provided.
diff --git a/README.md b/README.md index 59ac1063..c0dce1b7 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,23 @@ ## Hold up! -If you got here hoping to download Tachidesk-WebUI, go back and download [Tachidesk-Server](https://github.com/Suwayomi/Tachidesk-Server), Tachidesk-WebUI is distributed as an embedded web interface along with Tachidesk-Server. +If you got here hoping to download Suwayomi-WebUI, go back and download [Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server), Suwayomi-WebUI is distributed as an embedded web interface along with Suwayomi-Server. -# Tachidesk-WebUI -WebUI doesn't have it's own Tachidesk distribution and is version locked by Tachidesk-Server, In other words the Tachidesk-WebUI distribution is actually the Tachidesk-Server distribution. +# Suwayomi-WebUI +WebUI doesn't have it's own Suwayomi distribution and is version locked by Suwayomi-Server, In other words the Suwayomi-WebUI distribution is actually the Suwayomi-Server distribution. -Online builds of WebUI of are always available [here](https://tachidesk-webui-preview.github.io/). -*Make sure to set your Tachidesk-Server hostname in Settings or you'll get infinite loading.* Also note that its the **latest** revision of WebUI and might not work correctly if you connect to a stable build of Tachidesk-Server. +Online builds of WebUI of are always available [here](https://suwayomi-webui-preview.github.io/). +*Make sure to set your Suwayomi-Server hostname in Settings or you'll get infinite loading.* Also note that its the **latest** revision of WebUI and might not work correctly if you connect to a stable build of Suwayomi-Server. -You can find minified builds of WebUI in [Tachidesk-WebUI-preview](https://github.com/Suwayomi/Tachidesk-WebUI-preview) +You can find minified builds of WebUI in [Suwayomi-WebUI-preview](https://github.com/Suwayomi/Suwayomi-WebUI-preview) ## Contributing and Technical info See [CONTRIBUTING.md](./CONTRIBUTING.md). ## Translation -Feel free to translate the project on [Weblate](https://hosted.weblate.org/projects/suwayomi/tachidesk-webui/) +Feel free to translate the project on [Weblate](https://hosted.weblate.org/projects/suwayomi/suwayomi-webui/)
Translation Progress - -Translation status + +Translation status
diff --git a/index.html b/index.html index 5cebf60d..a0780420 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> - Tachidesk + Suwayomi diff --git a/package.json b/package.json index 60412bd0..dc8dc631 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "vite build", "test": "node -e \"console.log('imagine')\"", "build-md5": "find build -type f | sort | xargs md5sum | awk '{ print $1 }' | tr -d '\n' | md5sum| awk '{ print $1 }' > buildZip/md5sum ", - "build-zip": "cd build && rev=$(git rev-list HEAD --count) && echo r$rev > revision && zip -9 -r ../buildZip/Tachidesk-WebUI-r$rev *", + "build-zip": "cd build && rev=$(git rev-list HEAD --count) && echo r$rev > revision && zip -9 -r ../buildZip/Suwayomi-WebUI-r$rev *", "lint": "eslint src --ext .ts,.tsx,.js,.jsx", "createChangelog": "ts-node tools/scripts/createReleaseChangelog.ts", "updateDeps": "yarn upgrade && yarn syncyarnlock -s -k && yarn && git add package.json yarn.lock && git commit -m \"Update dependencies\" && echo Updated non breaking dependencies. Check potential breaking changes below... && yarn outdated", diff --git a/public/manifest.json b/public/manifest.json index d5fff124..d6f8be7e 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Tachidesk", - "name": "Tachidesk", + "short_name": "Suwayomi", + "name": "Suwayomi", "icons": [ { "src": "favicon.ico", diff --git a/src/components/context/NavbarContext.tsx b/src/components/context/NavbarContext.tsx index 5e6ab1fb..af7a8619 100644 --- a/src/components/context/NavbarContext.tsx +++ b/src/components/context/NavbarContext.tsx @@ -30,7 +30,7 @@ type ContextType = { export const NavBarContext = React.createContext({ defaultBackTo: undefined, setDefaultBackTo: (): void => {}, - title: 'Tachidesk', + title: 'Suwayomi', setTitle: (): void => {}, action:
, setAction: (): void => {}, diff --git a/src/components/navbar/NavBarContextProvider.tsx b/src/components/navbar/NavBarContextProvider.tsx index c087732e..ed6fca76 100644 --- a/src/components/navbar/NavBarContextProvider.tsx +++ b/src/components/navbar/NavBarContextProvider.tsx @@ -16,7 +16,7 @@ interface IProps { export function NavBarContextProvider({ children }: IProps) { const [defaultBackTo, setDefaultBackTo] = useState(); - const [title, setTitle] = useState('Tachidesk'); + const [title, setTitle] = useState('Suwayomi'); const [action, setAction] = useState(
); const [override, setOverride] = useState({ status: false, @@ -25,7 +25,7 @@ export function NavBarContextProvider({ children }: IProps) { const updateTitle = useCallback( (newTitle: string | React.ReactNode, browserTitle: string = typeof newTitle === 'string' ? newTitle : '') => { - document.title = `${browserTitle} - Tachidesk`; + document.title = `${browserTitle} - Suwayomi`; setTitle(newTitle); }, [setTitle], diff --git a/src/components/reader/pager/HorizontalPager.tsx b/src/components/reader/pager/HorizontalPager.tsx index 45520436..57f1bfc6 100644 --- a/src/components/reader/pager/HorizontalPager.tsx +++ b/src/components/reader/pager/HorizontalPager.tsx @@ -151,7 +151,7 @@ export function HorizontalPager(props: IReaderProps) { // Special case if scroll is moved all the way to the edge // This handles cases when last page is show, but is smaller then // window, in which case it would never get marked as read. - // See https://github.com/Suwayomi/Tachidesk-WebUI/issues/14 for more info + // See https://github.com/Suwayomi/Suwayomi-WebUI/issues/14 for more info if (settings.readerType === 'ContinuesHorizontalLTR' ? isAtEnd() : isAtStart()) { currentPageRef.current = pages.length - 1; setCurPage(currentPageRef.current); diff --git a/src/components/reader/pager/VerticalPager.tsx b/src/components/reader/pager/VerticalPager.tsx index c0bb2f5c..200e6966 100644 --- a/src/components/reader/pager/VerticalPager.tsx +++ b/src/components/reader/pager/VerticalPager.tsx @@ -57,7 +57,7 @@ export function VerticalPager(props: IReaderProps) { // If scroll is moved all the way to the bottom // This handles cases when last page is show, but is smaller then // window, in which case it would never get marked as read. - // See https://github.com/Suwayomi/Tachidesk-WebUI/issues/14 for more info + // See https://github.com/Suwayomi/Suwayomi-WebUI/issues/14 for more info currentPageRef.current = pages.length - 1; setCurPage(currentPageRef.current); diff --git a/src/screens/Settings.tsx b/src/screens/Settings.tsx index fba8c8ce..2acc3e89 100644 --- a/src/screens/Settings.tsx +++ b/src/screens/Settings.tsx @@ -135,7 +135,7 @@ export function Settings() { secondary={ <> {t('settings.label.language_description')} - + {t('global.language.title.weblate')} diff --git a/src/screens/SourceMangas.tsx b/src/screens/SourceMangas.tsx index 3739a01f..ccaca12a 100644 --- a/src/screens/SourceMangas.tsx +++ b/src/screens/SourceMangas.tsx @@ -243,7 +243,7 @@ export function SourceMangas() { const messageExtra = isLocalSource ? ( <> {t('source.local_source.label.checkout')} - + {t('source.local_source.label.guide')} diff --git a/src/screens/settings/About.tsx b/src/screens/settings/About.tsx index 8ce173b7..4e250e08 100644 --- a/src/screens/settings/About.tsx +++ b/src/screens/settings/About.tsx @@ -360,10 +360,10 @@ export function About() { - + diff --git a/src/theme.ts b/src/theme.ts index 509f4e00..f7376a3e 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -28,7 +28,7 @@ export const createTheme = (dark?: boolean) => { }, } as Theme); - const tachideskTheme = createMuiTheme( + const suwayomiTheme = createMuiTheme( { palette: { custom: { @@ -60,5 +60,5 @@ export const createTheme = (dark?: boolean) => { baseTheme, ); - return tachideskTheme; + return suwayomiTheme; }; diff --git a/tools/scripts/createReleaseChangelog.ts b/tools/scripts/createReleaseChangelog.ts index 2b905574..22bd3f5d 100644 --- a/tools/scripts/createReleaseChangelog.ts +++ b/tools/scripts/createReleaseChangelog.ts @@ -107,7 +107,7 @@ const createChangelogCommitLine = (commit: Commit): string => { const createChangelog = async (prevReleaseLastCommitSha: string) => { const owner = 'Suwayomi'; - const repo = 'Tachidesk-WebUI'; + const repo = 'Suwayomi-WebUI'; const numberOfCommits = await fetchTotalCommitCount(owner, repo); const githubCommits = await fetchCommits(owner, repo, prevReleaseLastCommitSha);