feat: add UCLA support (#54)

* chore: add UCLA data * refactor: swap ternary condition order * feat: handle colon in UCLA categories
laurelin60 · Apr 5, 2024 · fc6a025 · fc6a025
1 parent ee32d0e
commit fc6a025
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/components/search/Search.tsx b/components/search/Search.tsx
@@ -196,7 +196,7 @@ const Search = () => {
         const fetchData = async () => {
             try {
                 const universityParam = university;
-                const geParam = !ge.includes("GE") ? ge : ge.split(" ")[1];
+                const geParam = ge.includes("GE") ? ge.split(" ")[1] : ge;
                 const courses = await queryDatabase(universityParam, geParam);
 
                 setCourses(courses);

diff --git a/components/search/SearchResults.tsx b/components/search/SearchResults.tsx
@@ -88,7 +88,18 @@ const SearchResults = (props: SearchResultsProps) => {
                                             </div>
                                             <div className="flex flex-row gap-2 text-base font-light">
                                                 {result.fulfillsGEs
-                                                    .map((obj) => obj.category)
+                                                    .map((obj) => {
+                                                        const category =
+                                                            obj.category;
+
+                                                        return category.includes(
+                                                            ":",
+                                                        )
+                                                            ? category.split(
+                                                                  ": ",
+                                                              )[1]
+                                                            : category;
+                                                    })
                                                     .join(", ")}
                                             </div>
                                         </div>

diff --git a/components/search/SearchSelect.tsx b/components/search/SearchSelect.tsx
@@ -21,17 +21,31 @@ export const SearchSelect = (props: DropdownComponentProps) => {
     return (
         <div className="relative flex h-12 w-[300px] md:h-16">
             <Select value={value} onValueChange={onChange}>
-                <SelectTrigger className="h-full w-full overflow-ellipsis rounded-xl border-2 border-gray px-4 text-base md:text-2xl">
+                <SelectTrigger className="h-full w-full overflow-ellipsis rounded-xl border-2 border-gray px-4 text-left text-base md:text-2xl">
                     <SelectValue placeholder={placeholder} />
                 </SelectTrigger>
                 <SelectContent>
-                    {data.map((item) => (
-                        <SelectItem value={item} key={item} className="text-lg">
-                            {item.includes("University of California")
-                                ? "UC " + item.split(", ")[1]
-                                : item}
-                        </SelectItem>
-                    ))}
+                    {data.map((item) => {
+                        let option = item;
+
+                        if (option.includes("University of California")) {
+                            option = "UC " + item.split(", ")[1];
+                        }
+
+                        if (option.includes(": ")) {
+                            option = item.split(": ")[1];
+                        }
+
+                        return (
+                            <SelectItem
+                                value={item}
+                                key={item}
+                                className="text-lg"
+                            >
+                                {option}
+                            </SelectItem>
+                        );
+                    })}
                 </SelectContent>
             </Select>
         </div>

diff --git a/lib/constants.tsx b/lib/constants.tsx
@@ -21,4 +21,13 @@ export const UNIVERSITY_GE: Record<string, string[]> = {
         "GE F",
         "GE G",
     ],
+    "University of California, Los Angeles": [
+        "Arts and Humanities: Literary and Cultural Analysis",
+        "Arts and Humanities: Philosophical and Linguistic Analysis",
+        "Arts and Humanities: Visual and Performance Arts Analysis and Practice",
+        "Scientific Inquiry: Life Sciences",
+        "Scientific Inquiry: Physical Sciences",
+        "Society and Culture: Historical Analysis",
+        "Society and Culture: Social Analysis",
+    ],
 };