From bf8aeebdc732dd69f1b85f68554e392a64d95847 Mon Sep 17 00:00:00 2001
From: Nikhil Dange <nsdange@ucsd.edu>
Date: Thu, 2 May 2024 15:30:01 -0700
Subject: [PATCH 1/3] filtered events

---
 src/pages/store/cart.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/store/cart.tsx b/src/pages/store/cart.tsx
index fc5c694f..890a62ba 100644
--- a/src/pages/store/cart.tsx
+++ b/src/pages/store/cart.tsx
@@ -254,6 +254,13 @@ const getServerSidePropsFunc: GetServerSideProps = async ({ req, res }) => {
       .filter(
         event => !(event.orders && event.orderLimit && event.orders.length > event.orderLimit)
       )
+      // filter out events that have a start time less than 2 days from now
+      .filter(event => {
+        const startTime = new Date(event.start);
+        const now = new Date();
+        now.setDate(now.getDate() + 2);
+        return startTime >= now;
+      })
   );
   const userPromise = getCurrentUserAndRefreshCookie(AUTH_TOKEN, { req, res });
 

From 6656272891501fe020bcfbff1b08ae4dfefa7f6f Mon Sep 17 00:00:00 2001
From: Nikhil Dange <nsdange@ucsd.edu>
Date: Fri, 3 May 2024 18:27:56 -0700
Subject: [PATCH 2/3] styling changes

---
 src/pages/admin/store/pickup/[uuid].tsx       | 44 ++++++++++---------
 .../StorePickupEventDetailsPage.module.scss   |  8 ++++
 ...orePickupEventDetailsPage.module.scss.d.ts |  1 +
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/pages/admin/store/pickup/[uuid].tsx b/src/pages/admin/store/pickup/[uuid].tsx
index 2dcea7a8..0521f7ea 100644
--- a/src/pages/admin/store/pickup/[uuid].tsx
+++ b/src/pages/admin/store/pickup/[uuid].tsx
@@ -57,31 +57,33 @@ const PickupEventDetailsPage = ({ pickupEvent, token }: PickupEventDetailsPagePr
           <div>
             <PickupEventStatus status={status} variant="h3/bold" />
             <Typography variant="h1/bold">{title}</Typography>
-            <Button
-              className={`${styles.displayButton}`}
-              onClick={() => router.push(`${config.admin.store.pickupEdit}/${uuid}`)}
-            >
-              <Typography variant="h5/bold">Edit Pickup Event</Typography>
-            </Button>
-            {status === OrderPickupEventStatus.ACTIVE ? (
+            <div className={styles.buttonContainer}>
               <Button
                 className={`${styles.displayButton}`}
-                onClick={() => completePickupEvent(uuid, token)}
+                onClick={() => router.push(`${config.admin.store.pickupEdit}/${uuid}`)}
               >
-                <Typography variant="h5/bold">Complete Pickup Event</Typography>
+                <Typography variant="h5/bold">Edit Pickup Event</Typography>
               </Button>
-            ) : null}
-            {status === OrderPickupEventStatus.ACTIVE ? (
-              <Button
-                className={`${styles.displayButton}`}
-                onClick={() => {
-                  cancelPickupEvent(uuid, token);
-                }}
-                destructive
-              >
-                <Typography variant="h5/bold">Cancel Pickup Event</Typography>
-              </Button>
-            ) : null}
+              {status === OrderPickupEventStatus.ACTIVE ? (
+                <Button
+                  className={`${styles.displayButton}`}
+                  onClick={() => completePickupEvent(uuid, token)}
+                >
+                  <Typography variant="h5/bold">Complete Pickup Event</Typography>
+                </Button>
+              ) : null}
+              {status === OrderPickupEventStatus.ACTIVE ? (
+                <Button
+                  className={`${styles.displayButton}`}
+                  onClick={() => {
+                    cancelPickupEvent(uuid, token);
+                  }}
+                  destructive
+                >
+                  <Typography variant="h5/bold">Cancel Pickup Event</Typography>
+                </Button>
+              ) : null}
+            </div>
             <Typography variant="h4/regular" suppressHydrationWarning>
               {formatEventDate(start, end, true)}
             </Typography>
diff --git a/src/styles/pages/StorePickupEventDetailsPage.module.scss b/src/styles/pages/StorePickupEventDetailsPage.module.scss
index 4b576698..b814ccb0 100644
--- a/src/styles/pages/StorePickupEventDetailsPage.module.scss
+++ b/src/styles/pages/StorePickupEventDetailsPage.module.scss
@@ -46,6 +46,14 @@
       }
     }
 
+    .buttonContainer {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      gap: 1rem;
+      margin: 1rem 0;
+    }
+
     .orders {
       display: flex;
       flex-direction: column;
diff --git a/src/styles/pages/StorePickupEventDetailsPage.module.scss.d.ts b/src/styles/pages/StorePickupEventDetailsPage.module.scss.d.ts
index 807de6f0..7c896b54 100644
--- a/src/styles/pages/StorePickupEventDetailsPage.module.scss.d.ts
+++ b/src/styles/pages/StorePickupEventDetailsPage.module.scss.d.ts
@@ -1,6 +1,7 @@
 export type Styles = {
   active: string;
   back: string;
+  buttonContainer: string;
   container: string;
   description: string;
   displayButton: string;

From 01caad6b36bcaadc93b0183ec7117e5c1146d1cd Mon Sep 17 00:00:00 2001
From: Nikhil Dange <nsdange@ucsd.edu>
Date: Fri, 3 May 2024 22:44:59 -0700
Subject: [PATCH 3/3] remove code from other pr

---
 src/pages/store/cart.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/store/cart.tsx b/src/pages/store/cart.tsx
index 890a62ba..fc5c694f 100644
--- a/src/pages/store/cart.tsx
+++ b/src/pages/store/cart.tsx
@@ -254,13 +254,6 @@ const getServerSidePropsFunc: GetServerSideProps = async ({ req, res }) => {
       .filter(
         event => !(event.orders && event.orderLimit && event.orders.length > event.orderLimit)
       )
-      // filter out events that have a start time less than 2 days from now
-      .filter(event => {
-        const startTime = new Date(event.start);
-        const now = new Date();
-        now.setDate(now.getDate() + 2);
-        return startTime >= now;
-      })
   );
   const userPromise = getCurrentUserAndRefreshCookie(AUTH_TOKEN, { req, res });