Merge pull request #79 from SynclyProject/feat/47

refactor : 폴더 생성 input 코드 수정, 채팅 시간 수정

Author: 202110861

Syncly/src/components/Files/AddFile.tsx

@@ -96,7 +96,7 @@ const AddFile = ({
       //s3 업로드 코드 작성
       const s3Response = await axios.put(response.result.presignedUrl, e, {
         headers: {
-          "Content-Type": e.type,
+          "Content-Type": response.result.contentType,
         },
       });
       console.log("s3Response", s3Response);

Syncly/src/components/Files/FileList.tsx

@@ -146,6 +146,15 @@ const FileList = ({
           {noDataMessage}
         </p>
       )}
+      {showInput && (
+        <FileInput
+          type="folder"
+          user={"userProfile"}
+          onAdd={handleAddFolder}
+          onCancel={() => setShowInput(false)}
+          folderListRefetch={folderListRefetch}
+        />
+      )}
     </div>
   );
 };

Syncly/src/components/Screen/Chat.tsx

@@ -25,7 +25,9 @@ const Chat = ({
   hideProfile,
 }: IChatProps) => {
   const profileImageUrl = useShowImage(profile);
-
+  const hour = Number(time.split(":")[0]) + 9;
+  const minute = Number(time.split(":")[1]).toString().padStart(2, "0");
+  const convertedTime = `${hour}:${minute}`;
   return (
     <div className="flex flex-col gap-2">
       {!hideDate && (
@@ -39,7 +41,7 @@ const Chat = ({
         <div className="flex flex-col gap-2 items-end">
           <div className="flex gap-2 items-end">
             {!hideTime && (
-              <span className="text-sm text-[#828282]">{time}</span>
+              <span className="text-sm text-[#828282]">{convertedTime}</span>
             )}
             <p className="text-xs text-white max-w-[200px] flex gap-2 justify-center items-center px-4 py-3 bg-[#456990] rounded-tl-[16px] rounded-tr-[16px] rounded-br-[4px] rounded-bl-[16px]">
               {message}
@@ -69,7 +71,7 @@ const Chat = ({
               {message}
             </p>
             {!hideTime && (
-              <span className="text-sm text-[#828282]">{time}</span>
+              <span className="text-sm text-[#828282]">{convertedTime}</span>
             )}
           </div>
         </div>

Syncly/src/components/alarm/TeamInviteModel.tsx

@@ -90,6 +90,7 @@ const TeamInviteModel: React.FC<TeamInviteModelProps> = ({
                 email={member.memberEmail}
                 spaceId={spaceId}
                 memberId={member.workspaceMemberId}
+                memberObjectKey={member.memberObjectKey}
               />
             ))}
           </div>

Syncly/src/components/alarm/TeamMemberCard.tsx

@@ -2,6 +2,8 @@ import React, { useState } from "react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { GetSpaceRole } from "../../shared/api/WorkSpace/get";
 import { DeleteSpaceKick } from "../../shared/api/WorkSpace/delete";
+import Icon from "../../shared/ui/Icon";
+import { useShowImage } from "../../hooks/useShowImage";
 
 interface TeamMemberCardProps {
   name: string;
@@ -10,6 +12,7 @@ interface TeamMemberCardProps {
   spaceId: number;
   memberId: number;
   showMenu?: boolean;
+  memberObjectKey: string;
 }
 
 const TeamMemberCard: React.FC<TeamMemberCardProps> = ({
@@ -19,6 +22,7 @@ const TeamMemberCard: React.FC<TeamMemberCardProps> = ({
   showMenu = true,
   spaceId,
   memberId,
+  memberObjectKey,
 }) => {
   const [showModal, setShowModal] = useState(false);
 
@@ -36,17 +40,24 @@ const TeamMemberCard: React.FC<TeamMemberCardProps> = ({
       window.location.reload();
     },
   });
+  const profileImageUrl = useShowImage(memberObjectKey);
 
   return (
     <div className="w-full flex items-center border-t border-zinc-200 bg-white px-4 py-2">
       {/* 프로필 + 이름/역할 */}
-      <div className="flex w-1/2 items-center gap-2">
+      <div className="flex w-1/2 items-center gap-3">
         {/* 프로필 이미지 */}
-        <div className="w-10 h-10 bg-slate-100 rounded-full flex justify-center items-center">
-          <div className="w-6 h-6 relative overflow-hidden">
-            <div className="w-3.5 h-5 left-[5px] top-[2px] absolute bg-neutral-300" />
+        {profileImageUrl ? (
+          <img
+            src={profileImageUrl}
+            alt="profile"
+            className="w-[32px] h-[32px] rounded-full"
+          />
+        ) : (
+          <div className="w-[32px] h-[32px] rounded-full flex justify-center items-center">
+            <Icon name="User_Default" rounded={true} />
           </div>
-        </div>
+        )}
 
         {/* 이름 + 역할 */}
         <div className="flex flex-col justify-center">

Syncly/src/shared/type/teamSpaceType.ts

@@ -12,6 +12,7 @@ export type TTeamMember = {
   memberName: string;
   role: string;
   workspaceMemberId: number;
+  memberObjectKey: string;
 };
 
 export type TInvite = {