diff --git a/src/assets/icons/no_result_alert.svg b/src/assets/icons/alert.svg similarity index 74% rename from src/assets/icons/no_result_alert.svg rename to src/assets/icons/alert.svg index 4b30753c..8dc2525b 100644 --- a/src/assets/icons/no_result_alert.svg +++ b/src/assets/icons/alert.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/icons/edit.svg b/src/assets/icons/edit.svg index 3ae25e70..144450f5 100644 --- a/src/assets/icons/edit.svg +++ b/src/assets/icons/edit.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/icons/image.svg b/src/assets/icons/image.svg index 2f4debce..696daa79 100644 --- a/src/assets/icons/image.svg +++ b/src/assets/icons/image.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts index f1221708..8463ac85 100644 --- a/src/assets/icons/index.ts +++ b/src/assets/icons/index.ts @@ -22,7 +22,7 @@ export { default as LogoShortIcon } from './logo-short.svg?react' export { default as ReviewAlignIcon } from './review-align.svg?react' export { default as EditIcon } from './edit.svg?react' export { default as LeftSignXIcon } from './left-sign-x.svg?react' -export { default as NoSearchResultIcon } from './no_result_alert.svg?react' +export { default as AlertIcon } from './alert.svg?react' export { default as MultipleCheckIcon } from './multiple-check.svg?react' export { default as DropdownIcon } from './dropdown.svg?react' export { default as HexagonIcon } from './hexagon.svg?react' diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index e6c79cbe..093be99f 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -63,11 +63,11 @@ const Header = memo(({ handleGoBack }: HeaderProps) => {
{darkMode ? ( - + ) : ( )} @@ -77,7 +77,7 @@ const Header = memo(({ handleGoBack }: HeaderProps) => { {user?.path ? ( -
+
my
) : ( diff --git a/src/components/Profile/index.tsx b/src/components/Profile/index.tsx index 2765ed6b..2dbda922 100644 --- a/src/components/Profile/index.tsx +++ b/src/components/Profile/index.tsx @@ -7,7 +7,9 @@ interface ProfileProps { } const Profile = ({ - image = , + image = ( + + ), name, className, }: ProfileProps) => { diff --git a/src/components/UserList/index.tsx b/src/components/UserList/index.tsx index dd8bb92e..b3b14ca0 100644 --- a/src/components/UserList/index.tsx +++ b/src/components/UserList/index.tsx @@ -59,17 +59,15 @@ const UserList = ({ >
handleClick(user.id, user.name)} - className="flex items-center justify-between px-3 py-2 text-sm md:text-lg" + className="flex items-center justify-between px-2 py-2 text-sm md:text-lg" >
{responserCount && responserCount[index] && questionType !== 'PROCEEDING' && ( )} diff --git a/src/pages/CreatedReviewManagePage/components/AllResponseByReceiver/index.tsx b/src/pages/CreatedReviewManagePage/components/AllResponseByReceiver/index.tsx index 2b646c54..fd9b76f6 100644 --- a/src/pages/CreatedReviewManagePage/components/AllResponseByReceiver/index.tsx +++ b/src/pages/CreatedReviewManagePage/components/AllResponseByReceiver/index.tsx @@ -59,12 +59,7 @@ const AllResponseReviewByResponser = ({ /> { - return { - id: receiver.receiverId, - name: receiver.receiverName, - } - })} + users={findUserBySearchKeyword} onClickUser={({ id, name }) => setSelectedUser({ id, name })} responserCount={responseByReceiver?.map( (value) => value.responserCount, diff --git a/src/pages/CreatedReviewManagePage/components/AllResponseByResponser/index.tsx b/src/pages/CreatedReviewManagePage/components/AllResponseByResponser/index.tsx index ffd0f90b..30c1d20d 100644 --- a/src/pages/CreatedReviewManagePage/components/AllResponseByResponser/index.tsx +++ b/src/pages/CreatedReviewManagePage/components/AllResponseByResponser/index.tsx @@ -18,6 +18,7 @@ const AllResponseReviewByResponser = ({ const { data: responseByResponser } = useGetAllResponseByResponser({ reviewId, }).data || { data: [] } + const [sortState, setSortState] = useState(false) const [keyword, setKeyword] = useState('') const [filteredUsers, setFilteredUsers] = useState( responseByResponser.sort((a, b) => a.user.name.localeCompare(b.user.name)), @@ -36,12 +37,22 @@ const AllResponseReviewByResponser = ({ } const sortByName = () => { - setFilteredUsers( - () => - [...filteredUsers]?.sort((a, b) => - a.user.name.localeCompare(b.user.name), - ), - ) + if (sortState) { + setFilteredUsers( + () => + [...filteredUsers]?.sort((a, b) => + a.user.name.localeCompare(b.user.name), + ), + ) + } else { + setFilteredUsers( + () => + [...filteredUsers]?.sort((a, b) => + b.user.name.localeCompare(a.user.name), + ), + ) + } + setSortState((prevState) => !prevState) } const sortByResponse = () => { diff --git a/src/pages/CreatedReviewManagePage/components/AnswerGroup/RenderRefinedSubjective.tsx b/src/pages/CreatedReviewManagePage/components/AnswerGroup/RenderRefinedSubjective.tsx index 2835cd38..fb0b5dd9 100644 --- a/src/pages/CreatedReviewManagePage/components/AnswerGroup/RenderRefinedSubjective.tsx +++ b/src/pages/CreatedReviewManagePage/components/AnswerGroup/RenderRefinedSubjective.tsx @@ -12,20 +12,22 @@ const RenderRefinedSubjective = ({ text }: RenderRefinedSubjectiveProps) => { const { handleChangePrompt, handleRefine } = handlers return ( -
+
{isLoading && (
)} +

⭐ 전송될 취합 답변:

+ -
+
(

{value.userName}

-

+

-

+
) @@ -81,10 +81,10 @@ const renderResponseByQuestion = ( role?: 'responser' | 'receiver', ) => (
-
+
{(() => { switch (questionType) { case 'RATING': @@ -115,25 +115,33 @@ const QuestionAnswerRenderer = ({ const [inputId] = useState(nanoid()) return ( -
- +
+
) } diff --git a/src/pages/CreatedReviewManagePage/components/NotFoundSearchUser/index.tsx b/src/pages/CreatedReviewManagePage/components/NotFoundSearchUser/index.tsx index 379c13cb..bbddca76 100644 --- a/src/pages/CreatedReviewManagePage/components/NotFoundSearchUser/index.tsx +++ b/src/pages/CreatedReviewManagePage/components/NotFoundSearchUser/index.tsx @@ -1,9 +1,9 @@ -import { NoSearchResultIcon } from '@/assets/icons' +import { AlertIcon } from '@/assets/icons' const NotFoundUser = () => { return (
- +

검색 결과가 없다!

) diff --git a/src/pages/CreatedReviewManagePage/components/ReceiverTabReviewDatail/index.tsx b/src/pages/CreatedReviewManagePage/components/ReceiverTabReviewDatail/index.tsx index 321c106a..88b6fd60 100644 --- a/src/pages/CreatedReviewManagePage/components/ReceiverTabReviewDatail/index.tsx +++ b/src/pages/CreatedReviewManagePage/components/ReceiverTabReviewDatail/index.tsx @@ -128,8 +128,8 @@ const ReceiverReviewDetail = ({ return ( <> - -
+ +
-
+
+
+
{getReviewQuestion?.questions?.map((question) => ( - -
+ +