Skip to content

Dev #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IAmThe2ndHuman merged 2 commits into from
Feb 14, 2026
Merged

Dev #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
935ab5d
Revert "Update UI tweaks"
IAmThe2ndHuman Feb 14, 2026
3563d79
Add oauth fix
IAmThe2ndHuman Feb 14, 2026
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
36 changes: 15 additions & 21 deletions src/pages/ParticipantManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,13 @@ export default function ParticipantManager() {

return (
<TableRow key={user.id}>
<TableCell className="break-words">{user.username}</TableCell>
<TableCell className="break-words">{`${user.firstName} ${user.lastName}`}</TableCell>
<TableCell className="break-words">{user.email}</TableCell>
<TableCell className="break-words">
{user.university || "N/A"}
</TableCell>
<TableCell>{user.username}</TableCell>
<TableCell>{`${user.firstName} ${user.lastName}`}</TableCell>
<TableCell>{user.email}</TableCell>
<TableCell>{user.university || "N/A"}</TableCell>
<TableCell>{user.shirtSize}</TableCell>
<TableCell className="break-words">
{user.dietaryRestrictions || "None"}
</TableCell>
<TableCell className="break-words">
{user.attendedEvents.join(", ") || "None"}
</TableCell>
<TableCell>{user.dietaryRestrictions || "None"}</TableCell>
<TableCell>{user.attendedEvents.join(", ") || "None"}</TableCell>
<TableCell className="justify-end flex">
{resumeURL && (
<Button
Expand Down Expand Up @@ -92,17 +86,17 @@ export default function ParticipantManager() {
</header>

<main>
<Table className="table-fixed w-full">
<Table>
<TableHeader>
<TableRow>
<TableHead className="w-[10%]">Username</TableHead>
<TableHead className="w-[12%]">Name</TableHead>
<TableHead className="w-[15%]">Email</TableHead>
<TableHead className="w-[12%]">University</TableHead>
<TableHead className="w-[8%]">Shirt Size</TableHead>
<TableHead className="w-[13%]">Dietary Restrictions</TableHead>
<TableHead className="w-[18%]">Events Attended</TableHead>
<TableHead className="w-[12%]">Actions</TableHead>
<TableHead>Username</TableHead>
<TableHead>Name</TableHead>
<TableHead>Email</TableHead>
<TableHead>University</TableHead>
<TableHead>Shirt Size</TableHead>
<TableHead>Dietary Restrictions</TableHead>
<TableHead>Events Attended</TableHead>
<TableHead className="w-0">Actions</TableHead>
</TableRow>
</TableHeader>

Expand Down
5 changes: 3 additions & 2 deletions src/pages/RFIDReader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { activitiesAtom } from "@/atoms/event/activities";
import { Button } from "@/components/ui/button";
import { ButtonGroup } from "@/components/ui/button-group";
import { cn } from "@/lib/utils";
import { firestoreService } from "@/services/firestore.service";
import { rfidService } from "@/services/rfid.service";
Expand Down Expand Up @@ -173,7 +174,7 @@ export default function RFIDReader() {
<br />* means this activity is not eligible for the raffle.
</p>

<div className="mt-2 flex flex-wrap gap-2">
<ButtonGroup orientation="horizontal" className="mt-2">
<Button
variant={!selectedActivity ? "default" : "outline"}
onClick={() => setSelectedActivity(null)}
Expand All @@ -195,7 +196,7 @@ export default function RFIDReader() {
{!activity.eligibleForRaffle && "*"}
</Button>
))}
</div>
</ButtonGroup>

{showActivityAssignedToast === "success" && (
<p className="mt-2 text-green-500">
Expand Down
26 changes: 13 additions & 13 deletions src/pages/TeamManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ export default function TeamManager() {
key={team.id}
className={isUnverified ? "bg-yellow-50 dark:bg-yellow-900/20" : ""}
>
<TableCell className="break-words">{team.name}</TableCell>
<TableCell className="break-words">{team.track}</TableCell>
<TableCell className="break-words">
<TableCell>{team.name}</TableCell>
<TableCell>{team.track}</TableCell>
<TableCell>
{team.challenges.length > 0 ? team.challenges.join(", ") : "-"}
</TableCell>
<TableCell className="break-words">
<TableCell>
<TeamMembersList team={team} />
</TableCell>
<TableCell className="whitespace-pre-wrap break-words">
<TableCell className="whitespace-pre-wrap">
{team.mentoringHelp}
</TableCell>
<TableCell>{team.status}</TableCell>
Expand Down Expand Up @@ -268,16 +268,16 @@ export default function TeamManager() {
</header>

<main>
<Table className="table-fixed w-full">
<Table>
<TableHeader>
<TableRow>
<TableHead className="w-[12%]">Name</TableHead>
<TableHead className="w-[10%]">Track</TableHead>
<TableHead className="w-[15%]">Challenge</TableHead>
<TableHead className="w-[18%]">Members</TableHead>
<TableHead className="w-[20%]">Mentoring Help</TableHead>
<TableHead className="w-[8%]">Status</TableHead>
<TableHead className="w-[17%]">Actions</TableHead>
<TableHead>Name</TableHead>
<TableHead>Track</TableHead>
<TableHead>Challenge</TableHead>
<TableHead>Members</TableHead>
<TableHead>Mentoring Help</TableHead>
<TableHead className="w-0">Status</TableHead>
<TableHead className="w-0">Actions</TableHead>
</TableRow>
</TableHeader>

Expand Down