From bc6d1b7a40fda155887b357790ec9d95ce1863f7 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 13 Apr 2023 09:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BF=BB=E8=AF=91=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.jsx                               | 8 ++++----
 src/stores/{Plan.js => Reservation.js}     | 8 ++++----
 src/stores/Root.js                         | 6 +++---
 src/views/App.jsx                          | 6 +++---
 src/views/{plan => reservation}/Detail.jsx | 2 +-
 src/views/{plan => reservation}/Newest.jsx | 8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)
 rename src/stores/{Plan.js => Reservation.js} (86%)
 rename src/views/{plan => reservation}/Detail.jsx (92%)
 rename src/views/{plan => reservation}/Newest.jsx (85%)

diff --git a/src/main.jsx b/src/main.jsx
index 0b75844..dc195f2 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -13,8 +13,8 @@ import Login from "./views/Login";
 import SignOut from "./views/SignOut";
 import Index from "./views/index";
 import ErrorPage from "./views/error-page";
-import PlanNewest from "./views/plan/Newest";
-import PlanDetail from "./views/plan/Detail";
+import ReservationNewest from "./views/reservation/Newest";
+import ReservationDetail from "./views/reservation/Detail";
 
 configure({ 
   useProxies: "ifavailable",
@@ -32,8 +32,8 @@ const router = createBrowserRouter([
     errorElement: <ErrorPage />,
     children: [
       { index: true, element: <Index /> },
-      { path: "plan/newest", element: <PlanNewest />},
-      { path: "plan/:planId", element: <PlanDetail />}
+      { path: "reservation/newest", element: <ReservationNewest />},
+      { path: "reservation/:reservationId", element: <ReservationDetail />}
     ]
   },
   {
diff --git a/src/stores/Plan.js b/src/stores/Reservation.js
similarity index 86%
rename from src/stores/Plan.js
rename to src/stores/Reservation.js
index 5d83775..b4caacd 100644
--- a/src/stores/Plan.js
+++ b/src/stores/Reservation.js
@@ -2,7 +2,7 @@ import { makeAutoObservable, runInAction } from "mobx";
 import * as req from '../utils/request';
 import { prepareUrl } from '../utils/commons';
 
-class Plan {
+class Reservation {
 
   constructor(root) {
     makeAutoObservable(this, { rootStore: false });
@@ -11,7 +11,7 @@ class Plan {
 
   fetchRecent() {
     runInAction(() => {
-      this.planList = [
+      this.reservationList = [
         {
           key: '1',
           name: '中华游111029-N111025076',
@@ -37,7 +37,7 @@ class Plan {
     });
   }
 
-  planList = [
+  reservationList = [
     {
       key: '1',
       name: '-',
@@ -48,4 +48,4 @@ class Plan {
   ];
 }
 
-export default Plan;
\ No newline at end of file
+export default Reservation;
\ No newline at end of file
diff --git a/src/stores/Root.js b/src/stores/Root.js
index fb17968..34a34c3 100644
--- a/src/stores/Root.js
+++ b/src/stores/Root.js
@@ -1,11 +1,11 @@
 import { makeAutoObservable } from "mobx";
-import Plan from "./Plan";
+import Reservation from "./Reservation";
 import Auth from "./Auth";
 
 class Root {
   constructor() {
-    this.plan = new Plan(this);
-    this.auth = new Auth(this);
+    this.reservationStore = new Reservation(this);
+    this.authStore = new Auth(this);
     makeAutoObservable(this);
   }
 }
diff --git a/src/views/App.jsx b/src/views/App.jsx
index 5012f37..909298b 100644
--- a/src/views/App.jsx
+++ b/src/views/App.jsx
@@ -62,9 +62,9 @@ export default function App() {
 
               <Menu theme="dark" mode="horizontal" defaultSelectedKeys={['2']} items={
                 [
-                  { key: 1, label: <Link to="/plan/newest">Plan</Link> },
-                  { key: 2, label: <Link to="/invoice/list">Invoice</Link> },
-                  { key: 3, label: <Link to="/feedback/list">Feedback</Link> }
+                  { key: 1, label: <Link to="/reservation/newest">Reservation</Link> },
+                  { key: 3, label: <Link to="/feedback/list">Feedback</Link> },
+                  { key: 2, label: <Link to="/invoice/list">Invoice</Link> }
                 ]
               } />
             </Col>
diff --git a/src/views/plan/Detail.jsx b/src/views/reservation/Detail.jsx
similarity index 92%
rename from src/views/plan/Detail.jsx
rename to src/views/reservation/Detail.jsx
index 9dfa2b9..5860c0e 100644
--- a/src/views/plan/Detail.jsx
+++ b/src/views/reservation/Detail.jsx
@@ -58,7 +58,7 @@ const planListColumns = [
 ];
 
 function Detail() {
-  const { planId } = useParams();
+  const { reservationId } = useParams();
   const { plan } = useStore();
   const { planList } = plan;
 
diff --git a/src/views/plan/Newest.jsx b/src/views/reservation/Newest.jsx
similarity index 85%
rename from src/views/plan/Newest.jsx
rename to src/views/reservation/Newest.jsx
index c9fb3cd..5a82d8d 100644
--- a/src/views/plan/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -8,7 +8,7 @@ import { useStore } from '../../stores/StoreContext.js';
 
 const { Title } = Typography;
 
-const planListColumns = [
+const reservationListColumns = [
   {
     title: 'Name',
     dataIndex: 'name',
@@ -59,8 +59,8 @@ const planListColumns = [
 
 function Newest() {
 
-  const { plan } = useStore();
-  const { planList } = plan;
+  const { reservationStore } = useStore();
+  const { reservationList } = reservationStore;
 
   useEffect(() => {
     console.info('Newest.useEffect');
@@ -84,7 +84,7 @@ function Newest() {
       </Row>
       <Row>
         <Col span={24}>
-          <Table columns={planListColumns} dataSource={toJS(planList)} />
+          <Table columns={reservationListColumns} dataSource={toJS(reservationList)} />
         </Col>
       </Row>
     </Space>