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
4 changes: 2 additions & 2 deletions packages/back/src/data-source.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ConfigService } from '@nestjs/config';
import { config } from 'dotenv';
import { DataSource, DataSourceOptions } from 'typeorm';
import { SeederOptions } from 'typeorm-extension';
import { DataSource, type DataSourceOptions } from 'typeorm';
import type { SeederOptions } from 'typeorm-extension';

config({
path: './configs/env/.dev.env',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ToggleButton } from "@/app/_components";
import { chatRoomMutations } from "@/app/_queries";
import { useMutation } from "@tanstack/react-query";

interface RoomVisibilityToggleProps {
roomId: number;
defaultChecked: boolean;
}
export default function RoomVisibilityToggle({
roomId,
defaultChecked,
}: RoomVisibilityToggleProps) {
const { mutate: patchStatus } = useMutation(
chatRoomMutations.patchStatus(roomId),
);
return (
<ToggleButton
defaultChecked={defaultChecked}
onTurnOn={() => patchStatus({ chatRoomId: roomId, isPublic: true })}
onTurnOff={() => patchStatus({ chatRoomId: roomId, isPublic: false })}
/>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export default function SuspenseChatRoom() {
const finalAiMessage: Message = {
author: "Gemini",
content: fullText,
senderName: user.nickname,
senderProfileImage: user.profileUrl,
senderName: roomInfo.persona.name,
senderProfileImage: roomInfo.persona.image,
userId: user?.userId || "",
};
historyUpdater(finalAiMessage);
Expand Down
17 changes: 16 additions & 1 deletion packages/front/src/app/chat/[id]/_components/SuspenseSideBar.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
"use client";

import { ProfileCard } from "@/app/chat/[id]/_components/";
import {
ProfileCard,
RoomVisibilityToggle,
} from "@/app/chat/[id]/_components/";
import { useSuspenseQuery } from "@tanstack/react-query";
import { IoChatboxEllipses } from "react-icons/io5";
import { chatRoomQueries } from "@/app/_queries";
import { useParams } from "next/navigation";
import { useSuspenseAuth } from "@/app/_hooks";

export default function SuspenseSideBar() {
const { id } = useParams();
const { data: roomInfo } = useSuspenseQuery(
chatRoomQueries.detail(Number(id)),
);
const user = useSuspenseAuth();

return (
<>
<div className="dark:bg-gray-800 dark:border dark:border-r-2 dark:border-gray-700 flex-col py-8 pl-6 pr-2 w-64 bg-white flex-shrink-0 hidden md:flex">
Expand All @@ -25,6 +31,15 @@ export default function SuspenseSideBar() {
name={roomInfo.persona.name}
profileUrl={roomInfo.persona.image}
/>
{user.userId === roomInfo.userId && (
<div className="w-full flex items-center mt-3 flex-col">
<span>채팅방 {roomInfo.isPublic ? "공개" : "비공개"}</span>
<RoomVisibilityToggle
defaultChecked={roomInfo.isPublic}
roomId={roomInfo.id}
/>
</div>
)}
</div>
</>
);
Expand Down
3 changes: 2 additions & 1 deletion packages/front/src/app/chat/[id]/_components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export { default as ChatCard } from "./ChatCard";
export { default as ChatSendForm } from "./ChatSendForm";
export { default as EmptyChatCard } from "./EmptyChatCard";
export { default as ProfileCard } from "./ProfileCard";
export { default as SuspenseSideBar } from "./SuspenseSideBar";
export { default as RoomVisibilityToggle } from "./RoomVisibilityToggle";
export { default as SuspenseChatList } from "./SuspenseChatList";
export { default as SuspenseChatRoom } from "./SuspenseChatRoom";
export { default as SuspenseSideBar } from "./SuspenseSideBar";
1 change: 1 addition & 0 deletions packages/front/src/app/chat/[id]/_hooks/useChat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const useChat = (

newSocket.on("ai-stream-done", (data: { fullText: string }) => {
setIsAiThinking(false);
console.log(data);
options?.onStreamDone?.(data.fullText);
});

Expand Down