-
- Downloads
Merge branch 'main' into 'pbh'
# Conflicts: # backend/routers/auth.js # backend/src/services/authService.js
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- backend/app.js 2 additions, 2 deletionsbackend/app.js
- backend/routers/post.js 2 additions, 0 deletionsbackend/routers/post.js
- backend/src/controllers/postController.js 21 additions, 2 deletionsbackend/src/controllers/postController.js
- backend/src/controllers/userController.js 3 additions, 4 deletionsbackend/src/controllers/userController.js
- backend/src/middleware/auth.js 10 additions, 7 deletionsbackend/src/middleware/auth.js
- backend/src/models/Post.js 7 additions, 3 deletionsbackend/src/models/Post.js
- backend/src/services/authService.js 13 additions, 13 deletionsbackend/src/services/authService.js
- backend/src/services/postService.js 5 additions, 0 deletionsbackend/src/services/postService.js
- backend/utils/jwt.js 2 additions, 3 deletionsbackend/utils/jwt.js
- frontend/package-lock.json 598 additions, 6 deletionsfrontend/package-lock.json
- frontend/package.json 4 additions, 0 deletionsfrontend/package.json
- frontend/public/index.html 0 additions, 1 deletionfrontend/public/index.html
- frontend/src/App.js 1 addition, 1 deletionfrontend/src/App.js
- frontend/src/Components/DiaryList.js 26 additions, 14 deletionsfrontend/src/Components/DiaryList.js
- frontend/src/Components/Diarybox.js 43 additions, 46 deletionsfrontend/src/Components/Diarybox.js
- frontend/src/Components/DiaryboxDetail.js 63 additions, 0 deletionsfrontend/src/Components/DiaryboxDetail.js
- frontend/src/Components/Editor.js 65 additions, 22 deletionsfrontend/src/Components/Editor.js
- frontend/src/Components/Guest.js 1 addition, 0 deletionsfrontend/src/Components/Guest.js
- frontend/src/Components/HeaderProfile.js 9 additions, 1 deletionfrontend/src/Components/HeaderProfile.js
Loading
Please register or sign in to comment