Skip to content

Commit

Permalink
Merge pull request #23 from a-romantic-cat/feature/2
Browse files Browse the repository at this point in the history
Feature/2
  • Loading branch information
gitaehee authored Feb 11, 2024
2 parents d2b2c61 + feaeda8 commit 16918a6
Show file tree
Hide file tree
Showing 23 changed files with 894 additions and 606 deletions.
2 changes: 2 additions & 0 deletions front-end/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import SettingEnd from './components/Login/SettingEnd';
import CollectionMain from './components/RomanticLetterbox/Collection/CollectionMain';
import MyCollection from './components/RomanticLetterbox/Collection/MyCollection';
import MyWriting from './components/RomanticLetterbox/Collection/MyWriting';
import CollectionLetter from './components/RomanticLetterbox/Collection/CollectionLetter';

const GlobalStyle = createGlobalStyle`
body {
Expand Down Expand Up @@ -87,6 +88,7 @@ function App() {
<Route path="/CollectionMain" element={<CollectionMain />} />
<Route path="/MyCOllection" element={<MyCollection />} />
<Route path="/MyWriting" element={<MyWriting />} />
<Route path="/CollectionLetter" element={<CollectionLetter />} />
</Routes>
</BrowserRouter>
</div>
Expand Down
3 changes: 3 additions & 0 deletions front-end/src/assets/img/Unopen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions front-end/src/assets/img/clap.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/clober.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/good.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/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions front-end/src/assets/img/sad.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 16918a6

Please sign in to comment.