Merge pull request #453 from reservoirprotocol/jaden/grwth-3762

feat: proxy changes
reservoirprotocol · Jan 3, 2024 · ebb431d · ebb431d · vercel · Jan 3, 2024
2 parents e1f0007 + f299559
commit ebb431d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 171 deletions.
diff --git a/components/collections/CollectionActions.tsx b/components/collections/CollectionActions.tsx
@@ -110,7 +110,7 @@ const CollectionActions: FC<CollectionActionsProps> = ({ collection }) => {
         }
         setIsRefreshing(true)
         fetcher(
-          `${window.location.origin}/${marketplaceChain.proxyApi}/collections/refresh/v2`,
+          `${process.env.NEXT_PUBLIC_PROXY_URL}${marketplaceChain.proxyApi}/collections/refresh/v2`,
           undefined,
           {
             method: 'POST',

diff --git a/components/collections/TokenCard.tsx b/components/collections/TokenCard.tsx
@@ -293,10 +293,10 @@ export default ({
                   onClick={(e) => {
                     e.preventDefault()
                     e.stopPropagation()
-                    const url = `${proxyApi}/redirect/sources/${token?.market?.floorAsk?.source?.domain}/tokens/${token?.token?.contract}:${token?.token?.tokenId}/link/v2`
+                    const url = `${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/redirect/sources/${token?.market?.floorAsk?.source?.domain}/tokens/${token?.token?.contract}:${token?.token?.tokenId}/link/v2`
                     window.open(url, '_blank')
                   }}
-                  src={`${proxyApi}/redirect/sources/${token?.market?.floorAsk?.source?.domain}/logo/v2`}
+                  src={`${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/redirect/sources/${token?.market?.floorAsk?.source?.domain}/logo/v2`}
                 />
               ) : null}
             </Flex>

diff --git a/components/portfolio/PortfolioTokenCard.tsx b/components/portfolio/PortfolioTokenCard.tsx
@@ -339,7 +339,7 @@ export default ({
                     height: 20,
                     borderRadius: '50%',
                   }}
-                  src={`${proxyApi}/redirect/sources/${token?.ownership?.floorAsk?.source?.domain}/logo/v2`}
+                  src={`${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/redirect/sources/${token?.ownership?.floorAsk?.source?.domain}/logo/v2`}
                 />
               )}
             </>
@@ -470,7 +470,7 @@ export default ({
                 }
                 setIsRefreshing(true)
                 fetcher(
-                  `${window.location.origin}/${proxyApi}/tokens/refresh/v1`,
+                  `${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/tokens/refresh/v1`,
                   undefined,
                   {
                     method: 'POST',

diff --git a/components/portfolio/TokenTable.tsx b/components/portfolio/TokenTable.tsx
@@ -499,7 +499,7 @@ const TokenTableRow: FC<TokenTableRowProps> = ({
                 }
                 setIsRefreshing(true)
                 fetcher(
-                  `${window.location.origin}/${proxyApi}/tokens/refresh/v1`,
+                  `${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/tokens/refresh/v1`,
                   undefined,
                   {
                     method: 'POST',
@@ -926,7 +926,7 @@ const TokenTableRow: FC<TokenTableRowProps> = ({
                   }
                   setIsRefreshing(true)
                   fetcher(
-                    `${window.location.origin}/${proxyApi}/tokens/refresh/v1`,
+                    `${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/tokens/refresh/v1`,
                     undefined,
                     {
                       method: 'POST',

diff --git a/pages/[chain]/asset/[assetId].tsx b/pages/[chain]/asset/[assetId].tsx
@@ -387,7 +387,7 @@ const IndexPage: NextPage<Props> = ({ assetId, ssr }) => {
                 }
                 setIsRefreshing(true)
                 fetcher(
-                  `${window.location.origin}/${proxyApi}/tokens/refresh/v1`,
+                  `${process.env.NEXT_PUBLIC_PROXY_URL}${proxyApi}/tokens/refresh/v1`,
                   undefined,
                   {
                     method: 'POST',
@@ -416,8 +416,8 @@ const IndexPage: NextPage<Props> = ({ assetId, ssr }) => {
                       title: 'Refresh token failed',
                       description: ratelimit
                         ? `This token was recently refreshed. The next available refresh is ${timeTill(
-                          ratelimit
-                        )}.`
+                            ratelimit
+                          )}.`
                         : `This token was recently refreshed. Please try again later.`,
                     })
 
@@ -453,7 +453,10 @@ const IndexPage: NextPage<Props> = ({ assetId, ssr }) => {
                   <Text style="subtitle3" color="subtle" css={{ mr: '$2' }}>
                     You own {countOwned}
                   </Text>
-                  <Link href={`/portfolio/${account.address || ''}`} legacyBehavior={true}>
+                  <Link
+                    href={`/portfolio/${account.address || ''}`}
+                    legacyBehavior={true}
+                  >
                     <Anchor
                       color="primary"
                       weight="normal"
@@ -600,8 +603,8 @@ const IndexPage: NextPage<Props> = ({ assetId, ssr }) => {
 
 type SSRProps = {
   collection?:
-  | paths['/collections/v7']['get']['responses']['200']['schema']
-  | null
+    | paths['/collections/v7']['get']['responses']['200']['schema']
+    | null
   tokens?: paths['/tokens/v6']['get']['responses']['200']['schema'] | null
 }
 
@@ -648,10 +651,10 @@ export const getServerSideProps: GetServerSideProps<{
       : {}
 
     let collectionQuery: paths['/collections/v7']['get']['parameters']['query'] =
-    {
-      id: tokens?.tokens?.[0]?.token?.collection?.id,
-      normalizeRoyalties: NORMALIZE_ROYALTIES,
-    }
+      {
+        id: tokens?.tokens?.[0]?.token?.collection?.id,
+        normalizeRoyalties: NORMALIZE_ROYALTIES,
+      }
 
     const collectionsPromise = fetcher(
       `${reservoirBaseUrl}/collections/v7`,

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -224,9 +224,8 @@ AppWrapper.getInitialProps = async (appContext: AppContext) => {
   const appProps = await NextApp.getInitialProps(appContext)
   let baseUrl = ''
 
-  if (appContext.ctx.req?.headers.host) {
-    const host = appContext.ctx.req?.headers.host
-    baseUrl = `${host.includes('localhost') ? 'http' : 'https'}://${host}`
+  if (process.env.NEXT_PUBLIC_PROXY_URL) {
+    baseUrl = process.env.NEXT_PUBLIC_PROXY_URL
   } else if (process.env.NEXT_PUBLIC_HOST_URL) {
     baseUrl = process.env.NEXT_PUBLIC_HOST_URL || ''
   }

diff --git a/pages/api/reservoir/[...slug].ts b/pages/api/reservoir/[...slug].ts