From 8e0d62bf215b15df6de9230f4b69b8dcf6949389 Mon Sep 17 00:00:00 2001
From: Kevin Wu <kevinwu098@gmail.com>
Date: Tue, 16 Jan 2024 00:53:11 -0800
Subject: [PATCH 1/2] feat: convert search dropdown to shadcn

---
 components/search/Search.tsx       |  14 +--
 components/search/SearchSelect.tsx |  46 +++++++++
 components/ui/select.tsx           | 160 +++++++++++++++++++++++++++++
 package-lock.json                  |  86 ++++++++++++++++
 package.json                       |   1 +
 5 files changed, 301 insertions(+), 6 deletions(-)
 create mode 100644 components/search/SearchSelect.tsx
 create mode 100644 components/ui/select.tsx

diff --git a/components/search/Search.tsx b/components/search/Search.tsx
index 1e79714..ac2b008 100644
--- a/components/search/Search.tsx
+++ b/components/search/Search.tsx
@@ -17,6 +17,7 @@ import { analyticsEnum, logAnalytics } from "@/lib/analytics";
 import { useToast } from "../ui/use-toast";
 import { ToastAction } from "../ui/toast";
 import Link from "next/link";
+import { SearchSelect } from "./SearchSelect";
 
 export interface CollegeObject {
     sendingInstitution: string;
@@ -264,17 +265,18 @@ const Search = () => {
                         </span>
                     </div>
                     <div className="mt-8 flex flex-row items-center justify-between">
-                        <div className="flex flex-col flex-wrap gap-x-8 gap-y-2 md:flex-row xl:gap-8">
-                            <DropdownComponentSearch
-                                defaultValue={university}
+                        <div className="flex flex-col flex-wrap gap-x-4 gap-y-2 md:flex-row">
+                            <SearchSelect
+                                value={university}
                                 data={Object.keys(UNIVERSITY_GE)}
                                 onChange={handleUniversityChange}
+                                placeholder="University"
                             />
-                            <DropdownComponentSearch
-                                defaultValue={ge}
+                            <SearchSelect
+                                value={ge}
                                 data={UNIVERSITY_GE[university]}
                                 onChange={handleGeChange}
-                                key={university}
+                                placeholder="Category"
                             />
                         </div>
                     </div>
diff --git a/components/search/SearchSelect.tsx b/components/search/SearchSelect.tsx
new file mode 100644
index 0000000..4a876a2
--- /dev/null
+++ b/components/search/SearchSelect.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import { ChangeEvent, useState } from "react";
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select";
+
+export interface DropdownComponentProps {
+    value: string;
+    data: string[];
+    onChange: (university: string) => void;
+    placeholder?: string;
+}
+
+export const SearchSelect = (props: DropdownComponentProps) => {
+    const { value, data, onChange, placeholder } = props;
+
+    return (
+        <div className="flex place-content-center">
+            <div className="relative flex h-12 w-[100%] sm:w-[340px] md:h-16 xl: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">
+                        <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>
+                        ))}
+                    </SelectContent>
+                </Select>
+            </div>
+        </div>
+    );
+};
diff --git a/components/ui/select.tsx b/components/ui/select.tsx
new file mode 100644
index 0000000..a3fcbf6
--- /dev/null
+++ b/components/ui/select.tsx
@@ -0,0 +1,160 @@
+"use client";
+
+import * as React from "react";
+import * as SelectPrimitive from "@radix-ui/react-select";
+import { Check, ChevronDown, ChevronUp } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+const Select = SelectPrimitive.Root;
+
+const SelectGroup = SelectPrimitive.Group;
+
+const SelectValue = SelectPrimitive.Value;
+
+const SelectTrigger = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.Trigger>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+    <SelectPrimitive.Trigger
+        ref={ref}
+        className={cn(
+            "flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+            className,
+        )}
+        {...props}
+    >
+        {children}
+        <SelectPrimitive.Icon asChild>
+            <ChevronDown className="h-4 w-4 opacity-50" />
+        </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
+));
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
+
+const SelectScrollUpButton = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+>(({ className, ...props }, ref) => (
+    <SelectPrimitive.ScrollUpButton
+        ref={ref}
+        className={cn(
+            "flex cursor-default items-center justify-center py-1",
+            className,
+        )}
+        {...props}
+    >
+        <ChevronUp className="h-4 w-4" />
+    </SelectPrimitive.ScrollUpButton>
+));
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
+
+const SelectScrollDownButton = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+>(({ className, ...props }, ref) => (
+    <SelectPrimitive.ScrollDownButton
+        ref={ref}
+        className={cn(
+            "flex cursor-default items-center justify-center py-1",
+            className,
+        )}
+        {...props}
+    >
+        <ChevronDown className="h-4 w-4" />
+    </SelectPrimitive.ScrollDownButton>
+));
+SelectScrollDownButton.displayName =
+    SelectPrimitive.ScrollDownButton.displayName;
+
+const SelectContent = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.Content>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
+>(({ className, children, position = "popper", ...props }, ref) => (
+    <SelectPrimitive.Portal>
+        <SelectPrimitive.Content
+            ref={ref}
+            className={cn(
+                "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+                position === "popper" &&
+                    "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+                className,
+            )}
+            position={position}
+            {...props}
+        >
+            <SelectScrollUpButton />
+            <SelectPrimitive.Viewport
+                className={cn(
+                    "p-1",
+                    position === "popper" &&
+                        "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
+                )}
+            >
+                {children}
+            </SelectPrimitive.Viewport>
+            <SelectScrollDownButton />
+        </SelectPrimitive.Content>
+    </SelectPrimitive.Portal>
+));
+SelectContent.displayName = SelectPrimitive.Content.displayName;
+
+const SelectLabel = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.Label>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
+>(({ className, ...props }, ref) => (
+    <SelectPrimitive.Label
+        ref={ref}
+        className={cn("py-1.5 pl-8 pr-2 text-sm font-semibold", className)}
+        {...props}
+    />
+));
+SelectLabel.displayName = SelectPrimitive.Label.displayName;
+
+const SelectItem = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.Item>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
+>(({ className, children, ...props }, ref) => (
+    <SelectPrimitive.Item
+        ref={ref}
+        className={cn(
+            "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+            className,
+        )}
+        {...props}
+    >
+        <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+            <SelectPrimitive.ItemIndicator>
+                <Check className="h-4 w-4" />
+            </SelectPrimitive.ItemIndicator>
+        </span>
+
+        <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+    </SelectPrimitive.Item>
+));
+SelectItem.displayName = SelectPrimitive.Item.displayName;
+
+const SelectSeparator = React.forwardRef<
+    React.ElementRef<typeof SelectPrimitive.Separator>,
+    React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+    <SelectPrimitive.Separator
+        ref={ref}
+        className={cn("-mx-1 my-1 h-px bg-muted", className)}
+        {...props}
+    />
+));
+SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
+
+export {
+    Select,
+    SelectGroup,
+    SelectValue,
+    SelectTrigger,
+    SelectContent,
+    SelectLabel,
+    SelectItem,
+    SelectSeparator,
+    SelectScrollUpButton,
+    SelectScrollDownButton,
+};
diff --git a/package-lock.json b/package-lock.json
index dc946ca..ca1a4fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
             "version": "0.1.0",
             "dependencies": {
                 "@radix-ui/react-popover": "^1.0.7",
+                "@radix-ui/react-select": "^2.0.0",
                 "@radix-ui/react-slot": "^1.0.2",
                 "@radix-ui/react-toast": "^1.1.5",
                 "class-variance-authority": "^0.7.0",
@@ -2692,6 +2693,14 @@
                 "url": "https://opencollective.com/popperjs"
             }
         },
+        "node_modules/@radix-ui/number": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.0.1.tgz",
+            "integrity": "sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            }
+        },
         "node_modules/@radix-ui/primitive": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz",
@@ -2783,6 +2792,23 @@
                 }
             }
         },
+        "node_modules/@radix-ui/react-direction": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",
+            "integrity": "sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/@radix-ui/react-dismissable-layer": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz",
@@ -3009,6 +3035,49 @@
                 }
             }
         },
+        "node_modules/@radix-ui/react-select": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.0.0.tgz",
+            "integrity": "sha512-RH5b7af4oHtkcHS7pG6Sgv5rk5Wxa7XI8W5gvB1N/yiuDGZxko1ynvOiVhFM7Cis2A8zxF9bTOUVbRDzPepe6w==",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/number": "1.0.1",
+                "@radix-ui/primitive": "1.0.1",
+                "@radix-ui/react-collection": "1.0.3",
+                "@radix-ui/react-compose-refs": "1.0.1",
+                "@radix-ui/react-context": "1.0.1",
+                "@radix-ui/react-direction": "1.0.1",
+                "@radix-ui/react-dismissable-layer": "1.0.5",
+                "@radix-ui/react-focus-guards": "1.0.1",
+                "@radix-ui/react-focus-scope": "1.0.4",
+                "@radix-ui/react-id": "1.0.1",
+                "@radix-ui/react-popper": "1.1.3",
+                "@radix-ui/react-portal": "1.0.4",
+                "@radix-ui/react-primitive": "1.0.3",
+                "@radix-ui/react-slot": "1.0.2",
+                "@radix-ui/react-use-callback-ref": "1.0.1",
+                "@radix-ui/react-use-controllable-state": "1.0.1",
+                "@radix-ui/react-use-layout-effect": "1.0.1",
+                "@radix-ui/react-use-previous": "1.0.1",
+                "@radix-ui/react-visually-hidden": "1.0.3",
+                "aria-hidden": "^1.1.1",
+                "react-remove-scroll": "2.5.5"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/@radix-ui/react-slot": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
@@ -3131,6 +3200,23 @@
                 }
             }
         },
+        "node_modules/@radix-ui/react-use-previous": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz",
+            "integrity": "sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/@radix-ui/react-use-rect": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz",
diff --git a/package.json b/package.json
index 149b014..17485c8 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     },
     "dependencies": {
         "@radix-ui/react-popover": "^1.0.7",
+        "@radix-ui/react-select": "^2.0.0",
         "@radix-ui/react-slot": "^1.0.2",
         "@radix-ui/react-toast": "^1.1.5",
         "class-variance-authority": "^0.7.0",

From e512d3aa601569433c379a29abc792e96dece694 Mon Sep 17 00:00:00 2001
From: Kevin Wu <kevinwu098@gmail.com>
Date: Tue, 16 Jan 2024 00:58:50 -0800
Subject: [PATCH 2/2] style: responsive changes

---
 components/search/Search.tsx       |  2 +-
 components/search/SearchSelect.tsx | 37 ++++++++++++------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/components/search/Search.tsx b/components/search/Search.tsx
index ac2b008..03d1391 100644
--- a/components/search/Search.tsx
+++ b/components/search/Search.tsx
@@ -265,7 +265,7 @@ const Search = () => {
                         </span>
                     </div>
                     <div className="mt-8 flex flex-row items-center justify-between">
-                        <div className="flex flex-col flex-wrap gap-x-4 gap-y-2 md:flex-row">
+                        <div className="flex w-full flex-row flex-wrap gap-x-4 gap-y-2">
                             <SearchSelect
                                 value={university}
                                 data={Object.keys(UNIVERSITY_GE)}
diff --git a/components/search/SearchSelect.tsx b/components/search/SearchSelect.tsx
index 4a876a2..c7df1de 100644
--- a/components/search/SearchSelect.tsx
+++ b/components/search/SearchSelect.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { ChangeEvent, useState } from "react";
 import {
     Select,
     SelectContent,
@@ -20,27 +19,21 @@ export const SearchSelect = (props: DropdownComponentProps) => {
     const { value, data, onChange, placeholder } = props;
 
     return (
-        <div className="flex place-content-center">
-            <div className="relative flex h-12 w-[100%] sm:w-[340px] md:h-16 xl: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">
-                        <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>
-                        ))}
-                    </SelectContent>
-                </Select>
-            </div>
+        <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">
+                    <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>
+                    ))}
+                </SelectContent>
+            </Select>
         </div>
     );
 };