Skip to content

Commit 32c8be8

Browse files
authored
Merge pull request #55 from KWcapstone/41-feat-새소식-구현
Fix: 빌드 에러 수정 #41
2 parents 6943c67 + ddd7b28 commit 32c8be8

File tree

3 files changed

+37
-3
lines changed

3 files changed

+37
-3
lines changed

src/views/main/components/SideBar.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ const SideBar = ({ haveUnreadNews, setHaveUnreadNews }: sideBarPropsOfNews) => {
9494

9595
console.log("All News:", allNews);
9696
console.log("Unread News:", unreadNews);
97-
9897
let message = "";
9998
if (allNews.length == 0) {
10099
message = "소식이 없습니다.";

src/views/main/page/RecordPage.tsx

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import arrowDown from "@/assets/imgs/icon/arrow_down_black.svg";
66
// api
77
import { getSearch } from "@/api/common/common";
88
import { getRecord } from "@/api/main/record";
9+
import { getNewsNum } from "@/api/main/news";
910

1011
// component
1112
import SideBar from "@/views/main/components/SideBar";
@@ -26,6 +27,7 @@ const RecordPage = () => {
2627
const [isCheck, setIsCheck] = useState<boolean>(false);
2728
const [checkCount, setCheckCount] = useState<number>(0);
2829
const [record, setRecord] = useState<Array<recordData>>([]);
30+
const [isHavedUnreadNews, setIsHaveUnreadNews] = useState<boolean>(false);
2931
const orderRef = useRef<HTMLDivElement | null>(null);
3032

3133
// 전체 선택 여부 체크
@@ -128,9 +130,24 @@ const RecordPage = () => {
128130
};
129131
}, []);
130132

133+
useEffect(() => {
134+
getNewsNum().then((res: any) => {
135+
if (res.data.data.num > 0) {
136+
setIsHaveUnreadNews(true);
137+
} else {
138+
setIsHaveUnreadNews(false);
139+
}
140+
141+
console.log("Unread News Num:", res.data.data.num);
142+
});
143+
}, []);
144+
131145
return (
132146
<div className="main">
133-
<SideBar />
147+
<SideBar
148+
haveUnreadNews={isHavedUnreadNews}
149+
setHaveUnreadNews={setIsHaveUnreadNews}
150+
/>
134151
<div className="record-wrap">
135152
<div className="nevigation-wrap">
136153
<div className="title-wrap">

src/views/main/page/SummaryPage.tsx

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import arrowDown from "@/assets/imgs/icon/arrow_down_black.svg";
55

66
// utils
77
import { downloadAs } from "@/utils/download";
8+
89
// api
910
import { getSearch } from "@/api/common/common";
1011
import { getSummary } from "@/api/main/summary";
1112
import { getFileDwn } from "@/api/main/fileDwn";
13+
import { getNewsNum } from "@/api/main/news";
1214

1315
// component
1416
import SideBar from "@/views/main/components/SideBar";
@@ -29,6 +31,7 @@ const SummaryPage = () => {
2931
const [isCheck, setIsCheck] = useState<boolean>(false);
3032
const [checkCount, setCheckCount] = useState<number>(0);
3133
const [summary, setSummary] = useState<Array<summaryData>>([]);
34+
const [isHavedUnreadNews, setIsHaveUnreadNews] = useState<boolean>(false);
3235
const orderRef = useRef<HTMLDivElement | null>(null);
3336

3437
// 전체 선택 여부 체크
@@ -120,9 +123,24 @@ const SummaryPage = () => {
120123
};
121124
}, []);
122125

126+
useEffect(() => {
127+
getNewsNum().then((res: any) => {
128+
if (res.data.data.num > 0) {
129+
setIsHaveUnreadNews(true);
130+
} else {
131+
setIsHaveUnreadNews(false);
132+
}
133+
134+
console.log("Unread News Num:", res.data.data.num);
135+
});
136+
}, []);
137+
123138
return (
124139
<div className="main">
125-
<SideBar />
140+
<SideBar
141+
haveUnreadNews={isHavedUnreadNews}
142+
setHaveUnreadNews={setIsHaveUnreadNews}
143+
/>
126144
<div className="summary-wrap">
127145
<div className="nevigation-wrap">
128146
<div className="title-wrap">

0 commit comments

Comments
 (0)