diff --git a/web/src/app/app/(chat_experience)/chats/[chatId]/dashboard/[dashboardId]/page.tsx b/web/src/app/app/(chat_experience)/chats/[chatId]/dashboard/[dashboardId]/page.tsx index 5b01f6cc4..47c02022e 100644 --- a/web/src/app/app/(chat_experience)/chats/[chatId]/dashboard/[dashboardId]/page.tsx +++ b/web/src/app/app/(chat_experience)/chats/[chatId]/dashboard/[dashboardId]/page.tsx @@ -1,4 +1,4 @@ -import { AppAssetCheckLayout } from '@appLayouts/AppAssetCheckLayout'; +import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout'; export default function DashboardPage({ params: { dashboardId } diff --git a/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx b/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx index 8e49924fe..438ad9e88 100644 --- a/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx +++ b/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx @@ -1,5 +1,5 @@ import { MetricController } from '@appControllers/MetricController'; -import { AppAssetCheckLayout } from '@appLayouts/AppAssetCheckLayout'; +import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout'; export default function Page({ params: { chatId, metricId } diff --git a/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx b/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx index 69c227bb2..e7f937659 100644 --- a/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx +++ b/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx @@ -1,10 +1,10 @@ import { DashboardController } from '@appControllers/DashboardController'; -import { AppAssetCheckLayout } from '@/app/app/_layouts/AppAssetCheckLayout'; +import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout'; export default function Page({ params: { dashboardId } }: { params: { dashboardId: string } }) { return ( - // - - // + + + ); } diff --git a/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx b/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx index 3ed05d3f8..377f8fa1d 100644 --- a/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx +++ b/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx @@ -1,5 +1,5 @@ import { MetricController } from '@appControllers/MetricController'; -import { AppAssetCheckLayout } from '@appLayouts/AppAssetCheckLayout'; +import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout'; export default function MetricPage({ params: { metricId }, diff --git a/web/src/app/app/_controllers/DashboardController/DashboardController.tsx b/web/src/app/app/_controllers/DashboardController/DashboardController.tsx index 018bf12dc..ad85dec2a 100644 --- a/web/src/app/app/_controllers/DashboardController/DashboardController.tsx +++ b/web/src/app/app/_controllers/DashboardController/DashboardController.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import { useBusterDashboardIndividual } from '@/context/Dashboards'; import { FileIndeterminateLoader } from '@appComponents/FileIndeterminateLoader'; -import { DashboardFileView, useChatLayoutContextSelector } from '@appLayouts/ChatLayout'; +import { DashboardFileView, useChatLayoutContextSelector } from '@layouts/ChatLayout'; import { DashboardViewComponents } from './config'; import { AddTypeModal } from '../../_components/AddTypeModal'; import { useMemoizedFn } from 'ahooks'; diff --git a/web/src/app/app/_controllers/DashboardController/config.ts b/web/src/app/app/_controllers/DashboardController/config.ts index ee2010b83..94a56f2be 100644 --- a/web/src/app/app/_controllers/DashboardController/config.ts +++ b/web/src/app/app/_controllers/DashboardController/config.ts @@ -1,4 +1,4 @@ -import { DashboardFileView } from '../../_layouts/ChatLayout'; +import type { DashboardFileView } from '@chatLayout/ChatLayoutContext'; import { DashboardViewDashboardController } from './DashboardViewDashboardController'; import { DashboardViewFileController } from './DashboardViewFileController'; import React from 'react'; diff --git a/web/src/app/app/_controllers/MetricController/MetricController.tsx b/web/src/app/app/_controllers/MetricController/MetricController.tsx index 3c5a8662a..f9412d65a 100644 --- a/web/src/app/app/_controllers/MetricController/MetricController.tsx +++ b/web/src/app/app/_controllers/MetricController/MetricController.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { MetricFileView, useChatLayoutContextSelector -} from '@appLayouts/ChatLayout/ChatLayoutContext'; +} from '@layouts/ChatLayout/ChatLayoutContext'; import { MetricViewComponents } from './config'; import { useMetricIndividual } from '@/context/Metrics'; import { FileIndeterminateLoader } from '@appComponents/FileIndeterminateLoader'; diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx b/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx index b94b85e14..95d6f0549 100644 --- a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx +++ b/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { Text } from '@/components/text'; import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/icons'; -import { useChatLayoutContextSelector } from '@/app/app/_layouts/ChatLayout'; +import { useChatLayoutContextSelector } from '@chatLayout/ChatLayoutContext'; export const MetricEditControllerHeader: React.FC = React.memo(() => { const { styles, cx } = useStyles(); diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartController.tsx b/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartController.tsx index 649a5805f..560f697fa 100644 --- a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartController.tsx +++ b/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartController.tsx @@ -4,7 +4,7 @@ import { AppSplitter, AppSplitterRef } from '@/components/layout'; import { MetricViewChart } from './MetricViewChart'; import { MetricEditController } from './MetricEditController'; import { useMetricLayout } from '../useMetricLayout'; -import { useChatLayoutContextSelector } from '@appLayouts/ChatLayout'; +import { useChatLayoutContextSelector } from '@layouts/ChatLayout'; const autoSaveId = 'metric-edit-chart'; diff --git a/web/src/app/app/_controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx b/web/src/app/app/_controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx index 179e2c1e8..6aec4dae9 100644 --- a/web/src/app/app/_controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx +++ b/web/src/app/app/_controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx @@ -6,7 +6,7 @@ import { useMemoizedFn, useUnmount } from 'ahooks'; import { IDataResult } from '@/api/asset_interfaces'; import { useMetricLayout } from '../useMetricLayout'; import { AppSplitterRef } from '@/components'; -import { useChatLayoutContextSelector } from '@/app/app/_layouts/ChatLayout'; +import { useChatLayoutContextSelector } from '@chatLayout/ChatLayoutContext'; import { useSQLContextSelector } from '@/context/SQL'; const autoSaveId = 'metric-view-results'; diff --git a/web/src/app/app/_controllers/MetricController/config.ts b/web/src/app/app/_controllers/MetricController/config.ts index 8a0448d83..0d3cab8de 100644 --- a/web/src/app/app/_controllers/MetricController/config.ts +++ b/web/src/app/app/_controllers/MetricController/config.ts @@ -1,5 +1,5 @@ import React from 'react'; -import type { MetricFileView } from '@/app/app/_layouts/ChatLayout'; +import type { MetricFileView } from '@chatLayout/ChatLayoutContext'; import { MetricViewChartController } from './MetricViewChart'; import { MetricViewFile } from './MetricViewFile'; import { MetricViewResults } from './MetricViewResults'; diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningController.tsx b/web/src/app/app/_controllers/ReasoningController/ReasoningController.tsx index 055da3ccf..f367f241b 100644 --- a/web/src/app/app/_controllers/ReasoningController/ReasoningController.tsx +++ b/web/src/app/app/_controllers/ReasoningController/ReasoningController.tsx @@ -1,6 +1,6 @@ 'use client'; import React from 'react'; -import { useChatIndividualContextSelector } from '../../_layouts/ChatLayout/ChatContext'; +import { useChatIndividualContextSelector } from '@chatLayout/ChatContext'; import { ReasoningMessageContainer } from './ReasoningMessageContainer'; import { useMessageIndividual } from '@/context/Chats'; diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx b/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx index 9b59c4be7..d9f45ec6d 100644 --- a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx +++ b/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx @@ -1,10 +1,10 @@ import type { FileType } from '@/api/asset_interfaces'; -import { createChatAssetRoute } from '@appLayouts/ChatLayout/ChatLayoutContext/helpers'; +import { createChatAssetRoute } from '@layouts/ChatLayout/ChatLayoutContext/helpers'; import { AppTooltip } from '@/components/tooltip'; import { AppMaterialIcons } from '@/components/icons'; import { Button } from 'antd'; import React from 'react'; -import { useChatLayoutContextSelector } from '@/app/app/_layouts/ChatLayout'; +import { useChatLayoutContextSelector } from '@chatLayout/ChatLayoutContext'; import { useMemoizedFn } from 'ahooks'; export const ReasoningFileButtons = React.memo( diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx b/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx index 72a80ba51..110b97e13 100644 --- a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx +++ b/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx @@ -8,7 +8,6 @@ import { import { useBusterStylesContext } from '@/context/BusterStyles'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import { AnimatePresence, motion } from 'framer-motion'; -import { itemAnimationConfig } from '../animationConfig'; import { LoaderDot } from './LoaderDot'; import { ReasoningFileButtons } from './ReasoningFileButtons'; import { ReasoningFileTitle } from './ReasoningFileTitle'; diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx b/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx index 9739fab41..8e2ab5236 100644 --- a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx +++ b/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx @@ -5,7 +5,7 @@ import { AnimatePresence, motion } from 'framer-motion'; import { useMemoizedFn } from 'ahooks'; import { AppPopover } from '@/components'; import { PopoverProps } from 'antd'; -import { isOpenableFile, SelectedFile, useChatLayoutContextSelector } from '@appLayouts/ChatLayout'; +import { isOpenableFile, SelectedFile, useChatLayoutContextSelector } from '@layouts/ChatLayout'; const duration = 0.25; diff --git a/web/src/app/app/_layouts/AppAssetCheckLayout.tsx b/web/src/layouts/AppAssetCheckLayout.tsx similarity index 93% rename from web/src/app/app/_layouts/AppAssetCheckLayout.tsx rename to web/src/layouts/AppAssetCheckLayout.tsx index 2f01cbd84..ad282d1e6 100644 --- a/web/src/app/app/_layouts/AppAssetCheckLayout.tsx +++ b/web/src/layouts/AppAssetCheckLayout.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { getAssetCheck } from '@/api/buster_rest/assets/requests'; import { useSupabaseServerContext } from '@/context/Supabase/useSupabaseContext'; -import { AppPasswordAccess } from '../_controllers/AppPasswordAccess'; -import { AppNoPageAccess } from '../_controllers/AppNoPageAccess'; import { ShareAssetType } from '@/api/asset_interfaces'; import { useBusterSupabaseAuthMethods } from '@/hooks/useBusterSupabaseAuthMethods'; import { ClientSideAnonCheck } from './ClientSideAnonCheck'; import { redirect } from 'next/navigation'; import { BusterRoutes, createBusterRoute } from '@/routes'; +import { AppPasswordAccess } from '@/app/app/_controllers/AppPasswordAccess'; +import { AppNoPageAccess } from '@/app/app/_controllers/AppNoPageAccess'; export type AppAssetCheckLayoutProps = { metricId?: string; diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContainer.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContainer.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContainer.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContainer.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/AIWarning.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/AIWarning.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/AIWarning.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/AIWarning.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/SubmitButton.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/SubmitButton.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/SubmitButton.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/SubmitButton.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/index.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageBlock.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageBlock.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageBlock.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageBlock.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageHidden.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageHidden.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageHidden.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageHidden.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageSelector.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageSelector.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageSelector.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessageSelector.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/ChatResponseMessage_File.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/ChatResponseMessage_File.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/ChatResponseMessage_File.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/ChatResponseMessage_File.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/index.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessage_File/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessages.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessages.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessages.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseMessages.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/config.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/config.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/config.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/config.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/index.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/MessageContainer.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/MessageContainer.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/MessageContainer.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/MessageContainer.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/index.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatContent/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatContent/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeader.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeader.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeader.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeader.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderOptions.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderOptions.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderOptions.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderOptions.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/index.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx rename to web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderTitle.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/index.ts b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/ChatHeader/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/ChatHeader/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContainer/index.ts b/web/src/layouts/ChatLayout/ChatContainer/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContainer/index.ts rename to web/src/layouts/ChatLayout/ChatContainer/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContext/ChatContext.tsx b/web/src/layouts/ChatLayout/ChatContext/ChatContext.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContext/ChatContext.tsx rename to web/src/layouts/ChatLayout/ChatContext/ChatContext.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContext/index.ts b/web/src/layouts/ChatLayout/ChatContext/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContext/index.ts rename to web/src/layouts/ChatLayout/ChatContext/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContext/useAutoChangeLayout.ts b/web/src/layouts/ChatLayout/ChatContext/useAutoChangeLayout.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContext/useAutoChangeLayout.ts rename to web/src/layouts/ChatLayout/ChatContext/useAutoChangeLayout.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContext/useFileFallback.ts b/web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts similarity index 98% rename from web/src/app/app/_layouts/ChatLayout/ChatContext/useFileFallback.ts rename to web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts index bc844deea..676d49dd3 100644 --- a/web/src/app/app/_layouts/ChatLayout/ChatContext/useFileFallback.ts +++ b/web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts @@ -1,4 +1,4 @@ -import { SelectedFile } from '@appLayouts/ChatLayout'; +import { SelectedFile } from '@layouts/ChatLayout'; import { useBusterDashboardContextSelector } from '@/context/Dashboards'; import { useBusterMetricsIndividualContextSelector, useMetricIndividual } from '@/context/Metrics'; import { useEffect, useMemo } from 'react'; diff --git a/web/src/app/app/_layouts/ChatLayout/ChatContext/useSubscribeIndividualChat.ts b/web/src/layouts/ChatLayout/ChatContext/useSubscribeIndividualChat.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatContext/useSubscribeIndividualChat.ts rename to web/src/layouts/ChatLayout/ChatContext/useSubscribeIndividualChat.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayout.tsx b/web/src/layouts/ChatLayout/ChatLayout.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayout.tsx rename to web/src/layouts/ChatLayout/ChatLayout.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/ChatLayoutContext.tsx b/web/src/layouts/ChatLayout/ChatLayoutContext/ChatLayoutContext.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/ChatLayoutContext.tsx rename to web/src/layouts/ChatLayout/ChatLayoutContext/ChatLayoutContext.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/config.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/config.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/config.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/config.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/helpers.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/helpers.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/helpers.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/helpers.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/index.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/index.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/index.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/index.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/interfaces.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/interfaces.ts similarity index 99% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/interfaces.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/interfaces.ts index 2ea0dfcbc..d2c762a60 100644 --- a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/interfaces.ts +++ b/web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/interfaces.ts @@ -20,6 +20,5 @@ export type ValueFileView = 'file'; export type DatasetFileView = 'file'; export type CollectionFileView = 'file' | 'results'; export type ReasoningFileView = 'reasoning'; - export type FileViewSecondary = null | MetricFileViewSecondary; export type MetricFileViewSecondary = 'chart-edit' | 'sql-edit'; diff --git a/web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/useChatFileLayout.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/useChatFileLayout.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/useChatFileLayout.ts rename to web/src/layouts/ChatLayout/ChatLayoutContext/useChatFileLayout/useChatFileLayout.ts diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainer.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainer.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainer.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainer.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CollapseFileButton.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CollapseFileButton.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CollapseFileButton.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CollapseFileButton.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderButtons.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderButtons.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderButtons.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CollectionContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CreateChatButtont.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CreateChatButtont.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/CreateChatButtont.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/CreateChatButtont.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderButtons.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderButtons.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderButtons.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DatasetContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/FileButtonContainer.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/FileButtonContainer.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/FileButtonContainer.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/FileButtonContainer.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/FileContainerHeader.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/FileContainerHeader.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/FileContainerHeader.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/FileContainerHeader.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/HideButtonContainer.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/HideButtonContainer.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/HideButtonContainer.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/HideButtonContainer.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/ReasoningContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/ReasoningContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/ReasoningContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/ReasoningContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/SelectableButton.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/SelectableButton.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/SelectableButton.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/SelectableButton.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderButtons.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderButtons.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderButtons.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/TermContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderButtons.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderButtons.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderButtons.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderSegment.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderSegment.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderSegment.tsx rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/ValueContainerHeaderSegment.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/index.ts b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/index.ts rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/interfaces.ts b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/interfaces.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/FileContainerHeader/interfaces.ts rename to web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/interfaces.ts diff --git a/web/src/app/app/_layouts/ChatLayout/FileContainer/index.ts b/web/src/layouts/ChatLayout/FileContainer/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/FileContainer/index.ts rename to web/src/layouts/ChatLayout/FileContainer/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/hooks/index.ts b/web/src/layouts/ChatLayout/hooks/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/hooks/index.ts rename to web/src/layouts/ChatLayout/hooks/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/hooks/useDefaultFile.ts b/web/src/layouts/ChatLayout/hooks/useDefaultFile.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/hooks/useDefaultFile.ts rename to web/src/layouts/ChatLayout/hooks/useDefaultFile.ts diff --git a/web/src/app/app/_layouts/ChatLayout/hooks/useDefaultSplitterLayout.ts b/web/src/layouts/ChatLayout/hooks/useDefaultSplitterLayout.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/hooks/useDefaultSplitterLayout.ts rename to web/src/layouts/ChatLayout/hooks/useDefaultSplitterLayout.ts diff --git a/web/src/app/app/_layouts/ChatLayout/hooks/useInitialChatLayout.tsx b/web/src/layouts/ChatLayout/hooks/useInitialChatLayout.tsx similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/hooks/useInitialChatLayout.tsx rename to web/src/layouts/ChatLayout/hooks/useInitialChatLayout.tsx diff --git a/web/src/app/app/_layouts/ChatLayout/index.ts b/web/src/layouts/ChatLayout/index.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/index.ts rename to web/src/layouts/ChatLayout/index.ts diff --git a/web/src/app/app/_layouts/ChatLayout/interfaces.ts b/web/src/layouts/ChatLayout/interfaces.ts similarity index 100% rename from web/src/app/app/_layouts/ChatLayout/interfaces.ts rename to web/src/layouts/ChatLayout/interfaces.ts diff --git a/web/src/app/app/_layouts/ClientSideAnonCheck.tsx b/web/src/layouts/ClientSideAnonCheck.tsx similarity index 100% rename from web/src/app/app/_layouts/ClientSideAnonCheck.tsx rename to web/src/layouts/ClientSideAnonCheck.tsx diff --git a/web/tsconfig.json b/web/tsconfig.json index f1d9f6239..887ddcc0a 100644 --- a/web/tsconfig.json +++ b/web/tsconfig.json @@ -22,9 +22,9 @@ "@/*": ["./src/*"], "@utils/*": ["./src/utils/*"], "@appComponents/*": ["./src/app/app/_components/*"], - "@appLayouts/*": ["./src/app/app/_layouts/*"], + "@layouts/*": ["./src/layouts/*"], "@appControllers/*": ["./src/app/app/_controllers/*"], - "@chatLayout/*": ["./src/app/app/_layouts/ChatLayout/*"] + "@chatLayout/*": ["./src/layouts/ChatLayout/*"] }, "target": "ES2017" },