Skip to content

Commit

Permalink
Merge branch 'dev' into feat/board-api
Browse files Browse the repository at this point in the history
  • Loading branch information
Village-GG-Water authored Oct 7, 2024
2 parents 2698009 + 7537a09 commit bbd6bcc
Show file tree
Hide file tree
Showing 44 changed files with 1,395 additions and 645 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@ dist-ssr
*.njsproj
*.sln
*.sw?

# Environment files
.env
.env.local
.env.development
.env.*
!.env.example
123 changes: 111 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-powerglitch": "^1.0.3",
"react-query": "^3.39.3",
"react-router-dom": "^6.25.1",
"react-transition-group": "^4.4.5",
"styled-components": "^6.1.12",
Expand Down
1 change: 0 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import NewArticleEditor from './pages/NewArticleEditor';
import Login from './pages/Login';
import SignUp from './pages/SignUp';
import MyPage from './pages/MyPage';
import Section6 from './pages/Section6';

export default function App() {
// location.key을 통해 화면 전환 시 컴포넌트 충돌/중복 방지 용으로 사용됩니다.
Expand Down
Empty file removed src/assets/.gitkeep
Empty file.
Loading

0 comments on commit bbd6bcc

Please sign in to comment.