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.

Sign up for GitHub

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

Feat: 상품 썸네일 및 판매시작 api 연동 #124

Merged
merged 14 commits into from
Dec 5, 2021
Merged

Feat: 상품 썸네일 및 판매시작 api 연동 #124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
19948f4
style: 헤더와 컨텐츠 사이 margin 추가
Oct 8, 2021
f21dc0f
feat: 상품 확인 페이지
Oct 8, 2021
a63f392
feat: 판매 시작 api 연동
Oct 8, 2021
dea6508
refactor: 판매 시작 api react-query로 호출
Oct 20, 2021
741b3c1
refactor: 상품 썸네일 마크업 리팩터링
Oct 20, 2021
bfb545d
refactor: palette 컬러코드 추가
Oct 25, 2021
e4c709c
refactor: splitText 공통 함수 분리
Oct 25, 2021
8950c1b
refactor: onError 발생 시 openErrorSnackbar 변경
Oct 25, 2021
5448c46
feat: 상품 등록 단계별 api 호출로직 훅으로 분리
Nov 17, 2021
c268cc3
refactor: 리턴 데이터 타입 제네릭 타입으로 수정
jiyaaany Nov 28, 2021
33789a3
remove: common black 컬러 제거
Nov 30, 2021
52ec7e6
chore: yarn.lock 파일 수정된 거 복구
jiyaaany Nov 30, 2021
76ed7ea
remove: usePost에서 error 스낵바 처리를 하고 있어 useSaveProduct 훅에서 제거
jiyaaany Nov 30, 2021
eb76c79
refactor: palette text 컬러로 수정
jiyaaany Dec 1, 2021
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
4 changes: 2 additions & 2 deletions src/hooks/usePost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ interface Post {
onError?: () => void;
}

export const usePost = ({
export const usePost = <T extends ProductId>({
pathname,
errorMessage = GENERAL_ERROR,
onSuccess,
onError,
}: Post): UseMutationResult<ObjectResponse<ProductId> | void, unknown> => {
}: Post): UseMutationResult<ObjectResponse<T> | void, unknown> => {
const [postErrorMessage, setPostErrorMessage] = useState<string>();

useCommonSnackbar({
Expand Down
6 changes: 4 additions & 2 deletions src/libs/draftjs-utils/inline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,10 @@ export const changeOriginalStyleToNewStyle = ({
);
}

const editorStateWithNewStyleAndPreviousSelection =
EditorState.forceSelection(editorStateWithNewStyle, originalSelection);
const editorStateWithNewStyleAndPreviousSelection = EditorState.forceSelection(
editorStateWithNewStyle,
originalSelection,
);

return editorStateWithNewStyleAndPreviousSelection;
};
7 changes: 0 additions & 7 deletions src/pages/CreateProduct/components/Footer/hooks/useSaveProduct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { FAILED_TO_SAVE_PRODUCT } from 'constants/errors';

import { useCommonSnackbar } from 'components/CommonSnackbar/useCommonSnackbar';
import { usePost } from 'hooks/usePost';
import {
currentProductIdAtom,
Expand Down Expand Up @@ -62,11 +61,5 @@ export const useSaveProduct = (): SaveProduct => {
mutate(postProductData);
};

useCommonSnackbar({
message: FAILED_TO_SAVE_PRODUCT,
severity: 'error',
dependencies: [showError],
});

return { saveProduct };
};
30 changes: 15 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2220,15 +2220,15 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"

"@material-ui/core@^4.11.3":
version "4.11.3"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.3.tgz#f22e41775b0bd075e36a7a093d43951bf7f63850"
integrity sha512-Adt40rGW6Uds+cAyk3pVgcErpzU/qxc7KBR94jFHBYretU4AtWZltYcNsbeMn9tXL86jjVL1kuGcIHsgLgFGRw==
"@material-ui/core@^4.12.3":
version "4.12.3"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca"
integrity sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/styles" "^4.11.3"
"@material-ui/system" "^4.11.3"
"@material-ui/types" "^5.1.0"
"@material-ui/styles" "^4.11.4"
"@material-ui/system" "^4.12.1"
"@material-ui/types" "5.1.0"
"@material-ui/utils" "^4.11.2"
"@types/react-transition-group" "^4.2.0"
clsx "^1.0.4"
Expand All @@ -2245,10 +2245,10 @@
dependencies:
"@babel/runtime" "^7.4.4"

"@material-ui/lab@^4.0.0-alpha.58":
version "4.0.0-alpha.58"
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.58.tgz#c7ebb66f49863c5acbb20817163737caa299fafc"
integrity sha512-GKHlJqLxUeHH3L3dGQ48ZavYrqGOTXkFkiEiuYMAnAvXAZP4rhMIqeHOPXSUQan4Bd8QnafDcpovOSLnadDmKw==
"@material-ui/lab@^4.0.0-alpha.60":
version "4.0.0-alpha.60"
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.60.tgz#5ad203aed5a8569b0f1753945a21a05efa2234d2"
integrity sha512-fadlYsPJF+0fx2lRuyqAuJj7hAS1tLDdIEEdov5jlrpb5pp4b+mRDUqQTUxi4inRZHS1bEXpU8QWUhO6xX88aA==
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/utils" "^4.11.2"
Expand Down Expand Up @@ -2290,10 +2290,10 @@
jss-plugin-vendor-prefixer "^10.5.1"
prop-types "^15.7.2"

"@material-ui/system@^4.11.3":
version "4.11.3"
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.11.3.tgz#466bc14c9986798fd325665927c963eb47cc4143"
integrity sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw==
"@material-ui/system@^4.12.1":
version "4.12.1"
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c"
integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw==
dependencies:
"@babel/runtime" "^7.4.4"
"@material-ui/utils" "^4.11.2"
Expand Down