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
7 changes: 4 additions & 3 deletions client/src/components/ui/Leaderboard/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ export default function List() {
try {
const res = await fetch(`${API_BASE}/details/groups/`);
const data: number[] = await res.json();
setGroups(data);
if (data.length > 0) {
setSelectedGroup(data[0]);
const filteredGroups = data.filter((groupId) => groupId !== 0);
setGroups(filteredGroups);
if (filteredGroups.length > 0) {
setSelectedGroup(filteredGroups[0]);
}
} catch (err) {
console.error("Failed to fetch groups:", err);
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/ui/Matchdetails/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default function MatchDetailsList() {

<div className="relative">
<label htmlFor="groupSelect" className="body-sm pr-2 text-xs">
Select Group (optional)
Select Group (Select Group 0 For Elimination Round)
</label>
<select
id="groupSelect"
Expand All @@ -141,7 +141,7 @@ export default function MatchDetailsList() {
<option value="">-- None --</option>
{groups.map((gid) => (
<option key={gid} value={gid}>
Group {gid}
{gid === 0 ? "Group 0 (Elimination)" : `Group ${gid}`}
</option>
))}
</select>
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/ui/SchedulePage/EventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type EventCardProps = {
title: string;
location: string;
time: string;
description: string;
// description: string;
imageSrc: string;
};

Expand All @@ -14,7 +14,7 @@ export default function EventCard({
title,
location,
time,
description,
// description,
imageSrc,
}: EventCardProps) {
return (
Expand Down Expand Up @@ -62,7 +62,7 @@ export default function EventCard({
</svg>
<p className="text-text">{time}</p>
</div>
<p className="line-clamp-3 text-text">{description}</p>
{/* <p className="line-clamp-3 text-text">{description}</p> */}
</div>
{/* Image */}
<div className="relative aspect-[411/333] w-full max-w-xs flex-[3] sm:max-w-sm md:max-w-md lg:max-w-lg">
Expand Down
33 changes: 15 additions & 18 deletions client/src/components/ui/SchedulePage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,29 @@ import EventCard from "./EventCard";
export default function SchedulePage() {
return (
<div className="container mx-auto px-4 py-8">
<p className="medium-lg pt-8">Our next competition is: </p>
<p className="subtitle pb-8 font-bold">Monday - July 9th, 2025</p>

<EventCard
date="Monday - 9 July 2025"
title="Group Stages Start"
location="Melbourne Convention Centre"
time="5:00pm - 8:00pm"
description="The first stage of the competition kicks off with teams battling it out in the group round."
date="Thursday - 31 July 2025"
title="South Metro"
location="St Columba's Catholic Primary School"
time="9:00am - 2:30pm"
// description="The first stage of the competition kicks off with teams battling it out in the group round."
imageSrc="/drone.jpg"
/>

<EventCard
date="Tuesday - 10 July 2025"
title="Knockout Stages Start"
location="Murdoch University"
time="1:00pm - 4:00pm"
description="Knock out each other!"
date="Friday - 1 August 2025"
title="North Metro"
location="St Andrew's Grammar School"
time="9:00am - 2:30pm"
// description="Knock out each other!"
imageSrc="/drone.jpg"
/>
<EventCard
date="Wednesday - 11 July 2025"
title="Finals Day"
location="Location"
time="5:00pm - 8:00pm"
description="The final match to determine the drone champion of 2025!"
date="Saturday - 2 August 2025"
title="Award Ceremony & Family STEM Day"
location="Murdoch University"
time="9:30am - 4pm"
// description="The final match to determine the drone champion of 2025!"
imageSrc="/drone.jpg"
/>
</div>
Expand Down
24 changes: 11 additions & 13 deletions client/src/components/ui/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,33 @@ export default function Footer() {
Email:
<br />
<a
href="mailto:info@youthdronetournament.com.au"
href="mailto:info@aicodeaustralia.com.au"
className="ft-content break-all underline hover:text-primary"
>
info@youthdronetournament.com.au
info@aicodeaustralia.com.au
</a>
</p>
<p className="ft-content mb-2">
Venue:
<br />
Melbourne Convention Centre
<br />
1 Convention Centre Pl
<br />
South Wharf VIC 3006
</p>
{
<p className="ft-content mb-2">
64 Mill Point Rd
<br />
South Perth WA 6151
</p>
}
</div>

{/* Socials */}
<div className="pr-5">
<h3 className="ft-subtitle mb-5">Follow Us</h3>
<div className="mb-5 flex gap-4">
<a
href="https://www.facebook.com/people/Squadrone/100094782254912/"
href="https://www.facebook.com/AicodeAustralia/"
className="flex h-10 w-10 items-center justify-center rounded-full border border-white text-white transition hover:border-primary hover:text-primary"
>
<FaFacebookF size={18} />
</a>
<a
href="https://www.instagram.com/au.Squadrone/#"
href="https://www.instagram.com/aicodeaustralia/"
className="flex h-10 w-10 items-center justify-center rounded-full border border-white text-white transition hover:border-primary hover:text-primary"
>
<FaInstagram size={18} />
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ui/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Navbar() {
<nav className="medium-sm mx-auto flex h-full max-w-7xl items-center justify-between">
{/* Logo container */}
<div className="relative mx-10 flex h-10 w-28 items-center">
<p>Logo</p>
<p>2025 Australia Youth Drone Tournament</p>
{/* <Image
className="object-contain"
src="https://squadrone.com.au/wp-content/uploads/2024/11/squadrone-logo-01-scaled.webp"
Expand Down
9 changes: 5 additions & 4 deletions client/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,15 @@ export default function Home() {
<h3 className="card-heading">The Schedule</h3>
<div>
<p className="caption text-muted-foreground">
<span className="font-semibold">March 15-16: </span>Group Stages
<span className="font-semibold">31 July 2025: </span>South Metro
</p>
<p className="caption text-muted-foreground">
<span className="font-semibold">March 17: </span>Finals Day
<span className="font-semibold">1 August 2025: </span>North
Metro
</p>
<p className="caption text-muted-foreground">
<span className="font-semibold">Venue: </span>Melbourne
Convention Centre
<span className="font-semibold">2 August 2025: </span>Award
Ceremony & Family STEM Day
</p>
</div>
<Link href="/schedule" className="body-sm mb-5 text-primary">
Expand Down