feat: Enable the builder to be single site

decentraland · Nov 20, 2023 · 214d575 · 214d575
1 parent 74de0c7
commit 214d575
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/components/WorldListPage_WorldsForEnsOwnersFeature/NameTabs/NameTabs.spec.tsx b/src/components/WorldListPage_WorldsForEnsOwnersFeature/NameTabs/NameTabs.spec.tsx
@@ -1,6 +1,5 @@
 import { ReactNode } from 'react'
 import { render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
 import NameTabs from './NameTabs'
 import { TAB_QUERY_PARAM_KEY, TabType, UseCurrentlySelectedTabResult, useCurrentlySelectedTab } from '../hooks'

diff --git a/src/config/env/dev.json b/src/config/env/dev.json
@@ -1,13 +1,14 @@
 {
   "CHAIN_ID": "11155111",
   "ENVIRONMENT": "development",
+  "BASE_NAME": "/builder",
   "LOCAL_STORAGE_KEY": "builder",
   "EMAIL_SERVER_URL": "https://subscription.decentraland.org/subscribe",
   "PEER_URL": "https://peer.decentraland.zone",
   "ERC721_COLLECTION_BASE_URI": "https://peer.decentraland.zone/lambdas/collections/standard/erc721/",
   "BUILDER_SERVER_URL": "https://builder-api.decentraland.zone/v1",
   "MARKETPLACE_URL": "https://api.decentraland.zone/v1",
-  "MARKETPLACE_WEB_URL": "https://market.decentraland.zone",
+  "MARKETPLACE_WEB_URL": "https://decentraland.zone/marketplace",
   "LAND_MANAGER_GRAPH_URL": "https://api.studio.thegraph.com/query/49472/land-manager-sepolia/version/latest",
   "MARKETPLACE_GRAPH_URL": "https://api.studio.thegraph.com/query/49472/marketplace-sepolia/version/latest",
   "RENTALS_GRAPH_URL": "https://api.studio.thegraph.com/query/49472/rentals-ethereum-sepolia/version/latest",
@@ -27,13 +28,13 @@
   "IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false",
   "EXPLORER_URL": "https://play.decentraland.zone",
   "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.zone/v1",
-  "ACCOUNT_URL": "https://account.decentraland.zone",
+  "ACCOUNT_URL": "https://decentraland.zone/account",
   "DISCORD_URL": "https://dcl.gg/discord",
   "WEARABLES_ZIP_INFRA_URL": "http://a-test-url-com",
   "MIN_SALE_VALUE_IN_WEI": "1000000000000000000",
   "FORUM_URL": "https://forum.decentraland.org",
   "WORLDS_CONTENT_SERVER": "https://worlds-content-server.decentraland.zone",
-  "PROFILE_URL": "https://profile.decentraland.zone",
+  "PROFILE_URL": "https://decentraland.zone/profile",
   "SSO_URL": "https://id.decentraland.zone",
   "SENTRY_DSN": "https://428e8d298fb3f0fbcea645314a4a388c@o4504361728212992.ingest.sentry.io/4505748381564928",
   "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.zone",

diff --git a/src/config/env/stg.json b/src/config/env/stg.json
@@ -1,13 +1,14 @@
 {
   "CHAIN_ID": "1",
   "ENVIRONMENT": "staging",
+  "BASE_NAME": "/builder",
   "LOCAL_STORAGE_KEY": "builder",
   "EMAIL_SERVER_URL": "https://subscription.decentraland.org/subscribe",
   "PEER_URL": "https://peer.decentraland.org",
   "ERC721_COLLECTION_BASE_URI": "https://peer.decentraland.org/lambdas/collections/standard/erc721/",
   "BUILDER_SERVER_URL": "https://builder-api.decentraland.today/v1",
   "MARKETPLACE_URL": "https://api.decentraland.org/v1",
-  "MARKETPLACE_WEB_URL": "https://market.decentraland.today",
+  "MARKETPLACE_WEB_URL": "https://decentraland.today/marketplace",
   "LAND_MANAGER_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/land-manager",
   "MARKETPLACE_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/marketplace",
   "RENTALS_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/rentals-ethereum-mainnet",
@@ -27,13 +28,13 @@
   "IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false",
   "EXPLORER_URL": "https://play.decentraland.org",
   "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.today/v1",
-  "ACCOUNT_URL": "https://account.decentraland.today",
+  "ACCOUNT_URL": "https://decentraland.today/account",
   "DISCORD_URL": "https://dcl.gg/discord",
   "WEARABLES_ZIP_INFRA_URL": "https://docs.decentraland.org/decentraland/linked-wearables/#creating-linked-wearables-in-bulk",
   "MIN_SALE_VALUE_IN_WEI": "1000000000000000000",
   "FORUM_URL": "https://forum.decentraland.org",
   "WORLDS_CONTENT_SERVER": "https://worlds-content-server.decentraland.org",
-  "PROFILE_URL": "https://profile.decentraland.today",
+  "PROFILE_URL": "https://decentraland.today/profile",
   "SSO_URL": "https://id.decentraland.today",
   "SENTRY_DSN": "https://428e8d298fb3f0fbcea645314a4a388c@o4504361728212992.ingest.sentry.io/4505748381564928",
   "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.today",

diff --git a/src/modules/common/store.ts b/src/modules/common/store.ts
@@ -62,7 +62,7 @@ const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
   })
   : compose
 
-const history = createBrowserHistory()
+const history = createBrowserHistory({ basename: config.get('BASE_NAME') ?? undefined })
 const rootReducer = createRootReducer(history)
 
 const historyMiddleware = routerMiddleware(history)