Skip to content

Commit c26a048

Browse files
IAmThe2ndHumanIAmThe2ndHuman
authored
Merge pull request #25 from HackNCState/dev
Dev
2 parents 4948c8d + 3563d79 commit c26a048

3 files changed

Lines changed: 31 additions & 36 deletions

File tree

‎src/pages/ParticipantManager.tsx‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,13 @@ export default function ParticipantManager() {
3232

3333
return (
3434
<TableRow key={user.id}>
35-
<TableCell className="break-words">{user.username}</TableCell>
36-
<TableCell className="break-words">{`${user.firstName} ${user.lastName}`}</TableCell>
37-
<TableCell className="break-words">{user.email}</TableCell>
38-
<TableCell className="break-words">
39-
{user.university || "N/A"}
40-
</TableCell>
35+
<TableCell>{user.username}</TableCell>
36+
<TableCell>{`${user.firstName} ${user.lastName}`}</TableCell>
37+
<TableCell>{user.email}</TableCell>
38+
<TableCell>{user.university || "N/A"}</TableCell>
4139
<TableCell>{user.shirtSize}</TableCell>
42-
<TableCell className="break-words">
43-
{user.dietaryRestrictions || "None"}
44-
</TableCell>
45-
<TableCell className="break-words">
46-
{user.attendedEvents.join(", ") || "None"}
47-
</TableCell>
40+
<TableCell>{user.dietaryRestrictions || "None"}</TableCell>
41+
<TableCell>{user.attendedEvents.join(", ") || "None"}</TableCell>
4842
<TableCell className="justify-end flex">
4943
{resumeURL && (
5044
<Button
@@ -92,17 +86,17 @@ export default function ParticipantManager() {
9286
</header>
9387

9488
<main>
95-
<Table className="table-fixed w-full">
89+
<Table>
9690
<TableHeader>
9791
<TableRow>
98-
<TableHead className="w-[10%]">Username</TableHead>
99-
<TableHead className="w-[12%]">Name</TableHead>
100-
<TableHead className="w-[15%]">Email</TableHead>
101-
<TableHead className="w-[12%]">University</TableHead>
102-
<TableHead className="w-[8%]">Shirt Size</TableHead>
103-
<TableHead className="w-[13%]">Dietary Restrictions</TableHead>
104-
<TableHead className="w-[18%]">Events Attended</TableHead>
105-
<TableHead className="w-[12%]">Actions</TableHead>
92+
<TableHead>Username</TableHead>
93+
<TableHead>Name</TableHead>
94+
<TableHead>Email</TableHead>
95+
<TableHead>University</TableHead>
96+
<TableHead>Shirt Size</TableHead>
97+
<TableHead>Dietary Restrictions</TableHead>
98+
<TableHead>Events Attended</TableHead>
99+
<TableHead className="w-0">Actions</TableHead>
106100
</TableRow>
107101
</TableHeader>
108102

‎src/pages/RFIDReader.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { activitiesAtom } from "@/atoms/event/activities";
22
import { Button } from "@/components/ui/button";
3+
import { ButtonGroup } from "@/components/ui/button-group";
34
import { cn } from "@/lib/utils";
45
import { firestoreService } from "@/services/firestore.service";
56
import { rfidService } from "@/services/rfid.service";
@@ -173,7 +174,7 @@ export default function RFIDReader() {
173174
<br />* means this activity is not eligible for the raffle.
174175
</p>
175176

176-
<div className="mt-2 flex flex-wrap gap-2">
177+
<ButtonGroup orientation="horizontal" className="mt-2">
177178
<Button
178179
variant={!selectedActivity ? "default" : "outline"}
179180
onClick={() => setSelectedActivity(null)}
@@ -195,7 +196,7 @@ export default function RFIDReader() {
195196
{!activity.eligibleForRaffle && "*"}
196197
</Button>
197198
))}
198-
</div>
199+
</ButtonGroup>
199200

200201
{showActivityAssignedToast === "success" && (
201202
<p className="mt-2 text-green-500">

‎src/pages/TeamManager.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,15 @@ export default function TeamManager() {
194194
key={team.id}
195195
className={isUnverified ? "bg-yellow-50 dark:bg-yellow-900/20" : ""}
196196
>
197-
<TableCell className="break-words">{team.name}</TableCell>
198-
<TableCell className="break-words">{team.track}</TableCell>
199-
<TableCell className="break-words">
197+
<TableCell>{team.name}</TableCell>
198+
<TableCell>{team.track}</TableCell>
199+
<TableCell>
200200
{team.challenges.length > 0 ? team.challenges.join(", ") : "-"}
201201
</TableCell>
202-
<TableCell className="break-words">
202+
<TableCell>
203203
<TeamMembersList team={team} />
204204
</TableCell>
205-
<TableCell className="whitespace-pre-wrap break-words">
205+
<TableCell className="whitespace-pre-wrap">
206206
{team.mentoringHelp}
207207
</TableCell>
208208
<TableCell>{team.status}</TableCell>
@@ -268,16 +268,16 @@ export default function TeamManager() {
268268
</header>
269269

270270
<main>
271-
<Table className="table-fixed w-full">
271+
<Table>
272272
<TableHeader>
273273
<TableRow>
274-
<TableHead className="w-[12%]">Name</TableHead>
275-
<TableHead className="w-[10%]">Track</TableHead>
276-
<TableHead className="w-[15%]">Challenge</TableHead>
277-
<TableHead className="w-[18%]">Members</TableHead>
278-
<TableHead className="w-[20%]">Mentoring Help</TableHead>
279-
<TableHead className="w-[8%]">Status</TableHead>
280-
<TableHead className="w-[17%]">Actions</TableHead>
274+
<TableHead>Name</TableHead>
275+
<TableHead>Track</TableHead>
276+
<TableHead>Challenge</TableHead>
277+
<TableHead>Members</TableHead>
278+
<TableHead>Mentoring Help</TableHead>
279+
<TableHead className="w-0">Status</TableHead>
280+
<TableHead className="w-0">Actions</TableHead>
281281
</TableRow>
282282
</TableHeader>
283283

0 commit comments

Comments
 (0)