Merge pull request #52 from prgrms-web-devcourse-final-project/featur…

…e/homepage Fix: 각종 오류 및 요구사항 수정
prgrms-web-devcourse-final-project · Dec 9, 2024 · 1ad09dc · 1ad09dc
2 parents e53ce7a + 20fca33
commit 1ad09dc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx
@@ -14,16 +14,6 @@ const Header = () => {
     setIsMobileMenuOpen(!isMobileMenuOpen);
   };
 
-  const handleCommunityClick = (
-    e: React.MouseEvent<HTMLAnchorElement, MouseEvent>
-  ) => {
-    if (!isLoggedIn || !isAdmin) {
-      e.preventDefault();
-      alert('로그인 후 이용할 수 있는 페이지입니다.');
-      setIsMobileMenuOpen(!isMobileMenuOpen);
-    }
-  };
-
   return (
     <HeaderContainer>
       <HeaderContent>
@@ -57,15 +47,21 @@ const Header = () => {
               </StyledLink>
             </NavItem>
             <NavItem>
-              <StyledLink to="/community/post" onClick={handleCommunityClick}>
+              <StyledLink to="/community/post" onClick={toggleMobileMenu}>
                 Community
               </StyledLink>
             </NavItem>
             <NavItem>
               {isLoggedIn && (
                 <StyledLink
                   to={isAdmin ? '#' : '/mypage/setting'}
-                  onClick={toggleMobileMenu}
+                  onClick={(e) => {
+                    if (isAdmin) {
+                      e.preventDefault(); // Admin일 경우 링크 동작 차단
+                    } else {
+                      toggleMobileMenu();
+                    }
+                  }}
                 >
                   {isAdmin ? 'Admin Page' : 'My Page'}
                 </StyledLink>

diff --git a/src/components/pages/Payment/PaymentFailPage.tsx b/src/components/pages/Payment/PaymentFailPage.tsx
@@ -11,7 +11,7 @@ const PaymentFailPage = () => {
   const productId = Number(id);
   const queryString = window.location.search;
   const urlParams = new URLSearchParams(queryString);
-  const amount = urlParams.get('totalAmount');
+  const price = urlParams.get('price');
   const { data: product, isLoading, isError } = useProductQuery(productId);
 
   if (!product) {
@@ -33,7 +33,7 @@ const PaymentFailPage = () => {
               </SummaryRow>
               <SummaryRow>
                 <Label>결제 금액</Label>
-                <Value>{amount} 원</Value>
+                <Value>{price} 원</Value>
               </SummaryRow>
             </OrderSummary>
           </FailureSection>

diff --git a/src/components/pages/Payment/PaymentSuccessPage.tsx b/src/components/pages/Payment/PaymentSuccessPage.tsx
@@ -12,7 +12,7 @@ const PaymentSuccessPage = () => {
   const queryString = window.location.search;
   const urlParams = new URLSearchParams(queryString);
 
-  const amount = urlParams.get('totalAmount');
+  const price = urlParams.get('price');
 
   const { data: product, isLoading, isError } = useProductQuery(productId);
 
@@ -34,7 +34,7 @@ const PaymentSuccessPage = () => {
               </SummaryRow>
               <SummaryRow>
                 <Label>결제 금액</Label>
-                <Value>{amount}원</Value>
+                <Value>{price}원</Value>
               </SummaryRow>
             </OrderSummary>
           </SuccessSection>

diff --git a/src/components/pages/ProductDetailPage/ProductDetail.tsx b/src/components/pages/ProductDetailPage/ProductDetail.tsx
@@ -24,7 +24,7 @@ const ProductDetail: React.FC = () => {
   const { quantity, setQuantity } = useQuantity();
   const [remainingTime, setRemainingTime] = useState('');
   const navigate = useNavigate();
-  const isOutOfStock = product ? product.now >= product.currentStock : false;
+  const isOutOfStock = product ? product.currentStock < 0 : false;
   const isDeadlinePassed = remainingTime === '마감되었습니다.';
   const isButtonDisabled = isOutOfStock || isDeadlinePassed;
   useEffect(() => {
@@ -209,7 +209,7 @@ const Stars = styled.div`
   position: absolute;
   font-size: 20px;
   color: #ffaa00;
-  bottom: 80px;
+  bottom: 13%;
   right: 2%;
 
   @media (min-width: 768px) and (max-width: 1024px) {

diff --git a/src/components/pages/ProductPage/ProductComponent.tsx b/src/components/pages/ProductPage/ProductComponent.tsx
@@ -27,7 +27,7 @@ const ProductComponent: React.FC<ProductComponentProps> = ({
   const filteredProducts =
     selectedText === '마감 상품'
       ? products.filter(
-          (p) => p.available === false && new Date(p.deadline) < new Date()
+          (p) => p.available === false || new Date(p.deadline) < new Date()
         )
       : products.filter(
           (p) => p.available === true && new Date(p.deadline) > new Date()