@@ -87,8 +86,8 @@ const TableBody = React.forwardRef(
className={cn('[&_tr:last-child]:border-0', className)}
{...props}
/>
- ))
- }
+ );
+ },
);
TableBody.displayName = 'TableBody';
diff --git a/src/FE/components/ui/toggle-group.tsx b/src/FE/components/ui/toggle-group.tsx
index 6cadb522..e5322f8a 100644
--- a/src/FE/components/ui/toggle-group.tsx
+++ b/src/FE/components/ui/toggle-group.tsx
@@ -1,18 +1,19 @@
-"use client"
+'use client';
-import * as React from "react"
-import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"
-import { VariantProps } from "class-variance-authority"
+import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group';
+import * as React from 'react';
-import { cn } from "@/lib/utils"
-import { toggleVariants } from "@/components/ui/toggle"
+import { toggleVariants } from '@/components/ui/toggle';
+
+import { cn } from '@/lib/utils';
+import { VariantProps } from 'class-variance-authority';
const ToggleGroupContext = React.createContext<
VariantProps
>({
- size: "default",
- variant: "default",
-})
+ size: 'default',
+ variant: 'default',
+});
const ToggleGroup = React.forwardRef<
React.ElementRef,
@@ -21,23 +22,23 @@ const ToggleGroup = React.forwardRef<
>(({ className, variant, size, children, ...props }, ref) => (
{children}
-))
+));
-ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName
+ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName;
const ToggleGroupItem = React.forwardRef<
React.ElementRef,
React.ComponentPropsWithoutRef &
VariantProps
>(({ className, children, variant, size, ...props }, ref) => {
- const context = React.useContext(ToggleGroupContext)
+ const context = React.useContext(ToggleGroupContext);
return (
{children}
- )
-})
+ );
+});
-ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName
+ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName;
-export { ToggleGroup, ToggleGroupItem }
+export { ToggleGroup, ToggleGroupItem };
diff --git a/src/FE/components/ui/toggle.tsx b/src/FE/components/ui/toggle.tsx
index 1379f75d..4cf886e4 100644
--- a/src/FE/components/ui/toggle.tsx
+++ b/src/FE/components/ui/toggle.tsx
@@ -1,32 +1,32 @@
-"use client"
+'use client';
-import * as React from "react"
-import * as TogglePrimitive from "@radix-ui/react-toggle"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as TogglePrimitive from '@radix-ui/react-toggle';
+import * as React from 'react';
-import { cn } from "@/lib/utils"
+import { cn } from '@/lib/utils';
+import { type VariantProps, cva } from 'class-variance-authority';
const toggleVariants = cva(
- "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",
+ 'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground',
{
variants: {
variant: {
- default: "bg-transparent",
+ default: 'bg-transparent',
outline:
- "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",
+ 'border border-input bg-transparent hover:bg-accent hover:text-accent-foreground',
},
size: {
- default: "h-10 px-3",
- sm: "h-9 px-2.5",
- lg: "h-11 px-5",
+ default: 'h-10 px-3',
+ sm: 'h-9 px-2.5',
+ lg: 'h-11 px-5',
},
},
defaultVariants: {
- variant: "default",
- size: "default",
+ variant: 'default',
+ size: 'default',
},
- }
-)
+ },
+);
const Toggle = React.forwardRef<
React.ElementRef,
@@ -38,8 +38,8 @@ const Toggle = React.forwardRef<
className={cn(toggleVariants({ variant, size, className }))}
{...props}
/>
-))
+));
-Toggle.displayName = TogglePrimitive.Root.displayName
+Toggle.displayName = TogglePrimitive.Root.displayName;
-export { Toggle, toggleVariants }
+export { Toggle, toggleVariants };
diff --git a/src/FE/locales/zh-CN.json b/src/FE/locales/zh-CN.json
index c5b9b029..e7b0f45b 100644
--- a/src/FE/locales/zh-CN.json
+++ b/src/FE/locales/zh-CN.json
@@ -344,7 +344,7 @@
"Token Price": "Token价格",
"404: Page not found": "404: 页面未找到",
"Sorry, we couldn't find the page you were trying to access.": "抱歉，我们找不到你要访问的页面。",
- ": An error has occurred": ": 发生错误",
+ "An error has occurred": "发生错误",
"Sorry, there was an unexpected error, please try again later.": "抱歉，出现了意外错误，请稍后再试。",
"Local": "本地",
"Minio": "Minio",
@@ -361,4 +361,4 @@
"There's no model here": "这里没有模型",
"You can contact the administrator or create one yourself": "你可以联系管理员或者自己创建一个",
"Customized Text(Company name, etc)": "自定义文本（公司名称等）"
-}
\ No newline at end of file
+}
diff --git a/src/FE/next.config.js b/src/FE/next.config.js
index f341adf8..9c576cb7 100644
--- a/src/FE/next.config.js
+++ b/src/FE/next.config.js
@@ -1,13 +1,13 @@
const isDev = process.env?.NODE_ENV === 'development';
-console.log("NODE_ENV", process.env?.NODE_ENV);
-console.log("-------------------");
+console.log('NODE_ENV', process.env?.NODE_ENV);
+console.log('-------------------');
const withPWA = require('next-pwa')({
dest: 'public',
register: !isDev,
skipWaiting: !isDev,
disable: isDev,
-})
+});
/** @type {import('next').NextConfig} */
const nextConfig = {
@@ -22,8 +22,8 @@ const nextConfig = {
},
publicRuntimeConfig: {
chattingIds: {},
- globalConfigs: {}
- }
+ globalConfigs: {},
+ },
};
module.exports = withPWA(nextConfig);
diff --git a/src/FE/package-lock.json b/src/FE/package-lock.json
index b3702542..2fe84c73 100644
--- a/src/FE/package-lock.json
+++ b/src/FE/package-lock.json
@@ -62,6 +62,7 @@
"cross-env": "^7.0.3",
"eslint": "8.49.0",
"eslint-config-next": "13.4.19",
+ "husky": "^9.1.7",
"postcss": "^8.4.41",
"prettier": "^2.8.7",
"prettier-plugin-tailwindcss": "^0.2.5",
@@ -8019,6 +8020,22 @@
"node": "*"
}
},
+ "node_modules/husky": {
+ "version": "9.1.7",
+ "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+ "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "husky": "bin.js"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/typicode"
+ }
+ },
"node_modules/idb": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
@@ -13849,21 +13866,6 @@
"type": "github",
"url": "https://github.com/sponsors/wooorm"
}
- },
- "node_modules/@next/swc-win32-ia32-msvc": {
- "version": "14.2.5",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz",
- "integrity": "sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==",
- "cpu": [
- "ia32"
- ],
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">= 10"
- }
}
}
}
diff --git a/src/FE/package.json b/src/FE/package.json
index 3ededf52..d58bf404 100644
--- a/src/FE/package.json
+++ b/src/FE/package.json
@@ -8,7 +8,8 @@
"build": "next build",
"start": "next start",
"lint": "next lint",
- "format": "prettier --write ."
+ "format": "prettier --write .",
+ "prepare": "husky"
},
"dependencies": {
"@hookform/resolvers": "^3.3.4",
@@ -65,6 +66,7 @@
"cross-env": "^7.0.3",
"eslint": "8.49.0",
"eslint-config-next": "13.4.19",
+ "husky": "^9.1.7",
"postcss": "^8.4.41",
"prettier": "^2.8.7",
"prettier-plugin-tailwindcss": "^0.2.5",
diff --git a/src/FE/pages/_app.tsx b/src/FE/pages/_app.tsx
index 8c25e65d..04203d68 100644
--- a/src/FE/pages/_app.tsx
+++ b/src/FE/pages/_app.tsx
@@ -9,12 +9,11 @@ import { getUserInfo } from '@/utils/user';
import { UserRole } from '@/types/adminApis';
-import { ThemeProvider } from '@/components/Theme/ThemeProvider';
-
import ErrorPage from './_error';
import AdminLayout from './admin/layout';
import './globals.css';
+import { ThemeProvider } from '@/providers/ThemeProvider';
import 'katex/dist/katex.min.css';
function App({ Component, pageProps }: AppProps<{}> | any) {
@@ -25,7 +24,7 @@ function App({ Component, pageProps }: AppProps<{}> | any) {
useEffect(() => {
setIsClient(true);
- document.title = "Chats";
+ document.title = 'Chats';
}, []);
const isAdmin = () => {
diff --git a/src/FE/pages/_document.tsx b/src/FE/pages/_document.tsx
index 9eb3466a..016e5cb8 100644
--- a/src/FE/pages/_document.tsx
+++ b/src/FE/pages/_document.tsx
@@ -17,7 +17,11 @@ function ChatsDocument(props: Props) {
-
+
diff --git a/src/FE/pages/_error.tsx b/src/FE/pages/_error.tsx
index 456abe24..b45e4ff7 100644
--- a/src/FE/pages/_error.tsx
+++ b/src/FE/pages/_error.tsx
@@ -22,10 +22,7 @@ const ErrorPage = ({ statusCode }: { statusCode: number }) => {
return (
-
- {statusCode}
- {t(': An error has occurred')}
-
+ {t('An error has occurred')}
{t('Sorry, there was an unexpected error, please try again later.')}
diff --git a/src/FE/components/Admin/Files/FileServiceModal.tsx b/src/FE/pages/admin/_components/Files/FileServiceModal.tsx
similarity index 98%
rename from src/FE/components/Admin/Files/FileServiceModal.tsx
rename to src/FE/pages/admin/_components/Files/FileServiceModal.tsx
index eac92fdc..0174a46f 100644
--- a/src/FE/components/Admin/Files/FileServiceModal.tsx
+++ b/src/FE/pages/admin/_components/Files/FileServiceModal.tsx
@@ -42,7 +42,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const FileServiceModal = (props: IProps) => {
+const FileServiceModal = (props: IProps) => {
const { t } = useTranslation();
const { selected, isOpen, onClose, onSuccessful } = props;
const formFields: IFormFieldOption[] = [
@@ -220,3 +220,5 @@ export const FileServiceModal = (props: IProps) => {
);
};
+
+export default FileServiceModal;
diff --git a/src/FE/components/Admin/GlobalConfigs/GlobalConfigsModal.tsx b/src/FE/pages/admin/_components/GlobalConfigs/GlobalConfigsModal.tsx
similarity index 98%
rename from src/FE/components/Admin/GlobalConfigs/GlobalConfigsModal.tsx
rename to src/FE/pages/admin/_components/GlobalConfigs/GlobalConfigsModal.tsx
index baf22766..fd1670c5 100644
--- a/src/FE/components/Admin/GlobalConfigs/GlobalConfigsModal.tsx
+++ b/src/FE/pages/admin/_components/GlobalConfigs/GlobalConfigsModal.tsx
@@ -33,7 +33,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const GlobalConfigsModal = (props: IProps) => {
+const GlobalConfigsModal = (props: IProps) => {
const { t } = useTranslation();
const { configKeys = [], selected, isOpen, onClose, onSuccessful } = props;
const formFields: IFormFieldOption[] = [
@@ -158,3 +158,4 @@ export const GlobalConfigsModal = (props: IProps) => {
);
};
+export default GlobalConfigsModal;
diff --git a/src/FE/components/Admin/InvitationCode/InvitationCodeModal.tsx b/src/FE/pages/admin/_components/InvitationCode/InvitationCodeModal.tsx
similarity index 97%
rename from src/FE/components/Admin/InvitationCode/InvitationCodeModal.tsx
rename to src/FE/pages/admin/_components/InvitationCode/InvitationCodeModal.tsx
index b60ad431..c93c7c4c 100644
--- a/src/FE/components/Admin/InvitationCode/InvitationCodeModal.tsx
+++ b/src/FE/pages/admin/_components/InvitationCode/InvitationCodeModal.tsx
@@ -34,7 +34,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const InvitationCodeModal = (props: IProps) => {
+const InvitationCodeModal = (props: IProps) => {
const { t } = useTranslation();
const { selected, isOpen, onClose, onSuccessful } = props;
const formFields: IFormFieldOption[] = [
@@ -137,3 +137,4 @@ export const InvitationCodeModal = (props: IProps) => {
);
};
+export default InvitationCodeModal;
diff --git a/src/FE/components/Admin/LoginService/LoginServiceModal.tsx b/src/FE/pages/admin/_components/LoginService/LoginServiceModal.tsx
similarity index 98%
rename from src/FE/components/Admin/LoginService/LoginServiceModal.tsx
rename to src/FE/pages/admin/_components/LoginService/LoginServiceModal.tsx
index 51201547..180581a1 100644
--- a/src/FE/components/Admin/LoginService/LoginServiceModal.tsx
+++ b/src/FE/pages/admin/_components/LoginService/LoginServiceModal.tsx
@@ -40,7 +40,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const LoginServiceModal = (props: IProps) => {
+const LoginServiceModal = (props: IProps) => {
const { t } = useTranslation();
const { selected, types, isOpen, onClose, onSuccessful } = props;
const formFields: IFormFieldOption[] = [
@@ -169,3 +169,4 @@ export const LoginServiceModal = (props: IProps) => {
);
};
+export default LoginServiceModal;
diff --git a/src/FE/components/Admin/ModelKeys/ConfigModelModal.tsx b/src/FE/pages/admin/_components/ModelKeys/ConfigModelModal.tsx
similarity index 98%
rename from src/FE/components/Admin/ModelKeys/ConfigModelModal.tsx
rename to src/FE/pages/admin/_components/ModelKeys/ConfigModelModal.tsx
index 25c810a8..98916bba 100644
--- a/src/FE/components/Admin/ModelKeys/ConfigModelModal.tsx
+++ b/src/FE/pages/admin/_components/ModelKeys/ConfigModelModal.tsx
@@ -6,7 +6,7 @@ import useTranslation from '@/hooks/useTranslation';
import { DBModelProvider } from '@/types/model';
import { IconInfo } from '@/components/Icons';
-import Spinner from '@/components/Spinner';
+import Spinner from '@/components/Spinner/Spinner';
import Tips from '@/components/Tips/Tips';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
@@ -51,7 +51,7 @@ export interface PossibleModel {
deploymentName: string | null;
}
-export const ConfigModelModal = (props: IProps) => {
+const ConfigModelModal = (props: IProps) => {
const { t } = useTranslation();
const { modelKeyId, modelProverId, isOpen, onClose } = props;
const [models, setModels] = useState ([]);
@@ -235,3 +235,4 @@ export const ConfigModelModal = (props: IProps) => {
);
};
+export default ConfigModelModal;
diff --git a/src/FE/components/Admin/ModelKeys/ModelKeysModal.tsx b/src/FE/pages/admin/_components/ModelKeys/ModelKeysModal.tsx
similarity index 95%
rename from src/FE/components/Admin/ModelKeys/ModelKeysModal.tsx
rename to src/FE/pages/admin/_components/ModelKeys/ModelKeysModal.tsx
index 34eab153..8b1cd05f 100644
--- a/src/FE/components/Admin/ModelKeys/ModelKeysModal.tsx
+++ b/src/FE/pages/admin/_components/ModelKeys/ModelKeysModal.tsx
@@ -1,21 +1,17 @@
-import { Label } from '@radix-ui/react-dropdown-menu';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
import { useForm } from 'react-hook-form';
import toast from 'react-hot-toast';
import useTranslation from '@/hooks/useTranslation';
import {
- AutoCreateModelResult,
GetModelKeysResult,
ModelProviderInitialConfig,
PostModelKeysParams,
} from '@/types/adminApis';
import { feModelProviders } from '@/types/model';
-import { IconInfo } from '@/components/Icons';
-import Spinner from '@/components/Spinner';
-import Tips from '@/components/Tips/Tips';
+import Spinner from '@/components/Spinner/Spinner';
import { Button } from '@/components/ui/button';
import {
Dialog,
@@ -32,7 +28,6 @@ import FormTextarea from '@/components/ui/form/textarea';
import {
deleteModelKeys,
getModelProviderInitialConfig,
- postAutoCreateModels,
postModelKeys,
putModelKeys,
} from '@/apis/adminApis';
@@ -49,7 +44,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const ModelKeysModal = (props: IProps) => {
+const ModelKeysModal = (props: IProps) => {
const { t } = useTranslation();
const {
selected,
@@ -271,3 +266,4 @@ export const ModelKeysModal = (props: IProps) => {
);
};
+export default ModelKeysModal;
diff --git a/src/FE/components/Admin/Models/AddModelModal.tsx b/src/FE/pages/admin/_components/Models/AddModelModal.tsx
similarity index 99%
rename from src/FE/components/Admin/Models/AddModelModal.tsx
rename to src/FE/pages/admin/_components/Models/AddModelModal.tsx
index e6cabc1d..17ce1751 100644
--- a/src/FE/components/Admin/Models/AddModelModal.tsx
+++ b/src/FE/pages/admin/_components/Models/AddModelModal.tsx
@@ -47,7 +47,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const AddModelModal = (props: IProps) => {
+const AddModelModal = (props: IProps) => {
const { t } = useTranslation();
const [fileServices, setFileServices] = useState([]);
const [modelVersions, setModelVersions] = useState(
@@ -55,7 +55,6 @@ export const AddModelModal = (props: IProps) => {
);
const [modelReference, setModelReference] = useState();
const { isOpen, onClose, onSuccessful, modelKeys } = props;
- const [loading, setLoading] = useState(true);
const formSchema = z.object({
modelReferenceId: z.string().default('0'),
@@ -307,3 +306,4 @@ export const AddModelModal = (props: IProps) => {
);
};
+export default AddModelModal;
diff --git a/src/FE/components/Admin/Models/EditModelModal.tsx b/src/FE/pages/admin/_components/Models/EditModelModal.tsx
similarity index 99%
rename from src/FE/components/Admin/Models/EditModelModal.tsx
rename to src/FE/pages/admin/_components/Models/EditModelModal.tsx
index 60acc246..0b04c733 100644
--- a/src/FE/components/Admin/Models/EditModelModal.tsx
+++ b/src/FE/pages/admin/_components/Models/EditModelModal.tsx
@@ -43,7 +43,7 @@ interface IProps {
saveLoading?: boolean;
}
-export const EditModelModal = (props: IProps) => {
+const EditModelModal = (props: IProps) => {
const { t } = useTranslation();
const { isOpen, onClose, selected, onSuccessful, modelKeys } = props;
const [fileServices, setFileServices] = useState([]);
@@ -329,3 +329,4 @@ export const EditModelModal = (props: IProps) => {
);
};
+export default EditModelModal;
diff --git a/src/FE/components/Admin/Nav/Nav.tsx b/src/FE/pages/admin/_components/Nav/Nav.tsx
similarity index 96%
rename from src/FE/components/Admin/Nav/Nav.tsx
rename to src/FE/pages/admin/_components/Nav/Nav.tsx
index 01b5d22d..02a02a3d 100644
--- a/src/FE/components/Admin/Nav/Nav.tsx
+++ b/src/FE/pages/admin/_components/Nav/Nav.tsx
@@ -17,7 +17,7 @@ interface NavProps {
menus: IMenu[];
}
-export function Nav({ menus }: NavProps) {
+function Nav({ menus }: NavProps) {
const router = useRouter();
const active = (link: IMenu) => {
const { url } = link;
@@ -52,3 +52,4 @@ export function Nav({ menus }: NavProps) {
);
};
+export default ChatInput;
diff --git a/src/FE/components/Chat/EnableNetworkSearch.tsx b/src/FE/pages/home/_components/Chat/EnableNetworkSearch.tsx
similarity index 100%
rename from src/FE/components/Chat/EnableNetworkSearch.tsx
rename to src/FE/pages/home/_components/Chat/EnableNetworkSearch.tsx
diff --git a/src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx b/src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx
new file mode 100644
index 00000000..1384e5cd
--- /dev/null
+++ b/src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx
@@ -0,0 +1,12 @@
+import { FC, memo } from 'react';
+
+import { ChatMessage, Props } from '@/components/ChatMessage';
+
+const MemoizedChatMessage: FC = memo(
+ ChatMessage,
+ (prevProps, nextProps) =>
+ prevProps.message.content === nextProps.message.content &&
+ prevProps.messageIsStreaming === nextProps.messageIsStreaming,
+);
+
+export default MemoizedChatMessage;
diff --git a/src/FE/components/Chat/ModelSelect.tsx b/src/FE/pages/home/_components/Chat/ModelSelect.tsx
similarity index 65%
rename from src/FE/components/Chat/ModelSelect.tsx
rename to src/FE/pages/home/_components/Chat/ModelSelect.tsx
index 1bc843de..6a4c6ade 100644
--- a/src/FE/components/Chat/ModelSelect.tsx
+++ b/src/FE/pages/home/_components/Chat/ModelSelect.tsx
@@ -6,23 +6,15 @@ import { formatNumberAsMoney } from '@/utils/common';
import { ModelUsageDto } from '@/types/clientApis';
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '../ui/select';
+import HomeContext from '../../_contents/Home.context';
import { getModelUsage } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
-export const ModelSelect = () => {
+const ModelSelect = () => {
const { t } = useTranslation();
const {
- state: { selectModel, models },
- handleSelectModel,
+ state: { selectModel },
} = useContext(HomeContext);
const [modelUsage, setModelUsage] = useState();
@@ -34,16 +26,6 @@ export const ModelSelect = () => {
}
}, [selectModel]);
- const handleChange = (value: string) => {
- const model = models.find((m) => m.modelId.toString() == value);
- if (!model) return;
-
- handleSelectModel(model);
- getModelUsage(model.modelId).then((res) => {
- setModelUsage(res);
- });
- };
-
const getTitle = () => {
if (modelUsage) {
if (modelUsage.tokens === 0 && modelUsage.counts === 0) {
@@ -64,24 +46,6 @@ export const ModelSelect = () => {
- {/*
-
- */}
{modelUsage && modelUsage.tokens === 0 && modelUsage.counts === 0 ? (
￥{modelUsage.inputTokenPrice1M.toFixed(4)}/
@@ -120,3 +84,5 @@ export const ModelSelect = () => {
);
};
+
+export default ModelSelect;
diff --git a/src/FE/components/Chat/NoModel.tsx b/src/FE/pages/home/_components/Chat/NoModel.tsx
similarity index 93%
rename from src/FE/components/Chat/NoModel.tsx
rename to src/FE/pages/home/_components/Chat/NoModel.tsx
index 0bb7c01b..396b1f9a 100644
--- a/src/FE/components/Chat/NoModel.tsx
+++ b/src/FE/pages/home/_components/Chat/NoModel.tsx
@@ -1,6 +1,6 @@
import useTranslation from '@/hooks/useTranslation';
-import { IconModelSearch } from '../Icons';
+import { IconModelSearch } from '@/components/Icons';
const NoModel = () => {
const { t } = useTranslation();
diff --git a/src/FE/components/Chat/PromptList.tsx b/src/FE/pages/home/_components/Chat/PromptList.tsx
similarity index 92%
rename from src/FE/components/Chat/PromptList.tsx
rename to src/FE/pages/home/_components/Chat/PromptList.tsx
index 3b008083..d50b8e34 100644
--- a/src/FE/components/Chat/PromptList.tsx
+++ b/src/FE/pages/home/_components/Chat/PromptList.tsx
@@ -1,4 +1,4 @@
-import { ForwardedRef, MutableRefObject, forwardRef } from 'react';
+import { MutableRefObject } from 'react';
import { Prompt } from '@/types/prompt';
@@ -10,7 +10,7 @@ interface Props {
promptListRef: MutableRefObject;
}
-export const PromptList = ({
+const PromptList = ({
prompts,
activePromptIndex,
promptListRef,
@@ -43,3 +43,5 @@ export const PromptList = ({
);
};
+
+export default PromptList;
diff --git a/src/FE/components/Chat/SharedMessageModal.tsx b/src/FE/pages/home/_components/Chat/SharedMessageModal.tsx
similarity index 96%
rename from src/FE/components/Chat/SharedMessageModal.tsx
rename to src/FE/pages/home/_components/Chat/SharedMessageModal.tsx
index a539747b..13925391 100644
--- a/src/FE/components/Chat/SharedMessageModal.tsx
+++ b/src/FE/pages/home/_components/Chat/SharedMessageModal.tsx
@@ -23,7 +23,7 @@ interface IProps {
onShareChange: (isShared: boolean) => void;
}
-export const SharedMessageModal = (props: IProps) => {
+const SharedMessageModal = (props: IProps) => {
const { t } = useTranslation();
const { chat, isOpen, onClose, onShareChange } = props;
const [loading, setLoading] = useState(false);
@@ -104,3 +104,4 @@ export const SharedMessageModal = (props: IProps) => {
);
};
+export default SharedMessageModal;
diff --git a/src/FE/components/Chat/SystemPrompt.tsx b/src/FE/pages/home/_components/Chat/SystemPrompt.tsx
similarity index 95%
rename from src/FE/components/Chat/SystemPrompt.tsx
rename to src/FE/pages/home/_components/Chat/SystemPrompt.tsx
index 478360ba..e2509911 100644
--- a/src/FE/components/Chat/SystemPrompt.tsx
+++ b/src/FE/pages/home/_components/Chat/SystemPrompt.tsx
@@ -9,24 +9,25 @@ import {
import useTranslation from '@/hooks/useTranslation';
+import { formatPrompt } from '@/utils/promptVariable';
+
+import { AdminModelDto } from '@/types/adminApis';
import { Prompt } from '@/types/prompt';
-import { PromptList } from './PromptList';
-import { VariableModal } from './VariableModal';
+import PromptList from './PromptList';
+import VariableModal from './VariableModal';
import { getUserPromptDetail } from '@/apis/clientApis';
-import { formatPrompt } from '@/utils/promptVariable';
-import { AdminModelDto } from '@/types/adminApis';
interface Props {
currentPrompt: string;
prompts: Prompt[];
- model: AdminModelDto,
+ model: AdminModelDto;
onChangePromptText: (prompt: string) => void;
onChangePrompt: (prompt: Prompt) => void;
}
-export const SystemPrompt: FC = ({
+const SystemPrompt: FC = ({
currentPrompt,
prompts,
model,
@@ -196,10 +197,11 @@ export const SystemPrompt: FC = ({
resize: 'none',
bottom: `${textareaRef?.current?.scrollHeight}px`,
maxHeight: '300px',
- overflow: `${textareaRef.current && textareaRef.current.scrollHeight > 400
+ overflow: `${
+ textareaRef.current && textareaRef.current.scrollHeight > 400
? 'auto'
: 'hidden'
- }`,
+ }`,
}}
placeholder={
t(`Enter a prompt or type "/" to select a prompt...`) || ''
@@ -233,3 +235,5 @@ export const SystemPrompt: FC = ({
);
};
+
+export default SystemPrompt;
diff --git a/src/FE/components/Chat/VariableModal.tsx b/src/FE/pages/home/_components/Chat/VariableModal.tsx
similarity index 96%
rename from src/FE/components/Chat/VariableModal.tsx
rename to src/FE/pages/home/_components/Chat/VariableModal.tsx
index d989bea8..34f36edc 100644
--- a/src/FE/components/Chat/VariableModal.tsx
+++ b/src/FE/pages/home/_components/Chat/VariableModal.tsx
@@ -21,12 +21,7 @@ interface Props {
onClose: () => void;
}
-export const VariableModal: FC = ({
- prompt,
- variables,
- onSubmit,
- onClose,
-}) => {
+const VariableModal: FC = ({ prompt, variables, onSubmit, onClose }) => {
const { t } = useTranslation();
const [updatedVariables, setUpdatedVariables] = useState<
{ key: string; value: string }[]
@@ -112,3 +107,5 @@ export const VariableModal: FC = ({
);
};
+
+export default VariableModal;
diff --git a/src/FE/components/ChatSettings/ChatSettings.tsx b/src/FE/pages/home/_components/ChatSettings/ChatSettings.tsx
similarity index 100%
rename from src/FE/components/ChatSettings/ChatSettings.tsx
rename to src/FE/pages/home/_components/ChatSettings/ChatSettings.tsx
diff --git a/src/FE/components/ChatSettings/ChatSettingsBar.tsx b/src/FE/pages/home/_components/ChatSettings/ChatSettingsBar.tsx
similarity index 88%
rename from src/FE/components/ChatSettings/ChatSettingsBar.tsx
rename to src/FE/pages/home/_components/ChatSettings/ChatSettingsBar.tsx
index 2d932f50..54a59091 100644
--- a/src/FE/components/ChatSettings/ChatSettingsBar.tsx
+++ b/src/FE/pages/home/_components/ChatSettings/ChatSettingsBar.tsx
@@ -1,9 +1,8 @@
-import { useContext, useEffect, useState } from 'react';
+import { useContext, useState } from 'react';
-import { HomeContext } from '@/contexts/Home.context';
+import { IconX } from '@/components/Icons';
-import { IconX } from '../Icons';
-import ChatSettings from './ChatSettings';
+import HomeContext from '../../_contents/Home.context';
import SliderSetting from './SliderSetting';
const ChatSettingsBar = () => {
diff --git a/src/FE/components/ChatSettings/SliderSetting.tsx b/src/FE/pages/home/_components/ChatSettings/SliderSetting.tsx
similarity index 100%
rename from src/FE/components/ChatSettings/SliderSetting.tsx
rename to src/FE/pages/home/_components/ChatSettings/SliderSetting.tsx
diff --git a/src/FE/components/Chatbar/Chatbar.context.tsx b/src/FE/pages/home/_components/Chatbar/Chatbar.context.tsx
similarity index 61%
rename from src/FE/components/Chatbar/Chatbar.context.tsx
rename to src/FE/pages/home/_components/Chatbar/Chatbar.context.tsx
index 15f38cf1..c21f11db 100644
--- a/src/FE/components/Chatbar/Chatbar.context.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Chatbar.context.tsx
@@ -2,13 +2,22 @@ import { Dispatch, createContext } from 'react';
import { ActionType } from '@/hooks/useCreateReducer';
-import { ChatbarInitialState } from './Chatbar.state';
+import { ChatResult } from '@/types/clientApis';
export interface ChatbarContextProps {
state: ChatbarInitialState;
dispatch: Dispatch>;
handleDeleteChat: (chatId: string) => void;
}
+export interface ChatbarInitialState {
+ searchTerm: string;
+ filteredChats: ChatResult[];
+}
+
+export const initialState: ChatbarInitialState = {
+ searchTerm: '',
+ filteredChats: [],
+};
const ChatbarContext = createContext(undefined!);
diff --git a/src/FE/components/Chatbar/Chatbar.tsx b/src/FE/pages/home/_components/Chatbar/Chatbar.tsx
similarity index 89%
rename from src/FE/components/Chatbar/Chatbar.tsx
rename to src/FE/pages/home/_components/Chatbar/Chatbar.tsx
index 2701aa2e..357c078c 100644
--- a/src/FE/components/Chatbar/Chatbar.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Chatbar.tsx
@@ -7,16 +7,14 @@ import { removeSelectChatId, saveSelectChatId } from '@/utils/chats';
import { ChatResult } from '@/types/clientApis';
-import Sidebar from '@/components/Sidebar';
-
+import HomeContext from '../../_contents/Home.context';
+import Sidebar from '../Sidebar/Sidebar';
import ChatbarContext from './Chatbar.context';
-import { ChatbarInitialState, initialState } from './Chatbar.state';
-import { ChatBarSettings } from './ChatbarSettings';
-import { Conversations } from './Conversations';
-
-import { HomeContext } from '@/contexts/Home.context';
+import { ChatbarInitialState, initialState } from './Chatbar.context';
+import ChatBarSettings from './ChatbarSettings';
+import Conversations from './Conversations';
-export const Chatbar = () => {
+const Chatbar = () => {
const { t } = useTranslation();
const chatBarContextValue = useCreateReducer({
@@ -102,3 +100,4 @@ export const Chatbar = () => {
);
};
+export default Chatbar;
diff --git a/src/FE/components/Chatbar/ChatbarSettings.tsx b/src/FE/pages/home/_components/Chatbar/ChatbarSettings.tsx
similarity index 91%
rename from src/FE/components/Chatbar/ChatbarSettings.tsx
rename to src/FE/pages/home/_components/Chatbar/ChatbarSettings.tsx
index 713af4d9..99ff4f53 100644
--- a/src/FE/components/Chatbar/ChatbarSettings.tsx
+++ b/src/FE/pages/home/_components/Chatbar/ChatbarSettings.tsx
@@ -17,10 +17,6 @@ import {
IconSettingsCog,
IconUser,
} from '@/components/Icons/index';
-import { ChangePasswordModal } from '@/components/Modal/ChangePasswordModal';
-import UserBalanceModal from '@/components/Modal/UserBalanceModal';
-import { SettingModal } from '@/components/Settings/SettingModal';
-import { SidebarButton } from '@/components/Sidebar/SidebarButton';
import {
Popover,
PopoverContent,
@@ -28,10 +24,15 @@ import {
} from '@/components/ui/popover';
import { Separator } from '@/components/ui/separator';
+import HomeContext from '../../_contents/Home.context';
+import ChangePasswordModal from '../Modal/ChangePasswordModal';
+import UserBalanceModal from '../Modal/UserBalanceModal';
+import SettingModal from '../Settings/SettingModal';
+import SidebarButton from '../Sidebar/SidebarButton';
+
import { getUserBalanceOnly } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
-export const ChatBarSettings = () => {
+const ChatBarSettings = () => {
const router = useRouter();
const { t } = useTranslation();
const [changePwdModalOpen, setChangePwdModalOpen] = useState(false);
@@ -153,3 +154,4 @@ export const ChatBarSettings = () => {
);
};
+export default ChatBarSettings;
diff --git a/src/FE/components/Chatbar/ClearConversations.tsx b/src/FE/pages/home/_components/Chatbar/ClearConversations.tsx
similarity index 89%
rename from src/FE/components/Chatbar/ClearConversations.tsx
rename to src/FE/pages/home/_components/Chatbar/ClearConversations.tsx
index 1989ac88..fb4bfc32 100644
--- a/src/FE/components/Chatbar/ClearConversations.tsx
+++ b/src/FE/pages/home/_components/Chatbar/ClearConversations.tsx
@@ -3,13 +3,14 @@ import { FC, useState } from 'react';
import useTranslation from '@/hooks/useTranslation';
import { IconCheck, IconTrash, IconX } from '@/components/Icons/index';
-import { SidebarButton } from '@/components/Sidebar/SidebarButton';
+
+import SidebarButton from '../Sidebar/SidebarButton';
interface Props {
onClearConversations: () => void;
}
-export const ClearConversations: FC = ({ onClearConversations }) => {
+const ClearConversations: FC = ({ onClearConversations }) => {
const [isConfirming, setIsConfirming] = useState(false);
const { t } = useTranslation();
@@ -55,3 +56,5 @@ export const ClearConversations: FC = ({ onClearConversations }) => {
/>
);
};
+
+export default ClearConversations;
diff --git a/src/FE/components/Chatbar/Conversation.tsx b/src/FE/pages/home/_components/Chatbar/Conversation.tsx
similarity index 94%
rename from src/FE/components/Chatbar/Conversation.tsx
rename to src/FE/pages/home/_components/Chatbar/Conversation.tsx
index f2d11585..895e04a8 100644
--- a/src/FE/components/Chatbar/Conversation.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Conversation.tsx
@@ -10,12 +10,9 @@ import toast from 'react-hot-toast';
import useTranslation from '@/hooks/useTranslation';
import { ChatResult } from '@/types/clientApis';
-import { DBModelProvider } from '@/types/model';
import SidebarActionButton from '@/components/Button/SidebarActionButton';
-import { SharedMessageModal } from '@/components/Chat/SharedMessageModal';
import ChatIcon from '@/components/ChatIcon/ChatIcon';
-import ChatbarContext from '@/components/Chatbar/Chatbar.context';
import {
IconCheck,
IconDots,
@@ -24,7 +21,6 @@ import {
IconTrash,
IconX,
} from '@/components/Icons/index';
-import { Button } from '@/components/ui/button';
import {
DropdownMenu,
DropdownMenuContent,
@@ -32,14 +28,17 @@ import {
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
+import HomeContext from '../../_contents/Home.context';
+import SharedMessageModal from '../Chat/SharedMessageModal';
+import ChatbarContext from '../Chatbar/Chatbar.context';
+
import { deleteChats, putChats } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
interface Props {
chat: ChatResult;
}
-export const ConversationComponent = ({ chat }: Props) => {
+const ConversationComponent = ({ chat }: Props) => {
const { t } = useTranslation();
const {
state: {
@@ -215,3 +214,5 @@ export const ConversationComponent = ({ chat }: Props) => {
);
};
+
+export default ConversationComponent;
diff --git a/src/FE/components/Chatbar/Conversations.tsx b/src/FE/pages/home/_components/Chatbar/Conversations.tsx
similarity index 85%
rename from src/FE/components/Chatbar/Conversations.tsx
rename to src/FE/pages/home/_components/Chatbar/Conversations.tsx
index 2c552378..c4c3b0d0 100644
--- a/src/FE/components/Chatbar/Conversations.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Conversations.tsx
@@ -4,17 +4,16 @@ import useTranslation from '@/hooks/useTranslation';
import { ChatResult } from '@/types/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
-
import { Button } from '@/components/ui/button';
-import { ConversationComponent } from './Conversation';
+import HomeContext from '../../_contents/Home.context';
+import ConversationComponent from './Conversation';
interface Props {
chats: ChatResult[];
}
-export const Conversations = ({ chats }: Props) => {
+const Conversations = ({ chats }: Props) => {
const { t } = useTranslation();
const {
state: { chatsPaging },
@@ -46,3 +45,4 @@ export const Conversations = ({ chats }: Props) => {
);
};
+export default Conversations;
diff --git a/src/FE/components/HomeContent/HomeContent.tsx b/src/FE/pages/home/_components/HomeContent/HomeContent.tsx
similarity index 96%
rename from src/FE/components/HomeContent/HomeContent.tsx
rename to src/FE/pages/home/_components/HomeContent/HomeContent.tsx
index 49b60c72..251703e9 100644
--- a/src/FE/components/HomeContent/HomeContent.tsx
+++ b/src/FE/pages/home/_components/HomeContent/HomeContent.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
import { useRouter } from 'next/router';
@@ -22,11 +22,17 @@ import { DEFAULT_TEMPERATURE, IChat, Role } from '@/types/chat';
import { ChatMessage } from '@/types/chatMessage';
import { ChatResult, GetChatsParams } from '@/types/clientApis';
-import { Chat } from '@/components/Chat/Chat';
-import ChatSettingsBar from '@/components/ChatSettings/ChatSettingsBar';
-import { Chatbar } from '@/components/Chatbar/Chatbar';
-import PromptBar from '@/components/Promptbar';
-import Spinner from '@/components/Spinner';
+import Spinner from '@/components/Spinner/Spinner';
+
+import HomeContext, {
+ HandleUpdateChatParams,
+ HomeInitialState,
+ initialState,
+} from '../../_contents/Home.context';
+import Chat from '../Chat/Chat';
+import ChatSettingsBar from '../ChatSettings/ChatSettingsBar';
+import Chatbar from '../Chatbar/Chatbar';
+import PromptBar from '../Promptbar/Promptbar';
import {
getChatsByPaging,
@@ -36,12 +42,6 @@ import {
getUserPromptBrief,
postChats,
} from '@/apis/clientApis';
-import {
- HandleUpdateChatParams,
- HomeContext,
- HomeInitialState,
- initialState,
-} from '@/contexts/Home.context';
import Decimal from 'decimal.js';
import { v4 as uuidv4 } from 'uuid';
@@ -103,7 +103,7 @@ const HomeContent = () => {
data.temperature ??
userModelConfig?.temperature ??
DEFAULT_TEMPERATURE,
- prompt: data.content,
+ prompt: formatPrompt(data.content, { model }),
});
});
};
diff --git a/src/FE/components/Modal/ChangePasswordModal.tsx b/src/FE/pages/home/_components/Modal/ChangePasswordModal.tsx
similarity index 98%
rename from src/FE/components/Modal/ChangePasswordModal.tsx
rename to src/FE/pages/home/_components/Modal/ChangePasswordModal.tsx
index ae833119..a7ecf701 100644
--- a/src/FE/components/Modal/ChangePasswordModal.tsx
+++ b/src/FE/pages/home/_components/Modal/ChangePasswordModal.tsx
@@ -29,7 +29,7 @@ interface Props {
onClose: () => void;
}
-export const ChangePasswordModal = (props: Props) => {
+const ChangePasswordModal = (props: Props) => {
const { isOpen, onClose } = props;
const { t } = useTranslation();
const router = useRouter();
@@ -159,3 +159,4 @@ export const ChangePasswordModal = (props: Props) => {
);
};
+export default ChangePasswordModal;
diff --git a/src/FE/components/Modal/UserBalanceModal.tsx b/src/FE/pages/home/_components/Modal/UserBalanceModal.tsx
similarity index 100%
rename from src/FE/components/Modal/UserBalanceModal.tsx
rename to src/FE/pages/home/_components/Modal/UserBalanceModal.tsx
diff --git a/src/FE/components/ModeToggle/ModeTooggle.tsx b/src/FE/pages/home/_components/ModeToggle/ModeToggle.tsx
similarity index 92%
rename from src/FE/components/ModeToggle/ModeTooggle.tsx
rename to src/FE/pages/home/_components/ModeToggle/ModeToggle.tsx
index fc6cb780..5c4ad186 100644
--- a/src/FE/components/ModeToggle/ModeTooggle.tsx
+++ b/src/FE/pages/home/_components/ModeToggle/ModeToggle.tsx
@@ -7,7 +7,7 @@ import { useTheme } from 'next-themes';
import { IconMoon, IconSun } from '@/components/Icons';
import { Button } from '@/components/ui/button';
-export function ModeToggle() {
+function ModeToggle() {
const { setTheme } = useTheme();
return (
@@ -25,3 +25,4 @@ export function ModeToggle() {
);
}
+export default ModeToggle;
diff --git a/src/FE/components/PasteUpload/PasteUpload.tsx b/src/FE/pages/home/_components/PasteUpload/PasteUpload.tsx
similarity index 99%
rename from src/FE/components/PasteUpload/PasteUpload.tsx
rename to src/FE/pages/home/_components/PasteUpload/PasteUpload.tsx
index 0c7c329c..13c222e9 100644
--- a/src/FE/components/PasteUpload/PasteUpload.tsx
+++ b/src/FE/pages/home/_components/PasteUpload/PasteUpload.tsx
@@ -1,8 +1,9 @@
import React, { useEffect, useRef } from 'react';
import { checkFileSizeCanUpload, uploadFile } from '@/utils/uploadFile';
-import { ChatModelFileConfig } from '@/types/model';
+
import { ImageDef } from '@/types/chat';
+import { ChatModelFileConfig } from '@/types/model';
interface IPasteUploadProps {
fileServiceId: number;
diff --git a/src/FE/components/Popover/DateTimePopover.tsx b/src/FE/pages/home/_components/Popover/DateTimePopover.tsx
similarity index 93%
rename from src/FE/components/Popover/DateTimePopover.tsx
rename to src/FE/pages/home/_components/Popover/DateTimePopover.tsx
index dc18d626..1ff52815 100644
--- a/src/FE/components/Popover/DateTimePopover.tsx
+++ b/src/FE/pages/home/_components/Popover/DateTimePopover.tsx
@@ -1,7 +1,11 @@
import { IconSquareRoundedX } from '@/components/Icons';
import { Button } from '@/components/ui/button';
import { Calendar } from '@/components/ui/calendar';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/components/ui/popover';
import { cn } from '@/lib/utils';
diff --git a/src/FE/components/Popover/DeletePopover.tsx b/src/FE/pages/home/_components/Popover/DeletePopover.tsx
similarity index 93%
rename from src/FE/components/Popover/DeletePopover.tsx
rename to src/FE/pages/home/_components/Popover/DeletePopover.tsx
index 98f952c4..0ea3cf95 100644
--- a/src/FE/components/Popover/DeletePopover.tsx
+++ b/src/FE/pages/home/_components/Popover/DeletePopover.tsx
@@ -3,7 +3,11 @@ import { useState } from 'react';
import useTranslation from '@/hooks/useTranslation';
import { Button } from '@/components/ui/button';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/components/ui/popover';
interface Props {
onDelete: () => void;
diff --git a/src/FE/components/Promptbar/components/Prompt.tsx b/src/FE/pages/home/_components/Promptbar/Prompt.tsx
similarity index 95%
rename from src/FE/components/Promptbar/components/Prompt.tsx
rename to src/FE/pages/home/_components/Promptbar/Prompt.tsx
index c7b4d480..0eb116b4 100644
--- a/src/FE/components/Promptbar/components/Prompt.tsx
+++ b/src/FE/pages/home/_components/Promptbar/Prompt.tsx
@@ -10,8 +10,8 @@ import {
IconX,
} from '@/components/Icons/index';
-import PromptbarContext from '../PromptBar.context';
-import { PromptModal } from './PromptModal';
+import PromptbarContext from './PromptBar.context';
+import PromptModal from './PromptModal';
import { getUserPromptDetail } from '@/apis/clientApis';
@@ -19,7 +19,7 @@ interface Props {
prompt: PromptSlim;
}
-export const PromptComponent = ({ prompt }: Props) => {
+const PromptComponent = ({ prompt }: Props) => {
const {
dispatch: promptDispatch,
handleUpdatePrompt,
@@ -128,3 +128,4 @@ export const PromptComponent = ({ prompt }: Props) => {
);
};
+export default PromptComponent;
diff --git a/src/FE/components/Promptbar/PromptBar.context.tsx b/src/FE/pages/home/_components/Promptbar/PromptBar.context.tsx
similarity index 63%
rename from src/FE/components/Promptbar/PromptBar.context.tsx
rename to src/FE/pages/home/_components/Promptbar/PromptBar.context.tsx
index 497cf510..9201a0ee 100644
--- a/src/FE/components/Promptbar/PromptBar.context.tsx
+++ b/src/FE/pages/home/_components/Promptbar/PromptBar.context.tsx
@@ -2,9 +2,8 @@ import { Dispatch, createContext } from 'react';
import { ActionType } from '@/hooks/useCreateReducer';
-import { Prompt, PromptSlim } from '@/types/prompt';
-
-import { PromptbarInitialState } from './Promptbar.state';
+import { Prompt } from '@/types/prompt';
+import { PromptSlim } from '@/types/prompt';
export interface PromptbarContextProps {
state: PromptbarInitialState;
@@ -14,6 +13,16 @@ export interface PromptbarContextProps {
handleUpdatePrompt: (prompt: Prompt) => void;
}
+export interface PromptbarInitialState {
+ searchTerm: string;
+ filteredPrompts: PromptSlim[];
+}
+
+export const initialState: PromptbarInitialState = {
+ searchTerm: '',
+ filteredPrompts: [],
+};
+
const PromptbarContext = createContext(undefined!);
export default PromptbarContext;
diff --git a/src/FE/components/Promptbar/components/PromptModal.tsx b/src/FE/pages/home/_components/Promptbar/PromptModal.tsx
similarity index 96%
rename from src/FE/components/Promptbar/components/PromptModal.tsx
rename to src/FE/pages/home/_components/Promptbar/PromptModal.tsx
index a5d77ca4..c6d7e51f 100644
--- a/src/FE/components/Promptbar/components/PromptModal.tsx
+++ b/src/FE/pages/home/_components/Promptbar/PromptModal.tsx
@@ -9,8 +9,8 @@ import { UserRole } from '@/types/adminApis';
import { DEFAULT_TEMPERATURE } from '@/types/chat';
import { Prompt } from '@/types/prompt';
-import { TemperatureSlider } from '@/components/Chat/Temperature';
import { IconInfo } from '@/components/Icons';
+import TemperatureSlider from '@/components/TemperatureSlider/TemperatureSlider';
import Tips from '@/components/Tips/Tips';
import { Button } from '@/components/ui/button';
import {
@@ -24,7 +24,8 @@ import FormInput from '@/components/ui/form/input';
import FormSwitch from '@/components/ui/form/switch';
import FormTextarea from '@/components/ui/form/textarea';
-import { HomeContext } from '@/contexts/Home.context';
+import HomeContext from '../../_contents/Home.context';
+
import { zodResolver } from '@hookform/resolvers/zod';
import { z } from 'zod';
@@ -34,7 +35,7 @@ interface IProps {
onClose: () => void;
}
-export const PromptModal = (props: IProps) => {
+const PromptModal = (props: IProps) => {
const { t } = useTranslation();
const { prompt, onUpdatePrompt, onClose } = props;
@@ -191,3 +192,4 @@ export const PromptModal = (props: IProps) => {
);
};
+export default PromptModal;
diff --git a/src/FE/components/Promptbar/Promptbar.tsx b/src/FE/pages/home/_components/Promptbar/Promptbar.tsx
similarity index 91%
rename from src/FE/components/Promptbar/Promptbar.tsx
rename to src/FE/pages/home/_components/Promptbar/Promptbar.tsx
index df0089df..744a550e 100644
--- a/src/FE/components/Promptbar/Promptbar.tsx
+++ b/src/FE/pages/home/_components/Promptbar/Promptbar.tsx
@@ -1,19 +1,16 @@
import { useContext, useEffect } from 'react';
import toast from 'react-hot-toast';
-import useTranslation from '@/hooks/useTranslation';
-
import { useCreateReducer } from '@/hooks/useCreateReducer';
+import useTranslation from '@/hooks/useTranslation';
import { Prompt, PromptSlim } from '@/types/prompt';
-import { HomeContext } from '@/contexts/Home.context';
-
-import { Prompts } from './components/Prompts';
-import Sidebar from '@/components/Sidebar';
-
+import HomeContext from '../../_contents/Home.context';
+import Sidebar from '../Sidebar/Sidebar';
import PromptbarContext from './PromptBar.context';
-import { PromptbarInitialState, initialState } from './Promptbar.state';
+import { PromptbarInitialState, initialState } from './PromptBar.context';
+import Prompts from './Prompts';
import {
deleteUserPrompts,
@@ -72,7 +69,7 @@ const PromptBar = () => {
const handleUpdatePrompt = (prompt: Prompt) => {
putUserPrompts(prompt.id, prompt).then(() => {
- const existingPrompts = prompts.filter(x => x.id !== prompt.id);
+ const existingPrompts = prompts.filter((x) => x.id !== prompt.id);
homeDispatch({ field: 'prompts', value: [...existingPrompts, prompt] });
toast.success(t('Updated successful'));
});
diff --git a/src/FE/components/Promptbar/components/Prompts.tsx b/src/FE/pages/home/_components/Promptbar/Prompts.tsx
similarity index 76%
rename from src/FE/components/Promptbar/components/Prompts.tsx
rename to src/FE/pages/home/_components/Promptbar/Prompts.tsx
index 8b85569a..54e674c9 100644
--- a/src/FE/components/Promptbar/components/Prompts.tsx
+++ b/src/FE/pages/home/_components/Promptbar/Prompts.tsx
@@ -2,13 +2,13 @@ import { FC } from 'react';
import { PromptSlim } from '@/types/prompt';
-import { PromptComponent } from './Prompt';
+import PromptComponent from './Prompt';
interface Props {
prompts: PromptSlim[];
}
-export const Prompts: FC = ({ prompts }) => {
+const Prompts: FC = ({ prompts }) => {
return (
{prompts
@@ -20,3 +20,4 @@ export const Prompts: FC = ({ prompts }) => {
-
+
+
{webSiteInfo?.filingNumber}
-
- © {new Date().getFullYear()} Chats™ . All Rights Reserved.
-
- {webSiteInfo?.companyName && t(webSiteInfo.companyName)}
-
+ {webSiteInfo?.companyName}
+
+
+ © {new Date().getFullYear()}
+
+ ™ . All Rights Reserved.
+
|