Merge pull request #68 from Parvm1102/main

bug: search repo card fix acc to bet 50 for #104 commit

Author: RAWx18

backend/api/v1/routes/hub.py

@@ -21,6 +21,12 @@ def get_hub_projects(user: User = Depends(require_auth)) -> List[Project]:
     hub_service = HubService(user)
     return hub_service.get_projects()
 
+@router.get("/search", response_model=List[Project])
+def get_hub_projects(user: User = Depends(require_auth)) -> List[Project]:
+    """Get all projects for the user."""
+    hub_service = HubService(user)
+    return hub_service.get_projects()
+
 @router.get("/insights", response_model=List[Insight])
 def get_hub_insights(user: User = Depends(require_auth)) -> List[Insight]:
     """Get insights for the user."""

backend/app.py

@@ -192,6 +192,7 @@ async def lifespan(app: FastAPI):
 app.include_router(github_router, prefix="/api/v1/github", tags=["github"])
 app.include_router(analytics_router, prefix="/api/v1/analytics", tags=["analytics"])
 app.include_router(projects_router, prefix="/api/v1/projects", tags=["projects"])
+app.include_router(projects_router, prefix="/api/v1/search", tags=["search"])
 app.include_router(webhooks_router, prefix="/api/v1/webhooks", tags=["webhooks"])
 app.include_router(aggregated_router, prefix="/api/v1/aggregated", tags=["aggregated"])
 

ui/app/contribution/page.tsx

@@ -8,14 +8,16 @@ import AnimatedTransition from '@/components/AnimatedTransition';
 import { useAuth } from '@/contexts/AuthContext';
 import { toast } from 'sonner';
 import ErrorBoundary from '@/components/ErrorBoundary';
+import { WithAuthPersistence, useAuthDebug } from '@/utils/authPersistence';
 import ContributionRateLimitHandler from '@/components/ContributionRateLimitHandler';
 
 export default function ContributionPage() {
   const [authProcessed, setAuthProcessed] = useState(false);
   const showContent = useAnimateIn(false, 300);
   const router = useRouter();
   const searchParams = useSearchParams();
-  const { setUserFromCallback, isAuthenticated } = useAuth();
+  const { setUserFromCallback, isAuthenticated, loading } = useAuth();
+  const { logAuthState } = useAuthDebug();
 
   // Handle authentication parameters from OAuth callback
   useEffect(() => {
@@ -72,19 +74,29 @@ export default function ContributionPage() {
     const authToken = searchParams.get('auth_token');
     const authUser = searchParams.get('auth_user');
 
-    // If no auth params and not authenticated, redirect to home
+    logAuthState('ContributionPage:AuthCheck');
+    
+    // Wait for auth loading to complete before making redirect decisions
+    if (loading) {
+      console.log('Auth still loading, waiting...');
+      return;
+    }
+    
+    // If no auth params and not authenticated after loading, redirect to home
     if (!authToken && !authUser && !isAuthenticated) {
-      console.log('Not authenticated, redirecting to landing page');
+      console.log('Not authenticated after loading completed, redirecting to landing page');
+      logAuthState('ContributionPage:BeforeRedirect');
       router.push('/');
       return;
     }
 
     // If auth processing is complete and still not authenticated, redirect
     if (authProcessed && !isAuthenticated && !authToken) {
       console.log('Authentication processing complete but not authenticated, redirecting to landing page');
+      logAuthState('ContributionPage:BeforeProcessedRedirect');
       router.push('/');
     }
-  }, [isAuthenticated, searchParams, authProcessed, router]);
+  }, [isAuthenticated, loading, searchParams, authProcessed, router, logAuthState]);
 
   return (
     <ContributionRateLimitHandler>

ui/components/hub/projects/ProjectCard.tsx

@@ -40,7 +40,12 @@ export const ProjectCard: React.FC<ProjectCardProps> = ({ repo }) => {
           <Button variant="outline" size="sm" onClick={() => window.open(repo.html_url, '_blank')} className="bg-black text-white hover:bg-gray-700 border-gray-700">
             <ExternalLink className="h-4 w-4" />
           </Button>
-          <Button size="sm" onClick={handleOpenInBeetle} className="bg-orange-500 text-black hover:bg-orange-600">
+          <Button 
+            size="sm" 
+            onClick={handleOpenInBeetle} 
+            className="bg-orange-500 text-black hover:bg-orange-600"
+            data-testid="open-in-gitmesh"
+          >
             Open in GitMesh
           </Button>
         </div>

ui/components/hub/search/RepositoryCard.tsx

@@ -1,56 +1,57 @@
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { GitFork, Star, Users, ExternalLink } from "lucide-react";
-import { useRouter } from "next/navigation";
+import { Card, CardContent, CardFooter, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Repository } from '@/lib/github-api';
+import { Star, GitFork, ExternalLink } from 'lucide-react';
+import { useAuthAwareNavigation, useAuthDebug } from '@/utils/authPersistence';
 
-export function RepositoryCard({ repo }: { repo: any }) {
-  const router = useRouter();
+interface ProjectCardProps {
+  repo: Repository;
+}
+
+export const RepositoryCard: React.FC<ProjectCardProps> = ({ repo }) => {
+  const router = useAuthAwareNavigation();
+  const { logAuthState } = useAuthDebug();
 
   const handleOpenInBeetle = () => {
+    logAuthState('RepositoryCard:BeforeNavigation');
     const repoData = JSON.stringify(repo);
     const encodedRepo = encodeURIComponent(repoData);
     router.push(`/contribution?repo=${encodedRepo}`);
   };
 
   return (
-    <Card className="flex flex-col">
+    <Card className="bg-black shadow-lg rounded-lg flex flex-col h-full hover:shadow-orange-500/20 transition-shadow duration-300">
       <CardHeader>
-        <CardTitle>{repo.name}</CardTitle>
-        <CardDescription>{repo.description}</CardDescription>
+        <CardTitle className="text-xl font-bold text-orange-500">{repo.name}</CardTitle>
       </CardHeader>
       <CardContent className="flex-grow">
-        <div className="flex items-center space-x-4 text-sm text-muted-foreground">
-          <div className="flex items-center">
-            <Star className="mr-1 h-3 w-3" />
-            {repo.stargazers_count}
-          </div>
+        <p className="text-sm text-gray-400">{repo.description}</p>
+      </CardContent>
+      <CardFooter className="flex justify-between items-center mt-auto pt-4 border-t border-gray-800">
+        <div className="flex items-center space-x-4 text-gray-400">
           <div className="flex items-center">
-            <GitFork className="mr-1 h-3 w-3" />
-            {repo.forks_count}
+            <Star className="h-4 w-4 mr-1" />
+            <span>{repo.stargazers_count}</span>
           </div>
           <div className="flex items-center">
-            <Users className="mr-1 h-3 w-3" />
-            {repo.watchers_count}
+            <GitFork className="h-4 w-4 mr-1" />
+            <span>{repo.forks_count}</span>
           </div>
         </div>
-      </CardContent>
-      <CardFooter className="flex justify-between items-center space-x-2">
-        <Button 
-          variant="outline" 
-          size="sm" 
-          onClick={() => window.open(repo.html_url, '_blank')}
-          className="flex items-center space-x-1"
-        >
-          <ExternalLink className="h-3 w-3" />
-          <span>GitHub</span>
-        </Button>
-        <Button 
-          size="sm" 
-          onClick={handleOpenInBeetle}
-        >
-          Open in GitMesh
-        </Button>
+        <div className="flex items-center space-x-2">
+          <Button variant="outline" size="sm" onClick={() => window.open(repo.html_url, '_blank')} className="bg-black text-white hover:bg-gray-700 border-gray-700">
+            <ExternalLink className="h-4 w-4" />
+          </Button>
+          <Button 
+            size="sm" 
+            onClick={handleOpenInBeetle} 
+            className="bg-orange-500 text-black hover:bg-orange-600"
+            data-testid="open-in-gitmesh"
+          >
+            Open in GitMesh
+          </Button>
+        </div>
       </CardFooter>
     </Card>
   );
-}
+};

ui/components/hub/search/SearchResults.tsx

@@ -9,7 +9,7 @@ import { OrganizationCard } from './OrganizationCard';
 
 interface SearchResultsProps {
   query: string;
-}
+}RepositoryCard
 
 export function SearchResults({ query }: SearchResultsProps) {
   const { token } = useAuth();

ui/contexts/AuthContext.tsx

@@ -121,14 +121,29 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
         return false;
       }
 
+      // First check if token exists in localStorage - if so, assume authenticated during validation
+      const storedToken = keyManager.getGitmeshToken();
+      if (storedToken === tokenToUse) {
+        // Set authenticated state immediately to prevent redirects during validation
+        setIsAuthenticated(true);
+        console.log('Token exists in storage, setting authenticated state immediately');
+      }
+
       console.log('Making validation request to:', `${API_BASE_URL}/auth/validate`);
+      
+      // Add timeout to prevent hanging requests
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), 10000); // 10 second timeout
+
       const response = await fetch(`${API_BASE_URL}/auth/validate`, {
         headers: {
           'Authorization': `Bearer ${tokenToUse}`,
           'Content-Type': 'application/json'
-        }
+        },
+        signal: controller.signal
       });
 
+      clearTimeout(timeoutId);
       console.log('Validation response status:', response.status);
       console.log('Validation response ok:', response.ok);
 
@@ -155,6 +170,19 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
       }
     } catch (error) {
       console.error('Token validation error:', error);
+      
+      // If it's an abort error (timeout), and we have a stored token, 
+      // don't immediately clear auth state - keep it for offline scenarios
+      if (error instanceof Error && error.name === 'AbortError') {
+        const storedToken = keyManager.getGitmeshToken();
+        if (storedToken && storedToken === (authToken || token)) {
+          console.log('Token validation timed out, but token exists - maintaining auth state');
+          setIsAuthenticated(true);
+          setLoading(false);
+          return true;
+        }
+      }
+      
       setIsAuthenticated(false);
       setUser(null);
       setToken(null);