Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/TEAM-BEAT/BEAT-Client in…
Browse files Browse the repository at this point in the history
…to feat/TEAM-BEAT#380/guestManageRenewal

; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
  • Loading branch information
pepperdad committed Aug 31, 2024
2 parents 8e71e01 + d1094d4 commit 6062778
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 7 deletions.
13 changes: 12 additions & 1 deletion src/pages/modifyManage/utils/handleEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,18 @@ export const calculatePerformancePeriod = (
};

// scheduleNumber 생성
const scheduleNumbers = ["FIRST", "SECOND", "THIRD"];
const scheduleNumbers = [
"FIRST",
"SECOND",
"THIRD",
"FOURTH",
"FIFTH",
"SIXTH",
"SEVENTH",
"EIGHTH",
"NINTH",
"TENTH",
];

export const getScheduleNumber = (index: number): string => {
return scheduleNumbers[index] || `SCHEDULE_${index + 1}`;
Expand Down
13 changes: 10 additions & 3 deletions src/pages/register/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,17 @@ const Register = () => {
performanceImage: performanceUrls[index] || image.performanceImage,
})),
};
console.log(formData);
try {
await postPerformance(formData);
} catch (err) {
console.error("공연 등록 중 오류 발생:", err);
console.error("공연 등록 오류:", err);
const errorMessage =
err?.response?.status === 401
? "로그인 세션이 만료되었습니다.\n 다시 로그인 후 시도해주세요."
: "공연 등록을 실패했습니다.\n 다시 시도해주세요.";

openAlert({ title: errorMessage });
}
} catch (err) {
console.error("파일 업로드 중 오류 발생:", err);
Expand Down Expand Up @@ -413,9 +420,9 @@ const Register = () => {
/>
</InputRegisterBox>
<S.Divider />
<StepperRegisterBox title="회차 수" description="최대 3회차">
<StepperRegisterBox title="회차 수" description="최대 10회차">
<Stepper
max={3}
max={10}
round={totalScheduleCount}
onMinusClick={() => onMinusClick(setGigInfo)}
onPlusClick={() => onPlusClick(setGigInfo)}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/register/RegisterMaker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const RegisterMaker = ({
</S.RegisterContainer>
<S.FooterContainer>
<S.FooterDivider />
<S.FooterInfo>공연진 상세정보는 선택사항이며, 이후 수정불가합니다.</S.FooterInfo>
<S.FooterInfo>공연진 상세정보는 선택사항입니다.</S.FooterInfo>
<Button onClick={handleList} disabled={isButtonDisabled}>
다음
</Button>
Expand Down
1 change: 0 additions & 1 deletion src/pages/register/components/PosterThumbnail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ const PosterThumbnail = ({ value, onImageUpload }: PosterThumbnailProps) => {
<S.InputRegisterBox $marginBottom={2.8}>
<S.InputTitle>포스터 썸네일</S.InputTitle>
<S.InputDescription>한 장만 등록 가능합니다.</S.InputDescription>
<S.InputDescription $warning={true}>*포스터 썸네일은 수정불가합니다.</S.InputDescription>
<Spacing marginBottom="1.4" />
<S.FileInputWrapper>
<S.HiddenFileInput
Expand Down
13 changes: 12 additions & 1 deletion src/pages/register/utils/handleEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,18 @@ export const calculatePerformancePeriod = (scheduleList: { performanceDate: Dayj
};

// scheduleNumber 생성
const scheduleNumbers = ["FIRST", "SECOND", "THIRD"];
const scheduleNumbers = [
"FIRST",
"SECOND",
"THIRD",
"FOURTH",
"FIFTH",
"SIXTH",
"SEVENTH",
"EIGHTH",
"NINTH",
"TENTH",
];

export const getScheduleNumber = (index: number): string => {
return scheduleNumbers[index] || `SCHEDULE_${index + 1}`;
Expand Down

0 comments on commit 6062778

Please sign in to comment.