Skip to content

Commit b12a58b

Browse files
authored
Merge pull request #52 from KWcapstone/41-feat-새소식-구현
Fix: 자잘한 오류 수정
2 parents c8f7223 + 194c73e commit b12a58b

File tree

2 files changed

+42
-10
lines changed

2 files changed

+42
-10
lines changed

src/views/main/components/News.tsx

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const News = ({ onCloseModal }: NewsProps) => {
3737
date: "2025-03-16T08:17:28.000+00:00",
3838
},
3939
userName: "최세연",
40-
title: "New Feature Update!",
40+
title: "최세연님, 새로운 기능이 추가되었습니다!",
4141
isRead: true,
4242
},
4343
{
@@ -46,7 +46,32 @@ const News = ({ onCloseModal }: NewsProps) => {
4646
date: "2025-03-16T08:17:28.000+00:00",
4747
},
4848
userName: "임서연",
49-
title: "Welcome to Moaba!",
49+
title: "임서연님, Moaba에 오신 것을 환영합니다!",
50+
isRead: false,
51+
},
52+
],
53+
};
54+
55+
const newsResponse1 = {
56+
status: 200,
57+
message: "모든 알림을 조회합니다.",
58+
data: [
59+
{
60+
noticeId: {
61+
timestamp: 1742113048,
62+
date: "2025-03-16T08:17:28.000+00:00",
63+
},
64+
userName: "강현구",
65+
title: "강현구님, 새로운 기능이 추가되었습니다!",
66+
isRead: true,
67+
},
68+
{
69+
noticeId: {
70+
timestamp: 1742113048,
71+
date: "2025-03-16T08:17:28.000+00:00",
72+
},
73+
userName: "오은진",
74+
title: "오은진님, Moaba에 오신 것을 환영합니다!",
5075
isRead: false,
5176
},
5277
],
@@ -77,11 +102,19 @@ const News = ({ onCloseModal }: NewsProps) => {
77102
</div>
78103
<div className="right">모두 읽음으로 표시</div>
79104
</div>
80-
<div className="news-content">
81-
{newsResponse.data.map((item) => (
82-
<NewsItem key={item.noticeId.timestamp} data={item} />
83-
))}
84-
</div>
105+
{newsView === "all" ? (
106+
<div className="news-content">
107+
{newsResponse.data.map((item) => (
108+
<NewsItem key={item.noticeId.timestamp} data={item} />
109+
))}
110+
</div>
111+
) : (
112+
<div className="news-content">
113+
{newsResponse1.data.map((item) => (
114+
<NewsItem key={item.noticeId.timestamp} data={item} />
115+
))}
116+
</div>
117+
)}
85118
</div>
86119
);
87120
};

src/views/meeting/components/MindMapComponent.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ const MindMapComponent = ({
329329

330330
// 3) 전체 스크립트 합치기
331331
const fullScript = allScripts.join(" ");
332-
console.log("fullScript:", fullScript);
332+
console.log("fullScript: ", fullScript);
333333

334334
// 4) 단일 FormData 로 전송
335335
const form = new FormData();
@@ -342,13 +342,12 @@ const MindMapComponent = ({
342342
form.append("status", "Done");
343343

344344
console.time("[stopClick] upload");
345+
toggleListening();
345346
const res = await endMeeting(form);
346347
console.timeEnd("[stopClick] upload");
347348
console.log("[stopClick] upload ok:", res);
348349
// endMeeting는 multipart/form-data로 보낸다고 가정
349350
// (axios라면 headers는 자동 세팅됨)
350-
351-
toggleListening();
352351
} catch (err) {
353352
console.error("stopClick failed:", err);
354353
}

0 commit comments

Comments
 (0)