Misc. rewording + reorganization (#44)

README.md

@@ -7,7 +7,7 @@
 
 <h1 align="center">Tachiyomi <a href="#">Website</a></h1>
 <h3 align="center">Full-featured reader</h3>
-<p align="center">Read your favorite manga, webtoons, comics, and more – easier than ever on your Android.</p>
+<p align="center">Discover and read manga, webtoons, comics, and more – easier than ever on your Android device.</p>
 
 <p align="center">
 	<a title="Discord server" href="https://discord.gg/tachiyomi">

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"
 	}
 }

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"

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" }],

website/src/.vitepress/config/navigation/navbar.ts

@@ -2,12 +2,7 @@ import type { DefaultTheme } from "vitepress"
 
 const nav: DefaultTheme.NavItem[] = [
 	{
-		text: "Documentation",
+		text: "Get {app_version}",
-		link: "/docs/guides/getting-started",
-		activeMatch: "/docs/",
-	},
-	{
-		text: "{app_version}",
 		activeMatch: "^/*?(download|changelogs)/*?$",
 		items: [
 			{
@@ -15,15 +10,21 @@ const nav: DefaultTheme.NavItem[] = [
 				link: "/download/",
 			},
 			{
-				text: "Changelog",
+				text: "Changelogs",
-				link: "/changelogs/#latest",
+				link: "/changelogs/",
-			},
-			{
-				text: "Contributing",
-				link: "https://github.com/tachiyomiorg/tachiyomi/blob/master/CONTRIBUTING.md",
 			},
 		],
 	},
+	{
+		text: "Docs",
+		link: "/docs/guides/getting-started",
+		activeMatch: "/docs/",
+	},
+	{
+		text: "News",
+		link: "/news/",
+		activeMatch: "/news/",
+	},
 ]
 
 export default nav

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/",
-				},
-			],
-		},
 	]
 }
 

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(() => {
 
 <template>
 	<nav v-if="nav" aria-labelledby="main-nav-aria-label" class="VPNavBarMenu">
-		<span id="main-nav-aria-label" class="visually-hidden">Main Navigation</span>
+		<span id="main-nav-aria-label" class="visually-hidden">Main navigation</span>
 		<template v-for="item in nav" :key="item.text">
 			<VPNavBarMenuLink v-if="'link' in item" :item="item" />
 			<VPNavBarMenuGroup v-else :item="item" />
@@ -56,7 +56,7 @@ const nav = computed(() => {
 	display: none
 }
 
-@media (min-width: 768px) {
+@media (min-width 768px) {
 	.VPNavBarMenu {
 		display: flex
 	}

website/src/.vitepress/theme/components/CustomNavScreenMenu.vue

@@ -26,7 +26,7 @@ const nav = computed(() => {
 	}
 
 	return theme.value.nav?.map((item) => {
-		if (item.text !== "{app_version}") {
+		if (!item.text.includes("{app_version}")) {
 			return item
 		}
 
@@ -34,7 +34,7 @@ const nav = computed(() => {
 
 		return {
 			...item,
-			text: item.text === "{app_version}"	? appVersion : item.text,
+			text: item.text.replace("{app_version}", appVersion),
 		} satisfies DefaultTheme.NavItem
 	})
 })

website/src/.vitepress/theme/components/DownloadButtons.vue

@@ -26,7 +26,7 @@ onMounted(() => {
 	<div>
 		<div v-if="!isAndroid" class="custom-block danger">
 			<p class="custom-block-title">
-				Unsupported Operating System
+				Unsupported operating system
 			</p>
 			<p>
 				<strong>Tachiyomi</strong> is an <strong>Android app</strong> only.
@@ -38,11 +38,8 @@ onMounted(() => {
 				Caution
 			</p>
 			<p>
-				Any app for other operating systems that are not Android and
+				Any app for any operating systems other than Android called
-				that calls itself <strong>Tachiyomi</strong> is
+				<strong>Tachiyomi</strong> is not affiliated with this project.
-				<strong>impersonating</strong> the original
-				<strong>Tachiyomi</strong> app for <strong>Android</strong>
-				and is not affiliated with the project.
 			</p>
 			<blockquote>
 				For more information, read the

website/src/.vitepress/theme/styles/base.styl

@@ -227,6 +227,7 @@ main :where(h1, h2, h3, h4, h5, h6) + figure {
 /**
  * Component: Element Plus
  */
+
 body {
 	--el-color-primary: var(--vp-c-brand-1)
 }
@@ -234,6 +235,7 @@ body {
 /**
  * Component: Appearance Switch
  */
+
 .menu + .appearance::before {
 	margin-right: 8px !important
 }
@@ -243,5 +245,5 @@ body {
 }
 
 .VPMenu .CustomSwitchAppearance {
-	margin-right: -8px;
+	margin-right: -8px
 }

website/src/changelogs/index.md

@@ -13,6 +13,6 @@ import ChangelogsList from "@theme/components/ChangelogsList.vue";
 
 # Changelogs
 
-Changelogs of all Tachiyomi stable releases, obtained from the GitHub repository.
+Changelogs of all Tachiyomi stable releases. Also available [on GitHub](https://github.com/tachiyomiorg/tachiyomi/releases).
 
 <ChangelogsList />

website/src/docs/contribute.md

@@ -1,9 +1,9 @@
 ---
-title: Contribution
+title: Contribute
 description: Find out how to help translate or build the app and extensions.
 ---
 
-# Contribution
+# Contribute
 
 Find out how to help translate or build the app and extensions.
 

website/src/download/index.md

@@ -15,7 +15,9 @@ import Changelog from "@theme/components/Changelog.vue";
 
 # Download
 
-Download the latest stable version of **Tachiyomi** that released **<ReleaseDate type="stable" />** or the preview version that released **<ReleaseDate type="preview" />**.
+The latest stable version of **Tachiyomi** was released **<ReleaseDate type="stable" />** and the latest preview version was released **<ReleaseDate type="preview" />**.
+
+Preview releases are intended for testing upcoming changes and may not be a stable experience.
 
 <DownloadButtons />
 

website/src/extensions/index.md

@@ -1,6 +1,6 @@
 ---
 title: Extensions
-description: Browse and install the full list of sources for Tachiyomi.
+description: Browse and download sources for Tachiyomi.
 lastUpdated: false
 editLink: false
 prev: false
@@ -9,7 +9,7 @@ next: false
 
 # Extensions
 
-Web-based extensions page that enables users to browse and install additional sources that provide access to a wide range of content from various websites.
+Extensions can also be installed directly from the app.
 
 <ExtensionsWrapper/>
 

website/src/forks/index.md

@@ -1,27 +1,27 @@
 ---
-title: Official Forks
+title: Forks
 description: Forks are alternative versions of Tachiyomi with exclusive features.
 layout: home
 
 hero:
-  text: Official Forks
+  text: Endorsed Forks
   tagline: Forks are alternative versions of Tachiyomi with exclusive features.
 
 features:
   - title: Neko
-    details: Features specific to MangaDex with the featureset of TachiyomiJ2K
+    details: Features specific to MangaDex with the feature set of TachiyomiJ2K
-    icon: <img src="/forks/logo-neko.webp" alt="MangaDex Logo" height="32" width="32">
+    icon: <img src="/forks/logo-neko.webp" alt="Neko Logo" height="32" width="32">
     link: /forks/Neko/
   - title: TachiyomiJ2K
     details: New approach to the design of the base app along with several other enhancements
-    icon: <img src="/forks/logo-j2k.webp" alt="MangaDex Logo" height="32" width="32">
+    icon: <img src="/forks/logo-j2k.webp" alt="TachiyomiJ2K Logo" height="32" width="32">
     link: /forks/TachiyomiJ2K/
   - title: TachiyomiSY
     details: Keeping up-to-date with Tachiyomi while also adding exclusive features
-    icon: <img src="/forks/logo-sy.webp" alt="MangaDex Logo" height="32" width="32">
+    icon: <img src="/forks/logo-sy.webp" alt="TachiyomiSY Logo" height="32" width="32">
     link: /forks/TachiyomiSY/
   - title: TachiyomiAZ
     details: Keeps the old design of Tachiyomi with hamburger menu.
-    icon: <img src="/forks/logo-az.webp" alt="MangaDex Logo" height="32" width="32">
+    icon: <img src="/forks/logo-az.webp" alt="TachiyomiAZ Logo" height="32" width="32">
     link: /forks/TachiyomiAZ/
 ---

website/src/index.md

@@ -5,7 +5,7 @@ layout: home
 hero:
   name: Tachiyomi
   text: Full-featured reader
-  tagline: Read your favorite manga, webtoons, comics, and more – easier than ever on your Android.
+  tagline: Discover and read manga, webtoons, comics, and more – easier than ever on your Android device.
   image:
     alt: Tachiyomi Library Tab Dark
     light: /home/phone.light.webp
@@ -22,13 +22,13 @@ customMetaTitle: Tachiyomi
 
 features:
   - title: Tracking
-    details: Automatically keep track of your series with AniList, Bangumi, Kitsu, MangaUpdates, MyAnimeList, Shikimori, and more.
+    details: Automatically keep track of your series with MyAnimeList, AniList, Kitsu, and more.
     icon: <img src="/img/logo-anilist.svg" alt="AniList Logo" height="32" width="32">
   - title: Extensions
-    details: Online and offline reading from over a thousand sources, including MangaDex.
+    details: Online and offline reading from over a thousand sources.
     icon: <img src="/img/logo-mangadex.svg" alt="MangaDex Logo" height="32" width="32">
     link: /extensions/
   - title: Customization
-    details: A configurable reader with multiple reading modes, custom color filters, and many other settings.
+    details: Make it yours with multiple reading modes, custom color filters, and many other settings.
     icon: <svg height="24" width="24" viewbox="0 0 48 48" x="0.0" y="0.0"><g transform="translate(0.000000,0.000000) scale(0.013200,-0.013200)"><path class="st0" d="M1761.7-8.5l-305-5l13.3-163.3c6.7-88.3,13.3-198.3,13.3-245v-83.3H800H116.7l5-298.3l5-298.3l111.7,11.7 c253.3,23.3,1691.7,30,2436.7,11.7c426.7-11.7,786.7-23.3,800-26.7c21.7-6.7,25,33.3,25,296.7v303.3l-638.3-6.7 c-350-3.3-663.3,0-696.7,5l-58.3,11.7l5,250c5,213.3,1.7,248.3-20,245C2078.3-1.9,1930-6.9,1761.7-8.5z" fill="var(--vp-c-brand)" fill-rule="nonzero"></path><path class="st0" d="M816.7-1290.2c-213.3-83.3-266.7-111.7-263.3-135c1.7-16.7,36.7-121.7,78.3-233.3 c96.7-255,206.7-640,276.7-963.3c30-136.7,56.7-251.7,58.3-255c3.3-3.3,138.3,41.7,303.3,100l298.3,105l-20,100 c-58.3,280-413.3,1393.3-445,1390C1091.7-1183.5,963.3-1231.9,816.7-1290.2z" fill="var(--vp-c-brand)" fill-rule="nonzero"></path><path class="st0" d="M2376.7-1458.5c-173.3-695-381.7-1386.7-451.7-1501.7l-31.7-51.7l-288.3-5c-333.3-5-1521.7,15-1571.7,26.7 c-31.7,8.3-33.3,0-33.3-300v-310l83.3,10c46.7,5,863.3,15,1816.7,20l1733.3,11.7v293.3v293.3l-141.7-11.7 c-78.3-5-325-11.7-548.3-11.7c-318.3-1.7-403.3,3.3-396.7,20c5,10,36.7,83.3,70,161.7C2725-2560.2,3110-1375.2,3090-1356.9 c-6.7,6.7-543.3,156.7-608.3,171.7C2448.3-1178.5,2441.7-1196.9,2376.7-1458.5z" fill="var(--vp-c-brand)" fill-rule="nonzero"></path></g></svg>
 ---

website/src/news/2023-09-09-updated-website.md

@@ -0,0 +1,26 @@
+---
+type: article
+title: Updated website
+description: We've got a fresh new website we hope will be even easier to use
+date: 2023-09-09
+---
+
+# Updated website
+
+We've launched a fully rewritten website with improved usability for both users
+and contributors. Some improvements include the [download](/download/) page,
+which now doesn't require any new additional requests, and a new [changelogs](/changelogs/)
+page to easily see historical app release notes.
+
+This page is part of the new [news](/news/) section, which will be used in occasions
+like this to keep you informed of any interesting updates.
+
+Under the hood, we're now using [VitePress](https://vitepress.dev/) with
+[Vue.js](https://vuejs.org/) v3, replacing our previous usage of
+[VuePress](https://vuepress.vuejs.org/).
+
+As we're still in the process of rewritting and updating part of the
+documentation and guides, there may still be some errors or outdated content.
+If you find any, please report by opening an issue in the [repository for this website](https://github.com/tachiyomiorg/website/issues/new/choose) on GitHub.
+
+*The Tachiyomi Team*.

website/src/news/index.md

@@ -1,5 +1,5 @@
 ---
-title: News archive
+title: News
 description: Collection of news and announcements about Tachiyomi.
 lastUpdated: false
 editLink: false
@@ -12,7 +12,7 @@ import News from "@theme/components/News.vue";
 import RssLink from "@theme/components/RssLink.vue";
 </script>
 
-# News archive
+# News
 
 Collection of news and announcements about Tachiyomi.
 

website/src/news/updated-website.md

@@ -1,29 +0,0 @@
----
-type: article
-title: Updated website
-description: We've got a fresh new website we hope will be even easier to use
-date: 2023-07-20
----
-
-# Updated website
-
-The website was updated to use [VitePress](https://vitepress.dev/), a modern
-tool that replaces [VuePress](https://vuepress.vuejs.org/), which was used
-by many years in our previous website. This change will make the user usability
-better and will also allow contributors to make changes more easier as the
-code is more robust and updated to use [Vue.js](https://vuejs.org/) v3.
-
-Many improvements were done to several pages such as the [download](/download/)
-one, which now doesn't require any new additional requests. A new [changelogs](/changelogs/)
-page was also added to keep the history of all changes done in the app through time.
-
-This page is part of the new [news](/news/) section in the website, which
-will be used in ocasions like this to keep you informed. We hope these changes
-will make the users experience better and keep the information more easy to find.
-
-As we're still in the process of rewritting and updating part of the
-documentation and the guides, errors might be present in the texts. If you
-find any, please report by opening an issue in the [site repository](https://github.com/tachiyomiorg/website/issues/new/choose)
-on GitHub.
-
-*The Tachiyomi Team*.

website/src/privacy/index.md

@@ -1,6 +1,8 @@
 ---
 title: Privacy policy
 description: Privacy Policy that explains how Tachiyomi collects, uses, and protects users' personal information.
+lastUpdated: false
+editLink: false
 ---
 
 # Privacy policy

website/src/public/_redirects

@@ -8,5 +8,5 @@
 /help/guides/categories/             /docs/guides/categories             301
 /help/guides/local-manga/            /docs/guides/local-series/          301
 /help/guides/reader-settings/        /docs/guides/reader-settings        301
-/help/contribution/                  /docs/contribution                  301
+/help/contribution/                  /docs/contribute                    301
 /help/faq/                           /docs/faq/general                   301