Skip to content

Commit 55cb94d

Browse files
committed
Fix: delete feed like count and add main api page size
1 parent 852d6b4 commit 55cb94d

3 files changed

Lines changed: 31 additions & 22 deletions

File tree

src/components/feeds/FeedCard.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, {useEffect, useRef, useState} from 'react';
1+
import React, {useRef, useState} from 'react';
22
import {Link, useNavigate} from 'react-router-dom';
33
import { JSX } from 'react/jsx-runtime';
44
import Image from '@components/Image.tsx';
@@ -38,19 +38,19 @@ function FeedCard({id, userId, title, content, thumbnailUrl, createdDate, nickna
3838
const myID = authControl.getUserIdFromToken();
3939
const myuser = myID === userId;
4040

41-
const [likes, setLikes] = useState<number>(0);
42-
const {like, likeCount, setLike} = useLikeQuery(id => `/api/v1/feed/${id}/like`, id, likes, isLiked);
41+
// const [likes, setLikes] = useState<number>(0);
42+
const {like, /*likeCount,*/ setLike} = useLikeQuery(id => `/api/v1/feed/${id}/like`, id, /*likes*/0, isLiked);
4343

4444
const {data, setReqParams, hideData} = useInfScroll4Widget(`/api/v1/feed/${id}/comment`, 'comments', infScrollRef, dummy, {page: 0});
4545
const {isAvailableUser, fixedNickname, fixedPositionLevel} = useUserInfo(nickname, positionLevel);
4646
const isMobile = useWindowSizeStore(state => state.isMobile);
4747

48-
useEffect(() => {
49-
Api.fetch(`/api/v1/feed/${id}/like`)
50-
.then(res => res?.text())
51-
.then(count => setLikes(isNaN(Number(count)) ? -1 : Number(count)))
52-
.catch(() => setLikes(-1));
53-
}, [id]);
48+
// useEffect(() => {
49+
// Api.fetch(`/api/v1/feed/${id}/like`)
50+
// .then(res => res?.text())
51+
// .then(count => setLikes(isNaN(Number(count)) ? -1 : Number(count)))
52+
// .catch(() => setLikes(-1));
53+
// }, [id]);
5454

5555

5656
function clickLike() {
@@ -130,9 +130,9 @@ function FeedCard({id, userId, title, content, thumbnailUrl, createdDate, nickna
130130
<Like enable={like} width={24} height={24}/>
131131
{!isMobile && (
132132
<>
133-
<span className=''>
134-
{likeCount}
135-
</span>
133+
{/*<span className=''>*/}
134+
{/* {likeCount}*/}
135+
{/*</span>*/}
136136
좋아요
137137
</>
138138
)}

src/pages/MainPage/MainPage.tsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ import {
3131
} from '../../dummies/dummyData.ts';
3232
import RecommendJobs from '@components/jobs/RecommendJobs.tsx';
3333

34+
35+
const ENTERPRISE_SIZE = 3;
36+
const PERSONAL_SIZE = 3;
37+
const MENTEE_SIZE = 4;
38+
const FEED_SIZE = 3;
39+
const MENTOR_SIZE = 3;
40+
3441
// Todo: 컴포넌트 단위로 분리하자
3542
// Todo: 리스트 API 정리해서 일관하도록 만들기 - tanstack/react-query 사용
3643
function MainPage() {
@@ -41,7 +48,7 @@ function MainPage() {
4148
const mentoringPopup = useMentoringPopup(mentorings.mentoringSearchResponses);
4249

4350
useEffect(() => {
44-
Api.fetch2Json('/api/v1/mentorings?page=0')
51+
Api.fetch2Json(`/api/v1/mentorings?page=0&size=${MENTOR_SIZE}`)
4552
.then((data) => {
4653
setMentorings(data);
4754
}).catch((err) => {
@@ -157,7 +164,7 @@ function MainPage() {
157164
<p>멘토가 없습니다</p>
158165
</div>
159166
) :
160-
mentorings.mentoringSearchResponses.slice(0, 3).map((mentor: IMentoring | null | undefined) => mentor && (
167+
mentorings.mentoringSearchResponses.slice(0, MENTOR_SIZE).map((mentor: IMentoring | null | undefined) => mentor && (
161168
<MentorCard key={mentor.mentoringId}
162169
{...mentor}
163170
setLoginDialog={setIsLoginDialogOpen}/>
@@ -208,7 +215,7 @@ function EnterPriseList({setIsLoginDialogOpen}: IDataList) {
208215
const [projects, setProjects] = useState<IProjectList>(InitProject);
209216

210217
useEffect(() => {
211-
Api.fetch2Json('/api/v1/list/team?type=0&page=0')
218+
Api.fetch2Json(`/api/v1/list/team?type=0&page=0&size=${ENTERPRISE_SIZE}`)
212219
.then((data) => setProjects(data))
213220
.catch((err) => {
214221
console.error(err);
@@ -224,7 +231,7 @@ function EnterPriseList({setIsLoginDialogOpen}: IDataList) {
224231
<p>프로젝트가 없습니다</p>
225232
</div>
226233
) :
227-
projects.teamSearchResponseList.slice(0, 3).map((project) => project && (
234+
projects.teamSearchResponseList.slice(0, ENTERPRISE_SIZE).map((project) => project && (
228235
<ProjectCard key={project.id} {...project} setLoginDialog={setIsLoginDialogOpen}/>
229236
))}
230237
</div>
@@ -236,7 +243,7 @@ function PersonalList({setIsLoginDialogOpen}: IDataList) {
236243
const [studies, setStudies] = useState<IProjectList>(InitProject);
237244

238245
useEffect(() => {
239-
Api.fetch2Json('/api/v1/list/team?type=1&page=0')
246+
Api.fetch2Json(`/api/v1/list/team?type=1&page=0&size=${PERSONAL_SIZE}`)
240247
.then((data) => setStudies(data))
241248
.catch((err) => {
242249
console.error(err);
@@ -252,7 +259,7 @@ function PersonalList({setIsLoginDialogOpen}: IDataList) {
252259
<p>프로젝트가 없습니다</p>
253260
</div>
254261
) :
255-
studies.teamSearchResponseList.slice(0, 3).map((study) => study && (
262+
studies.teamSearchResponseList.slice(0, PERSONAL_SIZE).map((study) => study && (
256263
<ProjectCard key={study.id} {...study} setLoginDialog={setIsLoginDialogOpen}/>
257264
))}
258265
</div>
@@ -265,7 +272,7 @@ function MenteeList({setIsLoginDialogOpen}: IDataList) {
265272
{userCardResponses: [], size: 0, hasNextSlice: false});
266273

267274
useEffect(() => {
268-
Api.fetch2Json('/api/v1/list/user?orderBy=likes&page=0')
275+
Api.fetch2Json(`/api/v1/list/user?orderBy=likes&page=0&size=${MENTEE_SIZE}`)
269276
.then((data) => setUsers(data))
270277
.catch((err) => {
271278
console.error(err);
@@ -283,7 +290,7 @@ function MenteeList({setIsLoginDialogOpen}: IDataList) {
283290
<p>팀원이 없습니다</p>
284291
</div>
285292
) :
286-
users.userCardResponses.slice(0, 4).map((mentee: IUser | null | undefined, index: number) => mentee && (
293+
users.userCardResponses.slice(0, MENTEE_SIZE).map((mentee: IUser | null | undefined, index: number) => mentee && (
287294
<UserCard key={index} {...mentee} setLoginDialog={setIsLoginDialogOpen}/>
288295
))}
289296
</div>
@@ -296,7 +303,7 @@ function FeedList({setIsLoginDialogOpen}: IDataList) {
296303
{feedSearchResponses: [], size: 0, hasNextSlice: false});
297304

298305
useEffect(() => {
299-
Api.fetch2Json('/api/v1/feeds?page=0')
306+
Api.fetch2Json(`/api/v1/feeds?page=0&size=${FEED_SIZE}`)
300307
.then((data) => {
301308
setFeeds(data);
302309
}).catch((err) => {
@@ -315,7 +322,7 @@ function FeedList({setIsLoginDialogOpen}: IDataList) {
315322
<p>피드가 없습니다</p>
316323
</div>
317324
) :
318-
feeds.feedSearchResponses.slice(0, 3).map((feed: IMainFeeds | null | undefined) => feed && (
325+
feeds.feedSearchResponses.slice(0, FEED_SIZE).map((feed: IMainFeeds | null | undefined) => feed && (
319326
<MainFeedCard key={feed.id}
320327
{...feed}
321328
setLoginDialog={setIsLoginDialogOpen}/>

src/styles/components/Navigation.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ nav {
4949
}
5050

5151
img.logo {
52+
width: 180px;
5253
height: 40px;
5354
will-change: filter;
5455
transition: filter 300ms;
@@ -141,6 +142,7 @@ nav {
141142
}
142143

143144
img.logo {
145+
width: 135px;
144146
height: 30px;
145147
}
146148

0 commit comments

Comments
 (0)