Merge pull request #379 from beezSSG/dev

#deploy dev -> main 운영 배포 04-19 10:40

src/App.js

@@ -7,6 +7,7 @@ import "./firebase-messaging-sw.js";
 import MainHome from './pages/main/MainHome.js';
 import Manager from './pages/manager/Manager.js';
 import Ceo from './pages/ceo/Ceo.js';
+import ScrollToTop from './ScrollToTop'; 
 
 function App() {
 
@@ -34,6 +35,7 @@ function App() {
     <>
       <AuthProvider>
         <BrowserRouter>
+        <ScrollToTop />
           <Routes>
             <Route path='/*' element={<MainHome />} />
             <Route path='/manager/*' element={<Manager/>} />

src/ScrollToTop.js

@@ -0,0 +1,14 @@
+import { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+
+function ScrollToTop() {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [pathname]);
+
+  return null;
+}
+
+export default ScrollToTop;

src/assets/data/mypage/list.json

@@ -13,6 +13,7 @@
     {
       "title": "내 활동",
       "subtitle": [
+        { "subname": "최근본 상품", "subpath": "" },
         { "subname": "찜목록", "subpath": "save" },
         { "subname": "나의 후기", "subpath": "review" }
       ]

src/pages/ceo/Inventory.js

@@ -36,7 +36,6 @@ export default function Inventory() {
 
   return (
     <div className="mx-auto w-[80%]">
-      <p className="text-3xl font-semibold mb-4">재고 현황</p>
       <div className="text-center mb-5">
         <input
           type="search"
@@ -58,7 +57,7 @@ export default function Inventory() {
         <thead>
           <tr className="bg-yellow-400 p-20">
             <th className="w-1/6 py-2">번호</th>
-            <th className="w-1/2 py-2">점포 이름</th>
+            <th className="w-1/6 py-1">카테고리</th>
             <th className="w-1/2 py-1">상품 이름</th>
             <th className="w-1/5 py-2">가격</th>
             <th className="w-1/4 py-2">수량</th>
@@ -72,7 +71,7 @@ export default function Inventory() {
               className="border-b border-gray-300 hover:bg-gray-200"
             >
               <td className="text-center py-3">{[index + 1]}</td>
-              <td className="text-center py-3">{group.storeName}</td>
+              <td className="text-center py-3">{group.productCategory}</td>
               <td className="text-center py-3">{group.productName}</td>
               <td className="text-center py-3">
                 {group.price.toLocaleString()}원

src/pages/ceo/PickCheckModal.js

@@ -0,0 +1,57 @@
+import { useState } from "react";
+import { Modal, Button } from "antd";
+import axios from "axios";
+
+export default function PickCheckModal({ getPickup, group }) {
+
+  const [isOpen, setIsOpen] = useState(false);
+
+  const onToggleModal = () => {
+    setIsOpen((prev) => !prev);
+  };
+
+  // customerName / date
+  function confrimHandle() {
+    // const params = { "id": group[0].customerId, "date":group[0].date };
+    const params = { "date":group[0].date };
+    console.log(params);
+    axios
+    .post("ceo/deletepickup", null, { params: params })
+    .then((resp) => {
+      getPickup("",0);
+
+      console.log(resp);    
+    })
+    .catch((error) => {
+      // 오류가 발생했을 때의 처리
+      console.error("error");
+    }); 
+    onToggleModal();
+  }
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={onToggleModal}
+        className="bg-sub-yellow rounded-xl p-2 font-bold hover:bg-sub-orange"
+      >
+        확인하기
+      </button>
+
+      {isOpen && 
+        <Modal
+          open={true}
+          centered={true}
+          footer={null}
+          onCancel={onToggleModal}
+        >
+          {/* 여기에 모달내부에 보여줄 디자인을 작성 */}
+          <Button key="submit" onClick={confrimHandle}>
+             <h1 className="text-lg font-bold">승인 확인되었습니다</h1>
+          </Button>
+        </Modal>
+      }
+    </>
+  );
+}