Skip to content
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

Develop #4

Open
wants to merge 77 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
03b405b
✨ Feat: 구현 피팅, 사이즈 예측
S686 Jul 1, 2023
a1cca1e
💄 Design : 마이페이지/피팅페이지 UI/UX
Titorima Jul 1, 2023
02288c0
Merge branch 'develop' of 2github.com:AIVLE-School-Third-Big-Project/…
Titorima Jul 1, 2023
60c0f4a
🔀 Merge : develop
Titorima Jul 1, 2023
b6e9eb4
Merge pull request #12 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 1, 2023
04ae33d
🐛 Fix : 수정 app.js - dispatch
Titorima Jul 1, 2023
e33e0b2
Merge pull request #13 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 1, 2023
e8709d7
✨ Feat: 구현 피팅페이지 조회
S686 Jul 1, 2023
f98a544
✨ Feat : 추가 마이페이지 기능
Titorima Jul 2, 2023
e11a600
Merge pull request #14 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 2, 2023
eccf161
✨ Feat : 추가 개인정보 수정 에러 시 상세 알림
Titorima Jul 2, 2023
264b8e5
🔀 Merge!
Titorima Jul 2, 2023
0e86467
Merge branch 'develop' of 2github.com:AIVLE-School-Third-Big-Project/…
Titorima Jul 2, 2023
29499cf
Merge pull request #16 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 2, 2023
7cce166
✨ Feat : 추가 피팅, 사이즈예측 기능
S686 Jul 2, 2023
88ee909
✨ Feat: 추가 의류 업로드(크롤링)
Titorima Jul 2, 2023
6ab01e4
🔀 Merge!
Titorima Jul 2, 2023
a2ac520
Merge pull request #17 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 2, 2023
b552a54
🐛 Fix: 수정 피팅 페이지
Titorima Jul 2, 2023
402c2ea
Merge pull request #18 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 2, 2023
4f192d3
✨ Feat: 의류 업로드 기능 구현
S686 Jul 3, 2023
d4d144f
💄 Design : 피팅 페이지 수정
Titorima Jul 3, 2023
f432cef
🐛 Fix: allowedOrigins
Titorima Jul 3, 2023
28f6302
🔀 Merge!
Titorima Jul 3, 2023
ff893b2
Merge pull request #19 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 3, 2023
f6a4bc6
🐛 Fix: 수정 회원가입 (RegisterUser.js)
Titorima Jul 3, 2023
1c994f5
Merge branch 'develop' of 2github.com:AIVLE-School-Third-Big-Project/…
Titorima Jul 3, 2023
6fe4847
🔀 Merge!
Titorima Jul 3, 2023
801f9c8
Merge pull request #20 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 3, 2023
3c7c679
✨ Feat: 추가 마이페이지 기능
Titorima Jul 3, 2023
050b3ab
🐛 Fix: 수정 마이페이지
Titorima Jul 3, 2023
46e5d9e
Merge pull request #21 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 3, 2023
aafd9d6
✨ Feat: 피팅 및 의류 삭제 기능 구현
S686 Jul 3, 2023
b5cac30
Merge branch 'develop' of https://github.com/AIVLE-School-Third-Big-P…
S686 Jul 3, 2023
381e626
🐛 Fix: 수정 자잘한 오류
Titorima Jul 3, 2023
027332d
Merge pull request #22 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 3, 2023
233eee1
🐛 Fix: 수정 크롤링
Titorima Jul 3, 2023
01dea77
✨ Feat: 구현 회원가입 검증 기능
S686 Jul 3, 2023
2010c4f
✨ Feat: 이메일인증 API 추가
Titorima Jul 3, 2023
d70ed53
Merge pull request #23 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 3, 2023
f1f5c08
🐛 Fix: 수정 피팅 및 푸터
S686 Jul 3, 2023
abe327d
💄 Design: 수정 마이페이지
Titorima Jul 3, 2023
f56f8da
Merge pull request #24 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 3, 2023
a7d0182
✨ Feat: 추가 사이즈 추천 버튼
Titorima Jul 3, 2023
4dea947
:sparkles:: 추가 피팅 페이지
Oneul-hyeon Jul 4, 2023
da94a84
Merge pull request #25 from AIVLE-School-Third-Big-Project/temp
S686 Jul 4, 2023
c0fc92b
✨ Feat: 추가 의류사이즈 추천 및 마이페이지 이미지 변경
Jul 4, 2023
3c477f5
🔀 Merge!
Jul 4, 2023
bfa5a43
Merge pull request #26 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 4, 2023
69faa1e
✨ Feat: 구현 의류 삭제 알림
S686 Jul 4, 2023
838f610
✨ Feat: 구현 피팅페이지 부가기능
S686 Jul 4, 2023
e7cf831
✨ Feat: 추가 프로필 이미지 수정
Jul 4, 2023
7de1205
Merge pull request #27 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 4, 2023
d5588c4
✨ Feat: 추가 마이페이지 초기 이미지
Titorima Jul 4, 2023
d77bec7
Merge pull request #28 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 4, 2023
2db591a
🚨 Design: 변경 마이페이지 프로필 이미지 디자인
Titorima Jul 5, 2023
a2a2651
🐛 Fix: 수정 프로필 이미지 바로 변경 안되는 버그
Titorima Jul 5, 2023
78f97cb
Merge pull request #29 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 5, 2023
fc10513
✨ Feat : 추가 피팅페이지 이미지 저장 기능
Titorima Jul 5, 2023
68ec9e2
Merge pull request #30 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 5, 2023
d298d85
🐛 Fix: 수정 서버 버그 / 회원가입 후 로그인 풀림
Titorima Jul 5, 2023
0097082
Merge pull request #31 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 5, 2023
d0b6fbf
🐛 Fix: 되돌리기 안되는 버그 수정
Titorima Jul 5, 2023
93bce07
Merge pull request #32 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 5, 2023
e7b9cd6
✨ Feat: 배경 변경 기능 추가
Titorima Jul 5, 2023
ee1167c
Merge pull request #33 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 5, 2023
97aadf5
✨ Feat: 배경 변경 기능 추가
Titorima Jul 5, 2023
63bbcdd
🐛 Fix: 수정 옷 업로드 후 옷장 갱신 안되는 문제 해결
Titorima Jul 5, 2023
bcafb80
🔀 Merge!
Titorima Jul 5, 2023
68801f6
Merge pull request #35 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 5, 2023
2cf55fd
🐛 Fix: 수정 이미지 다운로드 버그
Jul 6, 2023
992bbbe
🐛 Fix: 수정 이미지 다운로드
Jul 6, 2023
3d92548
🐛 Fix: 수정 이미지 다운로드(찐)
Jul 6, 2023
0ebdef6
Merge pull request #36 from AIVLE-School-Third-Big-Project/mergeTemp
Titosvarius Jul 6, 2023
59cb5fa
🐛 Fix: 수정 회원가입 css
S686 Jul 6, 2023
b67b153
🐛 Fix: 수정 회원가입 css
S686 Jul 6, 2023
861ab81
✨ Feat: 구현 코디 공유 게시판
S686 Jul 10, 2023
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
Prev Previous commit
Next Next commit
🐛 Fix: 되돌리기 안되는 버그 수정
Titorima committed Jul 5, 2023
commit d0b6fbfc2c6c08d189acb60fb0a2e5d3fe9caaf3
22 changes: 13 additions & 9 deletions src/routes/UserInfo.js
Original file line number Diff line number Diff line change
@@ -210,10 +210,7 @@ router.put(
} else {
webAPI = process.env.WEB_API
}
console.log('before parse!1')
console.log({
params: { ID: userId, image_url: file },
})

// 사용자이미지 전처리 human parse
const aiApiParseResponse = await axios.post(
process.env.AI_PARSE_API,
@@ -222,17 +219,24 @@ router.put(
params: { ID: userId, image_url: file },
}
)
console.log('parse complete!')

console.log(aiApiParseResponse.data)
if (aiApiParseResponse.data.error) {
console.error('Error from AI API:', aiApiParseResponse.data.error)
if (
aiApiParseResponse.data.message ===
'human parse 실행 중 오류가 발생했습니다: cannot write mode RGBA as JPEG'
) {
res
.status(500)
.json({ success: false, code: 'CAN_NOT_WRITE', errno: -1 })
return
}
res
.status(500)
.json({ success: false, error: 'AI API failed.', errno: -1 })
.json({ success: false, code: 'AI_PARSE_ERROR', errno: -1 })
return
}

console.log('done!')
console.log('Parse done!')
res
.status(200)
.json({ success: true, code: 'IMAGE_CHANGE_DONE', errno: 0, url: file })
1 change: 1 addition & 0 deletions style/src/components/FittingPage/FittingPage.js
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ function FittingPage() {
<div className="empty-space" />
<LeftFitContainer
fittingImage={fittingImage}
setIsDefaultPage={setIsDefaultPage}
isDefaultPage={isDefaultPage}
setErrorCode={setErrorCode}
showAlert={showAlert}