From aa2c543ce8ed97a876a006ca2afeb3192d90909c Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:19:22 -0600 Subject: [PATCH 1/7] refactor(hooks): move hooks to root directory --- frontend/src/app/(main)/chat/Home.tsx | 6 +++--- frontend/src/app/(main)/chat/MainLayout.tsx | 4 ++-- frontend/src/app/(main)/page.tsx | 2 +- frontend/src/app/favicon.ico | Bin 25931 -> 0 bytes frontend/src/app/layout.tsx | 2 +- frontend/src/components/SignInModal.tsx | 2 +- frontend/src/components/chat/chat-bottombar.tsx | 4 ++-- frontend/src/components/chat/chat-list.tsx | 2 +- frontend/src/components/chat/chat-topbar.tsx | 2 +- .../components/code-engine/project-context.tsx | 2 +- frontend/src/components/ui/sidebar.tsx | 2 +- frontend/src/components/user-settings.tsx | 2 +- frontend/src/{app => }/hooks/useAuth.ts | 0 frontend/src/{app => }/hooks/useChatList.ts | 0 frontend/src/{app => }/hooks/useChatStore.ts | 0 frontend/src/{app => }/hooks/useChatStream.ts | 0 frontend/src/{app => }/hooks/useIsMobile.tsx | 0 .../src/{app => }/hooks/useLocalStorageData.ts | 0 frontend/src/{app => }/hooks/useModels.ts | 2 +- .../src/{app => }/hooks/useSpeechRecognition.ts | 0 .../src/{app => }/providers/AuthProvider.tsx | 0 .../src/{app => }/providers/BaseProvider.tsx | 0 .../providers/DynamicApolloProvider.tsx | 0 23 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 frontend/src/app/favicon.ico rename frontend/src/{app => }/hooks/useAuth.ts (100%) rename frontend/src/{app => }/hooks/useChatList.ts (100%) rename frontend/src/{app => }/hooks/useChatStore.ts (100%) rename frontend/src/{app => }/hooks/useChatStream.ts (100%) rename frontend/src/{app => }/hooks/useIsMobile.tsx (100%) rename frontend/src/{app => }/hooks/useLocalStorageData.ts (100%) rename frontend/src/{app => }/hooks/useModels.ts (97%) rename frontend/src/{app => }/hooks/useSpeechRecognition.ts (100%) rename frontend/src/{app => }/providers/AuthProvider.tsx (100%) rename frontend/src/{app => }/providers/BaseProvider.tsx (100%) rename frontend/src/{app => }/providers/DynamicApolloProvider.tsx (100%) diff --git a/frontend/src/app/(main)/chat/Home.tsx b/frontend/src/app/(main)/chat/Home.tsx index 7f503899..61681a1d 100644 --- a/frontend/src/app/(main)/chat/Home.tsx +++ b/frontend/src/app/(main)/chat/Home.tsx @@ -17,9 +17,9 @@ import { GET_CHAT_HISTORY } from '@/graphql/request'; import { useMutation, useQuery } from '@apollo/client'; import { toast } from 'sonner'; import { EventEnum } from '@/components/enum'; -import { useModels } from '../../hooks/useModels'; -import { useChatList } from '../../hooks/useChatList'; -import { useChatStream } from '../../hooks/useChatStream'; +import { useModels } from '../../../hooks/useModels'; +import { useChatList } from '../../../hooks/useChatList'; +import { useChatStream } from '../../../hooks/useChatStream'; import EditUsernameForm from '@/components/edit-username-form'; import ChatContent from '@/components/chat/chat'; import { ProjectContext } from '@/components/code-engine/project-context'; diff --git a/frontend/src/app/(main)/chat/MainLayout.tsx b/frontend/src/app/(main)/chat/MainLayout.tsx index 603406fb..4f4bb701 100644 --- a/frontend/src/app/(main)/chat/MainLayout.tsx +++ b/frontend/src/app/(main)/chat/MainLayout.tsx @@ -1,6 +1,5 @@ 'use client'; import React, { useEffect, useState } from 'react'; -import { useAuthContext } from '@/app/providers/AuthProvider'; import { useRouter } from 'next/navigation'; import { ResizablePanel, ResizablePanelGroup } from '@/components/ui/resizable'; import { SidebarProvider } from '@/components/ui/sidebar'; @@ -9,8 +8,9 @@ import { ChatSideBar } from '@/components/sidebar'; import ProjectModal from '@/components/project-modal'; import { useQuery } from '@apollo/client'; import { ProjectProvider } from '@/components/code-engine/project-context'; -import { useChatList } from '@/app/hooks/useChatList'; +import { useChatList } from '@/hooks/useChatList'; import { GET_USER_PROJECTS } from '@/graphql/request'; +import { useAuthContext } from '@/providers/AuthProvider'; export default function MainLayout({ children, diff --git a/frontend/src/app/(main)/page.tsx b/frontend/src/app/(main)/page.tsx index 7532cf71..bade694f 100644 --- a/frontend/src/app/(main)/page.tsx +++ b/frontend/src/app/(main)/page.tsx @@ -9,7 +9,7 @@ import { useTheme } from 'next-themes'; import { SignUpModal } from '@/components/SignUpModal'; import { SignInModal } from '@/components/SignInModal'; import { AuthChoiceModal } from '@/components/AuthChoiceModal'; -import { useAuthContext } from '../providers/AuthProvider'; +import { useAuthContext } from '@/providers/AuthProvider'; export default function HomePage() { const [message, setMessage] = useState(''); diff --git a/frontend/src/app/favicon.ico b/frontend/src/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index 1be91492..35de5094 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -1,7 +1,7 @@ import type { Metadata } from 'next'; import { Inter } from 'next/font/google'; import './globals.css'; -import { BaseProviders } from './providers/BaseProvider'; +import { BaseProviders } from '@/providers/BaseProvider'; const inter = Inter({ subsets: ['latin'] }); diff --git a/frontend/src/components/SignInModal.tsx b/frontend/src/components/SignInModal.tsx index dca7ff3a..6a1cffd5 100644 --- a/frontend/src/components/SignInModal.tsx +++ b/frontend/src/components/SignInModal.tsx @@ -17,7 +17,7 @@ import { useMutation } from '@apollo/client'; import { LOGIN_USER } from '@/graphql/mutations/auth'; import { toast } from 'sonner'; import { VisuallyHidden } from '@radix-ui/react-visually-hidden'; -import { useAuthContext } from '@/app/providers/AuthProvider'; +import { useAuthContext } from '@/providers/AuthProvider'; interface SignInModalProps { isOpen: boolean; diff --git a/frontend/src/components/chat/chat-bottombar.tsx b/frontend/src/components/chat/chat-bottombar.tsx index 70852fa5..98e26d10 100644 --- a/frontend/src/components/chat/chat-bottombar.tsx +++ b/frontend/src/components/chat/chat-bottombar.tsx @@ -14,9 +14,9 @@ import { StopIcon, } from '@radix-ui/react-icons'; import { Mic, SendHorizonal } from 'lucide-react'; -import useSpeechToText from '@/app/hooks/useSpeechRecognition'; +import useSpeechToText from '@/hooks/useSpeechRecognition'; import MultiImagePicker from '../image-embedder'; -import useChatStore from '@/app/hooks/useChatStore'; +import useChatStore from '@/hooks/useChatStore'; import Image from 'next/image'; export default function ChatBottombar({ diff --git a/frontend/src/components/chat/chat-list.tsx b/frontend/src/components/chat/chat-list.tsx index 9e6da27d..fd65ed41 100644 --- a/frontend/src/components/chat/chat-list.tsx +++ b/frontend/src/components/chat/chat-list.tsx @@ -10,7 +10,7 @@ import CodeDisplayBlock from '../code-display-block'; import { Message } from '../types'; import { Button } from '../ui/button'; import { Pencil } from 'lucide-react'; -import { useAuth } from '@/app/hooks/useAuth'; +import { useAuth } from '@/hooks/useAuth'; interface ChatListProps { messages: Message[]; diff --git a/frontend/src/components/chat/chat-topbar.tsx b/frontend/src/components/chat/chat-topbar.tsx index 55415c11..89f1093c 100644 --- a/frontend/src/components/chat/chat-topbar.tsx +++ b/frontend/src/components/chat/chat-topbar.tsx @@ -7,7 +7,7 @@ import { import React from 'react'; import { CaretSortIcon } from '@radix-ui/react-icons'; import { Button } from '../ui/button'; -import { useModels } from '@/app/hooks/useModels'; +import { useModels } from '@/hooks/useModels'; import { ScrollArea } from '@/components/ui/scroll-area'; import { Separator } from '@/components/ui/separator'; import { cn } from '@/lib/utils'; diff --git a/frontend/src/components/code-engine/project-context.tsx b/frontend/src/components/code-engine/project-context.tsx index f1609fa3..4e3a7cdb 100644 --- a/frontend/src/components/code-engine/project-context.tsx +++ b/frontend/src/components/code-engine/project-context.tsx @@ -9,7 +9,7 @@ import React, { } from 'react'; import { useLazyQuery, useMutation, useQuery } from '@apollo/client'; import { Project } from '../project-modal'; -import { useAuth } from '@/app/hooks/useAuth'; +import { useAuth } from '@/hooks/useAuth'; import { CREATE_PROJECT, GET_CHAT_DETAILS, diff --git a/frontend/src/components/ui/sidebar.tsx b/frontend/src/components/ui/sidebar.tsx index 70ebd1c1..90f4e5c1 100644 --- a/frontend/src/components/ui/sidebar.tsx +++ b/frontend/src/components/ui/sidebar.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { Slot } from '@radix-ui/react-slot'; import { VariantProps, cva } from 'class-variance-authority'; -import { useIsMobile } from '@/app/hooks/useIsMobile'; +import { useIsMobile } from '@/hooks/useIsMobile'; import { cn } from '@/lib/utils'; import { Button } from '@/components/ui/button'; import { Input } from '@/components/ui/input'; diff --git a/frontend/src/components/user-settings.tsx b/frontend/src/components/user-settings.tsx index 21adee0b..f32d6b2e 100644 --- a/frontend/src/components/user-settings.tsx +++ b/frontend/src/components/user-settings.tsx @@ -15,7 +15,7 @@ import { } from '@/components/ui/avatar'; import { GearIcon } from '@radix-ui/react-icons'; import { Button } from '@/components/ui/button'; -import { useAuth } from '@/app/hooks/useAuth'; +import { useAuth } from '@/hooks/useAuth'; import { useRouter } from 'next/navigation'; import { useMemo, useState, memo } from 'react'; import { EventEnum } from './enum'; diff --git a/frontend/src/app/hooks/useAuth.ts b/frontend/src/hooks/useAuth.ts similarity index 100% rename from frontend/src/app/hooks/useAuth.ts rename to frontend/src/hooks/useAuth.ts diff --git a/frontend/src/app/hooks/useChatList.ts b/frontend/src/hooks/useChatList.ts similarity index 100% rename from frontend/src/app/hooks/useChatList.ts rename to frontend/src/hooks/useChatList.ts diff --git a/frontend/src/app/hooks/useChatStore.ts b/frontend/src/hooks/useChatStore.ts similarity index 100% rename from frontend/src/app/hooks/useChatStore.ts rename to frontend/src/hooks/useChatStore.ts diff --git a/frontend/src/app/hooks/useChatStream.ts b/frontend/src/hooks/useChatStream.ts similarity index 100% rename from frontend/src/app/hooks/useChatStream.ts rename to frontend/src/hooks/useChatStream.ts diff --git a/frontend/src/app/hooks/useIsMobile.tsx b/frontend/src/hooks/useIsMobile.tsx similarity index 100% rename from frontend/src/app/hooks/useIsMobile.tsx rename to frontend/src/hooks/useIsMobile.tsx diff --git a/frontend/src/app/hooks/useLocalStorageData.ts b/frontend/src/hooks/useLocalStorageData.ts similarity index 100% rename from frontend/src/app/hooks/useLocalStorageData.ts rename to frontend/src/hooks/useLocalStorageData.ts diff --git a/frontend/src/app/hooks/useModels.ts b/frontend/src/hooks/useModels.ts similarity index 97% rename from frontend/src/app/hooks/useModels.ts rename to frontend/src/hooks/useModels.ts index 392af4ed..b7ebb8d7 100644 --- a/frontend/src/app/hooks/useModels.ts +++ b/frontend/src/hooks/useModels.ts @@ -3,7 +3,7 @@ import { toast } from 'sonner'; import { useState, useEffect } from 'react'; import { LocalStore } from '@/lib/storage'; import { GET_MODEL_TAGS } from '@/graphql/request'; -import { useAuthContext } from '@/app/providers/AuthProvider'; +import { useAuthContext } from '@/providers/AuthProvider'; interface ModelsCache { models: string[]; diff --git a/frontend/src/app/hooks/useSpeechRecognition.ts b/frontend/src/hooks/useSpeechRecognition.ts similarity index 100% rename from frontend/src/app/hooks/useSpeechRecognition.ts rename to frontend/src/hooks/useSpeechRecognition.ts diff --git a/frontend/src/app/providers/AuthProvider.tsx b/frontend/src/providers/AuthProvider.tsx similarity index 100% rename from frontend/src/app/providers/AuthProvider.tsx rename to frontend/src/providers/AuthProvider.tsx diff --git a/frontend/src/app/providers/BaseProvider.tsx b/frontend/src/providers/BaseProvider.tsx similarity index 100% rename from frontend/src/app/providers/BaseProvider.tsx rename to frontend/src/providers/BaseProvider.tsx diff --git a/frontend/src/app/providers/DynamicApolloProvider.tsx b/frontend/src/providers/DynamicApolloProvider.tsx similarity index 100% rename from frontend/src/app/providers/DynamicApolloProvider.tsx rename to frontend/src/providers/DynamicApolloProvider.tsx From ac82e4fa5e255bca806853b03f458301396225f5 Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:22:25 -0600 Subject: [PATCH 2/7] refactor: rename files to kebab-case and clean up imports in Home.tsx --- frontend/src/app/(main)/chat/Home.tsx | 11 ++--------- .../(main)/chat/{MainLayout.tsx => main-layout.tsx} | 0 .../{AuthChoiceModal.tsx => auth-choice-modal.tsx} | 0 .../components/{fileSidebar.tsx => file-sidebar.tsx} | 0 .../components/{SignInModal.tsx => sign-in-modal.tsx} | 0 .../components/{SignUpModal.tsx => sign-up-modal.tsx} | 0 .../{theme-provider.tsx => ThemeProvider.tsx} | 0 7 files changed, 2 insertions(+), 9 deletions(-) rename frontend/src/app/(main)/chat/{MainLayout.tsx => main-layout.tsx} (100%) rename frontend/src/components/{AuthChoiceModal.tsx => auth-choice-modal.tsx} (100%) rename frontend/src/components/{fileSidebar.tsx => file-sidebar.tsx} (100%) rename frontend/src/components/{SignInModal.tsx => sign-in-modal.tsx} (100%) rename frontend/src/components/{SignUpModal.tsx => sign-up-modal.tsx} (100%) rename frontend/src/providers/{theme-provider.tsx => ThemeProvider.tsx} (100%) diff --git a/frontend/src/app/(main)/chat/Home.tsx b/frontend/src/app/(main)/chat/Home.tsx index 61681a1d..2d8b9466 100644 --- a/frontend/src/app/(main)/chat/Home.tsx +++ b/frontend/src/app/(main)/chat/Home.tsx @@ -1,12 +1,6 @@ // app/page.tsx or components/Home.tsx 'use client'; -import React, { - useEffect, - useState, - useRef, - useCallback, - useContext, -} from 'react'; +import React, { useEffect, useState, useRef, useCallback } from 'react'; import { ResizablePanelGroup, ResizablePanel, @@ -14,7 +8,7 @@ import { } from '@/components/ui/resizable'; import { CodeEngine } from '@/components/code-engine/code-engine'; import { GET_CHAT_HISTORY } from '@/graphql/request'; -import { useMutation, useQuery } from '@apollo/client'; +import { useQuery } from '@apollo/client'; import { toast } from 'sonner'; import { EventEnum } from '@/components/enum'; import { useModels } from '../../../hooks/useModels'; @@ -22,7 +16,6 @@ import { useChatList } from '../../../hooks/useChatList'; import { useChatStream } from '../../../hooks/useChatStream'; import EditUsernameForm from '@/components/edit-username-form'; import ChatContent from '@/components/chat/chat'; -import { ProjectContext } from '@/components/code-engine/project-context'; export default function Home() { // Initialize state, refs, and custom hooks diff --git a/frontend/src/app/(main)/chat/MainLayout.tsx b/frontend/src/app/(main)/chat/main-layout.tsx similarity index 100% rename from frontend/src/app/(main)/chat/MainLayout.tsx rename to frontend/src/app/(main)/chat/main-layout.tsx diff --git a/frontend/src/components/AuthChoiceModal.tsx b/frontend/src/components/auth-choice-modal.tsx similarity index 100% rename from frontend/src/components/AuthChoiceModal.tsx rename to frontend/src/components/auth-choice-modal.tsx diff --git a/frontend/src/components/fileSidebar.tsx b/frontend/src/components/file-sidebar.tsx similarity index 100% rename from frontend/src/components/fileSidebar.tsx rename to frontend/src/components/file-sidebar.tsx diff --git a/frontend/src/components/SignInModal.tsx b/frontend/src/components/sign-in-modal.tsx similarity index 100% rename from frontend/src/components/SignInModal.tsx rename to frontend/src/components/sign-in-modal.tsx diff --git a/frontend/src/components/SignUpModal.tsx b/frontend/src/components/sign-up-modal.tsx similarity index 100% rename from frontend/src/components/SignUpModal.tsx rename to frontend/src/components/sign-up-modal.tsx diff --git a/frontend/src/providers/theme-provider.tsx b/frontend/src/providers/ThemeProvider.tsx similarity index 100% rename from frontend/src/providers/theme-provider.tsx rename to frontend/src/providers/ThemeProvider.tsx From e6c07a579513c8cc903860ebf9829e69bce0eaea Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:23:10 -0600 Subject: [PATCH 3/7] refactor(chat): update import path for MainLayout --- frontend/src/app/(main)/chat/layout.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/app/(main)/chat/layout.tsx b/frontend/src/app/(main)/chat/layout.tsx index 86f489f4..c465337d 100644 --- a/frontend/src/app/(main)/chat/layout.tsx +++ b/frontend/src/app/(main)/chat/layout.tsx @@ -1,5 +1,4 @@ -import type { Metadata, Viewport } from 'next'; -import MainLayout from './MainLayout'; +import MainLayout from './main-layout'; export default function Layout({ children, From f35faf17c4de941d13717727dec3f09fff4d7232 Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:23:28 -0600 Subject: [PATCH 4/7] refactor(components): update import paths for modal components --- frontend/src/app/(main)/page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/(main)/page.tsx b/frontend/src/app/(main)/page.tsx index bade694f..bae0614a 100644 --- a/frontend/src/app/(main)/page.tsx +++ b/frontend/src/app/(main)/page.tsx @@ -6,9 +6,9 @@ import Image from 'next/image'; import Link from 'next/link'; import { useTheme } from 'next-themes'; -import { SignUpModal } from '@/components/SignUpModal'; -import { SignInModal } from '@/components/SignInModal'; -import { AuthChoiceModal } from '@/components/AuthChoiceModal'; +import { SignUpModal } from '@/components/sign-up-modal'; +import { SignInModal } from '@/components/sign-in-modal'; +import { AuthChoiceModal } from '@/components/auth-choice-modal'; import { useAuthContext } from '@/providers/AuthProvider'; export default function HomePage() { From e62bcd4fa589def2fa8cb0c3f644a3877c32c029 Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:27:41 -0600 Subject: [PATCH 5/7] refactor: move chat-related files to chat directory and update layout and metadata ``` --- frontend/src/app/(main)/layout.tsx | 24 ------------------- frontend/src/app/{(main) => }/chat/Home.tsx | 6 ++--- frontend/src/app/{(main) => }/chat/layout.tsx | 0 .../src/app/{(main) => }/chat/main-layout.tsx | 0 frontend/src/app/{(main) => }/chat/page.tsx | 0 frontend/src/app/layout.tsx | 16 ++++++++++--- frontend/src/app/{(main) => }/page.tsx | 0 7 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 frontend/src/app/(main)/layout.tsx rename frontend/src/app/{(main) => }/chat/Home.tsx (96%) rename frontend/src/app/{(main) => }/chat/layout.tsx (100%) rename frontend/src/app/{(main) => }/chat/main-layout.tsx (100%) rename frontend/src/app/{(main) => }/chat/page.tsx (100%) rename frontend/src/app/{(main) => }/page.tsx (100%) diff --git a/frontend/src/app/(main)/layout.tsx b/frontend/src/app/(main)/layout.tsx deleted file mode 100644 index 71cddd19..00000000 --- a/frontend/src/app/(main)/layout.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { Metadata, Viewport } from 'next'; -import React from 'react'; -export const metadata: Metadata = { - title: 'Codefox - The best dev project generator', - description: 'The best dev project generator', -}; - -export const viewport: Viewport = { - width: 'device-width', - initialScale: 1, - maximumScale: 1, - userScalable: false, -}; -export default function HomeLayout({ - children, -}: { - children: React.ReactNode; -}) { - return ( -
-
{children}
-
- ); -} diff --git a/frontend/src/app/(main)/chat/Home.tsx b/frontend/src/app/chat/Home.tsx similarity index 96% rename from frontend/src/app/(main)/chat/Home.tsx rename to frontend/src/app/chat/Home.tsx index 2d8b9466..223679e9 100644 --- a/frontend/src/app/(main)/chat/Home.tsx +++ b/frontend/src/app/chat/Home.tsx @@ -11,11 +11,11 @@ import { GET_CHAT_HISTORY } from '@/graphql/request'; import { useQuery } from '@apollo/client'; import { toast } from 'sonner'; import { EventEnum } from '@/components/enum'; -import { useModels } from '../../../hooks/useModels'; -import { useChatList } from '../../../hooks/useChatList'; -import { useChatStream } from '../../../hooks/useChatStream'; import EditUsernameForm from '@/components/edit-username-form'; import ChatContent from '@/components/chat/chat'; +import { useModels } from '@/hooks/useModels'; +import { useChatList } from '@/hooks/useChatList'; +import { useChatStream } from '@/hooks/useChatStream'; export default function Home() { // Initialize state, refs, and custom hooks diff --git a/frontend/src/app/(main)/chat/layout.tsx b/frontend/src/app/chat/layout.tsx similarity index 100% rename from frontend/src/app/(main)/chat/layout.tsx rename to frontend/src/app/chat/layout.tsx diff --git a/frontend/src/app/(main)/chat/main-layout.tsx b/frontend/src/app/chat/main-layout.tsx similarity index 100% rename from frontend/src/app/(main)/chat/main-layout.tsx rename to frontend/src/app/chat/main-layout.tsx diff --git a/frontend/src/app/(main)/chat/page.tsx b/frontend/src/app/chat/page.tsx similarity index 100% rename from frontend/src/app/(main)/chat/page.tsx rename to frontend/src/app/chat/page.tsx diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index 35de5094..59c3d2cd 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -1,4 +1,4 @@ -import type { Metadata } from 'next'; +import type { Metadata, Viewport } from 'next'; import { Inter } from 'next/font/google'; import './globals.css'; import { BaseProviders } from '@/providers/BaseProvider'; @@ -6,10 +6,16 @@ import { BaseProviders } from '@/providers/BaseProvider'; const inter = Inter({ subsets: ['latin'] }); export const metadata: Metadata = { - title: 'Codefox', + title: 'Codefox - The best dev project generator', description: 'The best dev project generator', }; +export const viewport: Viewport = { + width: 'device-width', + initialScale: 1, + maximumScale: 1, + userScalable: false, +}; export default function RootLayout({ children, }: { @@ -18,7 +24,11 @@ export default function RootLayout({ return ( - {children} + +
+ {children} +
+
); diff --git a/frontend/src/app/(main)/page.tsx b/frontend/src/app/page.tsx similarity index 100% rename from frontend/src/app/(main)/page.tsx rename to frontend/src/app/page.tsx From 080add90490b52bebc1111afe83b9ac4a3044b44 Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:34:40 -0600 Subject: [PATCH 6/7] refactor(components): move code-engine components to chat folder --- frontend/src/app/chat/layout.tsx | 4 ++-- frontend/src/app/chat/page.tsx | 4 ++-- frontend/src/components/chat/chat-bottombar.tsx | 2 +- .../main-layout.tsx => components/chat/chat-layout.tsx} | 6 +++--- frontend/src/components/chat/{chat.tsx => chat-panel.tsx} | 0 .../src/components/{ => chat}/code-engine/code-engine.tsx | 0 .../{ => chat}/code-engine/file-explorer-button.tsx | 0 .../components/{ => chat}/code-engine/file-structure.tsx | 0 .../components/{ => chat}/code-engine/project-context.tsx | 2 +- frontend/src/components/{ => chat}/code-engine/web-view.tsx | 0 .../src/{app/chat/Home.tsx => components/chat/index.tsx} | 6 +++--- frontend/src/components/{ => chat}/project-modal.tsx | 0 frontend/src/components/sidebar.tsx | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename frontend/src/{app/chat/main-layout.tsx => components/chat/chat-layout.tsx} (95%) rename frontend/src/components/chat/{chat.tsx => chat-panel.tsx} (100%) rename frontend/src/components/{ => chat}/code-engine/code-engine.tsx (100%) rename frontend/src/components/{ => chat}/code-engine/file-explorer-button.tsx (100%) rename frontend/src/components/{ => chat}/code-engine/file-structure.tsx (100%) rename frontend/src/components/{ => chat}/code-engine/project-context.tsx (100%) rename frontend/src/components/{ => chat}/code-engine/web-view.tsx (100%) rename frontend/src/{app/chat/Home.tsx => components/chat/index.tsx} (96%) rename frontend/src/components/{ => chat}/project-modal.tsx (100%) diff --git a/frontend/src/app/chat/layout.tsx b/frontend/src/app/chat/layout.tsx index c465337d..5fbe73a2 100644 --- a/frontend/src/app/chat/layout.tsx +++ b/frontend/src/app/chat/layout.tsx @@ -1,9 +1,9 @@ -import MainLayout from './main-layout'; +import ChatLayout from '../../components/chat/chat-layout'; export default function Layout({ children, }: Readonly<{ children: React.ReactNode; }>) { - return {children}; + return {children}; } diff --git a/frontend/src/app/chat/page.tsx b/frontend/src/app/chat/page.tsx index 1ca9146d..508a47e6 100644 --- a/frontend/src/app/chat/page.tsx +++ b/frontend/src/app/chat/page.tsx @@ -1,5 +1,5 @@ -import Home from './Home'; +import Chat from '@/components/chat'; export default function Page() { - return ; + return ; } diff --git a/frontend/src/components/chat/chat-bottombar.tsx b/frontend/src/components/chat/chat-bottombar.tsx index 98e26d10..501782d2 100644 --- a/frontend/src/components/chat/chat-bottombar.tsx +++ b/frontend/src/components/chat/chat-bottombar.tsx @@ -1,7 +1,7 @@ 'use client'; import React, { useEffect } from 'react'; -import { ChatProps } from './chat'; +import { ChatProps } from './chat-panel'; import Link from 'next/link'; import { cn } from '@/lib/utils'; import { Button, buttonVariants } from '../ui/button'; diff --git a/frontend/src/app/chat/main-layout.tsx b/frontend/src/components/chat/chat-layout.tsx similarity index 95% rename from frontend/src/app/chat/main-layout.tsx rename to frontend/src/components/chat/chat-layout.tsx index 4f4bb701..92e1bb3c 100644 --- a/frontend/src/app/chat/main-layout.tsx +++ b/frontend/src/components/chat/chat-layout.tsx @@ -5,14 +5,14 @@ import { ResizablePanel, ResizablePanelGroup } from '@/components/ui/resizable'; import { SidebarProvider } from '@/components/ui/sidebar'; import { ChatSideBar } from '@/components/sidebar'; -import ProjectModal from '@/components/project-modal'; +import ProjectModal from '@/components/chat/project-modal'; import { useQuery } from '@apollo/client'; -import { ProjectProvider } from '@/components/code-engine/project-context'; import { useChatList } from '@/hooks/useChatList'; import { GET_USER_PROJECTS } from '@/graphql/request'; import { useAuthContext } from '@/providers/AuthProvider'; +import { ProjectProvider } from './code-engine/project-context'; -export default function MainLayout({ +export default function ChatLayout({ children, }: { children: React.ReactNode; diff --git a/frontend/src/components/chat/chat.tsx b/frontend/src/components/chat/chat-panel.tsx similarity index 100% rename from frontend/src/components/chat/chat.tsx rename to frontend/src/components/chat/chat-panel.tsx diff --git a/frontend/src/components/code-engine/code-engine.tsx b/frontend/src/components/chat/code-engine/code-engine.tsx similarity index 100% rename from frontend/src/components/code-engine/code-engine.tsx rename to frontend/src/components/chat/code-engine/code-engine.tsx diff --git a/frontend/src/components/code-engine/file-explorer-button.tsx b/frontend/src/components/chat/code-engine/file-explorer-button.tsx similarity index 100% rename from frontend/src/components/code-engine/file-explorer-button.tsx rename to frontend/src/components/chat/code-engine/file-explorer-button.tsx diff --git a/frontend/src/components/code-engine/file-structure.tsx b/frontend/src/components/chat/code-engine/file-structure.tsx similarity index 100% rename from frontend/src/components/code-engine/file-structure.tsx rename to frontend/src/components/chat/code-engine/file-structure.tsx diff --git a/frontend/src/components/code-engine/project-context.tsx b/frontend/src/components/chat/code-engine/project-context.tsx similarity index 100% rename from frontend/src/components/code-engine/project-context.tsx rename to frontend/src/components/chat/code-engine/project-context.tsx index 4e3a7cdb..8f019490 100644 --- a/frontend/src/components/code-engine/project-context.tsx +++ b/frontend/src/components/chat/code-engine/project-context.tsx @@ -8,13 +8,13 @@ import React, { useEffect, } from 'react'; import { useLazyQuery, useMutation, useQuery } from '@apollo/client'; -import { Project } from '../project-modal'; import { useAuth } from '@/hooks/useAuth'; import { CREATE_PROJECT, GET_CHAT_DETAILS, GET_USER_PROJECTS, } from '@/graphql/request'; +import { Project } from '../project-modal'; export interface ProjectContextType { projects: Project[]; diff --git a/frontend/src/components/code-engine/web-view.tsx b/frontend/src/components/chat/code-engine/web-view.tsx similarity index 100% rename from frontend/src/components/code-engine/web-view.tsx rename to frontend/src/components/chat/code-engine/web-view.tsx diff --git a/frontend/src/app/chat/Home.tsx b/frontend/src/components/chat/index.tsx similarity index 96% rename from frontend/src/app/chat/Home.tsx rename to frontend/src/components/chat/index.tsx index 223679e9..1082a1b0 100644 --- a/frontend/src/app/chat/Home.tsx +++ b/frontend/src/components/chat/index.tsx @@ -6,18 +6,18 @@ import { ResizablePanel, ResizableHandle, } from '@/components/ui/resizable'; -import { CodeEngine } from '@/components/code-engine/code-engine'; import { GET_CHAT_HISTORY } from '@/graphql/request'; import { useQuery } from '@apollo/client'; import { toast } from 'sonner'; import { EventEnum } from '@/components/enum'; import EditUsernameForm from '@/components/edit-username-form'; -import ChatContent from '@/components/chat/chat'; +import ChatContent from '@/components/chat/chat-panel'; import { useModels } from '@/hooks/useModels'; import { useChatList } from '@/hooks/useChatList'; import { useChatStream } from '@/hooks/useChatStream'; +import { CodeEngine } from './code-engine/code-engine'; -export default function Home() { +export default function Chat() { // Initialize state, refs, and custom hooks const urlParams = new URLSearchParams(window.location.search); const [chatId, setChatId] = useState(''); diff --git a/frontend/src/components/project-modal.tsx b/frontend/src/components/chat/project-modal.tsx similarity index 100% rename from frontend/src/components/project-modal.tsx rename to frontend/src/components/chat/project-modal.tsx diff --git a/frontend/src/components/sidebar.tsx b/frontend/src/components/sidebar.tsx index cc7c1167..8bb766ad 100644 --- a/frontend/src/components/sidebar.tsx +++ b/frontend/src/components/sidebar.tsx @@ -18,7 +18,7 @@ import { SidebarFooter, } from './ui/sidebar'; import { cn } from '@/lib/utils'; -import { ProjectContext } from './code-engine/project-context'; +import { ProjectContext } from './chat/code-engine/project-context'; interface SidebarProps { setIsModalOpen: (value: boolean) => void; // Parent setter to update collapse state From af3ad3cfc582b017faeebff9c95be20e042a58dd Mon Sep 17 00:00:00 2001 From: Sma1lboy <541898146chen@gmail.com> Date: Wed, 26 Feb 2025 15:57:39 -0600 Subject: [PATCH 7/7] refactor(components): move EventEnum to const directory and update import paths --- frontend/src/components/chat/chat-list.tsx | 2 +- frontend/src/components/chat/chat-panel.tsx | 2 +- frontend/src/components/chat/index.tsx | 2 +- frontend/src/components/file-sidebar.tsx | 2 +- frontend/src/components/sidebar-item.tsx | 2 +- frontend/src/components/sidebar.tsx | 2 +- frontend/src/components/user-settings.tsx | 2 +- frontend/src/{components/enum.ts => const/EventEnum.ts} | 0 frontend/src/{components/types.ts => const/MessageType.ts} | 0 frontend/src/hooks/useChatStream.ts | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename frontend/src/{components/enum.ts => const/EventEnum.ts} (100%) rename frontend/src/{components/types.ts => const/MessageType.ts} (100%) diff --git a/frontend/src/components/chat/chat-list.tsx b/frontend/src/components/chat/chat-list.tsx index fd65ed41..e329cad8 100644 --- a/frontend/src/components/chat/chat-list.tsx +++ b/frontend/src/components/chat/chat-list.tsx @@ -7,7 +7,7 @@ import { Avatar, AvatarFallback, AvatarImage, SmallAvatar } from '../ui/avatar'; import Markdown from 'react-markdown'; import remarkGfm from 'remark-gfm'; import CodeDisplayBlock from '../code-display-block'; -import { Message } from '../types'; +import { Message } from '../../const/MessageType'; import { Button } from '../ui/button'; import { Pencil } from 'lucide-react'; import { useAuth } from '@/hooks/useAuth'; diff --git a/frontend/src/components/chat/chat-panel.tsx b/frontend/src/components/chat/chat-panel.tsx index ec703de7..6d713513 100644 --- a/frontend/src/components/chat/chat-panel.tsx +++ b/frontend/src/components/chat/chat-panel.tsx @@ -1,7 +1,7 @@ import React from 'react'; import ChatBottombar from './chat-bottombar'; import ChatTopbar from './chat-topbar'; -import { ChatRequestOptions, Message } from '../types'; +import { ChatRequestOptions, Message } from '../../const/MessageType'; import ChatList from './chat-list'; export interface ChatProps { diff --git a/frontend/src/components/chat/index.tsx b/frontend/src/components/chat/index.tsx index 1082a1b0..16a12389 100644 --- a/frontend/src/components/chat/index.tsx +++ b/frontend/src/components/chat/index.tsx @@ -9,7 +9,7 @@ import { import { GET_CHAT_HISTORY } from '@/graphql/request'; import { useQuery } from '@apollo/client'; import { toast } from 'sonner'; -import { EventEnum } from '@/components/enum'; +import { EventEnum } from '@/const/EventEnum'; import EditUsernameForm from '@/components/edit-username-form'; import ChatContent from '@/components/chat/chat-panel'; import { useModels } from '@/hooks/useModels'; diff --git a/frontend/src/components/file-sidebar.tsx b/frontend/src/components/file-sidebar.tsx index fe3a1ada..a9d9ada9 100644 --- a/frontend/src/components/file-sidebar.tsx +++ b/frontend/src/components/file-sidebar.tsx @@ -8,7 +8,7 @@ import SidebarSkeleton from './sidebar-skeleton'; import UserSettings from './user-settings'; import { SideBarItem } from './sidebar-item'; import { Chat } from '@/graphql/type'; -import { EventEnum } from './enum'; +import { EventEnum } from '../const/EventEnum'; import { SidebarContent, SidebarGroup, diff --git a/frontend/src/components/sidebar-item.tsx b/frontend/src/components/sidebar-item.tsx index fc2a477c..00ae80fb 100644 --- a/frontend/src/components/sidebar-item.tsx +++ b/frontend/src/components/sidebar-item.tsx @@ -22,7 +22,7 @@ import Link from 'next/link'; import { useRouter } from 'next/navigation'; import { useEffect, useState } from 'react'; import { toast } from 'sonner'; -import { EventEnum } from './enum'; +import { EventEnum } from '../const/EventEnum'; interface SideBarItemProps { id: string; diff --git a/frontend/src/components/sidebar.tsx b/frontend/src/components/sidebar.tsx index 8bb766ad..5a3b1123 100644 --- a/frontend/src/components/sidebar.tsx +++ b/frontend/src/components/sidebar.tsx @@ -7,7 +7,7 @@ import SidebarSkeleton from './sidebar-skeleton'; import UserSettings from './user-settings'; import { SideBarItem } from './sidebar-item'; import { Chat } from '@/graphql/type'; -import { EventEnum } from './enum'; +import { EventEnum } from '../const/EventEnum'; import { SidebarContent, SidebarGroup, diff --git a/frontend/src/components/user-settings.tsx b/frontend/src/components/user-settings.tsx index f32d6b2e..9553cfa7 100644 --- a/frontend/src/components/user-settings.tsx +++ b/frontend/src/components/user-settings.tsx @@ -18,7 +18,7 @@ import { Button } from '@/components/ui/button'; import { useAuth } from '@/hooks/useAuth'; import { useRouter } from 'next/navigation'; import { useMemo, useState, memo } from 'react'; -import { EventEnum } from './enum'; +import { EventEnum } from '../const/EventEnum'; interface UserSettingsProps { isSimple: boolean; diff --git a/frontend/src/components/enum.ts b/frontend/src/const/EventEnum.ts similarity index 100% rename from frontend/src/components/enum.ts rename to frontend/src/const/EventEnum.ts diff --git a/frontend/src/components/types.ts b/frontend/src/const/MessageType.ts similarity index 100% rename from frontend/src/components/types.ts rename to frontend/src/const/MessageType.ts diff --git a/frontend/src/hooks/useChatStream.ts b/frontend/src/hooks/useChatStream.ts index b7bd3f0a..6273e481 100644 --- a/frontend/src/hooks/useChatStream.ts +++ b/frontend/src/hooks/useChatStream.ts @@ -1,7 +1,7 @@ import { useState, useCallback } from 'react'; import { useMutation, useSubscription } from '@apollo/client'; import { CHAT_STREAM, CREATE_CHAT, TRIGGER_CHAT } from '@/graphql/request'; -import { Message } from '@/components/types'; +import { Message } from '@/const/MessageType'; import { toast } from 'sonner'; import { useRouter } from 'next/navigation'; enum StreamStatus {