Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b73ac88
feature: 색상 추가
kanglocal Sep 18, 2024
9498c9b
fix: dropdown 스타일 변경
kanglocal Sep 18, 2024
3193acb
feature: BackIcon 추가
kanglocal Sep 18, 2024
6a6d6b8
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal Sep 21, 2024
096bac0
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal Oct 27, 2024
6d45ecd
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal Oct 27, 2024
73d2412
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal Oct 29, 2024
4a6e517
Feat: 검색 페이지 UI변경
kanglocal Oct 29, 2024
0cf6c3d
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal Nov 10, 2024
66b0e9a
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal Jan 18, 2025
9c45fdb
feature: API수정
kanglocal Feb 3, 2025
f2fd4bc
Feat: API 변경사항 반영
kanglocal Feb 3, 2025
39f4b95
Fix: 리스트 생성,수정 오류 수정 (#292)
seoyoung-min Jan 19, 2025
4bd92f1
design: 어드민 페이지 퍼블리싱
ParkSohyunee Jan 21, 2025
bdfa3fb
Feat: 어드민 로그인페이지 퍼블리싱 및 로그인 기능 구현
ParkSohyunee Jan 21, 2025
08c943b
Feat: 어드민 관련 기능 어드민 JWT 토큰으로 axiosInstance 적용
ParkSohyunee Jan 21, 2025
d6cbb92
Feat: 로그아웃 기능 구현
ParkSohyunee Jan 21, 2025
b5a5661
Feat: accessToken 만료 시, refreshToken으로 토큰 재발급 받는 로직 구현
ParkSohyunee Jan 21, 2025
1a24051
Feat: API 요청 시 AT, RT 오류일 때 로그인 페이지로 리다이렉트
ParkSohyunee Jan 21, 2025
fc32821
Merge remote-tracking branch 'origin/fix/design_and_logic' into fix/d…
kanglocal Feb 3, 2025
06cc127
Merge branch 'refs/heads/dev' into fix/design_and_logic
kanglocal Feb 4, 2025
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
3 changes: 3 additions & 0 deletions public/icons/new/back_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/new/history.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions public/icons/new/vertical_kebab_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/icons/ver3/bookmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/icons/ver3/detail_share.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/ver3/lock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions public/icons/ver3/more.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/ver3/reaction_agree.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/ver3/reaction_good.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/ver3/reaction_thanks.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/icons/ver3/share.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/ver3/visibility.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/app/_api/reaction/Reaction.ts
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📌 현지님! 리액션 api 파일이름 소문자로 변경 및 updateReaction.ts가 더 적절할 것 같아요!

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import axiosInstance from '@/lib/axios/axiosInstance';
import { ReactionType } from '@/lib/types/reactionType';

const reaction = async (listId: number, type: ReactionType) => {
return await axiosInstance.post(`/lists/${listId}/reaction`, { reaction: type });
};

export default reaction;
6 changes: 3 additions & 3 deletions src/app/_api/search/getSearchListResult.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ interface GetSearchListResultType {
cursorId: number | undefined | null;
sort: string;
keyword: string;
category: string;
categoryCode: string;
}

async function getSearchListResult({ sort, keyword, category, cursorId }: GetSearchListResultType) {
async function getSearchListResult({ sort, keyword, categoryCode, cursorId }: GetSearchListResultType) {
const params = new URLSearchParams({
size: '6',
});
Expand All @@ -17,7 +17,7 @@ async function getSearchListResult({ sort, keyword, category, cursorId }: GetSea
}

const response = await axiosInstance.get(
`/lists/search?keyword=${keyword}&sort=${sort}&category=${category}&${params.toString()}`
`/lists/search?keyword=${keyword}&sort=${sort}&categoryCode=${categoryCode}&${params.toString()}`
);

return response.data;
Expand Down
9 changes: 8 additions & 1 deletion src/app/_api/search/getSearchUserResult.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
import axiosInstance from '@/lib/axios/axiosInstance';

interface GetSearchUserResultType {
// cursorId: number | undefined | null;
page: number | undefined | null;
keyword: string;
}

async function getSearchUserResult({ keyword }: GetSearchUserResultType) {
async function getSearchUserResult({ keyword, page }: GetSearchUserResultType) {
console.log('page:::', page);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📌 콘솔로그 삭제해 주시면 좋을 것 같습니당

const params = new URLSearchParams({
size: '3',
});

if (page) {
params.append('page', page.toString());
}

const response = await axiosInstance.get(`/users?search=${keyword}&${params.toString()}`);

return response.data;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const myCollectWrapper = style({
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
gap: '6px',
});

export const collectWrapper = style([
Expand All @@ -13,3 +14,10 @@ export const collectWrapper = style([
cursor: 'pointer',
},
]);

export const collectTextWrapper = style({
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
});
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { useUser } from '@/store/useUser';
import numberFormatter from '@/lib/utils/numberFormatter';
import collectList from '@/app/_api/collect/__collectList';
import toasting from '@/lib/utils/toasting';
import CollectIcon from '/public/icons/collect.svg';
import CollectedIcon from '/public/icons/collected.svg';
import BookmarkIcon from '/public/icons/ver3/bookmark.svg';
import BookmarkedIcon from '/public/icons/collected.svg';
import Modal from '@/components/Modal/Modal';
import LoginModal from '@/components/login/LoginModal';
import useBooleanOutput from '@/hooks/useBooleanOutput';
Expand Down Expand Up @@ -74,7 +74,7 @@ const CollectButton = ({ data }: { data: CollectProps }) => {
return (
<>
<div className={styles.collectWrapper}>
<CollectIcon onClick={handleSetOn} />
<BookmarkIcon onClick={handleSetOn} />
</div>
{isOn && (
<Modal handleModalClose={handleSetOff} size="large">
Expand All @@ -89,15 +89,22 @@ const CollectButton = ({ data }: { data: CollectProps }) => {
if (loginUser?.id === data.ownerId) {
return (
<div className={styles.myCollectWrapper}>
<CollectedIcon />
<div>{numberFormatter(data.collectCount, 'ko') ?? 0}</div>
<BookmarkIcon />

<div className={styles.collectTextWrapper}>
<p>콜렉트</p>
{loginUser?.id === data.ownerId && <p>({numberFormatter(data.collectCount, 'ko') ?? 0})</p>}
</div>
</div>
);
}

return (
<div className={styles.collectWrapper} onClick={handleCollect}>
{data.isCollected ? <CollectedIcon /> : <CollectIcon />}
{data.isCollected ? <BookmarkedIcon width={24} height={24} /> : <BookmarkIcon />}
<div className={styles.collectTextWrapper}>
<p>콜렉트</p>
</div>
</div>
);
};
Expand Down
Loading
Loading