From 65513a8f6045f1d7a8225aab8cc3f135360eb402 Mon Sep 17 00:00:00 2001
From: Khuslen Misheel <khuslenmisheel@khuslens-air.wifi.local.cmu.edu>
Date: Sat, 9 Dec 2023 15:19:40 -0500
Subject: [PATCH 1/3] Sorted by current day in meal plan

---
 cookbook/templates/base.html               |  3 +-
 vue/src/apps/MealPlanView/MealPlanView.vue | 32 +++++++++++++---------
 vue/src/components/RecipeContextMenu.vue   |  1 +
 vue/src/components/print.css               |  6 ++++
 4 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 vue/src/components/print.css

diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 210492309..b0fae6027 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -86,11 +86,12 @@
             </a>
         {% endif %}
     {% endif %}
-
+    
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
             aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
+    
 
     {% if request.user.userpreference.left_handed %}
         {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue
index 2f60ae01f..f870ee96d 100644
--- a/vue/src/apps/MealPlanView/MealPlanView.vue
+++ b/vue/src/apps/MealPlanView/MealPlanView.vue
@@ -363,20 +363,26 @@ export default {
             }
         },
         mobileSimpleGrid() {
-            let grid = []
-
-            if (this.current_period !== null) {
-                for (const x of Array(7).keys()) {
-                    let moment_date = moment(this.current_period.periodStart).add(x, "d")
-                    grid.push({
-                        date: moment_date,
-                        create_default_date: moment_date.format("YYYY-MM-DD"), // improve meal plan edit modal to do formatting itself and accept dates
-                        date_label: moment_date.format("dd") + " " + moment_date.format("ll"),
-                        plan_entries: this.plan_items.filter((m) => moment_date.isBetween(moment(m.startDate), moment(m.endDate), 'day', '[]'))
-                    })
-                }
+            let grid = [];
+            let currentDate = moment();
+            for (let x = 0; x < 7; x++) {
+                let moment_date = currentDate.clone().add(x, "d");
+                grid.push({
+                    date: moment_date,
+                    create_default_date: moment_date.format("YYYY-MM-DD"),
+                    date_label: moment_date.format("dd") + " " + moment_date.format("ll"),
+                    plan_entries: this.plan_items.filter(
+                        (m) =>
+                            moment_date.isBetween(
+                                moment(m.startDate),
+                                moment(m.endDate),
+                                'day',
+                                '[]'
+                            )
+                    ),
+                });
             }
-            return grid
+            return grid;
         }
     },
     mounted() {
diff --git a/vue/src/components/RecipeContextMenu.vue b/vue/src/components/RecipeContextMenu.vue
index bf22a952f..d52e3c52b 100644
--- a/vue/src/components/RecipeContextMenu.vue
+++ b/vue/src/components/RecipeContextMenu.vue
@@ -1,5 +1,6 @@
 <template>
     <div>
+        <link rel="stylesheet" type="text/css" href="print.css" media="print">
         <div class="dropdown d-print-none">
             <a class="btn shadow-none pr-0 pl-0" href="javascript:void(0);" role="button" id="dropdownMenuLink"
                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/vue/src/components/print.css b/vue/src/components/print.css
new file mode 100644
index 000000000..63a576c41
--- /dev/null
+++ b/vue/src/components/print.css
@@ -0,0 +1,6 @@
+@media print {
+    body {
+      color: black;        /* Set text color to black */
+      background: white;   /* Set background color to white */
+    }
+}  
\ No newline at end of file

From 31c6defc9397b291264a1ef7f6498198ed1d63c0 Mon Sep 17 00:00:00 2001
From: Khuslen Misheel <khuslenmisheel@khuslens-air.wifi.local.cmu.edu>
Date: Sun, 10 Dec 2023 13:44:01 -0500
Subject: [PATCH 2/3] Only fixed current day in meal plan

---
 cookbook/templates/base.html             | 4 +---
 vue/src/components/RecipeContextMenu.vue | 1 -
 vue/src/components/print.css             | 6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 vue/src/components/print.css

diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index b0fae6027..407775b50 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -86,12 +86,10 @@
             </a>
         {% endif %}
     {% endif %}
-    
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
             aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
-    </button>
-    
+    </button>    
 
     {% if request.user.userpreference.left_handed %}
         {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
diff --git a/vue/src/components/RecipeContextMenu.vue b/vue/src/components/RecipeContextMenu.vue
index d52e3c52b..bf22a952f 100644
--- a/vue/src/components/RecipeContextMenu.vue
+++ b/vue/src/components/RecipeContextMenu.vue
@@ -1,6 +1,5 @@
 <template>
     <div>
-        <link rel="stylesheet" type="text/css" href="print.css" media="print">
         <div class="dropdown d-print-none">
             <a class="btn shadow-none pr-0 pl-0" href="javascript:void(0);" role="button" id="dropdownMenuLink"
                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/vue/src/components/print.css b/vue/src/components/print.css
deleted file mode 100644
index 63a576c41..000000000
--- a/vue/src/components/print.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@media print {
-    body {
-      color: black;        /* Set text color to black */
-      background: white;   /* Set background color to white */
-    }
-}  
\ No newline at end of file

From 0e34cc72d511dd94afec5033105a3581ef9fcfc3 Mon Sep 17 00:00:00 2001
From: Khuslen Misheel <khuslenmisheel@khuslens-air.wifi.local.cmu.edu>
Date: Sun, 10 Dec 2023 13:46:55 -0500
Subject: [PATCH 3/3] Proper fix for Calendar

---
 cookbook/templates/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 407775b50..210492309 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -86,10 +86,11 @@
             </a>
         {% endif %}
     {% endif %}
+
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
             aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
-    </button>    
+    </button>
 
     {% if request.user.userpreference.left_handed %}
         {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}