Merge pull request #16 from a-romantic-cat/feature/3

Feature/3
a-romantic-cat · Jan 29, 2024 · 3eba27a · 3eba27a
2 parents f41fc02 + 1d9654b
commit 3eba27a
Show file tree

Hide file tree

Showing 19 changed files with 2,407 additions and 72 deletions.
diff --git a/front-end/package-lock.json b/front-end/package-lock.json
diff --git a/front-end/package.json b/front-end/package.json
@@ -15,6 +15,7 @@
     "react": "^18.2.0",
     "react-calendar": "^4.8.0",
     "react-dom": "^18.2.0",
+    "react-icons": "^5.0.1",
     "react-markdown": "^9.0.1",
     "react-modal": "^3.16.1",
     "react-redux": "^9.1.0",

diff --git a/front-end/src/App.js b/front-end/src/App.js
@@ -18,6 +18,8 @@ import OpenLetter1 from './components/MyLetterbox/OpenLetter1';
 import CreateAccount from './components/Login/CreateAccount';
 import Terms from './components/Login/Terms';
 import MakeLetterbox from './components/Login/MakeLetterbox';
+import MissionMain from './components/Store/MissionMain';
+import CollectionBoxMain from './components/Store/CollectionBoxMain';
 import WritingLetter  from './components/RomanticLetterbox/WritingLetter/WritingLetter';
 import CompletedLetterWriting from './components/RomanticLetterbox/WritingLetter/CompletedLetterWriting';
 import CompletedLetterReplying from './components/RomanticLetterbox/ReplyingLetter/CompletedLetterReplying';
@@ -61,6 +63,8 @@ function App() {
           <Route path="/OpenLetter1" element={<OpenLetter1 />} />
           <Route path="/Terms" element={<Terms />} />
           <Route path="/MakeLetterbox" element={<MakeLetterbox />} />
+          <Route path="/MissionMain" element={<MissionMain />} />
+          <Route path="/CollectionBoxMain" element={<CollectionBoxMain />} />
           <Route path="/BoxSetting1" element={<BoxSetting1 />} />
           <Route path="/BoxSetting2" element={<BoxSetting2 />} />
           <Route path="/BoxSetting3" element={<BoxSetting3 />} />

diff --git a/front-end/src/assets/img/Checkbox.svg b/front-end/src/assets/img/Checkbox.svg
diff --git a/front-end/src/assets/img/CoinRed.svg b/front-end/src/assets/img/CoinRed.svg
diff --git a/front-end/src/assets/img/다음버튼.svg b/front-end/src/assets/img/다음버튼.svg
diff --git a/front-end/src/assets/img/달력제목오른쪽.svg b/front-end/src/assets/img/달력제목오른쪽.svg
diff --git a/front-end/src/assets/img/달력제목왼쪽.svg b/front-end/src/assets/img/달력제목왼쪽.svg
diff --git a/front-end/src/assets/img/발바닥.svg b/front-end/src/assets/img/발바닥.svg