Merge branch 'worktree-agent-a00c5cfa' into Develop
# Conflicts: # .planning/REQUIREMENTS.md # .planning/STATE.md # src/client/components/CatalogSearchOverlay.tsx # src/client/routes/threads/$threadId.tsx
This commit is contained in:
@@ -15,7 +15,6 @@ import { Route as IndexRouteImport } from './routes/index'
|
||||
import { Route as GlobalItemsIndexRouteImport } from './routes/global-items/index'
|
||||
import { Route as CollectionIndexRouteImport } from './routes/collection/index'
|
||||
import { Route as UsersUserIdRouteImport } from './routes/users/$userId'
|
||||
import { Route as ThreadsThreadIdRouteImport } from './routes/threads/$threadId'
|
||||
import { Route as SetupsSetupIdRouteImport } from './routes/setups/$setupId'
|
||||
import { Route as ItemsItemIdRouteImport } from './routes/items/$itemId'
|
||||
import { Route as GlobalItemsGlobalItemIdRouteImport } from './routes/global-items/$globalItemId'
|
||||
@@ -52,11 +51,6 @@ const UsersUserIdRoute = UsersUserIdRouteImport.update({
|
||||
path: '/users/$userId',
|
||||
getParentRoute: () => rootRouteImport,
|
||||
} as any)
|
||||
const ThreadsThreadIdRoute = ThreadsThreadIdRouteImport.update({
|
||||
id: '/threads/$threadId',
|
||||
path: '/threads/$threadId',
|
||||
getParentRoute: () => rootRouteImport,
|
||||
} as any)
|
||||
const SetupsSetupIdRoute = SetupsSetupIdRouteImport.update({
|
||||
id: '/setups/$setupId',
|
||||
path: '/setups/$setupId',
|
||||
@@ -91,7 +85,6 @@ export interface FileRoutesByFullPath {
|
||||
'/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
|
||||
'/items/$itemId': typeof ItemsItemIdRoute
|
||||
'/setups/$setupId': typeof SetupsSetupIdRoute
|
||||
'/threads/$threadId': typeof ThreadsThreadIdRouteWithChildren
|
||||
'/users/$userId': typeof UsersUserIdRoute
|
||||
'/collection/': typeof CollectionIndexRoute
|
||||
'/global-items/': typeof GlobalItemsIndexRoute
|
||||
@@ -119,7 +112,6 @@ export interface FileRoutesById {
|
||||
'/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
|
||||
'/items/$itemId': typeof ItemsItemIdRoute
|
||||
'/setups/$setupId': typeof SetupsSetupIdRoute
|
||||
'/threads/$threadId': typeof ThreadsThreadIdRouteWithChildren
|
||||
'/users/$userId': typeof UsersUserIdRoute
|
||||
'/collection/': typeof CollectionIndexRoute
|
||||
'/global-items/': typeof GlobalItemsIndexRoute
|
||||
@@ -135,7 +127,6 @@ export interface FileRouteTypes {
|
||||
| '/global-items/$globalItemId'
|
||||
| '/items/$itemId'
|
||||
| '/setups/$setupId'
|
||||
| '/threads/$threadId'
|
||||
| '/users/$userId'
|
||||
| '/collection/'
|
||||
| '/global-items/'
|
||||
@@ -162,7 +153,6 @@ export interface FileRouteTypes {
|
||||
| '/global-items/$globalItemId'
|
||||
| '/items/$itemId'
|
||||
| '/setups/$setupId'
|
||||
| '/threads/$threadId'
|
||||
| '/users/$userId'
|
||||
| '/collection/'
|
||||
| '/global-items/'
|
||||
@@ -177,7 +167,6 @@ export interface RootRouteChildren {
|
||||
GlobalItemsGlobalItemIdRoute: typeof GlobalItemsGlobalItemIdRoute
|
||||
ItemsItemIdRoute: typeof ItemsItemIdRoute
|
||||
SetupsSetupIdRoute: typeof SetupsSetupIdRoute
|
||||
ThreadsThreadIdRoute: typeof ThreadsThreadIdRouteWithChildren
|
||||
UsersUserIdRoute: typeof UsersUserIdRoute
|
||||
CollectionIndexRoute: typeof CollectionIndexRoute
|
||||
GlobalItemsIndexRoute: typeof GlobalItemsIndexRoute
|
||||
@@ -227,13 +216,6 @@ declare module '@tanstack/react-router' {
|
||||
preLoaderRoute: typeof UsersUserIdRouteImport
|
||||
parentRoute: typeof rootRouteImport
|
||||
}
|
||||
'/threads/$threadId': {
|
||||
id: '/threads/$threadId'
|
||||
path: '/threads/$threadId'
|
||||
fullPath: '/threads/$threadId'
|
||||
preLoaderRoute: typeof ThreadsThreadIdRouteImport
|
||||
parentRoute: typeof rootRouteImport
|
||||
}
|
||||
'/setups/$setupId': {
|
||||
id: '/setups/$setupId'
|
||||
path: '/setups/$setupId'
|
||||
@@ -272,21 +254,6 @@ declare module '@tanstack/react-router' {
|
||||
}
|
||||
}
|
||||
|
||||
interface ThreadsThreadIdRouteChildren {
|
||||
ThreadsThreadIdIndexRoute: typeof ThreadsThreadIdIndexRoute
|
||||
ThreadsThreadIdCandidatesCandidateIdRoute: typeof ThreadsThreadIdCandidatesCandidateIdRoute
|
||||
}
|
||||
|
||||
const ThreadsThreadIdRouteChildren: ThreadsThreadIdRouteChildren = {
|
||||
ThreadsThreadIdIndexRoute: ThreadsThreadIdIndexRoute,
|
||||
ThreadsThreadIdCandidatesCandidateIdRoute:
|
||||
ThreadsThreadIdCandidatesCandidateIdRoute,
|
||||
}
|
||||
|
||||
const ThreadsThreadIdRouteWithChildren = ThreadsThreadIdRoute._addFileChildren(
|
||||
ThreadsThreadIdRouteChildren,
|
||||
)
|
||||
|
||||
const rootRouteChildren: RootRouteChildren = {
|
||||
IndexRoute: IndexRoute,
|
||||
LoginRoute: LoginRoute,
|
||||
@@ -294,7 +261,6 @@ const rootRouteChildren: RootRouteChildren = {
|
||||
GlobalItemsGlobalItemIdRoute: GlobalItemsGlobalItemIdRoute,
|
||||
ItemsItemIdRoute: ItemsItemIdRoute,
|
||||
SetupsSetupIdRoute: SetupsSetupIdRoute,
|
||||
ThreadsThreadIdRoute: ThreadsThreadIdRouteWithChildren,
|
||||
UsersUserIdRoute: UsersUserIdRoute,
|
||||
CollectionIndexRoute: CollectionIndexRoute,
|
||||
GlobalItemsIndexRoute: GlobalItemsIndexRoute,
|
||||
|
||||
Reference in New Issue
Block a user