From 3ff19fc43a09292ec4c97ae6d25de51ce3e57fc1 Mon Sep 17 00:00:00 2001
From: 0xPratik <sariapratik@gmail.com>
Date: Sun, 3 Nov 2024 17:13:58 +0545
Subject: [PATCH 1/2] fix: prevent table overflow in unicorn-table component

---
 components/unicorn-table.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/unicorn-table.tsx b/components/unicorn-table.tsx
index 07274f0..c2f0c33 100644
--- a/components/unicorn-table.tsx
+++ b/components/unicorn-table.tsx
@@ -24,7 +24,7 @@ export const UnicornTable = ({
     return title
       .split("_")
       .map((word, index) =>
-        index === 0 ? word.charAt(0).toUpperCase() + word.slice(1) : word,
+        index === 0 ? word.charAt(0).toUpperCase() + word.slice(1) : word
       )
       .join(" ");
   };
@@ -68,7 +68,7 @@ export const UnicornTable = ({
           </TabsTrigger>
         </TabsList>
         <TabsContent value="table" className="flex-grow">
-          <div className="sm:min-h-[10px] relative">
+          <div className="sm:min-h-[10px] relative overflow-x-auto">
             <Table className="min-w-full divide-y divide-border">
               <TableHeader className="bg-secondary sticky top-0 shadow-sm">
                 <TableRow>
@@ -92,7 +92,7 @@ export const UnicornTable = ({
                       >
                         {formatCellValue(
                           column,
-                          company[column as keyof Unicorn],
+                          company[column as keyof Unicorn]
                         )}
                       </TableCell>
                     ))}

From 921a719930d07243b1ed95e3796962f581473dfb Mon Sep 17 00:00:00 2001
From: Nico Albanese <nico.albanese@vercel.com>
Date: Thu, 7 Nov 2024 09:26:48 +0000
Subject: [PATCH 2/2] resolve conflicts

---
 app/page.tsx                                  | 8 ++++----
 components/{unicorn-table.tsx => results.tsx} | 2 +-
 components/{unicorn-search.tsx => search.tsx} | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename components/{unicorn-table.tsx => results.tsx} (99%)
 rename components/{unicorn-search.tsx => search.tsx} (88%)

diff --git a/app/page.tsx b/app/page.tsx
index 263fe6e..86f2e87 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -7,10 +7,10 @@ import { Config, Result } from "@/lib/types";
 import { Loader2 } from "lucide-react";
 import { toast } from "sonner";
 import { ProjectInfo } from "@/components/project-info";
-import { UnicornTable } from "@/components/unicorn-table";
+import { Results } from "@/components/results";
 import { SuggestedQueries } from "@/components/suggested-queries";
 import { QueryViewer } from "@/components/query-viewer";
-import { UnicornSearch } from "@/components/unicorn-search";
+import { Search } from "@/components/search";
 import { Header } from "@/components/header";
 
 export default function Page() {
@@ -88,7 +88,7 @@ export default function Page() {
         >
           <div className="p-6 sm:p-8 flex flex-col flex-grow">
             <Header handleClear={handleClear} />
-            <UnicornSearch
+            <Search
               handleClear={handleClear}
               handleSubmit={handleSubmit}
               inputValue={inputValue}
@@ -134,7 +134,7 @@ export default function Page() {
                           </p>
                         </div>
                       ) : (
-                        <UnicornTable
+                        <Results
                           results={results}
                           chartConfig={chartConfig}
                           columns={columns}
diff --git a/components/unicorn-table.tsx b/components/results.tsx
similarity index 99%
rename from components/unicorn-table.tsx
rename to components/results.tsx
index c2f0c33..144c185 100644
--- a/components/unicorn-table.tsx
+++ b/components/results.tsx
@@ -11,7 +11,7 @@ import {
 } from "./ui/table";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "./ui/tabs";
 
-export const UnicornTable = ({
+export const Results = ({
   results,
   columns,
   chartConfig,
diff --git a/components/unicorn-search.tsx b/components/search.tsx
similarity index 88%
rename from components/unicorn-search.tsx
rename to components/search.tsx
index 6a99b9b..1b446d6 100644
--- a/components/unicorn-search.tsx
+++ b/components/search.tsx
@@ -1,8 +1,8 @@
-import { Search } from "lucide-react";
+import { Search as SearchIcon } from "lucide-react";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
 
-export const UnicornSearch = ({
+export const Search = ({
   handleSubmit,
   inputValue,
   setInputValue,
@@ -32,7 +32,7 @@ export const UnicornSearch = ({
             onChange={(e) => setInputValue(e.target.value)}
             className="pr-10 text-base"
           />
-          <Search className="absolute right-3 top-1/2 transform -translate-y-1/2 text-muted-foreground" />
+          <SearchIcon className="absolute right-3 top-1/2 transform -translate-y-1/2 text-muted-foreground" />
         </div>
         <div className="flex sm:flex-row items-center justify-center gap-2">
           {submitted ? (