@@ -207,4 +297,4 @@ const Card: React.FC = ({ cardData, colorWay, isFront, onAccept, onRe
};
-export default SwipeCards;
+export default SwipeCards;
\ No newline at end of file
diff --git a/app/chatbot/page.tsx b/app/chatbot/page.tsx
index 6c5624c..4be1b08 100644
--- a/app/chatbot/page.tsx
+++ b/app/chatbot/page.tsx
@@ -4,17 +4,24 @@ import { useState, useEffect, useRef, useCallback } from "react";
import { useSearchParams, useRouter } from "next/navigation";
import ChatInput from "../utils/component/ui/ChatInput";
import MessageWindow from "../utils/component/ui/MessageWindow";
-import { ChatHistory, ChatSetting, Message , MessageRole } from "@/app/exportType/types";
+import { ChatHistory, ChatSetting, Message, MessageRole } from "@/app/exportType/types";
-export default function Home(){
+export default function Home() {
const [history, setHistory] = useState([])
const [loading, setLoading] = useState(false);
const historyRef = useRef([]); // Create a ref for history
const [settings] = useState({
+<<<<<<< HEAD
temperature:1,
model:"gemini-2.5-pro",
systemInstruction:"you are a ai helper. Your goal is to expand the project idea and interact with the user on any problem or question they have with the project. You are not allow to code the project for them and stray away from your job"
+=======
+ temperature: 1,
+ model: "gemini-2.5-pro",
+ sysTemInstructions: "you are a ai helper. Your goal is to expand the project idea and interact with the user on any problem or question they have with the project. You are not allow to code the project for them and stray away from your job"
+
+>>>>>>> ce9e6f34ed31b7bff736cc9ba9a1b8dcdec85f3a
});
const router = useRouter();
const searchParams = useSearchParams();
@@ -24,23 +31,27 @@ export default function Home(){
historyRef.current = history; // Keep the ref updated with the latest history
}, [history]);
- const handleSend = useCallback(async(message:string)=>{
- const newUserMessage:Message = {
- role:"user",
- parts:[{text:message}],
+ const handleSend = useCallback(async (message: string) => {
+ const newUserMessage: Message = {
+ role: "user",
+ parts: [{ text: message }],
};
setHistory(prevHistory => {
const currentHistory = [...prevHistory, newUserMessage];
-
+
const sendApiRequest = async () => {
+<<<<<<< HEAD
setLoading(true);
try{
+=======
+ try {
+>>>>>>> ce9e6f34ed31b7bff736cc9ba9a1b8dcdec85f3a
const response = await fetch("/api/chat", {
method: "POST",
headers: {
- "Content-Type": "application/json",
- },
+ "Content-Type": "application/json",
+ },
body: JSON.stringify({
userMessage: message,
history: historyRef.current, // Use the ref for history
@@ -62,8 +73,8 @@ export default function Home(){
};
setHistory(prevHistory => [...prevHistory, aiMessage]);
-
- }
+
+ }
catch (error) {
console.error("Request Failed:", error);
}
@@ -82,7 +93,7 @@ export default function Home(){
if (title && summary) {
const message = `Explain the project titled '${title}' with the summary '${summary}' in detail, and suggest suitable roles for a team working on it.`;
-
+
const newUserMessage: Message = {
role: "user",
parts: [{ text: message }],
@@ -136,6 +147,7 @@ export default function Home(){
return (
@@ -42,14 +51,15 @@ export default function MessageWindow({history, isLoading}:MessageWindowProps){
{part.text}))}
- {isUser && (
-
-
-
+ {isUser && (
+
+
+
+
-
- )}
+ )}
+<<<<<<< HEAD
);
})}
@@ -69,7 +79,14 @@ export default function MessageWindow({history, isLoading}:MessageWindowProps){
)}
{/* Invisible element to help scroll to bottom */}
+=======
+ );
+ })}
+
+ {/* Invisible element to help scroll to bottom */}
+
+
+>>>>>>> ce9e6f34ed31b7bff736cc9ba9a1b8dcdec85f3a
-
);
}
\ No newline at end of file
diff --git a/app/utils/geminiHelper.ts b/app/utils/geminiHelper.ts
index 3a78f30..741f563 100644
--- a/app/utils/geminiHelper.ts
+++ b/app/utils/geminiHelper.ts
@@ -1,15 +1,16 @@
import { GoogleGenerativeAI } from "@google/generative-ai";
-import { ChatHistory, GenerateConfig,ChatSetting } from "../exportType/types";
+import { ChatHistory, GenerateConfig, ChatSetting } from "../exportType/types";
const apiKey = process.env.GEMINI_API_KEY;
-if(!apiKey){
+if (!apiKey) {
throw new Error("api key not found");
}
const genAI = new GoogleGenerativeAI(apiKey);
export async function chatToGemini(
+<<<<<<< HEAD
userMessage:string ,
history:ChatHistory,
settings:ChatSetting
@@ -25,18 +26,35 @@ export async function chatToGemini(
responseMimeType: "text/plain",
maxOutputTokens: 1900, // Increased to allow for longer responses
}
+=======
+ userMessage: string,
+ history: ChatHistory,
+ settings: ChatSetting
+): Promise {
+ const model = genAI.getGenerativeModel({
+ model: settings.model || "gemini-2.5-flash",
+ systemInstruction: settings.sysTemInstructions || "you are going to create a project idea, explain it in summery first before going to detail",
+ });
+>>>>>>> ce9e6f34ed31b7bff736cc9ba9a1b8dcdec85f3a
- const chatSession = model.startChat({
- generationConfig,
- history
- })
+ const generationConfig: GenerateConfig = {
+ temperature: settings.temperature || 1,
+ topP: 0.9,
+ responseMimeType: "text/plain",
+ maxOutputTokens: 1900, // Increased to allow for longer responses
+ }
- try {
- const result = await chatSession.sendMessage(userMessage);
- return result.response.text();
- }
- catch(error){
- console.error(error)
- throw error
- }
- }
\ No newline at end of file
+ const chatSession = model.startChat({
+ generationConfig,
+ history
+ })
+
+ try {
+ const result = await chatSession.sendMessage(userMessage);
+ return result.response.text();
+ }
+ catch (error) {
+ console.error(error)
+ throw error
+ }
+}
\ No newline at end of file
diff --git a/components/ProtectedNavButton.tsx b/components/ProtectedNavButton.tsx
deleted file mode 100644
index 34fa0e7..0000000
--- a/components/ProtectedNavButton.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-"use client";
-
-import React from "react";
-import { useRouter } from "next/navigation";
-
-export default function ProtectedNavButton({
- children = "Go to Dashboard",
- className = "mt-4 inline-block w-fit px-6 py-3 bg-blue-600 hover:bg-blue-700 text-white font-medium rounded-md shadow-md transition-colors",
-}: {
- children?: React.ReactNode;
- className?: string;
-}) {
- const router = useRouter();
-
- const handleClick = () => {
- // Simple client-side auth check.
- // Assumption: if localStorage has 'token' (or 'auth'), user is signed in.
- // Adjust key to match your real auth storage (cookie, localStorage key, etc.).
- const token = typeof window !== "undefined" ? localStorage.getItem("token") : null;
-
- if (token) {
- router.push("/dashboard");
- } else {
- router.push("/auth/login");
- }
- };
-
- return (
-
- );
-}