refactor: conflicts 해결

src/api/getProducts.js

@@ -1,32 +1,18 @@
-<<<<<<< HEAD
-const BASE_URL = 'https://panda-market-api.vercel.app/products';
-=======
 const BASE_URL = "https://backend-c2ut.onrender.com";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 
 
 export async function getProducts(
     { 
     offset = 0, 
     limit = 10, 
     page = 1, 
-<<<<<<< HEAD
-    pageSize = 10, 
-    sort = 'recent',
-=======
     sort = "recent",
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
     keyword = "",
 }
 ) {
   const query = `offset=${offset}&limit=${limit}&page=${page}&pageSize=${pageSize}&orderBy=${sort}&keyword=${keyword}`;
   const response = await fetch(`${BASE_URL}?${query}`);
   const data = await response.json();
-<<<<<<< HEAD
-
-  console.log("Fetched products:", data);
-=======
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 
   return data;
 }

src/components/App.js

@@ -1,14 +1,3 @@
-<<<<<<< HEAD:src/components/App.js
-import './App.css';
-import NavBar from './NavBar';
-import Footer from './Footer';
-import BestProducts from './BestProducts';
-import { OnSaleProducts } from './OnSaleProducts';
-import { useState } from 'react';
-import SearchBar from './SearchBar';
-import Pagination from './Pagination';
-import DropDown from './DropDown';
-=======
 import "../styles/ItemPage.css";
 import NavBar from "../components/NavBar";
 import Footer from "../components/Footer";
@@ -19,7 +8,6 @@ import SearchBar from "../components/SearchBar";
 import Pagination from "../components/Pagination";
 import DropDown from "../components/DropDown";
 import { NavLink } from "react-router-dom";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영):src/pages/ItemPage.js
 
 function App() {
 

src/components/BestProducts.js

@@ -1,16 +1,9 @@
 import { useEffect, useState } from "react";
 import "./BestProducts.css";
 import { getProducts } from "../api/getProducts";
-<<<<<<< HEAD
-import "./BestProducts.css";
-import "../images/empty_heart.png";
-import IsImage from "./IsImage";
-import "../images/no-image-available.png";
-=======
 import "../images/emptyHeart.png";
 import IsImage from "../utils/image.helper";
 import "../images/noImageAvailable.png";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 
 export function BestProducts() {
 

src/components/DropDown.js

@@ -1,12 +1,7 @@
-<<<<<<< HEAD
-import React, { useState } from 'react';
-import './DropDown.css';
-=======
 import React, { useState } from "react";
 import "../styles/DropDown.css";
 import DropdownToggle from "./DropdownToggle"; 
 import DropdownContent from "./DropdownContent";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 
 function DropDown({ options = [], onSelect }) {
     const [isOpen, setIsOpen] = useState(false);

src/components/Footer.js

@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-import instagram from '../images/ic_instagram.png';
-import facebook from '../images/ic_facebook.png';
-import twitter from '../images/ic_twitter.png';
-import youtube from '../images/ic_youtube.png';
-import './Footer.css';
-=======
 import instagram from "../images/ic_instagram.png";
 import facebook from "../images/ic_facebook.png";
 import twitter from "../images/ic_twitter.png";
 import youtube from "../images/ic_youtube.png";
 import "../styles/Footer.css";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 
 export function Footer() {
   return (

src/components/OnSaleProducts.js

@@ -1,12 +1,7 @@
 // import Product from "./ProductList";
 import "../images/search.png";
-<<<<<<< HEAD
-import "./OnSaleProducts.css";
-import "../images/empty_heart.png";
-=======
 import "../styles/OnSaleProducts.css";
 import "../images/emptyHeart.png";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 import { useState, useEffect } from "react";
 import getProducts from "../api/getProducts";
 import IsImage from "../utils/image.helper";
@@ -25,12 +20,6 @@ export function OnSaleProducts({ sort, page, keyword }) {
     const pageSize = input ? 10000 : 10;
     getProducts({ page, pageSize, sort: sortingType, keyword: input }) 
       .then((data) => {
-<<<<<<< HEAD
-        setOnSaleProducts(data.list);
-        data.list.forEach(product => {
-          if (!IsImage(String(product.images))) {
-            product.images = no_image_available;
-=======
         if (!data.products || !Array.isArray(data.products)) {
           throw new Error("Invalid products data");
         }
@@ -39,7 +28,6 @@ export function OnSaleProducts({ sort, page, keyword }) {
         data.products.forEach(product => {
           if (!product.images || !IsImage(product.images)) {
             product.images = noImageAvailable;
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
           }
         });
       })
@@ -68,13 +56,8 @@ export function OnSaleProducts({ sort, page, keyword }) {
       {
         filteredProducts.length > 0 ? (
           filteredProducts.map((product) => (
-<<<<<<< HEAD
-            <div className="on-sale-product-card" key={product.id}>
-              <img className="on-sale-product-image" src={product.images || no_image_available} alt={product.name} />
-=======
             <div className="on-sale-product-card" key={product._id}>
               <img className="on-sale-product-image" src={product.images || noImageAvailable} alt={product.name} />
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
               <div className="on-sale-product-info">
                 <h3>{product.name}</h3>
                 <p>{product.price.toLocaleString()}원</p>

src/components/Pagination.js

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-import { useState, useEffect } from 'react';
-import './Pagination.css';
-=======
 import { useState, useEffect } from "react";
 import "../styles/Pagination.css";
->>>>>>> 0f1a9c4 (refactor: sprint5 코멘트 반영)
 
 
 export function Pagination({ onPageChange }) {

src/components/RegistrationForm.js

@@ -1,4 +1,3 @@
-import React, { useState } from "react";
 import "../styles/RegistrationForm.css";
 import { useNavigate } from "react-router-dom";