Skip to content

Commit

Permalink
Merge pull request #14 from a-romantic-cat/feature/2
Browse files Browse the repository at this point in the history
Feature/2
  • Loading branch information
noeyeyh authored Jan 29, 2024
2 parents 65d4c68 + a08c95a commit e5c07ff
Show file tree
Hide file tree
Showing 30 changed files with 13,578 additions and 98 deletions.
1,228 changes: 1,205 additions & 23 deletions front-end/package-lock.json

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions front-end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,19 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"date-fns": "^3.3.1",
"moment": "^2.30.1",
"react": "^18.2.0",
"react-calendar": "^4.8.0",
"react-dom": "^18.2.0",
"react-markdown": "^9.0.1",
"react-modal": "^3.16.1",
"react-redux": "^9.1.0",
"react-router-dom": "^6.21.3",
"react-redux": "^9.1.0",
"react-router-dom": "^6.21.3",
"react-scripts": "5.0.1",
"redux": "^5.0.1",
"styled-components": "^6.1.8",
"web-vitals": "^2.1.4"
},
Expand Down
8 changes: 8 additions & 0 deletions front-end/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ 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 BoxSetting1 from './components/Login/BoxSetting1';
import BoxSetting2 from './components/Login/BoxSetting2';
import BoxSetting3 from './components/Login/BoxSetting3';
import SettingEnd from './components/Login/SettingEnd';

const Background = styled.div`
background-color: #FFFEF8;
Expand Down Expand Up @@ -47,6 +51,10 @@ function App() {
<Route path="/OpenLetter1" element={<OpenLetter1 />} />
<Route path="/Terms" element={<Terms />} />
<Route path="/MakeLetterbox" element={<MakeLetterbox />} />
<Route path="/BoxSetting1" element={<BoxSetting1 />} />
<Route path="/BoxSetting2" element={<BoxSetting2 />} />
<Route path="/BoxSetting3" element={<BoxSetting3 />} />
<Route path="/SettingEnd" element={<SettingEnd />} />
</Routes>
</BrowserRouter>
</Background>
Expand Down
3 changes: 3 additions & 0 deletions front-end/src/assets/img/BasicDate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions front-end/src/assets/img/CircleCheckbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions front-end/src/assets/img/NextIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions front-end/src/assets/img/PrevIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions front-end/src/assets/img/SelectDate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions front-end/src/assets/img/Selected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions front-end/src/assets/img/SelectedCheckbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions front-end/src/assets/img/SignCat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions front-end/src/assets/img/VectorChecked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions front-end/src/assets/img/VectorX.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions front-end/src/assets/img/내우체통_Blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions front-end/src/assets/img/내우체통_Green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions front-end/src/assets/img/내우체통_Pink.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e5c07ff

Please sign in to comment.