From 5a0be9cded90d70dd16a56d30b4804dbd830aa0f Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Mon, 21 Aug 2023 00:07:46 +0200
Subject: [PATCH] fix tech basepath

---
 resources/js/components/app/Routes.js      | 10 +++++-----
 resources/js/components/pages/Technique.js |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/app/Routes.js b/resources/js/components/app/Routes.js
index 396b2a7..5f2ed26 100644
--- a/resources/js/components/app/Routes.js
+++ b/resources/js/components/app/Routes.js
@@ -22,7 +22,7 @@ const AppRoutes = ({ doLogout }) => <Routes>
 		/>
 		<Route
 			path="dungeons/:name"
-			element={<Technique namespace="dungeons" type="dungeon" />}
+			element={<Technique basepath="dungeons" type="dungeon" />}
 		/>
 		<Route
 			path="events/:name"
@@ -35,7 +35,7 @@ const AppRoutes = ({ doLogout }) => <Routes>
 		/>
 		<Route
 			path="locations/:name"
-			element={<Technique namespace="locations" type="location" />}
+			element={<Technique basepath="locations" type="location" />}
 		/>
 		<Route path="map">
 			<Route index element={<Navigate replace to="lw" />} />
@@ -47,7 +47,7 @@ const AppRoutes = ({ doLogout }) => <Routes>
 		/>
 		<Route
 			path="modes/:name"
-			element={<Technique namespace="modes" type="mode" />}
+			element={<Technique basepath="modes" type="mode" />}
 		/>
 		<Route
 			path="rulesets"
@@ -55,7 +55,7 @@ const AppRoutes = ({ doLogout }) => <Routes>
 			/>
 		<Route
 			path="rulesets/:name"
-			element={<Technique namespace="rulesets" type="ruleset" />}
+			element={<Technique basepath="rulesets" type="ruleset" />}
 		/>
 		<Route path="schedule" element={<Schedule />} />
 		<Route
@@ -64,7 +64,7 @@ const AppRoutes = ({ doLogout }) => <Routes>
 		/>
 		<Route
 			path="tech/:name"
-			element={<Technique namespace="techniques" type="tech" />}
+			element={<Technique basepath="tech" type="tech" />}
 		/>
 		<Route path="tournaments/:id" element={<Tournament />} />
 		<Route path="users/:id" element={<User />} />
diff --git a/resources/js/components/pages/Technique.js b/resources/js/components/pages/Technique.js
index 32acd28..30eed5b 100644
--- a/resources/js/components/pages/Technique.js
+++ b/resources/js/components/pages/Technique.js
@@ -20,7 +20,7 @@ import { getLanguages, getMatchedLocale, getTranslation } from '../../helpers/Te
 import { useUser } from '../../helpers/UserContext';
 import i18n from '../../i18n';
 
-const Technique = ({ type }) => {
+const Technique = ({ basepath, type }) => {
 	const params = useParams();
 	const { name } = params;
 	const user = useUser();
@@ -91,7 +91,7 @@ const Technique = ({ type }) => {
 			<meta name="description" content={getTranslation(technique, 'short', i18n.language)} />
 		</Helmet>
 		<CanonicalLinks
-			base={`/tech/${technique.name}`}
+			base={`/${basepath}/${technique.name}`}
 			lang={getMatchedLocale(technique, i18n.language)}
 			langs={getLanguages(technique)}
 		/>
@@ -107,6 +107,7 @@ const Technique = ({ type }) => {
 };
 
 Technique.propTypes = {
+	basepath: PropTypes.string,
 	type: PropTypes.string,
 };
 
-- 
2.39.2