diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f4921456..b3d27377 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,6 +12,9 @@ env: jobs: deploy: runs-on: ubuntu-latest + defaults: + run: + working-directory: "website" permissions: contents: read @@ -33,6 +36,7 @@ jobs: with: node-version: 16 cache: npm + cache-dependency-path: "**/package-lock.json" - name: Install and build run: npm ci && npm run docs:build @@ -43,7 +47,7 @@ jobs: - name: Upload pages artifact uses: actions/upload-pages-artifact@v1 with: - path: src/.vitepress/dist + path: website/src/.vitepress/dist - name: Deploy id: deployment diff --git a/.gitignore b/.gitignore index 0d818ae6..c1e7a1f9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,14 +11,14 @@ .vite_opt_cache .vscode /coverage -/src/client/shared.ts -/src/node/shared.ts +website/src/client/shared.ts +website/src/node/shared.ts cache dist examples-temp node_modules pnpm-global -src/.temp -src/assets/style/sandbox.styl +website/src/.temp +website/src/assets/style/sandbox.styl temp TODOs.md diff --git a/netlify.toml b/netlify.toml index b4570b2e..ef56725a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,5 +2,6 @@ NODE_VERSION = "16" [build] + base = "website" publish = "src/.vitepress/dist" command = "npm run docs:build" diff --git a/.editorconfig b/website/.editorconfig similarity index 100% rename from .editorconfig rename to website/.editorconfig diff --git a/.eslintignore b/website/.eslintignore similarity index 100% rename from .eslintignore rename to website/.eslintignore diff --git a/.eslintrc.js b/website/.eslintrc.js similarity index 100% rename from .eslintrc.js rename to website/.eslintrc.js diff --git a/.markdownlint.json b/website/.markdownlint.json similarity index 100% rename from .markdownlint.json rename to website/.markdownlint.json diff --git a/.markdownlintignore b/website/.markdownlintignore similarity index 100% rename from .markdownlintignore rename to website/.markdownlintignore diff --git a/.prettierignore b/website/.prettierignore similarity index 100% rename from .prettierignore rename to website/.prettierignore diff --git a/.prettierrc.js b/website/.prettierrc.js similarity index 100% rename from .prettierrc.js rename to website/.prettierrc.js diff --git a/.stylintrc b/website/.stylintrc similarity index 100% rename from .stylintrc rename to website/.stylintrc diff --git a/package-lock.json b/website/package-lock.json similarity index 100% rename from package-lock.json rename to website/package-lock.json diff --git a/package.json b/website/package.json similarity index 100% rename from package.json rename to website/package.json diff --git a/src/.vitepress/config/head.ts b/website/src/.vitepress/config/head.ts similarity index 100% rename from src/.vitepress/config/head.ts rename to website/src/.vitepress/config/head.ts diff --git a/src/.vitepress/config/hooks/generateFeed.ts b/website/src/.vitepress/config/hooks/generateFeed.ts similarity index 100% rename from src/.vitepress/config/hooks/generateFeed.ts rename to website/src/.vitepress/config/hooks/generateFeed.ts diff --git a/src/.vitepress/config/hooks/generateMeta.ts b/website/src/.vitepress/config/hooks/generateMeta.ts similarity index 100% rename from src/.vitepress/config/hooks/generateMeta.ts rename to website/src/.vitepress/config/hooks/generateMeta.ts diff --git a/src/.vitepress/config/hooks/generateSitemap.ts b/website/src/.vitepress/config/hooks/generateSitemap.ts similarity index 100% rename from src/.vitepress/config/hooks/generateSitemap.ts rename to website/src/.vitepress/config/hooks/generateSitemap.ts diff --git a/src/.vitepress/config/icons.ts b/website/src/.vitepress/config/icons.ts similarity index 100% rename from src/.vitepress/config/icons.ts rename to website/src/.vitepress/config/icons.ts diff --git a/src/.vitepress/config/index.ts b/website/src/.vitepress/config/index.ts similarity index 100% rename from src/.vitepress/config/index.ts rename to website/src/.vitepress/config/index.ts diff --git a/src/.vitepress/config/markdown.ts b/website/src/.vitepress/config/markdown.ts similarity index 100% rename from src/.vitepress/config/markdown.ts rename to website/src/.vitepress/config/markdown.ts diff --git a/src/.vitepress/config/navigation/navbar.ts b/website/src/.vitepress/config/navigation/navbar.ts similarity index 100% rename from src/.vitepress/config/navigation/navbar.ts rename to website/src/.vitepress/config/navigation/navbar.ts diff --git a/src/.vitepress/config/navigation/sidebar.ts b/website/src/.vitepress/config/navigation/sidebar.ts similarity index 100% rename from src/.vitepress/config/navigation/sidebar.ts rename to website/src/.vitepress/config/navigation/sidebar.ts diff --git a/src/.vitepress/config/theme.ts b/website/src/.vitepress/config/theme.ts similarity index 94% rename from src/.vitepress/config/theme.ts rename to website/src/.vitepress/config/theme.ts index de359267..cd3bb78b 100644 --- a/src/.vitepress/config/theme.ts +++ b/website/src/.vitepress/config/theme.ts @@ -25,7 +25,7 @@ const themeConfig: DefaultTheme.Config = { }, editLink: { - pattern: "https://github.com/xhenos/kodo/edit/v3-vitepress/src/:path", + pattern: "https://github.com/xhenos/kodo/edit/v3-vitepress/website/src/:path", text: "Help us improve this page", }, diff --git a/src/.vitepress/theme/index.ts b/website/src/.vitepress/theme/index.ts similarity index 100% rename from src/.vitepress/theme/index.ts rename to website/src/.vitepress/theme/index.ts diff --git a/src/.vitepress/theme/layouts/CustomLayout.vue b/website/src/.vitepress/theme/layouts/CustomLayout.vue similarity index 100% rename from src/.vitepress/theme/layouts/CustomLayout.vue rename to website/src/.vitepress/theme/layouts/CustomLayout.vue diff --git a/src/.vitepress/theme/styles/base.styl b/website/src/.vitepress/theme/styles/base.styl similarity index 100% rename from src/.vitepress/theme/styles/base.styl rename to website/src/.vitepress/theme/styles/base.styl diff --git a/src/.vitepress/theme/styles/forks/neko.styl b/website/src/.vitepress/theme/styles/forks/neko.styl similarity index 100% rename from src/.vitepress/theme/styles/forks/neko.styl rename to website/src/.vitepress/theme/styles/forks/neko.styl diff --git a/src/.vitepress/theme/styles/forks/tachiyomi-az.styl b/website/src/.vitepress/theme/styles/forks/tachiyomi-az.styl similarity index 100% rename from src/.vitepress/theme/styles/forks/tachiyomi-az.styl rename to website/src/.vitepress/theme/styles/forks/tachiyomi-az.styl diff --git a/src/.vitepress/theme/styles/forks/tachiyomi-j2k.styl b/website/src/.vitepress/theme/styles/forks/tachiyomi-j2k.styl similarity index 100% rename from src/.vitepress/theme/styles/forks/tachiyomi-j2k.styl rename to website/src/.vitepress/theme/styles/forks/tachiyomi-j2k.styl diff --git a/src/.vitepress/theme/styles/forks/tachiyomi-sy.styl b/website/src/.vitepress/theme/styles/forks/tachiyomi-sy.styl similarity index 100% rename from src/.vitepress/theme/styles/forks/tachiyomi-sy.styl rename to website/src/.vitepress/theme/styles/forks/tachiyomi-sy.styl diff --git a/src/.vitepress/theme/styles/tree.styl b/website/src/.vitepress/theme/styles/tree.styl similarity index 100% rename from src/.vitepress/theme/styles/tree.styl rename to website/src/.vitepress/theme/styles/tree.styl diff --git a/src/docs/contribution.md b/website/src/docs/contribution.md similarity index 100% rename from src/docs/contribution.md rename to website/src/docs/contribution.md diff --git a/src/docs/faq/application/android-11+.md b/website/src/docs/faq/application/android-11+.md similarity index 100% rename from src/docs/faq/application/android-11+.md rename to website/src/docs/faq/application/android-11+.md diff --git a/src/docs/faq/application/browse/index.md b/website/src/docs/faq/application/browse/index.md similarity index 100% rename from src/docs/faq/application/browse/index.md rename to website/src/docs/faq/application/browse/index.md diff --git a/src/docs/faq/application/browse/reading-with-local-source.md b/website/src/docs/faq/application/browse/reading-with-local-source.md similarity index 100% rename from src/docs/faq/application/browse/reading-with-local-source.md rename to website/src/docs/faq/application/browse/reading-with-local-source.md diff --git a/src/docs/faq/application/downloads.md b/website/src/docs/faq/application/downloads.md similarity index 100% rename from src/docs/faq/application/downloads.md rename to website/src/docs/faq/application/downloads.md diff --git a/src/docs/faq/application/index.md b/website/src/docs/faq/application/index.md similarity index 100% rename from src/docs/faq/application/index.md rename to website/src/docs/faq/application/index.md diff --git a/src/docs/faq/application/library.md b/website/src/docs/faq/application/library.md similarity index 100% rename from src/docs/faq/application/library.md rename to website/src/docs/faq/application/library.md diff --git a/src/docs/faq/application/reader.md b/website/src/docs/faq/application/reader.md similarity index 100% rename from src/docs/faq/application/reader.md rename to website/src/docs/faq/application/reader.md diff --git a/src/docs/faq/application/shizuku.md b/website/src/docs/faq/application/shizuku.md similarity index 100% rename from src/docs/faq/application/shizuku.md rename to website/src/docs/faq/application/shizuku.md diff --git a/src/docs/faq/application/user-interface.md b/website/src/docs/faq/application/user-interface.md similarity index 100% rename from src/docs/faq/application/user-interface.md rename to website/src/docs/faq/application/user-interface.md diff --git a/src/docs/faq/extensions.md b/website/src/docs/faq/extensions.md similarity index 100% rename from src/docs/faq/extensions.md rename to website/src/docs/faq/extensions.md diff --git a/src/docs/faq/general.md b/website/src/docs/faq/general.md similarity index 100% rename from src/docs/faq/general.md rename to website/src/docs/faq/general.md diff --git a/src/docs/faq/miscellaneous.md b/website/src/docs/faq/miscellaneous.md similarity index 100% rename from src/docs/faq/miscellaneous.md rename to website/src/docs/faq/miscellaneous.md diff --git a/src/docs/guides/backups.md b/website/src/docs/guides/backups.md similarity index 100% rename from src/docs/guides/backups.md rename to website/src/docs/guides/backups.md diff --git a/src/docs/guides/categories.md b/website/src/docs/guides/categories.md similarity index 100% rename from src/docs/guides/categories.md rename to website/src/docs/guides/categories.md diff --git a/src/docs/guides/getting-started.md b/website/src/docs/guides/getting-started.md similarity index 100% rename from src/docs/guides/getting-started.md rename to website/src/docs/guides/getting-started.md diff --git a/src/docs/guides/img/guides_dump-crashlogs.png b/website/src/docs/guides/img/guides_dump-crashlogs.png similarity index 100% rename from src/docs/guides/img/guides_dump-crashlogs.png rename to website/src/docs/guides/img/guides_dump-crashlogs.png diff --git a/src/docs/guides/img/guides_nav-edge-light.png b/website/src/docs/guides/img/guides_nav-edge-light.png similarity index 100% rename from src/docs/guides/img/guides_nav-edge-light.png rename to website/src/docs/guides/img/guides_nav-edge-light.png diff --git a/src/docs/guides/img/guides_nav-kindlish-light.png b/website/src/docs/guides/img/guides_nav-kindlish-light.png similarity index 100% rename from src/docs/guides/img/guides_nav-kindlish-light.png rename to website/src/docs/guides/img/guides_nav-kindlish-light.png diff --git a/src/docs/guides/img/guides_nav-l-light.png b/website/src/docs/guides/img/guides_nav-l-light.png similarity index 100% rename from src/docs/guides/img/guides_nav-l-light.png rename to website/src/docs/guides/img/guides_nav-l-light.png diff --git a/src/docs/guides/img/guides_nav-right-and-left-light.png b/website/src/docs/guides/img/guides_nav-right-and-left-light.png similarity index 100% rename from src/docs/guides/img/guides_nav-right-and-left-light.png rename to website/src/docs/guides/img/guides_nav-right-and-left-light.png diff --git a/src/docs/guides/img/guides_reader-fit-height.png b/website/src/docs/guides/img/guides_reader-fit-height.png similarity index 100% rename from src/docs/guides/img/guides_reader-fit-height.png rename to website/src/docs/guides/img/guides_reader-fit-height.png diff --git a/src/docs/guides/img/guides_reader-fit-screen.png b/website/src/docs/guides/img/guides_reader-fit-screen.png similarity index 100% rename from src/docs/guides/img/guides_reader-fit-screen.png rename to website/src/docs/guides/img/guides_reader-fit-screen.png diff --git a/src/docs/guides/img/guides_reader-fit-width.png b/website/src/docs/guides/img/guides_reader-fit-width.png similarity index 100% rename from src/docs/guides/img/guides_reader-fit-width.png rename to website/src/docs/guides/img/guides_reader-fit-width.png diff --git a/src/docs/guides/img/guides_reader-original-size.png b/website/src/docs/guides/img/guides_reader-original-size.png similarity index 100% rename from src/docs/guides/img/guides_reader-original-size.png rename to website/src/docs/guides/img/guides_reader-original-size.png diff --git a/src/docs/guides/img/guides_reader-smart-fit.png b/website/src/docs/guides/img/guides_reader-smart-fit.png similarity index 100% rename from src/docs/guides/img/guides_reader-smart-fit.png rename to website/src/docs/guides/img/guides_reader-smart-fit.png diff --git a/src/docs/guides/img/guides_reader-stretch.png b/website/src/docs/guides/img/guides_reader-stretch.png similarity index 100% rename from src/docs/guides/img/guides_reader-stretch.png rename to website/src/docs/guides/img/guides_reader-stretch.png diff --git a/src/docs/guides/img/guides_webview-open.jpg b/website/src/docs/guides/img/guides_webview-open.jpg similarity index 100% rename from src/docs/guides/img/guides_webview-open.jpg rename to website/src/docs/guides/img/guides_webview-open.jpg diff --git a/src/docs/guides/local-manga.md b/website/src/docs/guides/local-manga.md similarity index 100% rename from src/docs/guides/local-manga.md rename to website/src/docs/guides/local-manga.md diff --git a/src/docs/guides/reader-settings.md b/website/src/docs/guides/reader-settings.md similarity index 100% rename from src/docs/guides/reader-settings.md rename to website/src/docs/guides/reader-settings.md diff --git a/src/docs/guides/source-migration.md b/website/src/docs/guides/source-migration.md similarity index 100% rename from src/docs/guides/source-migration.md rename to website/src/docs/guides/source-migration.md diff --git a/src/docs/guides/tracking.md b/website/src/docs/guides/tracking.md similarity index 100% rename from src/docs/guides/tracking.md rename to website/src/docs/guides/tracking.md diff --git a/src/docs/guides/troubleshooting.md b/website/src/docs/guides/troubleshooting.md similarity index 100% rename from src/docs/guides/troubleshooting.md rename to website/src/docs/guides/troubleshooting.md diff --git a/src/download.md b/website/src/download.md similarity index 100% rename from src/download.md rename to website/src/download.md diff --git a/src/extensions.md b/website/src/extensions.md similarity index 100% rename from src/extensions.md rename to website/src/extensions.md diff --git a/src/forks/index.md b/website/src/forks/index.md similarity index 100% rename from src/forks/index.md rename to website/src/forks/index.md diff --git a/src/forks/neko.md b/website/src/forks/neko.md similarity index 100% rename from src/forks/neko.md rename to website/src/forks/neko.md diff --git a/src/forks/tachiyomi-az.md b/website/src/forks/tachiyomi-az.md similarity index 100% rename from src/forks/tachiyomi-az.md rename to website/src/forks/tachiyomi-az.md diff --git a/src/forks/tachiyomi-j2k.md b/website/src/forks/tachiyomi-j2k.md similarity index 100% rename from src/forks/tachiyomi-j2k.md rename to website/src/forks/tachiyomi-j2k.md diff --git a/src/forks/tachiyomi-sy.md b/website/src/forks/tachiyomi-sy.md similarity index 100% rename from src/forks/tachiyomi-sy.md rename to website/src/forks/tachiyomi-sy.md diff --git a/src/index.md b/website/src/index.md similarity index 100% rename from src/index.md rename to website/src/index.md diff --git a/src/news/updated-website.md b/website/src/news/updated-website.md similarity index 100% rename from src/news/updated-website.md rename to website/src/news/updated-website.md diff --git a/src/privacy.md b/website/src/privacy.md similarity index 100% rename from src/privacy.md rename to website/src/privacy.md diff --git a/src/public/docs/guides/getting-started/installing-extensions_dark.webp b/website/src/public/docs/guides/getting-started/installing-extensions_dark.webp similarity index 100% rename from src/public/docs/guides/getting-started/installing-extensions_dark.webp rename to website/src/public/docs/guides/getting-started/installing-extensions_dark.webp diff --git a/src/public/docs/guides/getting-started/installing-extensions_light.webp b/website/src/public/docs/guides/getting-started/installing-extensions_light.webp similarity index 100% rename from src/public/docs/guides/getting-started/installing-extensions_light.webp rename to website/src/public/docs/guides/getting-started/installing-extensions_light.webp diff --git a/src/public/docs/guides/getting-started/security-warning.webp b/website/src/public/docs/guides/getting-started/security-warning.webp similarity index 100% rename from src/public/docs/guides/getting-started/security-warning.webp rename to website/src/public/docs/guides/getting-started/security-warning.webp diff --git a/src/public/favicon-16x16.png b/website/src/public/favicon-16x16.png similarity index 100% rename from src/public/favicon-16x16.png rename to website/src/public/favicon-16x16.png diff --git a/src/public/favicon-32x32.png b/website/src/public/favicon-32x32.png similarity index 100% rename from src/public/favicon-32x32.png rename to website/src/public/favicon-32x32.png diff --git a/src/public/favicon.ico b/website/src/public/favicon.ico similarity index 100% rename from src/public/favicon.ico rename to website/src/public/favicon.ico diff --git a/src/public/forks/forks_logo-az.png b/website/src/public/forks/forks_logo-az.png similarity index 100% rename from src/public/forks/forks_logo-az.png rename to website/src/public/forks/forks_logo-az.png diff --git a/src/public/forks/forks_logo-j2k.png b/website/src/public/forks/forks_logo-j2k.png similarity index 100% rename from src/public/forks/forks_logo-j2k.png rename to website/src/public/forks/forks_logo-j2k.png diff --git a/src/public/forks/forks_logo-neko.png b/website/src/public/forks/forks_logo-neko.png similarity index 100% rename from src/public/forks/forks_logo-neko.png rename to website/src/public/forks/forks_logo-neko.png diff --git a/src/public/forks/forks_logo-sy.png b/website/src/public/forks/forks_logo-sy.png similarity index 100% rename from src/public/forks/forks_logo-sy.png rename to website/src/public/forks/forks_logo-sy.png diff --git a/src/public/home/home_library-dark-original.png b/website/src/public/home/home_library-dark-original.png similarity index 100% rename from src/public/home/home_library-dark-original.png rename to website/src/public/home/home_library-dark-original.png diff --git a/src/public/home/home_library-dark.png b/website/src/public/home/home_library-dark.png similarity index 100% rename from src/public/home/home_library-dark.png rename to website/src/public/home/home_library-dark.png diff --git a/src/public/home/home_library-light-original.png b/website/src/public/home/home_library-light-original.png similarity index 100% rename from src/public/home/home_library-light-original.png rename to website/src/public/home/home_library-light-original.png diff --git a/src/public/home/home_library-light.png b/website/src/public/home/home_library-light.png similarity index 100% rename from src/public/home/home_library-light.png rename to website/src/public/home/home_library-light.png diff --git a/src/public/img/folder.svg b/website/src/public/img/folder.svg similarity index 100% rename from src/public/img/folder.svg rename to website/src/public/img/folder.svg diff --git a/src/public/img/jpeg.svg b/website/src/public/img/jpeg.svg similarity index 100% rename from src/public/img/jpeg.svg rename to website/src/public/img/jpeg.svg diff --git a/src/public/img/logo-128px.png b/website/src/public/img/logo-128px.png similarity index 100% rename from src/public/img/logo-128px.png rename to website/src/public/img/logo-128px.png diff --git a/src/public/img/logo.png b/website/src/public/img/logo.png similarity index 100% rename from src/public/img/logo.png rename to website/src/public/img/logo.png diff --git a/src/public/img/logo.svg b/website/src/public/img/logo.svg similarity index 100% rename from src/public/img/logo.svg rename to website/src/public/img/logo.svg diff --git a/src/public/img/netlify.svg b/website/src/public/img/netlify.svg similarity index 100% rename from src/public/img/netlify.svg rename to website/src/public/img/netlify.svg diff --git a/src/public/img/zip.svg b/website/src/public/img/zip.svg similarity index 100% rename from src/public/img/zip.svg rename to website/src/public/img/zip.svg diff --git a/stylelint.config.js b/website/stylelint.config.js similarity index 100% rename from stylelint.config.js rename to website/stylelint.config.js diff --git a/tsconfig.json b/website/tsconfig.json similarity index 100% rename from tsconfig.json rename to website/tsconfig.json diff --git a/tsconfig.node.json b/website/tsconfig.node.json similarity index 100% rename from tsconfig.node.json rename to website/tsconfig.node.json