From bc44cb675fde2cf7ca04259d056f7877e23e2311 Mon Sep 17 00:00:00 2001 From: hyemin Date: Tue, 7 Nov 2023 22:39:15 +0900 Subject: [PATCH] =?UTF-8?q?Feat:=20Home=ED=99=94=EB=A9=B4=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 38 +++++++++++++ package.json | 1 + src/App.js | 3 +- src/Atom/status.jsx | 8 +++ src/assets/Designer.png | Bin 1046545 -> 0 bytes src/components/views/Header/Header.css | 2 +- src/components/views/Header/Header.jsx | 8 ++- src/components/views/NavBar/NavBar.css | 3 - src/components/views/NavBar/NavBar.jsx | 11 +++- src/pages/Home/Complete.jsx | 7 +++ src/pages/Home/Home.jsx | 14 ++++- src/pages/Home/MainHome.css | 10 ++++ src/pages/Home/MainHome.jsx | 73 ++++++++++++++++++++----- src/pages/Home/Progress.jsx | 7 +++ src/pages/Home/Receipt.css | 28 ++++++++++ src/pages/Home/Receipt.jsx | 15 +++++ src/pages/Home/Wait.jsx | 7 +++ src/style/theme/theme.jsx | 2 +- 18 files changed, 210 insertions(+), 27 deletions(-) create mode 100644 src/Atom/status.jsx delete mode 100644 src/assets/Designer.png create mode 100644 src/pages/Home/Complete.jsx create mode 100644 src/pages/Home/MainHome.css create mode 100644 src/pages/Home/Progress.jsx create mode 100644 src/pages/Home/Receipt.css create mode 100644 src/pages/Home/Receipt.jsx create mode 100644 src/pages/Home/Wait.jsx diff --git a/package-lock.json b/package-lock.json index f3f5b53..2cbfd36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "react-redux": "^8.1.3", "react-router-dom": "^6.16.0", "react-scripts": "5.0.1", + "recoil": "^0.7.7", "redux": "^4.2.1", "redux-promise": "^0.6.0", "redux-thunk": "^2.4.2", @@ -9164,6 +9165,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/hamt_plus": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hamt_plus/-/hamt_plus-1.0.2.tgz", + "integrity": "sha512-t2JXKaehnMb9paaYA7J0BX8QQAY8lwfQ9Gjf4pg/mk4krt+cmwmU652HOoWonf+7+EQV97ARPMhhVgU1ra2GhA==" + }, "node_modules/handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", @@ -15327,6 +15333,25 @@ "node": ">=8.10.0" } }, + "node_modules/recoil": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/recoil/-/recoil-0.7.7.tgz", + "integrity": "sha512-8Og5KPQW9LwC577Vc7Ug2P0vQshkv1y3zG3tSSkWMqkWSwHmE+by06L8JtnGocjW6gcCvfwB3YtrJG6/tWivNQ==", + "dependencies": { + "hamt_plus": "1.0.2" + }, + "peerDependencies": { + "react": ">=16.13.1" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + }, + "react-native": { + "optional": true + } + } + }, "node_modules/recursive-readdir": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", @@ -25013,6 +25038,11 @@ "duplexer": "^0.1.2" } }, + "hamt_plus": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hamt_plus/-/hamt_plus-1.0.2.tgz", + "integrity": "sha512-t2JXKaehnMb9paaYA7J0BX8QQAY8lwfQ9Gjf4pg/mk4krt+cmwmU652HOoWonf+7+EQV97ARPMhhVgU1ra2GhA==" + }, "handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", @@ -29283,6 +29313,14 @@ "picomatch": "^2.2.1" } }, + "recoil": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/recoil/-/recoil-0.7.7.tgz", + "integrity": "sha512-8Og5KPQW9LwC577Vc7Ug2P0vQshkv1y3zG3tSSkWMqkWSwHmE+by06L8JtnGocjW6gcCvfwB3YtrJG6/tWivNQ==", + "requires": { + "hamt_plus": "1.0.2" + } + }, "recursive-readdir": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", diff --git a/package.json b/package.json index 4edd67c..8ab0a3c 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "react-redux": "^8.1.3", "react-router-dom": "^6.16.0", "react-scripts": "5.0.1", + "recoil": "^0.7.7", "redux": "^4.2.1", "redux-promise": "^0.6.0", "redux-thunk": "^2.4.2", diff --git a/src/App.js b/src/App.js index ba25e17..c617c87 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,4 @@ import { Route, Routes } from "react-router-dom"; -import Footer from "../src/components/views/Footer/Footer"; import Header from "../src/components/views/Header/Header"; import Inventory from "../src/pages/Inventory/Inventory"; import Mypage from "../src/pages/Mypage/Mypage"; @@ -18,7 +17,7 @@ function App() { } /> -