From ee913461f1ff032f4156af86c6a293f237445ddb Mon Sep 17 00:00:00 2001 From: yudejp Date: Fri, 24 Sep 2021 10:08:30 +0900 Subject: [PATCH] Using next.config.js rewrite for UUID validation --- next.config.js | 14 ++++++++++++++ pages/components/Minecraft/UUIDCheck.js | 15 --------------- pages/minecraft/players/[uuid].js | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 pages/components/Minecraft/UUIDCheck.js diff --git a/next.config.js b/next.config.js index b0018db..a065a9a 100644 --- a/next.config.js +++ b/next.config.js @@ -1,5 +1,18 @@ const nextTranslate = require('next-translate') +const rewrites = async () => { + return [ + { + source: '/minecraft/players/:uuid(\[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})', + destination: '/minecraft/players/:uuid' + }, + { + source: '/minecraft/players/:uuid', + destination: '/404' + } + ] +} + module.exports = nextTranslate({ i18n: { locales: ['ja', 'en'], @@ -29,4 +42,5 @@ module.exports = nextTranslate({ } ] }, + rewrites, }) \ No newline at end of file diff --git a/pages/components/Minecraft/UUIDCheck.js b/pages/components/Minecraft/UUIDCheck.js deleted file mode 100644 index 6f9f5fc..0000000 --- a/pages/components/Minecraft/UUIDCheck.js +++ /dev/null @@ -1,15 +0,0 @@ -import Players from './Players' -import WrongUUID from './WrongUUID' - -function App (props) { - const uuid = props; - const regex = "[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"; - - if (uuid.uuid.match(regex)) { - return - } else { - return - } -} - -export default App; \ No newline at end of file diff --git a/pages/minecraft/players/[uuid].js b/pages/minecraft/players/[uuid].js index 4c83ed4..770199a 100644 --- a/pages/minecraft/players/[uuid].js +++ b/pages/minecraft/players/[uuid].js @@ -8,9 +8,9 @@ import useTranslation from 'next-translate/useTranslation' import { useRouter } from 'next/router' // Data fetching -import UUIDCheck from '../../components/Minecraft/UUIDCheck' +import Players from '../../components/Minecraft/Players' -export default function Players() { +export default function UUID() { const router = useRouter() const { locale, locales, defaultLocale, pathname } = router const { t, lang } = useTranslation("index") @@ -19,7 +19,7 @@ export default function Players() { return ( <> - + )