From 42a56829a559f0863da03c2e466c6da627b6a85b Mon Sep 17 00:00:00 2001
From: Anthony Cossins <1451668+anthonyec@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:31:13 +0100
Subject: [PATCH] Fix routing for hubspot

---
 plugins/hubspot/src/pages/Menu.tsx  | 3 ++-
 plugins/hubspot/src/pages/index.tsx | 5 +++--
 plugins/hubspot/src/router.tsx      | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/hubspot/src/pages/Menu.tsx b/plugins/hubspot/src/pages/Menu.tsx
index c666f8aa..2fd94235 100644
--- a/plugins/hubspot/src/pages/Menu.tsx
+++ b/plugins/hubspot/src/pages/Menu.tsx
@@ -3,6 +3,7 @@ import { Logo } from "../components/Logo"
 import { ChartIcon, FormsIcon, PersonIcon, MessageIcon, LightningIcon, WidgetsIcon } from "../components/Icons"
 import { framer } from "framer-plugin"
 import cx from "classnames"
+import { BASE_PATH } from "../router"
 
 const MenuOption = ({
     icon,
@@ -22,7 +23,7 @@ const MenuOption = ({
     return (
         <button
             className={cx("h-[110px] w-full tile col items-center justify-center rounded-md", className)}
-            onClick={() => (onClick ? onClick() : navigate(to))}
+            onClick={() => (onClick ? onClick() : navigate(`${BASE_PATH}${to}`))}
         >
             {icon}
             <p className="font-semibold text-tertiary">{title}</p>
diff --git a/plugins/hubspot/src/pages/index.tsx b/plugins/hubspot/src/pages/index.tsx
index 6b414709..6f3df810 100644
--- a/plugins/hubspot/src/pages/index.tsx
+++ b/plugins/hubspot/src/pages/index.tsx
@@ -4,6 +4,7 @@ import { useLocation } from "wouter"
 import auth from "../auth"
 import { Button } from "../components/Button"
 import { Logo } from "../components/Logo"
+import { BASE_PATH } from "../router"
 
 export function AuthenticatePage() {
     const [, navigate] = useLocation()
@@ -15,7 +16,7 @@ export function AuthenticatePage() {
             const isAuth = await auth.isAuthenticated()
 
             if (isAuth) {
-                navigate("/menu")
+                navigate(`${BASE_PATH}/menu`)
             }
         }
 
@@ -53,7 +54,7 @@ export function AuthenticatePage() {
             // Poll the auth server and wait for tokens
             await pollForTokens(authorization.readKey)
 
-            navigate("/menu")
+            navigate(`${BASE_PATH}/menu`)
         } catch (e) {
             framer.notify(e instanceof Error ? e.message : "An unknown error occurred.", { variant: "error" })
         } finally {
diff --git a/plugins/hubspot/src/router.tsx b/plugins/hubspot/src/router.tsx
index d4131757..37985203 100644
--- a/plugins/hubspot/src/router.tsx
+++ b/plugins/hubspot/src/router.tsx
@@ -14,7 +14,7 @@ import { WidgetsPage } from "./pages/Widgets"
 import { PageErrorBoundaryFallback } from "./components/PageErrorBoundaryFallback"
 import { isLocal } from "./auth"
 
-const BASE_PATH = isLocal() ? "" : "/hubspot"
+export const BASE_PATH = isLocal() ? "" : "/hubspot"
 
 interface PluginRoute {
     path: string
@@ -108,6 +108,7 @@ function useRoutes(routes: PluginRoute[]) {
 
     const addToMatch = (route: PluginRoute, parentPath = "") => {
         const fullPath = BASE_PATH + parentPath + route.path
+
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const match = useRoute(fullPath)
         matches.push({ match, route: { ...route, path: fullPath } })