Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/league/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Contest } from "@/models/contest.model";
import { LevelEnum } from "@/models/level.enum";
import { Student } from "@/models/student.model";
import Footer from "@/components/shared/footer";
import { getContestsWithPictures } from "@/services/contest.service";
import { getContestsWithPictures } from "@/controllers/contest.controller";
import { useEffect, useState } from "react";

const navLinks = [
Expand Down
19 changes: 12 additions & 7 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { HeroUIProvider } from "@heroui/react";
import MainNavbar from '@/components/shared/main-navbar';
import { CursorWrapper } from "@/components/home/ui/cursor-wrapper";
import Footer from "../components/shared/footer";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";

const navLinks = [
{ key: "home", label: "Home", href: "#home" },
Expand All @@ -14,16 +15,20 @@ const navLinks = [
{ key: "league", label: "League", href: "/league" },
];

const queryClient = new QueryClient();

export default function HomePage() {
return (
<HeroUIProvider>
<CursorWrapper>
<MainNavbar navLinks={navLinks} />
<Hero />
<AboutUs />
<Members />
<Footer />
</CursorWrapper>
<QueryClientProvider client={queryClient}>
<CursorWrapper>
<MainNavbar navLinks={navLinks} />
<Hero />
<AboutUs />
<Members />
<Footer />
</CursorWrapper>
</QueryClientProvider>
</HeroUIProvider>
);
}
23 changes: 15 additions & 8 deletions src/components/home/sections/members.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
"use client";

import { useEffect, useState } from "react";
import { useState } from "react";
import MemberCard from "../member-card";
import MemberModal from "../member-modal";
import { Member } from "@/models/member.model";
import { getMembersService } from "@/services/member.service";
import Link from "next/link";
import { Card, CardContent } from "../../shared/ui/card";
import { Users } from "lucide-react";
import { getMembers } from "@/controllers/member.controller";
import { useQuery } from "@tanstack/react-query";

export function Members() {
const [members, setMembers] = useState<Member[]>([]);
const [selectedMember, setSelectedMember] = useState<Member | null>(null);
const [isModalOpen, setIsModalOpen] = useState(false);

useEffect(() => {
getMembersService().then((data) => setMembers(data));
console.log("Members:", members);
}, []);
const { data: members, isLoading } = useQuery({
queryKey: ['members'],
queryFn: async () => {
return await getMembers()
}
});

const handleMemberClick = (member: Member) => {
setSelectedMember(member);
Expand All @@ -42,7 +44,12 @@ export function Members() {
</p>
</div>
<div className="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
{members.filter(member => member.active).map((member) => (
{isLoading && (
<div className="col-span-1 sm:col-span-1 md:col-span-2 lg:col-span-3 text-center">
<p className="text-gray-500">Cargando miembros...</p>
</div>
)}
{!isLoading && members.filter(member => member.active).map((member) => (
<MemberCard
key={member._id}
member={member}
Expand Down
File renamed without changes.
7 changes: 0 additions & 7 deletions src/services/member.service.ts

This file was deleted.