From e793189da13e091d075b88fe3e47a3fb2d0c7c6f Mon Sep 17 00:00:00 2001
From: Copple <10214025+kiwicopple@users.noreply.github.com>
Date: Fri, 12 Aug 2022 17:52:40 +0200
Subject: [PATCH] push new routes

---
 apps/reference/nav/_referenceNavbar.js        | 29 +++++++++----------
 .../theme/DocSidebar/Desktop/Content/index.js | 15 +++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/reference/nav/_referenceNavbar.js b/apps/reference/nav/_referenceNavbar.js
index 641f0f40482..45c0538b13c 100644
--- a/apps/reference/nav/_referenceNavbar.js
+++ b/apps/reference/nav/_referenceNavbar.js
@@ -1,16 +1,19 @@
+const config = require('../docusaurus.config.js')
+
+const baseUrl = config.baseUrl
+
 const navbar = [
   {
     to: '/',
     label: 'Guides',
-    activeBaseRegex:
-      '.*.docs/$|^/docs/architecture|(^/docs/guides/(database|auth|storage|api|examples!))|(^/docs/guides/(examples|with-angular|with-flutter|with-nextjs|with-nuxt-3|with-react|with-redwoodjs|with-svelte|with-vue-3)|^/docs/faq|^/docs/going-into-prod|^/docs/handbook|^/docs/company)',
+    activeBaseRegex: `.*.docs/$|^/${baseUrl}/architecture|(^/${baseUrl}/guides/(database|auth|storage|api|examples!))|(^/${baseUrl}/guides/(examples|with-angular|with-flutter|with-nextjs|with-nuxt-3|with-react|with-redwoodjs|with-svelte|with-vue-3)|^/${baseUrl}/faq|^/${baseUrl}/going-into-prod|^/${baseUrl}/handbook|^/${baseUrl}/company)`,
     position: 'left',
   },
   {
     to: '/reference',
     label: 'Reference',
     position: 'left',
-    activeBaseRegex: '^/docs/reference$|^/docs/reference/$', // exactly match "/docs/reference/" only
+    activeBaseRegex: `^/${baseUrl}/reference$|^/${baseUrl}/reference/$`, // exactly match "/${baseUrl}/reference/" only
   },
 
   { href: 'https://app.supabase.com', label: 'Login', position: 'right' },
@@ -39,7 +42,7 @@ const navbar = [
     to: 'reference/api',
     position: 'left',
     label: 'API',
-    supabaseCustomNavBarRegex: '(^/docs/reference/api$|docs/reference/api/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/api$|${baseUrl}/reference/api/)`,
   },
   // {
   //   type: 'docsVersionDropdown',
@@ -53,7 +56,7 @@ const navbar = [
     to: 'reference/cli',
     position: 'left',
     label: 'CLI',
-    supabaseCustomNavBarRegex: '(^/docs/reference/cli$|docs/reference/cli/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/cli$|${baseUrl}/reference/cli/)`,
   },
   // {
   //   type: 'docsVersionDropdown',
@@ -67,15 +70,13 @@ const navbar = [
     to: 'reference/javascript',
     position: 'left',
     label: 'JavaScript Library',
-    supabaseCustomNavBarRegex:
-      '(^/docs/reference/javascript$|docs/reference/javascript/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/javascript$|${baseUrl}/reference/javascript/)`,
   },
   {
     type: 'docsVersionDropdown',
     position: 'left',
     docsPluginId: '_supabase_js',
-    supabaseCustomNavBarRegex:
-      '(^/docs/reference/javascript$|docs/reference/javascript/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/javascript$|${baseUrl}/reference/javascript/)`,
   },
 
   /**
@@ -87,7 +88,7 @@ const navbar = [
     to: 'reference/auth',
     position: 'left',
     label: 'Auth Server',
-    supabaseCustomNavBarRegex: '(^/docs/reference/auth$|docs/reference/auth/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/auth$|${baseUrl}/reference/auth/)`,
   },
   // {
   //   type: 'docsVersionDropdown',
@@ -101,8 +102,7 @@ const navbar = [
     to: 'reference/storage',
     position: 'left',
     label: 'Storage Server',
-    supabaseCustomNavBarRegex:
-      '(^/docs/reference/storage$|docs/reference/storage/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/storage$|${baseUrl}/reference/storage/)`,
   },
   // {
   //   type: 'docsVersionDropdown',
@@ -118,7 +118,7 @@ const navbar = [
     to: 'reference/supabase-dart',
     position: 'left',
     label: 'Dart Library',
-    supabaseCustomNavBarRegex: '(^/docs/reference/dart$|docs/reference/dart/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/dart$|${baseUrl}/reference/dart/)`,
   },
   // {
   //   type: 'docsVersionDropdown',
@@ -131,8 +131,7 @@ const navbar = [
     to: 'reference/auth-helpers',
     position: 'left',
     label: 'Auth Helpers',
-    supabaseCustomNavBarRegex:
-      '(^/docs/reference/auth-helpers$|docs/reference/auth-helpers/)',
+    supabaseCustomNavBarRegex: `(^/${baseUrl}/reference/auth-helpers$|${baseUrl}/reference/auth-helpers/)`,
   },
   // {
   //   type: 'docsVersionDropdown',
diff --git a/apps/reference/src/theme/DocSidebar/Desktop/Content/index.js b/apps/reference/src/theme/DocSidebar/Desktop/Content/index.js
index e96cc390bf8..2dc910c3c82 100644
--- a/apps/reference/src/theme/DocSidebar/Desktop/Content/index.js
+++ b/apps/reference/src/theme/DocSidebar/Desktop/Content/index.js
@@ -3,14 +3,15 @@ import Content from '@theme-original/DocSidebar/Desktop/Content'
 import { useLocation } from '@docusaurus/router'
 import Link from '@docusaurus/Link'
 
+const baseUrl = `new-docs`
 const subNavRoutes = [
   // Add any routes which should have a subnav
-  '/docs/reference/api',
-  '/docs/reference/cli',
-  '/docs/reference/auth',
-  '/docs/reference/storage',
-  '/docs/reference/javascript',
-  '/docs/reference/dart',
+  `/${baseUrl}/reference/api`,
+  `/${baseUrl}/reference/cli`,
+  `/${baseUrl}/reference/auth`,
+  `/${baseUrl}/reference/storage`,
+  `/${baseUrl}/reference/javascript`,
+  `/${baseUrl}/reference/dart`,
 ]
 
 const requiresSubNav = (pathname, routes) => {
@@ -23,7 +24,7 @@ export default function ContentWrapper(props) {
   return (
     <>
       {pathname && requiresSubNav(pathname, subNavRoutes) && (
-        <Link to="/docs/reference" id="custom--main-menu-button">
+        <Link to={`/${baseUrl}/reference`} id="custom--main-menu-button">
           <svg
             width="24"
             height="24"