+ 요청하신 페이지를 찾는 중
+ 오류가 발생했습니다.
+
+
+
+
- 요청하신 페이지를 찾는 중
- 오류가 발생했습니다.
-
-
-
- + 요청하신 페이지를 찾는 중
+
-
- {blackMember.profilePicture ? (
+
- }
- >
+
+ {blackMember.receiverProfilePicture ? (
) : (
diff --git a/src/components/home/autoMatching/index.tsx b/src/components/home/autoMatching/index.tsx
index 3135267..f3a34a5 100644
--- a/src/components/home/autoMatching/index.tsx
+++ b/src/components/home/autoMatching/index.tsx
@@ -16,10 +16,10 @@ import { useToast } from '@/contexts/ToastContext';
import useLocationStore from '@/store/useLocationStore';
import startAutoMatching from '@/libs/apis/matching/startAutoMatching.api';
import useSSEStore from '@/store/useSSEStore';
-import SpinnerIcon from '@/assets/icon/spinnerIcon.svg?react';
import { useNavigate } from 'react-router-dom';
import axios from 'axios';
import useRequestStatus from '@/hooks/useRequestStatus';
+import InviteMembersLoading from '@/components/loading/InviteMembersLoading';
const AutoMatching = ({ isOpen }: { isOpen: boolean }) => {
const {
@@ -180,17 +180,7 @@ const AutoMatching = ({ isOpen }: { isOpen: boolean }) => {
{tags.map((tag) => {
@@ -7,7 +14,7 @@ const Tags = ({ tags }: { tags: string[] }) => {
key={tag}
className="text-assistive min-w-fit text-black font-medium px-3 py-1 rounded-full bg-primary"
>
- # {tag}
+ # {showLabel(tag)}
);
})}
diff --git a/src/components/home/manualMatching/matchingInfoItem/index.tsx b/src/components/home/manualMatching/matchingInfoItem/index.tsx
index d803a0f..f1e55f2 100644
--- a/src/components/home/manualMatching/matchingInfoItem/index.tsx
+++ b/src/components/home/manualMatching/matchingInfoItem/index.tsx
@@ -90,7 +90,7 @@ const MatchingInfoItem = ({
)}
diff --git a/src/components/loading/InviteMembersLoading.tsx b/src/components/loading/InviteMembersLoading.tsx
new file mode 100644
index 0000000..7566eac
--- /dev/null
+++ b/src/components/loading/InviteMembersLoading.tsx
@@ -0,0 +1,11 @@
+import SpinnerIcon from '@/assets/icon/spinnerIcon.svg?react';
+
+const InviteMembersLoading = () => {
+ return (
+ >({
@@ -94,13 +94,7 @@ const ManualMatchingRegister = () => {
-
- }
- >
+ 추가 멘트 : - {manualInfo.description} + {manualInfo.description ? manualInfo.description : 'X'}
+
+ );
+};
+
+export default InviteMembersLoading;
diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx
index 04f9349..1a4dcbe 100644
--- a/src/components/modal/index.tsx
+++ b/src/components/modal/index.tsx
@@ -20,7 +20,7 @@ export const Modal = ({ children }: ModalProps) => {
type: 'keyframes',
}}
role="dialog"
- className="flex flex-col gap-[16px] p-[16px] h-fit max-w-[430px] w-full z-[1000] bg-secondary absolute left-1/2 -translate-x-1/2 bottom-0 rounded-t-box text-white"
+ className="flex flex-col gap-[16px] p-[16px] h-fit max-w-[430px] w-full z-[1000] bg-secondary fixed left-1/2 -translate-x-1/2 bottom-0 rounded-t-box text-white"
>
{children}
,
diff --git a/src/pages/manual-register/index.tsx b/src/pages/manual-register/index.tsx
index 53d4118..d4c05cc 100644
--- a/src/pages/manual-register/index.tsx
+++ b/src/pages/manual-register/index.tsx
@@ -18,11 +18,11 @@ import { formatTimeToSelect } from '@/utils';
import TimeSelect from '@/components/manual-register/timeSelect';
import { useToast } from '@/contexts/ToastContext';
import { useNavigate } from 'react-router-dom';
-import SpinnerIcon from '@/assets/icon/spinnerIcon.svg?react';
import useSheetStore from '@/store/useSheetStore';
import createManualMatchingRoom from '@/libs/apis/manual/createManualMatchingRoom.api';
import axios from 'axios';
import { Suspense } from 'react';
+import InviteMembersLoading from '@/components/loading/InviteMembersLoading';
const ManualMatchingRegister = () => {
const manualMatchingForm = useForm