fix: Links (#593)

* fix: Links

* chore: update decentraland-gatsby v5.96.1

* fix: Remove logs

* fix: Radash

---------

Co-authored-by: Braian Mellor <[email protected]>

package.json

@@ -17,7 +17,7 @@
     "core-js": "^3.22.2",
     "cssnano": "^5.0.10",
     "dcl-catalyst-client": "^21.5.0",
-    "decentraland-gatsby": "^5.92.0",
+    "decentraland-gatsby": "^5.96.1",
     "es6-shim": "^0.35.6",
     "express-fileupload": "^1.2.1",
     "gatsby": "^4.23.0",

src/api/Events.ts

@@ -58,7 +58,7 @@ export type EditSchedule = Pick<
 >
 
 export default class Events extends API {
-  static Url = env("EVENTS_URL", `https://events.decentraland.org/api`)
+  static Url = env("EVENTS_API_URL", `https://events.decentraland.org/api`)
 
   static Cache = new Map<string, Events>()
 
@@ -71,7 +71,7 @@ export default class Events extends API {
   }
 
   static get() {
-    return this.from(env("EVENTS_URL", this.Url))
+    return this.from(env("EVENTS_API_URL", this.Url))
   }
 
   static parseEvent(event: SessionEventAttributes): SessionEventAttributes {

src/components/Button/AddToCalendarButton.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback } from "react"
 
+import { withPrefix } from "gatsby"
+
 import useTrackContext from "decentraland-gatsby/dist/context/Track/useTrackContext"
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import Time from "decentraland-gatsby/dist/utils/date/Time"
@@ -53,7 +55,7 @@ export default function AddToCalendarButton({
       target="_blank"
       {...props}
       onClick={handleClick}
-      href={to}
+      href={withPrefix(to)}
       basic
       className={TokenList.join(["AddToCalendarButton", props.className])}
     >

src/components/Button/AttendingButtons.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo, useState } from "react"
 
+import { withPrefix } from "gatsby"
+
 import { useLocation } from "@gatsbyjs/reach-router"
 import useTrackContext from "decentraland-gatsby/dist/context/Track/useTrackContext"
 import useAsyncTask from "decentraland-gatsby/dist/hooks/useAsyncTask"
@@ -58,7 +60,7 @@ export default function AttendingButtons(props: AttendingButtonsProps) {
         await (navigator as any).share({
           title: event.name,
           text: event.description,
-          url: location.origin + locations.event(event.id),
+          url: location.origin + withPrefix(locations.event(event.id)),
         })
       } catch (err) {
         console.error(err)
@@ -183,7 +185,7 @@ export default function AttendingButtons(props: AttendingButtonsProps) {
           disabled={loading || sharing || !approved}
           onClick={handleStopPropagation}
           className="fluid"
-          href={href}
+          href={href ? withPrefix(href) : href}
           target="_blank"
           style={{
             display: "flex",

src/components/Button/JumpInButton.tsx

@@ -1,5 +1,7 @@
 import React, { useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import {
   Button,
@@ -28,7 +30,7 @@ export default function JumpInButton(props: ButtonProps) {
     <Button
       primary
       className="fluid"
-      href={href}
+      href={withPrefix(href)}
       target="_blank"
       style={{
         display: "flex",

src/components/Event/CarouselEvents/CarouselEvents.tsx

@@ -1,8 +1,8 @@
 import React, { useCallback, useMemo } from "react"
 
-import Carousel2, {
-  IndicatorType,
-} from "decentraland-gatsby/dist/components/Carousel2/Carousel2"
+import { withPrefix } from "gatsby"
+
+import Carousel2 from "decentraland-gatsby/dist/components/Carousel2/Carousel2"
 import SubTitle from "decentraland-gatsby/dist/components/Text/SubTitle"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
@@ -108,7 +108,7 @@ export const CarouselEvents = React.memo((props: CarouselEventsProps) => {
             <Button
               primary
               as="a"
-              href={locations.schedule(schedule.id)}
+              href={withPrefix(locations.schedule(schedule.id))}
               onClick={handleClickFullSchedule}
             >
               Full Schedule
@@ -176,7 +176,7 @@ const CarouselThemeHeader = React.memo(function CarouselThemeHeader({
       <Button
         as="a"
         primary
-        href={locations.schedule(schedule.id)}
+        href={withPrefix(locations.schedule(schedule.id))}
         onClick={handleClickFullSchedule}
       >
         {CarouselThemeHeaderCTA[schedule.theme]}

src/components/Event/EventCard/EventCard.tsx

@@ -1,19 +1,19 @@
 import React, { useCallback, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import ImgFixed from "decentraland-gatsby/dist/components/Image/ImgFixed"
 import Avatar from "decentraland-gatsby/dist/components/Profile/Avatar"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
 import { Card } from "decentraland-ui/dist/components/Card/Card"
 
 import { SessionEventAttributes } from "../../../entities/Event/types"
-import WorldIcon from "../../../images/worlds-icon.svg"
 import locations from "../../../modules/locations"
 import StartIn from "../../Badge/StartIn"
 import AttendingButtons from "../../Button/AttendingButtons"
 import JumpInPosition from "../../Button/JumpInPosition"
 import EventDate from "../EventDate/EventDate"
-import EventSection from "../EventSection"
 
 import "./EventCard.css"
 
@@ -64,7 +64,7 @@ export default React.memo(function EventCard(props: EventCardProps) {
         props.loading && "loading",
         event && !event.approved && "pending",
       ])}
-      href={href}
+      href={href ? withPrefix(href) : href}
       onClick={handleClick}
     >
       {event && <StartIn date={nextStartAt} />}

src/components/Event/EventCardBig/EventCardBig.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import ImgFixed from "decentraland-gatsby/dist/components/Image/ImgFixed"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
@@ -48,7 +50,7 @@ export default React.memo(function EventCardBig(props: EventCardBigProps) {
         props.loading && "loading",
         event && !event.approved && "pending",
       ])}
-      href={href}
+      href={href ? withPrefix(href) : href}
       onClick={handleClick}
     >
       <div className="event-card-big__container">

src/components/Event/EventCardMini/EventCardMini.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import ImgFixed from "decentraland-gatsby/dist/components/Image/ImgFixed"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
@@ -52,7 +54,7 @@ export default React.memo(function EventCardMini(props: EventCardMiniProps) {
         props.loading && "loading",
         event && !event.approved && "pending",
       ])}
-      href={href}
+      href={href ? withPrefix(href) : href}
       onClick={handleClick}
     >
       {event && !props.loading && (

src/components/Event/EventModal/EventDetail/EventDetail.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import DateBox from "decentraland-gatsby/dist/components/Date/DateBox"
 import Avatar from "decentraland-gatsby/dist/components/Profile/Avatar"
 import Italic from "decentraland-gatsby/dist/components/Text/Italic"
@@ -154,7 +156,7 @@ export default function EventDetail({ event, ...props }: EventDetailProps) {
                   basic
                   className="edit-detail__menu-icon-button"
                   as="a"
-                  href={locations.editEvent(event.id)}
+                  href={withPrefix(locations.editEvent(event.id))}
                   onClick={prevent(() =>
                     navigate(locations.editEvent(event.id))
                   )}
@@ -167,7 +169,7 @@ export default function EventDetail({ event, ...props }: EventDetailProps) {
                   basic
                   className="edit-detail__menu-icon-button"
                   as="a"
-                  href={locations.cloneEvent(event.id)}
+                  href={withPrefix(locations.cloneEvent(event.id))}
                   onClick={prevent(() =>
                     navigate(locations.cloneEvent(event.id))
                   )}

src/components/Event/ListEvents/ListEvents.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import { useLocation } from "@gatsbyjs/reach-router"
 import useTrackContext from "decentraland-gatsby/dist/context/Track/useTrackContext"
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
@@ -138,7 +140,10 @@ export const ListEvents = React.memo((props: ListEventsProps) => {
         new URLSearchParams(location.search)
       )
       track(SegmentEvent.Filter, newFilters)
-      navigate(url(location.pathname, newParams))
+      const pathname = location.pathname.startsWith(withPrefix("/"))
+        ? location.pathname.slice(withPrefix("/").length)
+        : location.pathname
+      navigate(url(pathname, newParams))
     },
     [location.pathname, location.search, props.filters]
   )
@@ -152,7 +157,10 @@ export const ListEvents = React.memo((props: ListEventsProps) => {
         new URLSearchParams(location.search)
       )
       track(SegmentEvent.Filter, newFilters)
-      navigate(url(location.pathname, newParams))
+      const pathname = location.pathname.startsWith(withPrefix(""))
+        ? location.pathname.slice(withPrefix("/").length)
+        : location.pathname
+      navigate(url(pathname, newParams))
     },
     [location.pathname, location.search, props.filters]
   )
@@ -172,7 +180,10 @@ export const ListEvents = React.memo((props: ListEventsProps) => {
         new URLSearchParams(location.search)
       )
       track(SegmentEvent.Filter, newFilters)
-      navigate(url(location.pathname, newParams))
+      const pathname = location.pathname.startsWith(withPrefix("/"))
+        ? location.pathname.slice(withPrefix("/").length)
+        : location.pathname
+      navigate(url(pathname, newParams))
     },
     []
   )
@@ -192,7 +203,10 @@ export const ListEvents = React.memo((props: ListEventsProps) => {
         new URLSearchParams(location.search)
       )
       track(SegmentEvent.Filter, newFilters)
-      navigate(url(location.pathname, newParams))
+      const pathname = location.pathname.startsWith(withPrefix("/"))
+        ? location.pathname.slice(withPrefix("/").length)
+        : location.pathname
+      navigate(url(pathname, newParams))
     },
     []
   )

src/components/Layout/Navigation.tsx

@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import { useLocation } from "@gatsbyjs/reach-router"
 import useAuthContext from "decentraland-gatsby/dist/context/Auth/useAuthContext"
 import useTrackContext from "decentraland-gatsby/dist/context/Track/useTrackContext"
@@ -102,6 +104,9 @@ export default function Navigation(props: NavigationProps) {
 
       debounceTrack(e.target.value)
       let target = location.pathname
+      if (target.startsWith(withPrefix("/"))) {
+        target = target.slice(withPrefix("/").length)
+      }
       const search = newParams.toString()
       if (search) {
         target += "?" + search

src/config/dev.json

@@ -1,7 +1,7 @@
 {
   "GATSBY_CHAIN_ID": "1,137",
   "GATSBY_DECENTRALAND_URL": "https://play.decentraland.org",
-  "GATSBY_EVENTS_URL": "https://events.decentraland.zone/api",
+  "GATSBY_EVENTS_API_URL": "https://events.decentraland.zone/api",
   "GATSBY_EVENTS_BASE_URL": "https://decentraland.zone/events",
   "GATSBY_LAND_URL": "https://api.decentraland.org",
   "GATSBY_PROFILE_URL": "https://peer.decentraland.org",

src/config/prod.json

@@ -1,7 +1,7 @@
 {
   "GATSBY_CHAIN_ID": "1,137",
   "GATSBY_DECENTRALAND_URL": "https://play.decentraland.org",
-  "GATSBY_EVENTS_URL": "https://events.decentraland.org/api",
+  "GATSBY_EVENTS_API_URL": "https://events.decentraland.org/api",
   "GATSBY_EVENTS_BASE_URL": "https://events.decentraland.org",
   "GATSBY_LAND_URL": "https://api.decentraland.org",
   "GATSBY_PROFILE_URL": "https://peer.decentraland.org",

src/entities/Event/utils.ts

@@ -1,3 +1,5 @@
+import { withPrefix } from "gatsby"
+
 import Time from "decentraland-gatsby/dist/utils/date/Time"
 import env from "decentraland-gatsby/dist/utils/env"
 import padStart from "lodash/padStart"
@@ -20,7 +22,10 @@ const DECENTRALAND_URL = env(
   "DECENTRALAND_URL",
   "https://play.decentraland.org"
 )
-const EVENTS_URL = env("EVENTS_URL", "https://events.decentraland.org/api")
+const EVENTS_BASE_URL = env(
+  "EVENTS_BASE_URL",
+  "https://events.decentraland.org"
+)
 const PROFILE_SITE_URL = env(
   "PROFILE_SITE_URL",
   "https://profile.decentraland.org"
@@ -33,8 +38,8 @@ export function profileSiteUrl(address: string) {
 }
 
 export function siteUrl(pathname = "") {
-  const target = new URL(EVENTS_URL)
-  target.pathname = pathname
+  const target = new URL(EVENTS_BASE_URL)
+  target.pathname = withPrefix(pathname)
   return target
 }
 

src/modules/locations.ts

@@ -1,5 +1,4 @@
 import API from "decentraland-gatsby/dist/utils/api/API"
-import env from "decentraland-gatsby/dist/utils/env"
 
 import { EventType } from "../entities/Event/types"
 import {
@@ -9,8 +8,6 @@ import {
 } from "../entities/Event/utils"
 import { ALL_EVENT_CATEGORY } from "../entities/EventCategory/types"
 
-const BASE_URL = env("BASE_URL", "/")
-
 export enum EventView {
   Attendees = "attendees",
 }
@@ -90,7 +87,7 @@ export function url(
   path: string,
   query?: Record<string, string> | URLSearchParams
 ) {
-  return API.url(BASE_URL, path, query)
+  return API.url("", path, query)
 }
 
 export default {

src/modules/servers.ts

@@ -2,7 +2,7 @@ import { cache } from "dcl-catalyst-client/dist/contracts-snapshots/data"
 import API from "decentraland-gatsby/dist/utils/api/API"
 import Catalyst from "decentraland-gatsby/dist/utils/api/Catalyst"
 import { CatalystAbout } from "decentraland-gatsby/dist/utils/api/Catalyst.types"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 const mainRealmUrl = "https://realm-provider.decentraland.org/main"
 

src/modules/worlds.ts

@@ -1,6 +1,6 @@
 import Dataloader from "dataloader"
 import Time from "decentraland-gatsby/dist/utils/date/Time"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 import Places, { AggregatePlaceAttributes } from "../api/Places"