From 04c4e0c1f3e94d61c562cb431b5bf72c23d1bf7e Mon Sep 17 00:00:00 2001 From: Matchu Date: Wed, 14 Sep 2022 19:41:45 -0700 Subject: [PATCH] Migrate /support/petAppearances to Next.js routing This was only a little bit tricky! I also noticed the hanger loading indicator being weird without having a container Box, so I added one. --- pages/support/petAppearances.tsx | 5 +++ src/app/App.js | 8 ----- src/app/SupportPetAppearancesPage.js | 40 ++++++++++++---------- src/app/WardrobePage/support/useSupport.js | 5 ++- 4 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pages/support/petAppearances.tsx diff --git a/pages/support/petAppearances.tsx b/pages/support/petAppearances.tsx new file mode 100644 index 0000000..00da6be --- /dev/null +++ b/pages/support/petAppearances.tsx @@ -0,0 +1,5 @@ +import SupportPetAppearancesPage from "../../src/app/SupportPetAppearancesPage"; + +export default function PrivacyPolicyPageWrapper() { + return ; +} diff --git a/src/app/App.js b/src/app/App.js index 5b0baa3..eb873e7 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -21,9 +21,6 @@ const ItemTradesSeekingPage = loadable(() => import("./ItemTradesPage").then((m) => m.ItemTradesSeekingPage) ); const ModelingPage = loadable(() => import("./ModelingPage")); -const SupportPetAppearancesPage = loadable(() => - import("./SupportPetAppearancesPage") -); const UserItemListsIndexPage = loadable(() => import("./UserItemListsIndexPage") ); @@ -104,11 +101,6 @@ function App() { - - - - - diff --git a/src/app/SupportPetAppearancesPage.js b/src/app/SupportPetAppearancesPage.js index 5ffad41..604979b 100644 --- a/src/app/SupportPetAppearancesPage.js +++ b/src/app/SupportPetAppearancesPage.js @@ -9,20 +9,20 @@ import { PopoverContent, PopoverTrigger, } from "@chakra-ui/popover"; -import { Link } from "react-router-dom"; import HangerSpinner from "./components/HangerSpinner"; import { ErrorMessage, Heading1 } from "./util"; import useSupport from "./WardrobePage/support/useSupport"; +import Link from "next/link"; function SupportPetAppearancesPage() { const { isSupportUser } = useSupport(); if (!isSupportUser) { - return "Sorry, this page is only for Support users!"; + return Sorry, this page is only for Support users!; } return ( - <> + Support: Pet appearances These species/color combinations have some UNKNOWN{" "} @@ -43,7 +43,7 @@ function SupportPetAppearancesPage() { - + ); } @@ -112,21 +112,25 @@ function SpeciesColorEditorLink({ species, color }) { ); return ( - - {color.name} {species.name} - + + {color.name} {species.name} + + ); } diff --git a/src/app/WardrobePage/support/useSupport.js b/src/app/WardrobePage/support/useSupport.js index 0c164ea..af3c8af 100644 --- a/src/app/WardrobePage/support/useSupport.js +++ b/src/app/WardrobePage/support/useSupport.js @@ -17,7 +17,10 @@ import * as React from "react"; */ function useSupport() { const supportSecret = React.useMemo( - () => localStorage.getItem("supportSecret"), + () => + typeof localStorage !== "undefined" + ? localStorage.getItem("supportSecret") + : null, [] );