From 5c5bdb11ff2395ac2038c9cba2cd0e290d410d55 Mon Sep 17 00:00:00 2001 From: Matchu Date: Tue, 15 Jun 2021 22:46:43 -0700 Subject: [PATCH] Oops, fix Lists page links! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right, oops, the redirect works when you navigate directly to a URL, but not client-side! Fixed a bunch of 'em 😅 --- src/app/GlobalFooter.js | 2 +- src/app/GlobalHeader.js | 2 +- src/app/ItemTradesPage.js | 2 +- src/app/UserItemsPage.js | 20 ++++++++++++-------- src/server/types/ClosetList.js | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/app/GlobalFooter.js b/src/app/GlobalFooter.js index 052d338..a9be301 100644 --- a/src/app/GlobalFooter.js +++ b/src/app/GlobalFooter.js @@ -112,7 +112,7 @@ function ColorModeButton() { function useClassicDTIUrl() { const itemPageMatch = useRouteMatch("/items/:itemId"); - const userItemsPageMatch = useRouteMatch("/user/:userId/items"); + const userItemsPageMatch = useRouteMatch("/user/:userId/lists"); const modelingPageMatch = useRouteMatch("/modeling"); if (itemPageMatch) { diff --git a/src/app/GlobalHeader.js b/src/app/GlobalHeader.js index e7a4a3f..e626004 100644 --- a/src/app/GlobalHeader.js +++ b/src/app/GlobalHeader.js @@ -128,7 +128,7 @@ function UserNavBarSection() { )} {id && ( - + Lists )} diff --git a/src/app/ItemTradesPage.js b/src/app/ItemTradesPage.js index 5120f98..953956f 100644 --- a/src/app/ItemTradesPage.js +++ b/src/app/ItemTradesPage.js @@ -251,7 +251,7 @@ function ItemTradesTable({ trades.map((trade) => ( { console.error(error); @@ -549,13 +549,17 @@ function ClosetList({ closetList, isCurrentUser, showHeading }) { lineHeight="1.2" // to match Input paddingY="2px" // to account for Input border/padding > - {closetList.isDefaultList ? closetList.name : - {closetList.name} - } + {closetList.isDefaultList ? ( + closetList.name + ) : ( + + {closetList.name} + + )} ))} diff --git a/src/server/types/ClosetList.js b/src/server/types/ClosetList.js index 1189a9b..d85a240 100644 --- a/src/server/types/ClosetList.js +++ b/src/server/types/ClosetList.js @@ -205,7 +205,7 @@ const resolvers = { }, ], timestamp: new Date().toISOString(), - url: `https://impress-2020.openneo.net/user/${user.id}/items#list-${closetListId}`, + url: `https://impress-2020.openneo.net/user/${user.id}/lists#list-${closetListId}`, }, ], });