Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/pages/Chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,6 @@ const Chat = () => {

const searchInputRef = useRef<HTMLInputElement>(null);

useChatShortcuts({
searchInputRef,
items: filteredUsers,
selectedItem: selectedUser,
onSelect: selectUser,
onEscape: () => setShowConversationList(true),
getItemId: (user) => user.id,
});

const messagesEndRef = useRef<HTMLDivElement | null>(null);
const typingTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
Expand Down Expand Up @@ -432,6 +424,15 @@ const Chat = () => {
setTypingUserId(null);
}, []);

useChatShortcuts({
searchInputRef,
items: filteredUsers,
selectedItem: selectedUser,
onSelect: selectUser,
onEscape: () => setShowConversationList(true),
getItemId: (user) => user.id,
});

if (!currentUser) {
return (
<main className="flex min-h-[calc(100vh-4rem)] items-center justify-center bg-slate-950 px-4 text-white">
Expand Down
22 changes: 13 additions & 9 deletions src/pages/aipage.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useState } from "react";
import { Bot, Send, User } from "lucide-react";
import { supabase } from "@/integrations/supabase/client";
import { API_BASE_URL } from "@/config/api";

interface Message {
role: "user" | "assistant";
content: string;
}

const AIPage = () => {
const [messages, setMessages] = useState<any[]>([
const [messages, setMessages] = useState<Message[]>([
{
role: "assistant",
content:
Expand All @@ -22,12 +26,12 @@ const AIPage = () => {
const prompt = input;

// USER MESSAGE
const userMessage = {
const userMessage: Message = {
role: "user",
content: prompt,
};

setMessages((prev: any) => [
setMessages((prev) => [
...prev,
userMessage,
]);
Expand All @@ -38,7 +42,7 @@ const AIPage = () => {
try {
const { data: { session } } = await supabase.auth.getSession();
if (!session) {
setMessages((prev: any) => [
setMessages((prev) => [
...prev,
{
role: "assistant",
Expand All @@ -49,7 +53,7 @@ const AIPage = () => {
return;
}

const formattedMessages = [...messages, userMessage].map((msg: any) => ({
const formattedMessages = [...messages, userMessage].map((msg) => ({
role: msg.role,
content: msg.content,
}));
Expand All @@ -73,7 +77,7 @@ const AIPage = () => {
const data = await res.json();
const aiReply = data?.answer;

setMessages((prev: any) => [
setMessages((prev) => [
...prev,
{
role: "assistant",
Expand All @@ -82,7 +86,7 @@ const AIPage = () => {
]);
} catch (error) {
console.error(error);
setMessages((prev: any) => [
setMessages((prev) => [
...prev,
{
role: "assistant",
Expand Down Expand Up @@ -142,7 +146,7 @@ const AIPage = () => {

{/* MESSAGES LAYER */}
<div className="flex-1 overflow-y-auto p-5 space-y-5">
{messages.map((msg: any, index: number) => {
{messages.map((msg, index: number) => {
const isUser = msg.role === "user";

return (
Expand Down
Loading