Add prefix /db/ to database route and subroutes

mathesar/urls.py

@@ -46,9 +46,10 @@
     path('administration/users/', views.admin_home, name='admin_users_home'),
     path('administration/users/<user_id>/', views.admin_home, name='admin_users_edit'),
     path('administration/update/', views.admin_home, name='admin_update'),
-    path('<db_name>/', views.schemas, name='schemas'),
+    path('db/', views.home, name='db_home'),
+    path('db/<db_name>/', views.schemas, name='schemas'),
     re_path(
-        r'^(?P<db_name>\w+)/(?P<schema_id>\w+)/',
+        r'^db/(?P<db_name>\w+)/(?P<schema_id>\w+)/',
         views.schema_home,
         name='schema_home'
     ),

mathesar_ui/src/routes/RootRoute.svelte

@@ -37,7 +37,7 @@
     </Route>
   {/if}
 
-  <Route path="/:databaseName/*" let:meta firstmatch>
+  <Route path="/db/:databaseName/*" let:meta firstmatch>
     <DatabaseRoute databaseName={meta.params.databaseName} />
   </Route>
 

mathesar_ui/src/routes/urls.ts

@@ -1,72 +1,75 @@
 export function getDatabasePageUrl(databaseName: string): string {
-  return `/${databaseName}/`;
+  return `/db/${databaseName}/`;
 }
 
 export function getSchemaPageUrl(
   databaseName: string,
   schemaId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/`;
+  return `${getDatabasePageUrl(databaseName)}${schemaId}/`;
 }
 
 export function getSchemaPageTablesSectionUrl(
   databaseName: string,
   schemaId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/tables/`;
+  return `${getSchemaPageUrl(databaseName, schemaId)}tables/`;
 }
 
 export function getSchemaPageExplorationsSectionUrl(
   databaseName: string,
   schemaId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/explorations/`;
+  return `${getSchemaPageUrl(databaseName, schemaId)}explorations/`;
 }
 
 export function getImportPageUrl(
   databaseName: string,
   schemaId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/import/`;
+  return `${getSchemaPageUrl(databaseName, schemaId)}import/`;
 }
 
 export function getImportPreviewPageUrl(
   databaseName: string,
   schemaId: number,
   previewTableId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/import/${previewTableId}/`;
+  return `${getImportPageUrl(databaseName, schemaId)}${previewTableId}/`;
 }
 
 export function getDataExplorerPageUrl(
   databaseName: string,
   schemaId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/data-explorer/`;
+  return `${getSchemaPageUrl(databaseName, schemaId)}data-explorer/`;
 }
 
 export function getExplorationPageUrl(
   databaseName: string,
   schemaId: number,
   queryId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/explorations/${queryId}/`;
+  return `${getSchemaPageExplorationsSectionUrl(
+    databaseName,
+    schemaId,
+  )}${queryId}/`;
 }
 
 export function getExplorationEditorPageUrl(
   databaseName: string,
   schemaId: number,
   queryId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/explorations/${queryId}/edit/`;
+  return `${getExplorationPageUrl(databaseName, schemaId, queryId)}edit/`;
 }
 
 export function getTablePageUrl(
   databaseName: string,
   schemaId: number,
   tableId: number,
 ): string {
-  return `/${databaseName}/${schemaId}/tables/${tableId}/`;
+  return `${getSchemaPageTablesSectionUrl(databaseName, schemaId)}${tableId}/`;
 }
 
 export function getRecordPageUrl(
@@ -75,7 +78,9 @@ export function getRecordPageUrl(
   tableId: number,
   recordId: unknown,
 ): string {
-  return `/${databaseName}/${schemaId}/tables/${tableId}/${String(recordId)}`;
+  return `${getTablePageUrl(databaseName, schemaId, tableId)}${String(
+    recordId,
+  )}`;
 }
 
 export const USER_PROFILE_URL = '/profile/';