fix remaining wrong links due to domain change

Author: bcamarneiro

.changeset/silent-seals-occur.md

@@ -0,0 +1,5 @@
+---
+"@fleek-platform/dashboard": patch
+---
+
+fix remaining links

src/pages/_app.tsx

@@ -11,7 +11,7 @@ import { AppProps } from '@/types/App';
 import { useRouter } from '@/hooks/useRouter';
 import { usePathname } from 'next/navigation';
 import { isServerSide } from '@/utils/isServerSide';
-import { getQueryParamsToObj } from '@/utils/url';
+import { getDashboardUrl, getQueryParamsToObj } from '@/utils/url';
 // TODO: Rename the util as `cookies` (plural)
 import { cookies } from '@/utils/cookie';
 import HomePage from '@/pages/LandingPage';
@@ -21,7 +21,8 @@ import { setDefined, getDefined, DEFINED_OVERRIDES_FILENAME } from '../defined';
 import { getWebsiteUrl } from '@/utils/url';
 
 const loadConfig = async (): Promise<boolean> => {
-  const overridesJson = `${getDefined('NEXT_PUBLIC_DASHBOARD_BASE_PATH')}/${DEFINED_OVERRIDES_FILENAME}`;
+  const dashboardBasePath = getDashboardUrl();
+  const overridesJson = `${dashboardBasePath}/${DEFINED_OVERRIDES_FILENAME}`;
 
   try {
     const response = await fetch(overridesJson);

src/providers/AuthProvider.tsx

@@ -14,7 +14,7 @@ import { usePathname } from 'next/navigation';
 import { useCookies } from './CookiesProvider';
 import { useRouter } from 'next/router';
 
-import { getWebsiteUrl } from '@/utils/url';
+import { getDashboardUrl, getWebsiteUrl } from '@/utils/url';
 
 import { getDefined } from '@/defined';
 
@@ -107,6 +107,7 @@ export const AuthProvider: React.FC<React.PropsWithChildren<{}>> = ({
   );
 
   useEffect(() => {
+    const dashboardBasePath = getDashboardUrl();
     if (
       !cookies.values.accessToken ||
       !cookies.values.authToken ||
@@ -125,7 +126,7 @@ export const AuthProvider: React.FC<React.PropsWithChildren<{}>> = ({
     if (pathname === routes.home()) {
       // TODO: Create an utility, include related unit test
       // use utils to form URL correctly/conventions
-      window.location.href = `${getDefined('NEXT_PUBLIC_DASHBOARD_BASE_PATH')}${routes.project.home({ projectId: cookies.values.projectId })}/${window.location.search}`;
+      window.location.href = `${dashboardBasePath}${routes.project.home({ projectId: cookies.values.projectId })}/${window.location.search}`;
     }
   }, [cookies.values.accessToken, router, logout, pathname]);
 

src/ui/ftw/EmptyState/EmptyState.tsx

@@ -8,7 +8,7 @@ import { CodeBlock } from '../CodeBlock/CodeBlock';
 import { Text } from '../Text/Text';
 import { emptyStateIllustrations, Section } from './emptyStateIllustrations';
 
-import { getDefined } from '@/defined';
+import { getDashboardUrl } from '@/utils/url';
 
 type ImageProps = ComponentProps<typeof ImageComponent> & {
   section: Section;
@@ -17,8 +17,9 @@ type ImageProps = ComponentProps<typeof ImageComponent> & {
 const Image: React.FC<ImageProps> = ({ section, ...props }) => {
   const { resolvedTheme } = useTheme();
   const theme = resolvedTheme === 'dark' ? 'dark' : 'light';
-  const src = getDefined('NEXT_PUBLIC_DASHBOARD_BASE_PATH')
-    ? `${getDefined('NEXT_PUBLIC_DASHBOARD_BASE_PATH')}/${emptyStateIllustrations[theme][section]}`
+  const dashboardBasePath = getDashboardUrl();
+  const src = dashboardBasePath
+    ? `${dashboardBasePath}/${emptyStateIllustrations[theme][section]}`
     : emptyStateIllustrations[theme][section];
 
   return (

src/utils/paths.ts

@@ -1,25 +1,25 @@
 import { getDefined } from '@/defined';
+import { getDashboardUrl } from './url';
 
 const normalizePathname = (pathname: string) => {
   const [path, query] = pathname.split('?');
 
   const segments = path.split('/').filter(Boolean);
 
   const normalizedPath = pathname.startsWith('/')
-    ? '/' + segments.join('/')
+    ? `/${segments.join('/')}`
     : segments.join('/');
 
   return query ? `${normalizedPath}?${query}` : normalizedPath;
 };
 
 export const joinBase = (pathname: string) => {
-  if (!getDefined('NEXT_PUBLIC_DASHBOARD_BASE_PATH')) {
+  const dashboardBasePath = getDashboardUrl();
+  if (!dashboardBasePath) {
     return normalizePathname(pathname);
   }
 
-  const normalizedBase = normalizePathname(
-    getDefined('NEXT_PUBLIC_DASHBOARD_BASE_PATH'),
-  );
+  const normalizedBase = normalizePathname(dashboardBasePath);
   const normalizedPath = normalizePathname(pathname);
 
   const pathWithoutLeadingSlash = normalizedPath.startsWith('/')
@@ -28,6 +28,6 @@ export const joinBase = (pathname: string) => {
 
   return (
     normalizedBase +
-    (pathWithoutLeadingSlash ? '/' + pathWithoutLeadingSlash : '')
+    (pathWithoutLeadingSlash ? `/${pathWithoutLeadingSlash}` : '')
   );
 };