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: User 페이지 스타일 변경 #48

Merged
merged 6 commits into from
Sep 26, 2024
Merged

Conversation

aquaman122
Copy link
Contributor

💡 작업 내용

  • User 페이지 스타일 변경

💡 자세한 설명

🛠️ 유저 페이지 목록

const UserOrder = () => {
  const navigate = useNavigate();

  return (
    <div className="pb-10">
      {/* 참여한 정식 경매 내역 */}
      <div>
        <h2 className="text-xl font-bold mb-4">참여한 정식 경매 내역</h2>
        <div className="flex justify-between space-x-3">
          {/* 진행중인 경매 */}
          <div
            className="flex flex-col items-center p-4 border border-gray2 rounded-lg w-1/3 cursor-pointer"
            onClick={() =>
              navigate('/order/history', {
                state: { sortType: 'AuctionHistory' },
              })
            }
          >
            <img
              src={OnGoingIcon}
              alt="진행중인 경매"
              className="mb-2 w-8 h-8"
            />
            <span className="text-sm font-semibold">진행중인 경매</span>
            <span className="text-orange-500 mt-1 text-lg">1 </span>
          </div>

          {/* 성공한 경매 */}
          <div
            className="flex flex-col items-center p-4 border border-gray2 rounded-lg w-1/3 cursor-pointer"
            onClick={() =>
              navigate('/order/history', { state: { sortType: 'AuctionsWon' } })
            }
          >
            <img src={SuccessIcon} alt="성공한 경매" className="mb-2 w-8 h-8" />
            <span className="text-sm font-semibold">성공한 경매</span>
            <span className="text-orange-500 mt-1 text-lg">1 </span>
          </div>

          {/* 실패한 경매 */}
          <div
            className="flex flex-col items-center p-4 border border-gray2 rounded-lg w-1/3 cursor-pointer"
            onClick={() =>
              navigate('/order/history', {
                state: { sortType: 'AuctionsLost' },
              })
            }
          >
            <img src={FailedIcon} alt="실패한 경매" className="mb-2 w-8 h-8" />
            <span className="text-sm font-semibold">실패한 경매</span>
            <span className="text-orange-500 mt-1 text-lg">1 </span>
          </div>
        </div>
      </div>

      {/* 내가 등록한 경매 내역 */}
      <div className="mt-8">
        <h2 className="text-xl font-bold mb-4">내가 등록한 경매 내역</h2>
        <div className="flex justify-between space-x-3">
          {/* 정식 경매 */}
          <div
            className="flex flex-col items-center p-4 border border-gray2 rounded-lg w-1/2 cursor-pointer"
            onClick={() =>
              navigate('user/registered/list', { state: { sortType: true } })
            }
          >
            <img src={AuctionIcon} alt="정식 경매" className="mb-2 w-8 h-8" />
            <span className="text-sm font-semibold">정식 경매</span>
            <span className="text-orange-500 mt-1 text-lg">1 </span>
          </div>

          {/* 사전 경매 */}
          <div
            className="flex flex-col items-center p-4 border border-gray2 rounded-lg w-1/2 cursor-pointer"
            onClick={() =>
              navigate('user/registered/list', { state: { sortType: false } })
            }
          >
            <img
              src={PreAuctionIcon}
              alt="사전 경매"
              className="mb-2 w-8 h-8"
            />
            <span className="text-sm font-semibold">사전 경매</span>
            <span className="text-orange-500 mt-1 text-lg">1 </span>
          </div>
        </div>
      </div>
    </div>
  );
};

export default UserOrder;

🚩 후속 작업 (선택)

  • api 연결

✅ 셀프 체크리스트

  • PR 제목을 형식에 맞게 작성했나요?
  • 브랜치 전략에 맞는 브랜치에 PR을 올리고 있나요? (master/main이 아닙니다.)
  • 이슈는 close 했나요?
  • Reviewers, Labels, Projects를 등록했나요?
  • 작업 도중 문서 수정이 필요한 경우 잘 수정했나요?
  • 테스트는 잘 통과했나요?
  • 불필요한 코드는 제거했나요?

@aquaman122 aquaman122 added ✨feature 구현, 개선 사항 관련 부분 👩🏻‍💻frontend 프론트엔드 작업 labels Sep 19, 2024
@aquaman122 aquaman122 self-assigned this Sep 19, 2024
Copy link
Contributor

@CLOUDoort CLOUDoort left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

고생하셨습니다!

<div className="pb-10">
{/* 참여한 정식 경매 내역 */}
<div>
<h2 className="text-xl font-bold mb-4">참여한 정식 경매 내역</h2>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

텍스트 크기는 text-xl 대신 tailwind.config에 있는 text-heading 으로 통일하면 좋을 것 같습니다!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵!

{/* 참여한 정식 경매 내역 */}
<div>
<h2 className="text-xl font-bold mb-4">참여한 정식 경매 내역</h2>
<div className="flex justify-between space-x-3">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flex를 사용할 때는 space보다 gap 사용하는게 좋다고 합니다!

onClick={() =>
navigate('/order/history', {
state: { sortType: 'AuctionHistory' },
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

경로와 sortType을 인자로 받는 함수를 따로 작성하는 것도 좋아보입니다!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

좋은 것 같습니다!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

중복되는 경매 내역 UI는 컴포넌트로 따로 만들면 좋아보입니다!

src/main.tsx Outdated
// return;
// }
// const { worker } = await import('./mocks/broswer');
// await worker.start();
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 설정은 commit안하는게 좋은 것 같습니다!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엇 네넵!

@aquaman122 aquaman122 merged commit 088a60f into dev Sep 26, 2024
@aquaman122 aquaman122 deleted the fix/pages-styles-edit branch September 26, 2024 06:11
@aquaman122 aquaman122 restored the fix/pages-styles-edit branch October 2, 2024 07:04
@aquaman122 aquaman122 deleted the fix/pages-styles-edit branch October 2, 2024 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✨feature 구현, 개선 사항 관련 부분 👩🏻‍💻frontend 프론트엔드 작업
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants