Add way too much

Resource reordering, better MD rendering, restricting to universities

Author: IAmThe2ndHuman

functions/auth/models.py

@@ -1,12 +1,13 @@
 from dataclasses import dataclass, field
 from typing import Literal, Optional
 
+
 @dataclass
 class User:
     id: str
     """Unique identifier for the user. Probably their Discord ID"""
 
-    role: Literal['participant', 'organizer']  # 'participant' | 'organizer'
+    role: Literal["participant", "organizer"]  # 'participant' | 'organizer'
     username: str
 
     # registration info (required for participant data structure)
@@ -17,6 +18,7 @@ class User:
     shirtSize: Optional[str] = None
     dietaryRestrictions: Optional[str] = None
     rfidUUID: Optional[str] = None
+    university: Optional[str] = None
 
     # init event info (there may be more defined in the frontend...just because these are the ones used in auth)
     teamId: Optional[str] = None  # this will be unset (undefined) until team assignment

functions/auth/oauth_callback.py

@@ -85,6 +85,11 @@
     default="RFID UUID",
     description="The header name of the column containing participants' RFID UUIDs.",
 )
+UNIVERSITY_COL_R = StringParam(
+    "UNIVERSITY_COL_R",
+    default="University",
+    description="The header name of the column containing participants' university in the Registrations sheet.",
+)
 
 
 def _get_col_index_from_headers(headers: list[str], name: str) -> int:
@@ -113,7 +118,9 @@ def _get_registration(uid: str, username: str) -> User:
 
     import gspread
 
-    is_organizer = uid in [o.strip() for o in ORGANIZERS_LIST.value.split(",") if o.strip()]
+    is_organizer = uid in [
+        o.strip() for o in ORGANIZERS_LIST.value.split(",") if o.strip()
+    ]
 
     if is_organizer:
         return User(id=uid, role="organizer", username=username)
@@ -142,7 +149,9 @@ def _get_registration(uid: str, username: str) -> User:
             reg_headers, USERNAME_COL_R.value
         )
 
-        cell = reg_sheet.find(username, in_column=username_col_idx, case_sensitive=False)
+        cell = reg_sheet.find(
+            username, in_column=username_col_idx, case_sensitive=False
+        )
 
         # participant not registered
         if not cell:
@@ -196,6 +205,11 @@ def _get_registration(uid: str, username: str) -> User:
         rfid_idx = _get_col_index_from_headers(checkin_headers, RFID_UUID_COL_C.value)
         rfid_uuid = _get_cell_from_row(checkin_row, rfid_idx)
 
+        university_idx = _get_col_index_from_headers(
+            reg_headers, UNIVERSITY_COL_R.value
+        )
+        university = _get_cell_from_row(reg_row, university_idx)
+
         print(
             email,
             first_name,
@@ -204,6 +218,7 @@ def _get_registration(uid: str, username: str) -> User:
             dietary_restrictions,
             shirt_size,
             rfid_uuid,
+            university,
         )
 
         return User(
@@ -217,6 +232,7 @@ def _get_registration(uid: str, username: str) -> User:
             dietaryRestrictions=dietary_restrictions,
             shirtSize=shirt_size,
             rfidUUID=rfid_uuid,
+            university=university,
             # mark if they checked in on friday as having attended the career fair event
             attendedEvents=["career_fair_friday"] if friday_checked_in else [],
         )

functions/firestore/event.py

@@ -30,24 +30,42 @@ def initialize_event(request: https_fn.CallableRequest) -> None:
 
     default_config = {
         "tracks": [
-            {"name": "Track 1", "description": "Sample elite ball track"},
-            {"name": "Track 2", "description": "Sample great ball track"},
-            {"name": "Track 3", "description": "Sample poke ball track"},
+            {
+                "name": "Track 1",
+                "description": "Sample elite ball track",
+                "fullDescription": "",
+                "allowedUniversities": [],
+            },
+            {
+                "name": "Track 2",
+                "description": "Sample great ball track",
+                "fullDescription": "",
+                "allowedUniversities": [],
+            },
+            {
+                "name": "Track 3",
+                "description": "Sample poke ball track",
+                "fullDescription": "",
+                "allowedUniversities": [],
+            },
         ],
         "challenges": [
             {
                 "name": "Sample Challenge 1",
                 "description": "This is a sample challenge description.",
+                "fullDescription": "",
                 "category": "default",
             },
             {
                 "name": "MLH Best Use of AI",
                 "description": "Build a project that uses AI in a creative way.",
+                "fullDescription": "",
                 "category": "mlh",
             },
             {
                 "name": "MLH Best Domain Name",
                 "description": "Register a domain name for your project.",
+                "fullDescription": "",
                 "category": "mlh",
             },
         ],

functions/firestore/teams.py

@@ -55,6 +55,7 @@ def submit_team_registration(request: https_fn.CallableRequest) -> None:
     event_config_doc = db.collection("event").document("main").get()
     event_config = event_config_doc.to_dict() if event_config_doc.exists else {}
     configured_challenges = event_config.get("challenges", [])
+    configured_tracks = event_config.get("tracks", [])
 
     # Build a lookup of challenge name -> category
     challenge_category_map = {}
@@ -82,12 +83,14 @@ def submit_team_registration(request: https_fn.CallableRequest) -> None:
     # check if members are not already in a team (check their teamId field)
 
     users_ref = db.collection("users")
+    member_docs = {}
 
     for member_id in member_ids:
         user_doc = users_ref.document(member_id).get()
 
         if user_doc.exists:
             user_data = user_doc.to_dict()
+            member_docs[member_id] = user_data
 
             if user_data and user_data.get("teamId"):
                 raise https_fn.HttpsError(
@@ -100,6 +103,26 @@ def submit_team_registration(request: https_fn.CallableRequest) -> None:
                 message=f"User {member_id} not found.",
             )
 
+    # Validate track university restrictions
+    selected_track_config = next(
+        (t for t in configured_tracks if t.get("name") == track), None
+    )
+    if selected_track_config:
+        allowed_universities = selected_track_config.get("allowedUniversities", [])
+        if allowed_universities:
+            for member_id in member_ids:
+                member_data = member_docs.get(member_id, {})
+                member_university = (member_data.get("university") or "").strip()
+                if member_university not in allowed_universities:
+                    raise https_fn.HttpsError(
+                        code=https_fn.FunctionsErrorCode.INVALID_ARGUMENT,
+                        message=(
+                            f"Your selected track is restricted to certain universities, "
+                            f"and one or more of your team members are not from an eligible university. "
+                            f"If you believe this is a mistake, please open a support ticket on the Discord."
+                        ),
+                    )
+
     teams_ref = db.collection("teams")
     team_doc_ref = teams_ref.document()
 

src/atoms/event/resources.ts

@@ -11,14 +11,28 @@ export const resourcesAtom = atom((get) => {
 
 	// straight up hardcoding the tracks and challenges resource here to always be in sync 😭😭
 	let tracksContent = tracks
-		.map((t) => `**${t.name}**\\\n${t.description ?? ""}`)
+		.map((t) => {
+			const isRestricted = t.allowedUniversities && t.allowedUniversities.length > 0;
+			const desc = t.fullDescription || t.description || "";
+			let entry = `**${t.name}**${isRestricted ? "*" : ""}`;
+			if (desc) entry += `  \n${desc}`;
+			if (isRestricted) {
+				entry += `  \n*\\* this track is restricted to students of: ${t.allowedUniversities.join(", ")}*`;
+			}
+			return entry;
+		})
 		.join("\n\n");
-	tracksContent = `Select the track that best fits your project. You can only submit to one track.\\\n\\\n${tracksContent}`;
+	tracksContent = `Select the track that best fits your project. You can only submit to one track.\n\n${tracksContent}`;
 
 	let challengesContent = challenges
-		.map((c) => `**${c.name}**\\\n${c.description ?? ""}`)
+		.map((c) => {
+			const desc = c.fullDescription || c.description || "";
+			let entry = `**${c.name}**`;
+			if (desc) entry += `  \n${desc}`;
+			return entry;
+		})
 		.join("\n\n");
-	challengesContent = `Complete these additional challenges for extra prizes. You can only submit to one challenge.\\\n\\\n${challengesContent}`;
+	challengesContent = `Participate in these additional challenges for extra prizes.\n\n*You can only choose one challenge. However, you can choose to participate in any additional MLH challenges as well.*\n\n${challengesContent}`;
 
 	const newResources = [...resources];
 
@@ -101,6 +115,33 @@ export const deleteResourceAtom = atom(null, async (get, _, index: number) => {
 });
 
 // TODO: add reorderResourceAtom?
+export const reorderResourceAtom = atom(
+	null,
+	async (
+		get,
+		_,
+		payload: { fromIndex: number; toIndex: number },
+	) => {
+		const resources = get(resourcesAtom);
+		if (!resources) return;
+
+		const { fromIndex, toIndex } = payload;
+		if (
+			fromIndex < 0 ||
+			fromIndex >= resources.length ||
+			toIndex < 0 ||
+			toIndex >= resources.length
+		)
+			return;
+
+		const updated = [...resources];
+		const [moved] = updated.splice(fromIndex, 1);
+		updated.splice(toIndex, 0, moved);
+
+		await firestoreService.updateEventConfig({ resources: updated });
+	},
+);
+
 export const setResourceAtom = atom(
 	null,
 	async (get, _, payload: { index: number; resource: Resource }) => {

src/components/TeamForm.tsx

@@ -404,10 +404,14 @@ export default function TeamForm({
 						<FieldLabel>
 							Members ({members.length}/{maxMembers})
 						</FieldLabel>
+						
 						<span className="text-xs text-muted-foreground">
 							Min {minMembers} members required
 						</span>
 					</div>
+					<FieldDescription>
+						Ensure that all your team members have logged into Hack_NCState Today at least once in order to appear in the search results.
+					</FieldDescription>
 
 					<div className="flex flex-col gap-2">
 						<ItemGroup>
@@ -486,8 +490,7 @@ export default function TeamForm({
 												query.length >= 2 &&
 												filteredSearchResults.length === 0 && (
 													<CommandEmpty>
-														No users found. Make sure everyone from your team
-														has logged in for them to appear here.
+														No users found
 													</CommandEmpty>
 												)}
 											{!loading &&

src/pages/Home/Main/OrganizerView/ChallengeEditor.tsx

@@ -40,13 +40,16 @@ function ChallengeForm({
 	const [description, setDescription] = useState(
 		initialChallenge?.description ?? "",
 	);
+	const [fullDescription, setFullDescription] = useState(
+		initialChallenge?.fullDescription ?? "",
+	);
 	const [category, setCategory] = useState<ChallengeCategory>(
 		initialChallenge?.category ?? "default",
 	);
 
 	const handleSubmit = (e: React.FormEvent) => {
 		e.preventDefault();
-		onSave({ name, description, category });
+		onSave({ name, description, fullDescription, category });
 	};
 
 	return (
@@ -62,11 +65,21 @@ function ChallengeForm({
 			</div>
 
 			<div className="flex flex-col gap-2">
-				<Label>Description</Label>
-				<Textarea
+				<Label>Brief Description</Label>
+				<Input
 					value={description}
 					onChange={(e) => setDescription(e.target.value)}
-					placeholder="Challenge Description"
+					placeholder="Short description shown during team registration"
+				/>
+			</div>
+
+			<div className="flex flex-col gap-2">
+				<Label>Full Description (Markdown)</Label>
+				<Textarea
+					value={fullDescription}
+					onChange={(e) => setFullDescription(e.target.value)}
+					placeholder="Detailed description shown in the Resources panel. Supports markdown."
+					rows={4}
 				/>
 			</div>