Skip to content

Commit 8c235f3

Browse files
committed
Merge branch 'dev' of https://github.com/MUIT-UMC/Frontend into dev
2 parents 3e5ffdb + fd997b4 commit 8c235f3

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/components/buy/Step3.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ const Step3 = () => {
4343
peopleCount,
4444
selectedTicketName,
4545
ticketInfo,
46+
amateurTicketId: selectedTicket.amateurTicketId,
4647
},
4748
});
4849
};
49-
5050

5151
return (
5252
<Container>

src/components/buy/Step4.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ const token = localStorage.getItem("accessToken");
88

99
const Step4 = () => {
1010
const navigate = useNavigate();
11-
const { amateurId } = useParams();
11+
// const { amateurTicketId } = useParams();
1212
const [accountName, setAccountName] = useState("");
1313
const [isSubmitting, setIsSubmitting] = useState(false);
1414
const isButtonActive = accountName.trim().length > 0;
1515
const location = useLocation();
16-
const { peopleCount, selectedTicketName="일반 예매",ticketInfo } = location.state || {};
16+
const { peopleCount, selectedTicketName="일반 예매",ticketInfo,amateurTicketId } = location.state || {};
17+
console.log("ticketId",amateurTicketId)
1718

1819
const handleSubmit = async () => {
1920
if (!isButtonActive || isSubmitting) return;
2021

2122
setIsSubmitting(true);
2223

23-
const url = `${import.meta.env.VITE_APP_SERVER_URL}/tickets/purchase/${amateurId}`;
24-
24+
const url = `${import.meta.env.VITE_APP_SERVER_URL}/tickets/purchase/${amateurTicketId}`;
2525
try {
2626
const response = await fetch(url, {
2727
method: 'POST',

src/components/small-theater/CreditInfo.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const CreditsWrapper = styled.div`
4747
`;
4848
const CreditRow = styled.div`
4949
display: grid;
50-
grid-template-columns: auto 1fr; /* Two columns for position and name */
50+
grid-template-columns: 120px 1fr; /* Two columns for position and name */
5151
column-gap: 35px; /* Gap between position and name */
5252
align-items: center;
5353
`;

0 commit comments

Comments
 (0)