-
Notifications
You must be signed in to change notification settings - Fork 6
Fix: 알림, 검색, 상세페이지 디자인 및 로직 수정 #294
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.
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
kanglocal
wants to merge
21
commits into
8-Sprinters:dev
Choose a base branch
from
kanglocal:fix/design_and_logic
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
b73ac88
feature: 색상 추가
kanglocal 9498c9b
fix: dropdown 스타일 변경
kanglocal 3193acb
feature: BackIcon 추가
kanglocal 6a6d6b8
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal 096bac0
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal 6d45ecd
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal 73d2412
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal 4a6e517
Feat: 검색 페이지 UI변경
kanglocal 0cf6c3d
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal 66b0e9a
Merge remote-tracking branch 'upstream/dev' into feature/search-page
kanglocal 9c45fdb
feature: API수정
kanglocal f2fd4bc
Feat: API 변경사항 반영
kanglocal 39f4b95
Fix: 리스트 생성,수정 오류 수정 (#292)
seoyoung-min 4bd92f1
design: 어드민 페이지 퍼블리싱
ParkSohyunee bdfa3fb
Feat: 어드민 로그인페이지 퍼블리싱 및 로그인 기능 구현
ParkSohyunee 08c943b
Feat: 어드민 관련 기능 어드민 JWT 토큰으로 axiosInstance 적용
ParkSohyunee d6cbb92
Feat: 로그아웃 기능 구현
ParkSohyunee b5a5661
Feat: accessToken 만료 시, refreshToken으로 토큰 재발급 받는 로직 구현
ParkSohyunee 1a24051
Feat: API 요청 시 AT, RT 오류일 때 로그인 페이지로 리다이렉트
ParkSohyunee fc32821
Merge remote-tracking branch 'origin/fix/design_and_logic' into fix/d…
kanglocal 06cc127
Merge branch 'refs/heads/dev' into fix/design_and_logic
kanglocal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📌 현지님! 리액션 api 파일이름 소문자로 변경 및 updateReaction.ts가 더 적절할 것 같아요!