fix merged conflict

Author: abhayymishraa

backend/apps/owasp/graphql/queries/project.py

@@ -9,12 +9,10 @@
 class ProjectQueries(graphene.ObjectType):
     """GraphQL queries for OWASP projects."""
 
-    project = graphene.Field(ProjectType, project_id=graphene.ID(), key=graphene.String())
+    project = graphene.Field(ProjectType, key=graphene.String())
 
-    def resolve_project(self, info, project_id=None, key=None):
-        """Resolve a project by its ID or key."""
-        if id:
-            return Project.objects.get(id=id)
+    def resolve_project(self, info, key=None):
+        """Resolve a project by its key."""
         if key:
             return Project.objects.get(key=key)
         return None

backend/poetry.lock

@@ -22,24 +22,6 @@ import SecondaryCard from 'components/SecondaryCard'
 import TopContributors from 'components/ToggleContributors'
 import ToggleableList from 'components/ToogleList'
 
-export const formatDate = (input: number | string) => {
-  const date =
-    typeof input === 'number'
-      ? new Date(input * 1000) // Unix timestamp in seconds
-      : new Date(input) // ISO date string
-
-  if (isNaN(date.getTime())) {
-    throw new Error('Invalid date')
-  }
-
-  return date.toLocaleDateString('en-US', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-  })
-}
-
-
 const ProjectDetailsPage = () => {
   const { projectKey } = useParams()
   const [project, setProject] = useState(null)
@@ -72,8 +54,6 @@ const ProjectDetailsPage = () => {
     }
   }, [data])
 
-  const navigate = useNavigate()
-
   if (isLoading || loading)
     return (
       <div className="flex min-h-[60vh] items-center justify-center">

frontend/src/pages/ProjectDetails.tsx

@@ -1,5 +1,14 @@
-export const formatDate = (timestamp: number) => {
-  return new Date(timestamp * 1000).toLocaleDateString('en-US', {
+export const formatDate = (input: number | string) => {
+  const date =
+    typeof input === 'number'
+      ? new Date(input * 1000) // Unix timestamp in seconds
+      : new Date(input) // ISO date string
+
+  if (isNaN(date.getTime())) {
+    throw new Error('Invalid date')
+  }
+
+  return date.toLocaleDateString('en-US', {
     year: 'numeric',
     month: 'long',
     day: 'numeric',