Merge branch 'main' into feature/add-user-login-page

BesLogic · Mar 23, 2024 · bc709eb · bc709eb
2 parents 4cdb678 + 00492e1
commit bc709eb
Show file tree

Hide file tree

Showing 7 changed files with 2,616 additions and 2,492 deletions.
diff --git a/canopeum_backend/canopeum_backend/settings.py b/canopeum_backend/canopeum_backend/settings.py
@@ -127,7 +127,7 @@
         "USER": "root",
         "PASSWORD": "canopeum",
         "HOST": "localhost",
-        "PORT": "3306",
+        "PORT": "3308",  # Same as in docker-compose.yml
     },
 }
 

diff --git a/canopeum_backend/canopeum_backend/views.py b/canopeum_backend/canopeum_backend/views.py
@@ -194,11 +194,8 @@ class PostListAPIView(APIView):
     def get(self, request):
         comment_count = Comment.objects.filter(post=request.data.get("id")).count()
         has_liked = 0
-        siteId = request.GET.get("siteId", "")
-        if siteId != "":
-            posts = Post.objects.filter(site=siteId)
-        else:
-            posts = Post.objects.all()
+        site_id = request.GET.get("siteId", "")
+        posts = Post.objects.filter(site=site_id) if not site_id else Post.objects.all()
         serializer = PostSerializer(posts, many=True, context={"comment_count": comment_count, "has_liked": has_liked})
         return Response(serializer.data)
 

diff --git a/canopeum_frontend/src/pages/MapSite.tsx b/canopeum_frontend/src/pages/MapSite.tsx
@@ -1,8 +1,10 @@
 import { useParams } from 'react-router-dom'
 
 const MapSite = () => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars -- We plan on using it
+  /* eslint-disable @typescript-eslint/no-unused-vars -- We plan on using it */
+  // @ts-expect-error: We plan on using it
   const { siteId } = useParams()
+  /* eslint-enable @typescript-eslint/no-unused-vars */
 
   return (
     <div>