Merge pull request #99 from modern-agile-team/feature/chatRenewal/#96

Fix(DongGun/View) : View 삭제

src/apis/chat-dummy/ChattingDummy.ts

@@ -0,0 +1,15 @@
+interface ChatMessage {
+  chatId: string;
+  textMessage: string;
+  createdAt: string;
+  sender: {
+    id: string;
+    name: string;
+    profileImage: string;
+  };
+}
+interface ChatMessageList {
+  roomId: string;
+  contents: ChatMessage[];
+  hasNext: boolean;
+}

src/apis/user.ts

@@ -15,7 +15,7 @@ const USERS = {
   path: '/user',
 
   //유저정보조회api
-  async getUserProfile(): Promise<UserInfo> {
+  async getMyProfile(): Promise<UserInfo> {
     try {
       const result: AxiosResponse = await instance.get(`${USERS.path}/my-info`);
       return result.data;

src/components/molecules/add-friend/AddFriend.tsx

@@ -15,7 +15,7 @@ const AddFriend = (props: User) => {
   const router = useRouter();
   const handleMypage = async () => {
     try {
-      const userInfo = await USERS.getUserProfile();
+      const userInfo = await USERS.getMyProfile();
       const id = userInfo.userId;
       router.push(`/mypage/${id}`);
     } catch (error) {
@@ -24,7 +24,7 @@ const AddFriend = (props: User) => {
   };
   const handleAddFriend = async () => {
     try {
-      const userInfo = await USERS.getUserProfile();
+      const userInfo = await USERS.getMyProfile();
       const currentUserId = userInfo.userId;
       const friendId = props.id;
       if (currentUserId === friendId) {

src/components/molecules/chat-icon/ChatIcon.tsx

@@ -0,0 +1,24 @@
+import React, { useEffect, useState } from 'react';
+import { useRouter } from 'next/router';
+import { useRecoilState, useRecoilValue } from 'recoil';
+import USERS, { UserInfo } from '@/apis/user';
+import { MyProfileAtom } from '@/recoil/atoms/MyProfile';
+
+export const ChatIcon = () => {
+  const [myProfile, setMyprofile] = useRecoilState(MyProfileAtom);
+  const getMyProfile = async () => {
+    const myInfo = await USERS.getMyProfile();
+    setMyprofile(myInfo);
+  };
+  useEffect(() => {
+    getMyProfile();
+  });
+
+  const handleChatPage = () => {
+    const myId = useRecoilValue(MyProfileAtom);
+  };
+
+  return <></>;
+};
+
+export default ChatIcon;

src/components/molecules/chat-list/ChatDMFriendList.tsx

@@ -8,7 +8,7 @@ import { friendInfoState } from '@/recoil/atoms/FriendsAtom';
 interface DMFriendListProps {}
 
 const DMFriendList = ({}: DMFriendListProps) => {
-  const [friendListCollapse, setFriendListCollapse] = useState(false);
+  const [friendListCollapse, setFriendListCollapse] = useState<boolean>(false);
   const friendsData = useRecoilValue(friendInfoState);
   const router = useRouter();
   const collapsibleRef = useRef<HTMLDivElement>(null);

src/components/molecules/chat-list/styles.ts

@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 interface ButtonContainerProps {
-  collapse: boolean;
+  collapse: Boolean;
   onClick: () => void;
 }
 

src/components/molecules/post-comment/PostCreateReComment.tsx

@@ -61,7 +61,7 @@ const PostCreateReComment = ({ commentId }: PostCreateRCommentProps) => {
 
   //본인 정보 받아오는 api 호출
   const getUserInfo = async () => {
-    const response = await USERS.getUserProfile();
+    const response = await USERS.getMyProfile();
     setUserInfo((prev) => {
       return {
         ...prev,

src/components/organisms/chats/chat-space/ChatSpace.tsx

@@ -1,10 +1,8 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import * as S from './styled';
 import DMFriendList from '../../../molecules/chat-list/ChatDMFriendList';
 import DMList from '../../../molecules/chat-list/ChatDMList';
 import Chatting from '../chatting/Chatting';
-// import ChattingRoom from '../chat-room/ChatRoom';
-// import DMList from '../chat-dm/ChatDMList';
 
 const ChatSpace = (): JSX.Element => {
   return (

src/components/organisms/common/floatingbar/FloatingBar.tsx

@@ -35,7 +35,7 @@ const FloatingBar = () => {
 
   const handleGetMyId = async () => {
     try {
-      const response = await USERS.getUserProfile();
+      const response = await USERS.getMyProfile();
       console.log(response);
       setMyInfo(response.userId);
     } catch (error: any) {
@@ -87,18 +87,13 @@ const FloatingBar = () => {
           <MdOutlineSearch />
         </S.FriendSearchIcon>
       </div>
-      {/* <div onClick={friendOnClink}>
-        <UserIcon />
-      </div> */}
       <div onClick={handleMypage}>
         <UserIcon />
       </div>
-
       <S.ChatIcon onClick={handleModal}>
         <IoMdChatbubbles />
       </S.ChatIcon>
       {isOpenModal && <ChatModal show={isOpenModal} hide={handleModal} />}
-
       <S.ScrollButotn>
         <MdKeyboardArrowDown onClick={scrollToBottom} />
       </S.ScrollButotn>

src/components/organisms/friend-list/ListFriend.tsx

@@ -44,18 +44,19 @@ const ListFriend = () => {
 
         if (loginUserId === item.requesterId) {
           friendInfo = {
-            requesterId: item[`${requester}Id`],
-            requesterName: item[requester]?.name || '',
-            requesterImage: item[requester]?.userImage?.imageUrl || '',
+            requesterId: item[`${respondent}Id`],
+            requesterName: item[respondent]?.name || '',
+            requesterImage: item[respondent]?.userImage?.imageUrl || '',
           };
         } else {
           friendInfo = {
-            respondentId: item[`${respondent}Id`],
-            respondentName: item[respondent]?.name || '',
-            respondentImage: item[respondent]?.userImage?.imageUrl || '',
+            respondentId: item[`${requester}Id`],
+            respondentName: item[requester]?.name || '',
+            respondentImage: item[requester]?.userImage?.imageUrl || '',
           };
         }
 
+        console.log(friendInfo);
         return friendInfo;
       });
 
@@ -78,7 +79,7 @@ const ListFriend = () => {
 
     const isConfirmed = window.confirm(
       `${
-        friendToDelete?.respondentId === deletedId
+        friendToDelete?.requesterId === deletedId
           ? friendToDelete?.respondentName
           : friendToDelete?.requesterName
       }님을 친구에서 삭제하시겠습니까?`,

src/components/organisms/post-board/PostBoards.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useState, useRef, useCallback } from 'react';
 import UnitBox from '@/components/molecules/post-board/UnitBox';
 import BOARDS from '@/apis/boards';
-import { Board } from '@/components/veiws/AllPost';
 import * as S from './styled';
+import { Board } from '@/components/templates/post-temp/PostTemplates';
 
 const PostBoards = (props: Board): JSX.Element => {
   const [getList, setGetList] = useState<any>([]);

src/components/organisms/post-unit/PostCreateComments.tsx

@@ -64,7 +64,7 @@ const PostCreateComment = (props: BoardId) => {
 
   //본인 정보 받아오는 api 호출
   const getUserInfo = async () => {
-    const response = await USERS.getUserProfile();
+    const response = await USERS.getMyProfile();
     setUserInfo((prev) => {
       return {
         ...prev,

src/components/templates/chat-temp/ChatPageTemplate.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+
+export interface Me {
+  id: number;
+}
+
+const ChatPageTemplate = () => {
+  return <></>;
+};
+
+export default ChatPageTemplate;

src/components/templates/post-temp/PostTemplates.tsx

@@ -2,14 +2,18 @@ import PostBoardHeader from '../../organisms/post-board/PostBoardHearder';
 import * as S from './styled';
 import PostBoards from '@/components/organisms/post-board/PostBoards';
 import { ContextType, Suspense, useEffect, useState } from 'react';
-import { Board } from '@/components/veiws/AllPost';
 import { useRouter } from 'next/router';
 import PostSearchBoard from '@/components/organisms/post-board/PostSearchBoard';
 import { ParsedUrlQuery } from 'querystring';
 import { IncomingMessage, ServerResponse } from 'http';
 import SEARCH from '@/apis/search';
 import { GetServerSideProps, NextPage } from 'next';
 
+export interface Board {
+  main?: string;
+  totalPage?: number;
+}
+
 const PostBoardTemplates = (props: Board): JSX.Element => {
   const router = useRouter();
   const [queryValue, setQueryValue] = useState('');