Fix redirects (#573)

* Fix redirects, maybe?

Maybe fix redirects?

* Change how pages are redirected

* Remove 'redirect-frontmatter' reference

* Try another method of making routes

* Try dehydration

* Update package-lock after rebase

package-lock.json

@@ -5,7 +5,6 @@
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "tachiyomi-website",
 			"version": "1.0.0",
 			"license": "MPL-2.0",
 			"dependencies": {
@@ -25,6 +24,7 @@
 				"vue-material-design-icons": "^4.11.0",
 				"vue-moment": "^4.1.0",
 				"vue-sweetalert2": "^4.2.0",
+				"vuepress-plugin-dehydrate": "^1.1.5",
 				"vuepress-plugin-robots": "^1.0.1",
 				"vuex": "^3.6.2"
 			},
@@ -45,7 +45,6 @@
 				"vuepress-plugin-clean-urls": "^1.1.2",
 				"vuepress-plugin-container": "^2.1.5",
 				"vuepress-plugin-element-ui": "^1.1.0",
-				"vuepress-plugin-redirect-frontmatter": "^1.0.0",
 				"vuepress-plugin-zooming": "^1.1.8",
 				"webpack": "^4.44.2"
 			}
@@ -16070,6 +16069,14 @@
 				"markdown-it-container": "^2.0.0"
 			}
 		},
+		"node_modules/vuepress-plugin-dehydrate": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/vuepress-plugin-dehydrate/-/vuepress-plugin-dehydrate-1.1.5.tgz",
+			"integrity": "sha512-9F2x1vLCK4poPUMkLupD4HsgWdbZ68Escvma+DE1Dk6aAJdH5FGwmfOMxj4sMCBwz7S4s6bTMna+QQgD3+bzBA==",
+			"dependencies": {
+				"@vuepress/shared-utils": "^1.2.0"
+			}
+		},
 		"node_modules/vuepress-plugin-element-ui": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/vuepress-plugin-element-ui/-/vuepress-plugin-element-ui-1.1.0.tgz",
@@ -16080,15 +16087,6 @@
 				"markdown-it-container": "^2.0.0"
 			}
 		},
-		"node_modules/vuepress-plugin-redirect-frontmatter": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/vuepress-plugin-redirect-frontmatter/-/vuepress-plugin-redirect-frontmatter-1.0.0.tgz",
-			"integrity": "sha512-IReQqFYis7/Q49W9LTYthhO8VVNCOhnH/HymJHsvpLPeRTTreZUlnJ/i75LgdCnDGeHrTWocFej0Y/uBQUgVHw==",
-			"dev": true,
-			"dependencies": {
-				"lodash": "^4.17.15"
-			}
-		},
 		"node_modules/vuepress-plugin-robots": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vuepress-plugin-robots/-/vuepress-plugin-robots-1.0.1.tgz",
@@ -30770,6 +30768,14 @@
 				"markdown-it-container": "^2.0.0"
 			}
 		},
+		"vuepress-plugin-dehydrate": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/vuepress-plugin-dehydrate/-/vuepress-plugin-dehydrate-1.1.5.tgz",
+			"integrity": "sha512-9F2x1vLCK4poPUMkLupD4HsgWdbZ68Escvma+DE1Dk6aAJdH5FGwmfOMxj4sMCBwz7S4s6bTMna+QQgD3+bzBA==",
+			"requires": {
+				"@vuepress/shared-utils": "^1.2.0"
+			}
+		},
 		"vuepress-plugin-element-ui": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/vuepress-plugin-element-ui/-/vuepress-plugin-element-ui-1.1.0.tgz",
@@ -30780,15 +30786,6 @@
 				"markdown-it-container": "^2.0.0"
 			}
 		},
-		"vuepress-plugin-redirect-frontmatter": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/vuepress-plugin-redirect-frontmatter/-/vuepress-plugin-redirect-frontmatter-1.0.0.tgz",
-			"integrity": "sha512-IReQqFYis7/Q49W9LTYthhO8VVNCOhnH/HymJHsvpLPeRTTreZUlnJ/i75LgdCnDGeHrTWocFej0Y/uBQUgVHw==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.15"
-			}
-		},
 		"vuepress-plugin-robots": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vuepress-plugin-robots/-/vuepress-plugin-robots-1.0.1.tgz",

package.json

@@ -37,7 +37,6 @@
 		"vuepress-plugin-clean-urls": "^1.1.2",
 		"vuepress-plugin-container": "^2.1.5",
 		"vuepress-plugin-element-ui": "^1.1.0",
-		"vuepress-plugin-redirect-frontmatter": "^1.0.0",
 		"vuepress-plugin-zooming": "^1.1.8",
 		"webpack": "^4.44.2"
 	},
@@ -58,6 +57,7 @@
 		"vue-material-design-icons": "^4.11.0",
 		"vue-moment": "^4.1.0",
 		"vue-sweetalert2": "^4.2.0",
+		"vuepress-plugin-dehydrate": "^1.1.5",
 		"vuepress-plugin-robots": "^1.0.1",
 		"vuex": "^3.6.2"
 	}

src/.vuepress/config/plugins.js

@@ -30,6 +30,7 @@ module.exports = [
 			ga: "UA-148212082-1",
 		},
 	],
+	["vuepress-plugin-dehydrate"],
 	[
 		"@vuepress/active-header-links",
 		{
@@ -49,7 +50,6 @@ module.exports = [
 			normalSuffix: "/",
 		},
 	],
-	["redirect-frontmatter"],
 	[
 		"vuepress-plugin-zooming",
 		{

src/.vuepress/enhanceApp.js

@@ -11,6 +11,21 @@ import Element from "element-ui";
 
 import store from "./store";
 
+const redirectList = [
+	{
+		path: "/help/guides/troubleshooting-problems/",
+		redirect: "/help/guides/troubleshooting/",
+	},
+	{
+		path: "/help/guides/reading-local-manga/",
+		redirect: "/help/guides/local-manga/",
+	},
+	{
+		path: "/help/guides/creating-backups/",
+		redirect: "/help/guides/backups/",
+	}
+]
+
 export default ({
 	Vue, // the version of Vue being used in the VuePress app
 	options, // the options for the root Vue instance
@@ -25,4 +40,6 @@ export default ({
 	Vue.use(VueMoment);
 	Vue.use(Element);
 	Vue.mixin({ store });
+	// Reroute to new pages
+	router.addRoutes(redirectList);
 };

src/help/guides/backups.md

@@ -2,8 +2,6 @@
 title: Backups
 description: Backups can save you a lot of headache in case something happens to your installation or device.
 lang: en-US
-permalink: /help/guides/backups
-redirectFrom: /help/guides/creating-backups
 ---
 
 # Backups

src/help/guides/local-manga.md

@@ -2,8 +2,6 @@
 title: Local manga
 description: All the information you would need to read your own local manga.
 lang: en-US
-permalink: /help/guides/local-manga
-redirectFrom: /help/guides/reading-local-manga
 ---
 
 # Local manga

src/help/guides/troubleshooting.md

@@ -2,8 +2,6 @@
 title: Troubleshooting
 description: Encountered an issue with a source or the app? Here are resources to help you troubleshoot it.
 lang: en-US
-permalink: /help/guides/troubleshooting
-redirectFrom: /help/guides/troubleshooting-problems
 ---
 
 # Troubleshooting