-
Notifications
You must be signed in to change notification settings - Fork 0
feat: 전체적인 기능 추가 #59
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
Merged
feat: 전체적인 기능 추가 #59
Changes from all commits
Commits
Show all changes
126 commits
Select commit
Hold shift + click to select a range
7893b2a
feat: 일기 조회 추가 및 일기 이미지 수정 로직 수정
kangsea09 be66a23
fix: 이미지 조회 div 높이 수정 및 css 주석 삭제
kangsea09 ac7c0f0
fix: 로그인시 메인으로 이동하는 경로 변경, 회원가입시 이메일 인증후 이메일 변경이불가하도록 변경
pbc1001 a1fac4c
fix: 기존 비밀번호 표시가 두개의 input에 모두 적용되었던 것 변경 및 이미지 변경 추가
pbc1001 4714d25
fix: setCheckMessage가 남아있는 문제 해결
pbc1001 936eabe
Merge pull request #32 from MoDeep11/feat/api-sign-up
pbc1001 8a07c76
feat: api 채팅 추가
kangsea09 91bfcb6
feat: 다이어리 추천 조회 및 다이어리 목록 조회
kangsea09 158fe92
feat: 사용자 정보 조회, 달력 조회 연동 추가
kangsea09 8407257
fix: 중복 코드 삭제
kangsea09 b245409
Merge pull request #36 from MoDeep11/feat/publishing-home
kangsea09 6c579fa
fix: 민감 정보 로깅 제거
kangsea09 91fa0ab
Merge pull request #35 from MoDeep11/feat/api-diaries
kangsea09 0679d83
feat: 일기 목록 조회 기능 추가
kangsea09 5075c0f
fix: 중복 삭제
kangsea09 df70272
fix: 민감한 요청 메타데이터 콘솔 노출을 제거
kangsea09 04c92d7
fix: 에러 출력 방법 수정
kangsea09 b59ce32
fix: 헤더 로그인시 문제 해결
pbc1001 c0c7da2
Merge pull request #38 from MoDeep11/feat/api-chat
kangsea09 3bceb27
Merge pull request #37 from MoDeep11/feat/api-user
kangsea09 d92a984
Merge pull request #41 from MoDeep11/feat/fix-header
pbc1001 eb54317
fix: useState 관련 동기 문제
pbc1001 f8e3968
feat: 마이페이지 api 연동
pbc1001 b2cca77
fix: 토큰 만료시 로그아웃 되도록 설정
pbc1001 18023a0
fix: 마이페이지 api 연동 (완)
pbc1001 01992ab
fix: 마운트 직후 1회 검사하도록 변경
pbc1001 f725f93
fix: 쓸모없는 콘솔로그 삭제
pbc1001 a4c5d8d
fix: 비밀번호 검증 요청 추가
pbc1001 e427324
Merge pull request #43 from MoDeep11/feat/api-mypage
pbc1001 9b8eee2
Merge pull request #42 from MoDeep11/feat/refresh-api
pbc1001 725e877
feat: 사진첩 api 연결
pbc1001 f3a30e7
Merge branch 'develop' into feat/refresh-api
pbc1001 bd131fb
Revert "Merge branch 'develop' into feat/refresh-api"
pbc1001 616a7cd
Reapply "Merge branch 'develop' into feat/refresh-api"
pbc1001 01b83b6
fix: 통계 페이지 api 연동
pbc1001 ce298ab
fix: emotionDistribution이 null일 경우를 위한 옵셔널 체이닝
pbc1001 a06e6ca
fix: 빠른 처리로 인한 오류발생을 막기위한 Abortcontroller 추가
pbc1001 33e3896
Terminal fix: emotionDistribution이 null일 경우를 위한 옵셔널 체이닝(2)
pbc1001 8fe63c8
Merge pull request #44 from MoDeep11/feat/static-api
pbc1001 bdde126
feat: 사진첩 api 연결
pbc1001 fe1a422
Revert "Merge branch 'develop' into feat/refresh-api"
pbc1001 7931f51
Reapply "Merge branch 'develop' into feat/refresh-api"
pbc1001 028c16a
Merge remote-tracking branch 'origin/feat/photo-api' into feat/photo-api
pbc1001 8d4da66
refator: 토큰 만료 로직 수정 및 header에 Authorization 토큰 추가
kangsea09 18c68cf
fix: 경로 수정
kangsea09 2fba8f7
refactor: 코드래빗 코드 반영
kangsea09 a8f2e0f
refactor: 코드래빗 코드 반영
kangsea09 5196690
Merge pull request #45 from MoDeep11/fix/instance
kangsea09 441d534
feat: emotion 이미지 추가
kangsea09 bf35f7f
Merge pull request #46 from MoDeep11/feat/add-img
kangsea09 4d2c9ee
feat: 전체적인 기능 추가
kangsea09 5854ac0
feat: 전체적인 기능 추가
kangsea09 b1bf863
Merge remote-tracking branch 'origin/feat/publishing-home' into feat/…
kangsea09 30f8bf3
refactor: 코드래빗 코드 반영
kangsea09 d03d92f
Merge pull request #47 from MoDeep11/feat/publishing-home
kangsea09 477af6b
feat: 이미지 클릭 시 해당 일기로 이동 기능 추가
kangsea09 47dedfe
fix: 데이터 반환 수정
kangsea09 ff9fb4f
Merge pull request #48 from MoDeep11/feat/api-diaries
kangsea09 993adbf
feat: 이미지 클릭 시 해당 일기로 이동 기능 추가
kangsea09 1fc73b8
Merge remote-tracking branch 'origin/feat/publishing-home' into feat/…
kangsea09 ca36d37
feat: 일기 수정 기능 추가
kangsea09 9a0a870
Merge pull request #49 from MoDeep11/feat/api-diaries
kangsea09 7e8d286
feat: 이미지 클릭 시 해당 일기로 이동 기능 추가
kangsea09 f471884
Merge remote-tracking branch 'origin/feat/publishing-home' into feat/…
kangsea09 14bfcf5
Merge pull request #50 from MoDeep11/feat/publishing-home
kangsea09 f1203c7
feat: 프로필 랜덤 기능 추가
pbc1001 d69a402
Merge remote-tracking branch 'origin/feat/refresh-api' into feat/refr…
pbc1001 7b23744
fix: 사용되지 않는 error 로 인한 eslint 오류
pbc1001 81fb958
fix: 새로고침시에도 alert 창이 뜨던것 수정
pbc1001 6bc3674
feat: 사진첩 api 연결
pbc1001 f3c7e79
Revert "Merge branch 'develop' into feat/refresh-api"
pbc1001 1f8c3a4
Reapply "Merge branch 'develop' into feat/refresh-api"
pbc1001 7f5d253
Revert "Merge branch 'develop' into feat/refresh-api"
pbc1001 a8b5a15
Reapply "Merge branch 'develop' into feat/refresh-api"
pbc1001 0e84cfe
Merge remote-tracking branch 'origin/feat/photo-api' into feat/photo-api
pbc1001 95403cb
feat: 사진첩 api 연동
pbc1001 d273977
Revert "Merge branch 'develop' into feat/refresh-api"
pbc1001 dfe8159
Reapply "Merge branch 'develop' into feat/refresh-api"
pbc1001 fd1870f
Revert "Merge branch 'develop' into feat/refresh-api"
pbc1001 9664fba
Reapply "Merge branch 'develop' into feat/refresh-api"
pbc1001 357283f
feat: 사진첩 api 연동
pbc1001 dcfba2f
Merge remote-tracking branch 'origin/feat/photo-api' into feat/photo-api
pbc1001 7d47d43
feat: 일기 조회 기능 추가
kangsea09 2b9dd5a
fix:tokenExpiary가 없을경우 영구 우회되는 경우 방지
pbc1001 9d3841d
Merge pull request #51 from MoDeep11/feat/rand-profile
pbc1001 b40aff0
refactor: 코드래빗 코드 반영
kangsea09 8ca75b8
feat: 일기 조회 기능 추가
kangsea09 dcff5dc
refactor: 코드래빗 코드 반영
kangsea09 fd0c8f6
Merge remote-tracking branch 'origin/feat/api-diaries' into feat/api-…
kangsea09 8f72189
Merge pull request #53 from MoDeep11/feat/api-diaries
kangsea09 80ee700
fix: 해당 달이 아닌 일의 color 변경
kangsea09 204ef49
Merge pull request #52 from MoDeep11/feat/refresh-api
pbc1001 c42bdb9
feat: 이미지 데이터 받아와 연동 추가
kangsea09 7b4a674
fix: 미처 지우지못한 콘솔로그 삭제
pbc1001 84317d8
Merge pull request #55 from MoDeep11/feat/statics-api(2)
pbc1001 78805c9
Merge pull request #57 from MoDeep11/feat/publishing-home
kangsea09 5153225
Merge pull request #56 from MoDeep11/feat/api-editDiary
kangsea09 4898782
Merge pull request #54 from MoDeep11/feat/photo-api
pbc1001 beb2237
fix: 콘솔로그 삭제 및 잘못 삭제된 setStatics 복구
pbc1001 c3bde77
Merge branch 'feat/statics-api(2)' into develop
pbc1001 f0d13d8
fix: yearnum, datenum에서 나던 경고문구 수정
pbc1001 55c210d
Merge pull request #58 from MoDeep11/feat/photo-api
pbc1001 c638041
fix: 사진 클릭시 일기로 이동하는 로직이 실수로 삭제된것을 복구
pbc1001 af88ce8
fix: 설문조사 링크 추가
pbc1001 69906f4
fix: 코드래빗 코드 반영
kangsea09 8aa3a4f
Merge pull request #60 from MoDeep11/feat/publishing-home
kangsea09 1b471ec
fix: 코드래빗 코드 반영
kangsea09 616cea3
Merge pull request #61 from MoDeep11/feat/api-editDiary
kangsea09 be29c61
feat: 통계 기능 추가
kangsea09 32cce4f
feat: 달력에 이모지 추가
kangsea09 fade304
fix: AI 피드백이 오지 않았을 때 기능 추가
kangsea09 d687924
refactor: 코드래빗 코드 반영
kangsea09 7946123
refactor: 코드래빗 코드 반영
kangsea09 c41274e
Merge pull request #62 from MoDeep11/feat/publishing-home
kangsea09 828eb85
Merge pull request #63 from MoDeep11/feat/api-diaries
kangsea09 c29fa99
fix: 오류 수정
kangsea09 ebe7f65
Merge pull request #64 from MoDeep11/feat/publishing-home
kangsea09 abc859e
fix: 코드래빗 코드 수정
pbc1001 bdb18e7
Merge pull request #65 from MoDeep11/feat/photo-coderabbit
pbc1001 7953e61
fix: 토큰이 노출 삭제
kangsea09 8114408
Merge pull request #66 from MoDeep11/feat/api-user
kangsea09 c488b8b
feat: 엔터키 입력시 로그인
pbc1001 520448e
fix: 코드래빗 권고사항 변경
pbc1001 50fb8bf
refactor: 코드래빗 코드 반영
kangsea09 560e92c
Merge pull request #68 from MoDeep11/feat/publishing-home
kangsea09 947c4d2
Merge pull request #67 from MoDeep11/feat/api-login
pbc1001 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 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
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,83 @@ | ||
| import instance from "./instance"; | ||
|
|
||
| const logApiError = (label, error) => { | ||
| const status = error?.response?.status; | ||
| const message = error?.response?.data?.message ?? error?.message; | ||
| console.error(label, { status, message }); | ||
| }; | ||
|
|
||
| // 채팅 생성 | ||
| export const createChat = async (chatData) => { | ||
| try { | ||
| const res = await instance.post(`/api/v1/chats`, chatData); | ||
| return res.data; | ||
| } catch (error) { | ||
| // 상세 에러 로깅 | ||
| logApiError("채팅 생성 실패:", error); | ||
| throw error; | ||
| } | ||
| }; | ||
|
|
||
| // 채팅 음성 생성 | ||
| export const createChatVoice = async (chatId, voiceData) => { | ||
| try { | ||
| const res = await instance.post(`/api/v1/chats/${chatId}/voice`, voiceData); | ||
| return res.data; | ||
| } catch (error) { | ||
| logApiError("음성 생성 실패:", error); | ||
| throw error; | ||
| } | ||
| }; | ||
|
|
||
| // 채팅 메시지 전송 | ||
| export const createChatMessage = async (chatId, messageData) => { | ||
| try { | ||
| const res = await instance.post( | ||
| `/api/v1/chats/${chatId}/messages`, | ||
| messageData, | ||
| ); | ||
| return res.data; | ||
| } catch (error) { | ||
| logApiError("메시지 전송 실패:", error); | ||
| throw error; | ||
| } | ||
| }; | ||
|
|
||
| // 채팅 수정 | ||
| export const updateChat = async (chatId) => { | ||
| try { | ||
| const res = await instance.patch(`/api/v1/chats/${chatId}`); | ||
| return res.data; | ||
| } catch (error) { | ||
| logApiError("채팅 수정 실패:", error); | ||
| throw error; | ||
| } | ||
| }; | ||
|
|
||
| // 대화 중 사진 추가 | ||
| export const createChatImage = async (chatId, imageData) => { | ||
| try { | ||
| const res = await instance.post( | ||
| `/api/v1/chats/${chatId}/images`, | ||
| imageData, | ||
| ); | ||
| return res.data; | ||
| } catch (error) { | ||
| logApiError("이미지 생성 실패:", error); | ||
| throw error; | ||
| } | ||
| }; | ||
|
|
||
| // AI 이미지 생성 요청 | ||
| export const createChatImageGeneration = async (chatId, generationData) => { | ||
| try { | ||
| const res = await instance.post( | ||
| `/api/v1/chats/${chatId}/images/generations`, | ||
| generationData, | ||
| ); | ||
| return res.data; | ||
| } catch (error) { | ||
| logApiError("이미지 생성 실패:", error); | ||
| throw error; | ||
| } | ||
| }; |
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
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,48 @@ | ||
| import instance from "./instance"; | ||
|
|
||
| export const getMyInfo = async () => { | ||
| const response = await instance.get("/api/v1/users/me"); | ||
| return response.data; | ||
| }; | ||
|
|
||
| export const withdrawAccount = async () => { | ||
| const response = await instance.delete("/api/v1/auth/me"); | ||
| return response.data; | ||
| }; | ||
|
|
||
| export const updateProfile = async (formData) => { | ||
| const response = await instance.patch('/api/v1/users/me/profile', formData, { | ||
| headers: { | ||
| "Content-Type": undefined, | ||
| }, | ||
| }); | ||
| return response.data; | ||
| }; | ||
|
|
||
| export const changePassword = async (passwordData) => { | ||
| const response = await instance.patch('/api/v1/users/me/password', passwordData); | ||
| return response.data; | ||
| }; | ||
|
|
||
| export const deleteUser = async () => { | ||
| const refreshToken = localStorage.getItem("refreshToken"); | ||
| const response = await instance.delete('/api/v1/users/me', { | ||
| data: { | ||
| refreshToken: refreshToken | ||
| } | ||
| }); | ||
| return response.data; | ||
| }; | ||
|
|
||
| export const logout = async () => { | ||
| const refreshToken = localStorage.getItem("refreshToken"); | ||
| const response = await instance.post('/api/v1/auth/logout', { | ||
| refreshToken: refreshToken | ||
| }); | ||
| return response.data; | ||
| }; | ||
|
|
||
| export const getRandomProfile = async () => { | ||
| const response = await instance.patch('/api/v1/users/me/profile-images/random'); | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import instance from "./instance"; | ||
|
|
||
| export const getMyGallery = async (yearMonth, tag = "") => { | ||
| const response = await instance.get('/api/v1/diaries', { | ||
| params: { | ||
| imageType: 'MANUAL', | ||
| hasPhoto: true, | ||
| yearMonth: yearMonth, | ||
| limit: 32, | ||
| tag: tag || null, | ||
| sort: 'createdAt,desc' | ||
| } | ||
| }); | ||
| return response.data; | ||
| }; |
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.
Uh oh!
There was an error while loading. Please reload this page.