-
Notifications
You must be signed in to change notification settings - Fork 1
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
[ Feature/dev 53 ] 워크북 card list 불러오기 mock api 연결 및 테스트 #130
Merged
Merged
Changes from 24 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
88f2778
feat : workbook list mock api
Happhee d82a959
Merge branch 'develop' of github.com-A:YAPP-Github/24th-Web-Team-1-FE…
Happhee 342a3fa
feat : category and workbooks and subscription list mock api
Happhee 209325f
bugfix : spec out body data
Happhee 1bbe34c
feat : workbook list and subscription workbook list query options
Happhee 5be5bff
feat : workbooks with subscription route path
Happhee 7744c66
refactor : on click link copy utils
Happhee 5ba7ea7
feat : mock api response workbook subscriptions
Happhee 53739da
bugfix : change category type to client and server
Happhee 6efafe3
feat : workbook card type and badge component in model
Happhee 48f8b7a
feat : categoy with model
Happhee 196d941
bugfix : category with workbookcardlist
Happhee 5599d8e
feat : category field with category model
Happhee 2737f1c
test : get button title , get badgeInfo get workbook card type
Happhee 3788db5
feat : get article id with learn type
Happhee 4cde9b5
feat : article Id in workbook client type
Happhee 8b648f9
feat : custom hook with workbook card bottom button handler
Happhee 6a1ecdd
feat : image wrapper , cardbadge workbook card component
Happhee 45cfbd6
refactor : workbook subscribe hook
Happhee c593835
feat : useQueries workbook list in main workbook page
Happhee 60654de
bugfix : category list loading state
Happhee 28aa622
style : remove title margin left
Happhee 5db3d98
feat : id, badge , bottom button with click event
Happhee c79cfd8
test : workbook card wrapper
Happhee 4379640
style : article list in main page
Happhee fc03bb3
feat : articels category mock api
Happhee 30a970c
test : fix data length
Happhee 371d50d
init : react intersection observer
Happhee 4e171d1
feat : articles with category api
Happhee 863ac2b
feat : articles with category infinite query
Happhee fba8ac9
feat : articles fetch infinite query params type
Happhee 8294cf0
bugfix : data fetch with scroll
Happhee 3594a15
feat : article card detail root wrapper
Happhee 0edc8d3
bugfix : query params only category code
Happhee a912e41
feat : remove tag in article content text
Happhee 3d14f78
docs : remove artilce with workbook list component
Happhee 2452500
docs : skeleton few logo
Happhee a9db4b1
bugfix : image domain config
Happhee 286aafa
docs : remove temp image url
Happhee d871471
feat : category tab skeleton
Happhee 49ccc23
feat : article card skeleton in component
Happhee eedd68d
feat : workbookcard skeleton in workbookcard component
Happhee 5484a9e
docs : remove defalut image url
Happhee e975e50
bugfix : move key props data
Happhee 18d3511
feat : category constant
Happhee 5668754
bugfix : category fetch code
Happhee 13d140f
feat : article card WithWorkbookList component
Happhee e2525c0
teat : fix test data
Happhee 771c189
test : bugfix mock use toast
Happhee ed65336
feat : getWithWorkbookList in articlecardmodel
Happhee a7baf21
Merge pull request #133 from YAPP-Github/feature/DEV-70
Happhee 052c28a
Merge pull request #131 from YAPP-Github/feature/DEV-52
Happhee 155d304
Merge branch 'develop' into feature/DEV-53
Happhee e7a926f
bugfix : category api controll
Happhee 9da3b93
bugfix : image domain
Happhee 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
This file contains 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,45 @@ | ||
import { toast } from "@shared/components/ui/use-toast"; | ||
import { SUBSCRIBE_USER_ACTIONS } from "@subscription/constants/subscribe"; | ||
import { subscribeWorkbookOptions } from "@subscription/remotes/postSubscriptionQueryOptions"; | ||
import { useMutation } from "@tanstack/react-query"; | ||
|
||
export default function useSusbscribeWorkbook() { | ||
const { mutate: subscribeWorkbook } = useMutation(subscribeWorkbookOptions()); | ||
const postSubscribeWorkbook = ({ | ||
workbookId, | ||
handleSucess, | ||
}: { | ||
workbookId: string; | ||
handleSucess?: () => void; | ||
}) => { | ||
try { | ||
subscribeWorkbook( | ||
{ workbookId }, | ||
{ | ||
onSuccess: () => { | ||
toast({ | ||
title: SUBSCRIBE_USER_ACTIONS.SUBSCRIBE_SUCCESS, | ||
}); | ||
if (handleSucess) handleSucess(); | ||
}, | ||
onError: (error) => { | ||
let errorMessage = SUBSCRIBE_USER_ACTIONS.SUBSCRIBE_FAIL; | ||
if (error && error.data && error.data.message) { | ||
errorMessage = error.data.message || errorMessage; | ||
} | ||
toast({ | ||
title: errorMessage, | ||
}); | ||
}, | ||
}, | ||
); | ||
} catch (error) { | ||
console.error("catch error", error); | ||
|
||
toast({ | ||
title: SUBSCRIBE_USER_ACTIONS.SUBSCRIBE_FAIL, | ||
}); | ||
} | ||
}; | ||
return { postSubscribeWorkbook }; | ||
} |
This file contains 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,8 +1,8 @@ | ||
export type CategoryInfo = { | ||
export type CategoryServerInfo = { | ||
code: number; | ||
name: string; | ||
}; | ||
|
||
export type CategoryInfoList = { | ||
categories: CategoryInfo[]; | ||
export type CategoryClientInfo = { | ||
code: number; | ||
name: string; | ||
}; |
This file contains 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 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 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 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 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 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 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.
아직 client info 하고 server info 하고 똑같은 상태인가용?? (둘 다 code, name 이길래용!!)
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.
넵ㅂ! 추후에 변경될수있어서 모델 만든겁니다!
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.
일단 서버랑 클라가 같더라도 만드는게 좋다고 생각해요