From aed5942dbd15359c139322aa14b37b64ec3e89d4 Mon Sep 17 00:00:00 2001
From: Pau Matas <pmatasalbiol@gmail.com>
Date: Sat, 16 Mar 2024 19:47:55 +0100
Subject: [PATCH] fix: hardcoding just isn't for me

---
 src/app/api/subject/all/value-label/route.ts |  26 ++++
 src/components/Combobox.tsx                  |  10 +-
 src/components/Form.tsx                      | 137 +++----------------
 3 files changed, 48 insertions(+), 125 deletions(-)
 create mode 100644 src/app/api/subject/all/value-label/route.ts

diff --git a/src/app/api/subject/all/value-label/route.ts b/src/app/api/subject/all/value-label/route.ts
new file mode 100644
index 0000000..1b63fc7
--- /dev/null
+++ b/src/app/api/subject/all/value-label/route.ts
@@ -0,0 +1,26 @@
+import { db } from "@/lib/db"
+
+export async function GET(req: Request) {
+  const subjects = await db.subject.findMany({
+    select: {
+      acronym: true,
+      name: true,
+    },
+    orderBy: {
+      semester: "asc",
+    },
+  })
+
+  const subjectsValueLabel = subjects.map((subject) => {
+    return {
+      value: subject.acronym.toLowerCase(),
+      label: `${subject.acronym} - ${subject.name}`,
+    }
+  })
+
+  return new Response(JSON.stringify(subjectsValueLabel), {
+    headers: {
+      "content-type": "application/json",
+    },
+  })
+}
diff --git a/src/components/Combobox.tsx b/src/components/Combobox.tsx
index d220fee..8ae33d1 100644
--- a/src/components/Combobox.tsx
+++ b/src/components/Combobox.tsx
@@ -38,18 +38,20 @@ export function Combobox({
             variant="outline"
             role="combobox"
             aria-expanded={open}
-            className="w-[200px] justify-between"
+            className="w-80 justify-between"
           >
             {value
               ? options.find((option) => option.value === value)?.label
-              : "Select..."}
+              : "Selecciona..."}
             <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="max-h-80 flex flex-col w-[200px] p-0">
+        <PopoverContent className="max-h-80 flex flex-col w-80 p-0">
           <Command>
             <CommandInput placeholder="Search..." />
-            <CommandEmpty className="flex-1">No option found.</CommandEmpty>
+            <CommandEmpty className="flex-1">
+              No s&apos;han trobat resultats.
+            </CommandEmpty>
             <CommandGroup className="flex-1 h-full overflow-y-scroll">
               {options.map((option) => (
                 <CommandItem
diff --git a/src/components/Form.tsx b/src/components/Form.tsx
index d6c89de..2a6ea68 100644
--- a/src/components/Form.tsx
+++ b/src/components/Form.tsx
@@ -6,7 +6,7 @@ import { useMutation } from "@tanstack/react-query"
 import axios from "axios"
 import { useRouter } from "next/navigation"
 import { toast } from "@/hooks/use-toast"
-import { useEffect } from "react"
+import { useEffect, useState } from "react"
 import { Button } from "@/components/ui/Button"
 import {
   Form,
@@ -48,6 +48,7 @@ export function ProfileForm({
   isAdmin: boolean
 }) {
   const router = useRouter()
+  const [assignatures, setAssignatures] = useState([])
 
   const { mutate: createApuntsPost } = useMutation({
     mutationFn: async ({
@@ -123,125 +124,19 @@ export function ProfileForm({
 
     createApuntsPost(payload)
   }
-  // ------------------------------
-  const assignatures = [
-    {
-      value: "alg",
-      label: "ALG",
-    },
-    {
-      value: "cal",
-      label: "CAL",
-    },
-    {
-      value: "lmd",
-      label: "LMD",
-    },
-    {
-      value: "ap1",
-      label: "AP1",
-    },
-    {
-      value: "ap2",
-      label: "AP2",
-    },
-    {
-      value: "ac2",
-      label: "AC2",
-    },
-    {
-      value: "pie1",
-      label: "PIE1",
-    },
-    {
-      value: "com",
-      label: "COM",
-    },
-    {
-      value: "sis",
-      label: "SIS",
-    },
-    {
-      value: "ap3",
-      label: "AP3",
-    },
-    {
-      value: "teoi",
-      label: "TEOI",
-    },
-    {
-      value: "pie2",
-      label: "PIE2",
-    },
-    {
-      value: "bd",
-      label: "BD",
-    },
-    {
-      value: "psd",
-      label: "PSD",
-    },
-    {
-      value: "ipa",
-      label: "IPA",
-    },
-    {
-      value: "om",
-      label: "OM",
-    },
-    {
-      value: "ad",
-      label: "AD",
-    },
-    {
-      value: "aa1",
-      label: "AA1",
-    },
-    {
-      value: "vi",
-      label: "VI",
-    },
-    {
-      value: "cai",
-      label: "CAI",
-    },
-    {
-      value: "bda",
-      label: "BDA",
-    },
-    {
-      value: "aa2",
-      label: "AA2",
-    },
-    {
-      value: "ei",
-      label: "EI",
-    },
-    {
-      value: "taed1",
-      label: "TAED1",
-    },
-    {
-      value: "poe",
-      label: "POE",
-    },
-    {
-      value: "piva",
-      label: "PIVA",
-    },
-    {
-      value: "pe",
-      label: "PE",
-    },
-    {
-      value: "taed2",
-      label: "TAED2",
-    },
-    {
-      value: "altres",
-      label: "Altres",
-    },
-  ]
+
+  useEffect(() => {
+    async function fetchAssignatures() {
+      try {
+        const response = await axios.get("/api/subject/all/value-label")
+        setAssignatures(response.data)
+      } catch (error) {
+        console.error("Error fetching subjects:", error)
+      }
+    }
+    fetchAssignatures()
+  }, [])
+
   const tipus = [
     {
       value: "apunts",
@@ -264,7 +159,7 @@ export function ProfileForm({
       label: "Altres",
     },
   ]
-  // ------------------------------
+
   return (
     <Form {...form}>
       <form