Skip to content

Dev 배포용 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soeun-727 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Dev 배포용 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
115cf10
fix: 지도 수정
soeun-727 Jan 24, 2026
ce44400
fix: 불필요한 import 주석처리
soeun-727 Jan 24, 2026
93bf098
fix: 불필요한 import 주석처리
soeun-727 Jan 24, 2026
c4d7cf2
merge: 충돌 해결
soeun-727 Jan 24, 2026
9ff42dd
Merge pull request #61 from 7th-COKERTHON/hotfix/ui-fix
bini0918 Jan 24, 2026
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
7 changes: 5 additions & 2 deletions src/components/modal/InterestModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface Props {
onClose?: () => void;
}

export default function InterestModal({ category, interest, onClose }: Props) {
export default function InterestModal({ category, interest, image, onClose }: Props) {
useEffect(() => {
document.body.style.overflow = 'hidden';
return () => {
Expand Down Expand Up @@ -43,7 +43,10 @@ export default function InterestModal({ category, interest, onClose }: Props) {
}}
onClick={(e) => e.stopPropagation()}
>
<h3 className="typo-heading3 font-bold">{category}</h3>
<div>
<h3 className="typo-heading3 font-bold">{category}</h3>
<img src={image} />
</div>
<div className="flex h-7 px-3 bg-(--gray-200) mt-4 rounded-[100px] items-center">
<p className="justify-center">{interest}</p>
</div>
Expand Down
25 changes: 13 additions & 12 deletions src/pages/MatchingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { useNavigate } from 'react-router-dom';
import SpectrumLabel from '../components/common/SpectrumLabel';
import Comment from '../components/match/Comment';
import Mission from '../components/match/Mission';
import ChatInput from '../components/match/ChatInput';
import InputField from '../components/match/InputField';
// import ChatInput from '../components/match/ChatInput';
// import InputField from '../components/match/InputField';
import Header from '../components/common/Header';
import PictureMissionModal from '../components/modal/PictureMissionModal';
import MissionSuccessModal from '../components/modal/MissionSuccessModal';
Expand All @@ -19,7 +19,8 @@ type MissionData = {

export default function MatchingPage() {
const navigate = useNavigate();
const [inputValues, setInputValues] = useState(['', '', '', '']);

// const [inputValue, setInputValue] = useState('');
const [missions, setMissions] = useState<MissionData[]>([
{ number: 1, isCompleted: true, mission: '미션 1 설명' },
{ number: 2, isCompleted: true, mission: '미션 2 설명' },
Expand All @@ -33,10 +34,10 @@ export default function MatchingPage() {
const [showFinalModal, setShowFinalModal] = useState(false);
const [showRecordModal, setShowRecordModal] = useState(false);

const handleSend = (text: string) => {
console.log('전송:', text);
// 전송 로직 추가
};
// const handleSend = (text: string) => {
// console.log('전송:', text);
// // 전송 로직 추가
// };

const handleMissionClick = (mission: MissionData) => {
if (!mission.isCompleted) {
Expand Down Expand Up @@ -74,11 +75,11 @@ export default function MatchingPage() {
setShowRecordModal(true);
};

const handleInputChange = (index: number, value: string) => {
const nextValues = [...inputValues];
nextValues[index] = value;
setInputValues(nextValues);
};
// const handleInputChange = (index: number, value: string) => {
// const nextValues = [...inputValues];
// nextValues[index] = value;
// setInputValues(nextValues);
// };

return (
<div className="px-[30px] py-6 flex flex-col items-center">
Expand Down