From b3315a2cb457bde38a5c2285d6ef870acaca8d3f Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 10 Sep 2023 09:43:55 -0400 Subject: [PATCH] Misc. rewording + reorganization (#44) --- README.md | 2 +- website/package.json | 26 ++++----- website/src/.vitepress/config.ts | 2 +- website/src/.vitepress/config/headConfig.ts | 2 +- .../.vitepress/config/navigation/navbar.ts | 25 ++++----- .../.vitepress/config/navigation/sidebar.ts | 53 +++++++++---------- .../theme/components/CustomNavBarMenu.vue | 8 +-- .../theme/components/CustomNavScreenMenu.vue | 4 +- .../theme/components/DownloadButtons.vue | 9 ++-- website/src/.vitepress/theme/styles/base.styl | 4 +- website/src/changelogs/index.md | 2 +- .../docs/{contribution.md => contribute.md} | 4 +- website/src/download/index.md | 4 +- website/src/extensions/index.md | 4 +- website/src/forks/index.md | 14 ++--- website/src/index.md | 8 +-- .../src/news/2023-09-09-updated-website.md | 26 +++++++++ website/src/news/index.md | 4 +- website/src/news/updated-website.md | 29 ---------- website/src/privacy/index.md | 2 + website/src/public/_redirects | 2 +- 21 files changed, 115 insertions(+), 119 deletions(-) rename website/src/docs/{contribution.md => contribute.md} (97%) create mode 100644 website/src/news/2023-09-09-updated-website.md delete mode 100644 website/src/news/updated-website.md diff --git a/README.md b/README.md index af4e776b..54063e06 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

Tachiyomi Website

Full-featured reader

-

Read your favorite manga, webtoons, comics, and more – easier than ever on your Android.

+

Discover and read manga, webtoons, comics, and more – easier than ever on your Android device.

diff --git a/website/package.json b/website/package.json index 25568698..cb0ce9f3 100644 --- a/website/package.json +++ b/website/package.json @@ -30,6 +30,19 @@ "lint:style": "stylelint \"**/*.{styl,vue}\" \"src/.vitepress/**/*.{styl,vue}\"", "lint:style:fix": "stylelint --fix \"**/*.{styl,vue}\" \"src/.vitepress/**/*.{styl,vue}\"" }, + "dependencies": { + "@iconify-prerendered/vue-mdi": "^0.23.1689058119", + "@octokit/rest": "^20.0.1", + "@octokit/types": "^11.1.0", + "@tanstack/vue-query": "^4.34.0", + "@vueuse/core": "^10.4.1", + "axios": "^1.5.0", + "element-plus": "^2.3.12", + "lodash.groupby": "^4.6.0", + "markdown-it": "^13.0.1", + "markdown-it-shortcode-tag": "^1.1.0", + "moment": "^2.29.4" + }, "devDependencies": { "@antfu/eslint-config": "^0.41.0", "@mdit/plugin-attrs": "^0.4.8", @@ -70,18 +83,5 @@ "lint-staged": { "*.{styl,vue}": "stylelint --fix", "*.{html,json}": "prettier --write" - }, - "dependencies": { - "@iconify-prerendered/vue-mdi": "^0.23.1689058119", - "@octokit/rest": "^20.0.1", - "@octokit/types": "^11.1.0", - "@tanstack/vue-query": "^4.34.0", - "@vueuse/core": "^10.4.1", - "axios": "^1.5.0", - "element-plus": "^2.3.12", - "lodash.groupby": "^4.6.0", - "markdown-it": "^13.0.1", - "markdown-it-shortcode-tag": "^1.1.0", - "moment": "^2.29.4" } } diff --git a/website/src/.vitepress/config.ts b/website/src/.vitepress/config.ts index 39c1c8db..23901b34 100644 --- a/website/src/.vitepress/config.ts +++ b/website/src/.vitepress/config.ts @@ -18,7 +18,7 @@ import generateFeed from "./config/hooks/generateFeed" // Allows generation of R import generateOgImages from "./config/hooks/generateOgImages" const title = "Tachiyomi" -const description = "Read your favorite manga, webtoons, comics, and more – easier than ever on your Android." +const description = "Discover and read manga, webtoons, comics, and more – easier than ever on your Android device." const env = loadEnv("", process.cwd()) const hostname: string = env.VITE_HOSTNAME || "http://localhost:4173" diff --git a/website/src/.vitepress/config/headConfig.ts b/website/src/.vitepress/config/headConfig.ts index deb4fb8b..39003496 100644 --- a/website/src/.vitepress/config/headConfig.ts +++ b/website/src/.vitepress/config/headConfig.ts @@ -49,7 +49,7 @@ const headConfig: HeadConfig[] = [ "meta", { property: "og:description", - content: "Read your favorite manga, webtoons, comics, and more – easier than ever on your Android.", + content: "Discover and read manga, webtoons, comics, and more – easier than ever on your Android device.", }, ], ["meta", { property: "og:locale", content: "en_US" }], diff --git a/website/src/.vitepress/config/navigation/navbar.ts b/website/src/.vitepress/config/navigation/navbar.ts index d8658838..12dfb79b 100644 --- a/website/src/.vitepress/config/navigation/navbar.ts +++ b/website/src/.vitepress/config/navigation/navbar.ts @@ -2,12 +2,7 @@ import type { DefaultTheme } from "vitepress" const nav: DefaultTheme.NavItem[] = [ { - text: "Documentation", - link: "/docs/guides/getting-started", - activeMatch: "/docs/", - }, - { - text: "{app_version}", + text: "Get {app_version}", activeMatch: "^/*?(download|changelogs)/*?$", items: [ { @@ -15,15 +10,21 @@ const nav: DefaultTheme.NavItem[] = [ link: "/download/", }, { - text: "Changelog", - link: "/changelogs/#latest", - }, - { - text: "Contributing", - link: "https://github.com/tachiyomiorg/tachiyomi/blob/master/CONTRIBUTING.md", + text: "Changelogs", + link: "/changelogs/", }, ], }, + { + text: "Docs", + link: "/docs/guides/getting-started", + activeMatch: "/docs/", + }, + { + text: "News", + link: "/news/", + activeMatch: "/news/", + }, ] export default nav diff --git a/website/src/.vitepress/config/navigation/sidebar.ts b/website/src/.vitepress/config/navigation/sidebar.ts index 85c69fc0..79695cfc 100644 --- a/website/src/.vitepress/config/navigation/sidebar.ts +++ b/website/src/.vitepress/config/navigation/sidebar.ts @@ -12,6 +12,30 @@ const sidebar: DefaultTheme.SidebarMulti = { function defaultSidebar(): DefaultTheme.SidebarItem[] { return [ + { + items: [ + { + text: "Download", + link: "/download/", + }, + { + text: "Extensions", + link: "/extensions/", + }, + { + text: "Changelogs", + link: "/changelogs/", + }, + { + text: "Forks", + link: "/forks/", + }, + { + text: "Contribute", + link: "/docs/contribute", + }, + ], + }, { text: "Frequently Asked Questions", items: [ @@ -108,35 +132,6 @@ function defaultSidebar(): DefaultTheme.SidebarItem[] { }, ], }, - { - text: "Application", - items: [ - { - text: "Contribution", - link: "/docs/contribution", - }, - { - text: "Download", - link: "/download/", - }, - { - text: "Extensions", - link: "/extensions/", - }, - { - text: "Changelogs", - link: "/changelogs/", - }, - { - text: "Forks", - link: "/forks/", - }, - { - text: "News", - link: "/news/", - }, - ], - }, ] } diff --git a/website/src/.vitepress/theme/components/CustomNavBarMenu.vue b/website/src/.vitepress/theme/components/CustomNavBarMenu.vue index 8a1f46e4..5ac2fa64 100644 --- a/website/src/.vitepress/theme/components/CustomNavBarMenu.vue +++ b/website/src/.vitepress/theme/components/CustomNavBarMenu.vue @@ -27,7 +27,7 @@ const nav = computed(() => { } return theme.value.nav?.map((item) => { - if (item.text !== "{app_version}") { + if (!item.text.includes("{app_version}")) { return item } @@ -35,7 +35,7 @@ const nav = computed(() => { return { ...item, - text: item.text === "{app_version}" ? appVersion : item.text, + text: item.text.replace("{app_version}", appVersion), } satisfies DefaultTheme.NavItem }) }) @@ -43,7 +43,7 @@ const nav = computed(() => {