From 2e20edf3e784cccb98fd3a196cc68f51ba35bf31 Mon Sep 17 00:00:00 2001
From: Matthew Alex <matalex412@gmail.com>
Date: Thu, 22 Aug 2024 11:54:23 +0100
Subject: [PATCH] style: move logo into company column for event table

---
 app/events/EventTable.tsx | 16 ++++++----------
 app/events/page.tsx       |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/events/EventTable.tsx b/app/events/EventTable.tsx
index 5438f505..ac3d1298 100644
--- a/app/events/EventTable.tsx
+++ b/app/events/EventTable.tsx
@@ -39,19 +39,13 @@ const EventTable = ({
   const columnDefsMap = useMemo(() => {
     const columnDefsMap_: Partial<Record<ColumnName, ColumnDef<EventRow, any>>> = {
       "company.name": {
-        cell: info => <Link href={getCompanyLink(info.row.original.company)}>{info.getValue()}</Link>,
-        header: "Company",
-        id: "company.name",
-        sortingFn: "alphanumeric",
-      },
-      "company.logo": {
         cell: info => (
-          <Flex align="center" justify="center">
+          <Flex align="center" justify="start" gap="4">
             <Flex justify="center" height="4em" maxWidth="8em">
               {info.getValue() && (
                 <Image
                   unoptimized
-                  src={`/api/uploads/${info.getValue()}`}
+                  src={`/api/uploads/${info.row.original.company.logo}`}
                   alt="profile teaser"
                   width={100}
                   height={100}
@@ -59,10 +53,12 @@ const EventTable = ({
                 />
               )}
             </Flex>
+            <Link href={getCompanyLink(info.row.original.company)}>{info.getValue()}</Link>
           </Flex>
         ),
-        header: "",
-        enableSorting: false,
+        header: "Company",
+        id: "company.name",
+        sortingFn: "alphanumeric",
       },
       title: {
         cell: info => <Link href={`/events/${info.row.original.id}`}>{info.getValue()}</Link>,
diff --git a/app/events/page.tsx b/app/events/page.tsx
index 793e4961..27c7fb49 100644
--- a/app/events/page.tsx
+++ b/app/events/page.tsx
@@ -20,7 +20,7 @@ const EventsPage = async () => {
         <Heading size="8">Events</Heading>
         <EventTable
           events={events}
-          columns={["company.logo", "company.name", "title", "dateStart", "shortDescription", "location", "spaces"]}
+          columns={["company.name", "title", "dateStart", "shortDescription", "location", "spaces"]}
         />
       </Flex>
     </RestrictedArea>