Merge branch 'main' into raymond/live-badge-tweaks

acmucsd · Apr 23, 2024 · 4bd7874 · 4bd7874
2 parents 89962c5 + 799ed07
commit 4bd7874
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/src/components/common/ThemeToggle/index.tsx b/src/components/common/ThemeToggle/index.tsx
@@ -29,7 +29,7 @@ const ThemeToggle = () => {
     // This affects the color of the safe zone on iPhone 15.
     const metaThemeColor = document.querySelector('meta[name="theme-color"]');
     if (metaThemeColor && resolvedTheme === 'dark') {
-      metaThemeColor.setAttribute('content', '#37393e');
+      metaThemeColor.setAttribute('content', '#25262b');
     } else if (metaThemeColor) {
       metaThemeColor.setAttribute('content', '#fff');
     }

diff --git a/src/components/events/EventCard/index.tsx b/src/components/events/EventCard/index.tsx
@@ -74,6 +74,7 @@ const EventCard = ({
       <Link
         href={`${config.eventsRoute}/${uuid}`}
         data-community={community}
+        data-disabled={borderless}
         className={`${styles.container} ${borderless ? '' : styles.bordered} ${className || ''}`}
         onClick={e => {
           e.preventDefault();

diff --git a/src/components/events/EventCard/style.module.scss b/src/components/events/EventCard/style.module.scss
@@ -20,7 +20,7 @@
     border-radius: 10px;
   }
 
-  &:not([disabled]):hover {
+  &:not([data-disabled]):hover {
     outline-width: 4px;
     transform: scale(0.975);
 

diff --git a/src/pages/admin/store/pickup/index.tsx b/src/pages/admin/store/pickup/index.tsx
@@ -25,14 +25,15 @@ const AdminPickupPage = ({ futurePickupEvents, pastPickupEvents }: AdminPickupPa
         <Typography variant="h1/bold" style={{ marginRight: 'auto' }}>
           Manage Pickup Events
         </Typography>
-
-        <button
-          type="button"
-          className={`${styles.displayButton} ${display === 'future' && styles.active}`}
-          onClick={() => router.push(`${config.admin.store.pickupCreate}`)}
-        >
-          <Typography variant="h5/bold">Create New Pickup Event</Typography>
-        </button>
+        <div className={styles.displayButtons}>
+          <button
+            type="button"
+            className={`${styles.displayButton} ${styles.active}`}
+            onClick={() => router.push(`${config.admin.store.pickupCreate}`)}
+          >
+            <Typography variant="h5/bold">Create New Pickup Event</Typography>
+          </button>
+        </div>
 
         <div className={styles.displayButtons}>
           <button

diff --git a/src/pages/store/cart.tsx b/src/pages/store/cart.tsx
@@ -249,7 +249,11 @@ const getServerSidePropsFunc: GetServerSideProps = async ({ req, res }) => {
 
   const savedCartPromise = CartService.getCart({ req, res });
   const pickupEventsPromise = getFutureOrderPickupEvents(AUTH_TOKEN).then(events =>
-    events.filter(event => event.status !== 'CANCELLED')
+    events
+      .filter(event => event.status !== 'CANCELLED')
+      .filter(
+        event => !(event.orders && event.orderLimit && event.orders.length > event.orderLimit)
+      )
   );
   const userPromise = getCurrentUserAndRefreshCookie(AUTH_TOKEN, { req, res });