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

[Fix/#273] 공연 등록할 때 출연진 추가 시 다음 스텝으로 안 넘어가는 오류 수정 #274

Merged
merged 9 commits into from
Jul 19, 2024
9 changes: 8 additions & 1 deletion src/assets/svgs/IconMinus.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import type { SVGProps } from "react";
const SvgIconMinus = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="#FFF"
viewBox="0 0 24 24"
width="24"
height="24"
{...props}
>
<path stroke="current" strokeMiterlimit={10} strokeWidth={1.2} d="M17 12H7" />
</svg>
);
Expand Down
9 changes: 8 additions & 1 deletion src/assets/svgs/IconPlus.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import type { SVGProps } from "react";
const SvgIconPlus = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="#FFF"
viewBox="0 0 24 24"
width="24"
height="24"
{...props}
>
<path stroke="current" strokeMiterlimit={10} strokeWidth={1.2} d="M12 7v10M17 12H7" />
</svg>
);
Expand Down
2 changes: 2 additions & 0 deletions src/components/commons/stepper/Stepper.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export const StepperBtn = styled.button<{ disabled: boolean }>`
width: 2.4rem;
height: 2.4rem;

color: ${({ theme, disabled }) => (disabled ? theme.colors.gray_500 : theme.colors.white)};

cursor: ${({ theme, disabled }) => (disabled ? "not-allowed" : "pointer")};

stroke: ${({ theme, disabled }) => (disabled ? theme.colors.gray_500 : theme.colors.white)};
Expand Down
1 change: 1 addition & 0 deletions src/pages/MyRegisterdShow/MyRegisterdShow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const MyRegisterdShow = () => {
{showList?.map((item: RegisteredObjProps, index: number) => (
<RegisteredCard
key={item.performanceId}
performanceId={item.performanceId}
performanceTitle={item.performanceTitle}
performancePeriod={item.performancePeriod}
genre={item.genre}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ export const CardInfoTitleText = styled.span`
width: 21rem;
overflow: hidden;

text-overflow: ellipsis;
white-space: nowrap;
color: ${({ theme }) => theme.colors.white};
white-space: nowrap;
text-overflow: ellipsis;
${({ theme }) => theme.fonts.heading4};
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import * as S from "./RegisteredCard.styled";

const RegisteredCard = ({
param,
performanceId,
performanceTitle,
performancePeriod,
genre,
posterImage,
}: Omit<RegisteredObjProps, "performanceId">) => {
}: RegisteredObjProps) => {
const navigate = useNavigate();
//공연 수정하기 뷰 연결하고 나면 url 변경해야할 수도 있음
// 또한, 파라미터를 넘겨서 조회할 수 있도록 url에 파라미터를 추가해야할 수 있음.
Expand All @@ -26,9 +27,18 @@ const RegisteredCard = ({

return (
<S.CardWrapper>
<S.CardImg imgsrc={posterImage ?? ""} />
<S.CardImg
imgsrc={posterImage ?? ""}
onClick={() => {
navigate(`/gig/${performanceId}`);
}}
/>
<S.CardInfo>
<S.CardInfoTextBox>
<S.CardInfoTextBox
onClick={() => {
navigate(`/gig/${performanceId}`);
}}
>
<S.CardInfoTextTitleBox>
<S.CardInfoGenreText>{getShowTypeText(genre as SHOW_TYPE_KEY)}</S.CardInfoGenreText>
<S.CardInfoTitleText>{performanceTitle}</S.CardInfoTitleText>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/modifyManage/ModifyManage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ const ModifyManage = () => {
value={performanceDescription}
onChange={(e) => setPerformanceDescription(e.target.value)}
placeholder="공연을 예매할 예매자들에게 공연을 소개해주세요."
maxLength={300}
maxLength={250}
/>
</InputModifyManageBox>
<S.Divider />
Expand Down Expand Up @@ -423,7 +423,7 @@ const ModifyManage = () => {
value={performanceAttentionNote}
onChange={(e) => setPerformanceAttentionNote(e.target.value)}
placeholder="입장 안내, 공연 중 인터미션, 공연장 반입금지 물품, 촬영 가능 여부, 주차 안내 등 예매자들이 꼭 알고 있어야할 유의사항을 입력해주세요."
maxLength={300}
maxLength={250}
/>
</InputModifyManageBox>
<S.Divider />
Expand Down
28 changes: 14 additions & 14 deletions src/pages/register/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ const Register = () => {
if (userObj === null) {
openAlert({
title: "로그인이 필요한 서비스입니다.",
okCallback: () => navigate("/main"),
});
handleKakaoLogin("/gig-register");
}

handleKakaoLogin("/register");
}, []);

// gigInfo 초기화
Expand Down Expand Up @@ -96,18 +96,18 @@ const Register = () => {
},
],
castList: [
{
castName: "", // 이름
castRole: "", // 역할
castPhoto: "", // 출연진 사진 URL
},
// {
// castName: "", // 이름
// castRole: "", // 역할
// castPhoto: "", // 출연진 사진 URL
// },
],
staffList: [
{
staffName: "", // 이름
staffRole: "", // 역할
staffPhoto: "", // 스태프 사진 URL
},
// {
// staffName: "", // 이름
// staffRole: "", // 역할
// staffPhoto: "", // 스태프 사진 URL
// },
],
});

Expand Down Expand Up @@ -363,7 +363,7 @@ const Register = () => {
value={performanceDescription}
onChange={(e) => handleChange(e, setGigInfo)}
placeholder="공연을 예매할 예매자들에게 공연을 소개해주세요."
maxLength={300}
maxLength={250}
/>
</InputRegisterBox>
<S.Divider />
Expand Down Expand Up @@ -440,7 +440,7 @@ const Register = () => {
value={performanceAttentionNote}
onChange={(e) => handleChange(e, setGigInfo)}
placeholder="입장 안내, 공연 중 인터미션, 공연장 반입금지 물품, 촬영 가능 여부, 주차 안내 등 예매자들이 꼭 알고 있어야할 유의사항을 입력해주세요."
maxLength={300}
maxLength={250}
/>
</InputRegisterBox>
<S.Divider />
Expand Down
Loading