Merge branch 'main' into fe/feat/#27

SV-Winter-BootCamp-Team-C · Jan 19, 2024 · 15ae496 · 15ae496
2 parents f66efc1 + cc06215
commit 15ae496
Show file tree

Hide file tree

Showing 15 changed files with 168 additions and 706 deletions.
diff --git a/backend/controller/formAllUser.js b/backend/controller/formAllUser.js
@@ -45,7 +45,7 @@ const getUserSurveys = async (req, res) => {
             mainImageUrl: survey.mainImageUrl || null,
             createdAt: survey.createdAt,
             deadline: survey.deadline,
-            attendedCount: attendedCount,
+            attendCount: attendedCount,
           };
         }),
       );

diff --git a/frontend/.husky/pre-commit b/frontend/.husky/pre-commit