fix menu dates calculation

GunnWATT · Nov 14, 2024 · 59b1374 · 59b1374
1 parent c57683f
commit 59b1374
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/client/src/components/layout/PeriodActionButton.tsx b/client/src/components/layout/PeriodActionButton.tsx
@@ -14,7 +14,7 @@ function ActionButton(props: ActionButtonProps) {
     const { children, now, note, onClick } = props;
     return (
         <button
-            className={`mt-2 w-full px-3.5 py-1.5 right-5 top-0 rounded-md ${note || 'sm:w-fit sm:absolute sm:my-auto sm:h-fit'} ${now ? 'bottom-8' : 'bottom-0'} bg-black/10 dark:bg-black/20 hover:bg-black/20 dark:hover:bg-black/30 transition duration-75`}
+            className={`mt-2 w-full px-3.5 py-1.5 right-5 top-0 rounded-md ${note || 'md:w-fit md:absolute md:my-auto md:h-fit'} ${now ? 'bottom-8' : 'bottom-0'} bg-black/10 dark:bg-black/20 hover:bg-black/20 dark:hover:bg-black/30 transition duration-75`}
             onClick={onClick}
         >
             {children}
@@ -58,12 +58,7 @@ function MenuAction(props: PeriodActionButtonProps) {
     const formatted = date.toFormat('MM-dd');
     const meal = name.toLowerCase() as 'brunch' | 'lunch';
 
-    if (!menu) {
-        localStorage.removeItem('menu');
-        return <></>
-    }
-
-    if (formatted in menu && menu[formatted][meal])
+    if (menu && formatted in menu && menu[formatted][meal]) {
         return (
             <>
                 <ActionButton {...props} onClick={() => setModal(true)}>
@@ -77,6 +72,7 @@ function MenuAction(props: PeriodActionButtonProps) {
                 />
             </>
         )
+    }
 
     return <></>
 }
diff --git a/client/src/components/lists/MenuModal.tsx b/client/src/components/lists/MenuModal.tsx
@@ -19,7 +19,7 @@ export default function MenuModal(props: MenuModalProps) {
     const [nutritionModal, setNutritionModal] = useState<string | null>(null);
 
     return (
-        <CenteredModal className="relative flex flex-col bg-content rounded-md w-[28rem] max-h-[90%] mx-2 p-6 shadow-xl" isOpen={isOpen} setIsOpen={setIsOpen}>
+        <CenteredModal className="relative flex flex-col bg-content rounded-md min-w-full sm:min-w-[28rem] max-h-[90%] mx-2 p-6 shadow-xl" isOpen={isOpen} setIsOpen={setIsOpen}>
             <Dialog.Title className="text-xl font-semibold mb-3 pr-6">
                 {name} Menu
             </Dialog.Title>
@@ -29,18 +29,16 @@ export default function MenuModal(props: MenuModalProps) {
                     <div key={item}>
                         <div
                             className="truncate text-center cursor-pointer px-8 py-4 text-secondary rounded-md bg-black/10 dark:bg-black/20 hover:bg-black/20 dark:hover:bg-black/30 transition duration-75"
-                            onClick={() => nutrition && setNutritionModal(item)}
+                            onClick={() => setNutritionModal(item)}
                         >
                             {item}
                         </div>
-                        {nutrition && (
-                            <NutritionModal
-                                item={item}
-                                nutrition={nutrition}
-                                isOpen={(nutritionModal === item)}
-                                setIsOpen={() => setNutritionModal(null)}
-                            />
-                        )}
+                        <NutritionModal
+                            item={item}
+                            nutrition={nutrition}
+                            isOpen={nutritionModal === item}
+                            setIsOpen={() => setNutritionModal(null)}
+                        />
                     </div>
                 ))}
             </section>

diff --git a/functions/src/menu.ts b/functions/src/menu.ts
@@ -10,7 +10,7 @@ import { SCHOOL_START, SCHOOL_END } from '@watt/shared/data/schedule';
 const firestore = admin.firestore();
 
 export const menu = onSchedule("every day 00:00", async () => {
-    const now = DateTime.now().setZone('America/Los_Angeles');
+    const now = DateTime.now();
 
     if (now < SCHOOL_START || now > SCHOOL_END) {
         await firestore.collection('gunn').doc('menu').set({
@@ -66,8 +66,7 @@ export const menu = onSchedule("every day 00:00", async () => {
 
     const days = Array
         .from({ length: daysInMonth }, (_, i) => DateTime
-            .fromObject({ year, month, day: i + 1 })
-            .setZone('America/Los_Angeles'))
+            .fromObject({ year, month, day: i + 1 }))
         .filter(day => {
             const { periods } = getSchedule(day, alternates);
             return periods && periods.filter(({ n }) => n === 'B' || n === 'L').length;