From 0e58ffb73557e3eb31d9a5937864c581265c14c2 Mon Sep 17 00:00:00 2001
From: elias <elias.jansson@gmail.com>
Date: Sun, 15 Jun 2025 20:48:05 +0200
Subject: [PATCH] Pizza fixes and removed school menu since summer

---
 .../Areas/Identity/Pages/Account/Login.cshtml | 21 +------------------
 .../Identity/Pages/Account/Login.cshtml.cs    |  2 +-
 Aberwyn/Views/Admin/Todo.cshtml               |  1 -
 Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml      |  2 +-
 Aberwyn/Views/Home/Menu.cshtml                |  3 ++-
 Aberwyn/wwwroot/js/menu.js                    |  2 +-
 6 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml
index 61f2bf6..6e9b9fd 100644
--- a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml
+++ b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml
@@ -19,32 +19,13 @@
                     <span asp-validation-for="Input.UserName" class="text-danger"></span>
                 </div>
                 <div class="form-floating">
-                    <input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
                     <label asp-for="Input.Password" class="form-label"></label>
+                    <input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
                     <span asp-validation-for="Input.Password" class="text-danger"></span>
                 </div>
-                <div>
-                    <div class="checkbox">
-                        <label asp-for="Input.RememberMe" class="form-label">
-                            <input class="form-check-input" asp-for="Input.RememberMe" />
-                            @Html.DisplayNameFor(m => m.Input.RememberMe)
-                        </label>
-                    </div>
-                </div>
                 <div>
                     <button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
                 </div>
-                <div>
-                    <p>
-                        <a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
-                    </p>
-                    <p>
-                        <a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
-                    </p>
-                    <p>
-                        <a id="resend-confirmation" asp-page="./ResendEmailConfirmation">Resend email confirmation</a>
-                    </p>
-                </div>
             </form>
         </section>
     </div>
diff --git a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs
index 18a2f60..1af18f5 100644
--- a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs
+++ b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs
@@ -62,7 +62,7 @@ namespace Aberwyn.Areas.Identity.Pages.Account
         public class InputModel
         {
             [Required]
-            [Display(Name = "Användarnamn")]
+            [Display(Name = "Username")]
             public string UserName { get; set; }
 
             [Required]
diff --git a/Aberwyn/Views/Admin/Todo.cshtml b/Aberwyn/Views/Admin/Todo.cshtml
index be2d097..5707a80 100644
--- a/Aberwyn/Views/Admin/Todo.cshtml
+++ b/Aberwyn/Views/Admin/Todo.cshtml
@@ -35,7 +35,6 @@
 }
 
         .todo-board {
-            padding: 20px;
             font-family: sans-serif;
         }
         .todo-columns {
diff --git a/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml b/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml
index 739fc5e..d5b3af8 100644
--- a/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml
+++ b/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml
@@ -3,7 +3,7 @@
 @{
     ViewData["Title"] = "Pizza Admin";
     var availablePizzas = Model.AvailablePizzas as List<Meal> ?? new List<Meal>();
-    var restaurantOpen = ViewBag.RestaurantOpen as bool? ?? true;
+    var restaurantOpen = ViewBag.RestaurantIsOpen as bool? ?? false;
 }
 
 <link rel="stylesheet" href="~/css/pizza-admin.css" />
diff --git a/Aberwyn/Views/Home/Menu.cshtml b/Aberwyn/Views/Home/Menu.cshtml
index 9634090..8b95389 100644
--- a/Aberwyn/Views/Home/Menu.cshtml
+++ b/Aberwyn/Views/Home/Menu.cshtml
@@ -65,6 +65,7 @@
         </div>
     </div>
 
+<!--
       <div class="school-meals card-view">
         <h2>Skolmat</h2>
 
@@ -85,7 +86,7 @@
           </div>
         </div>
       </div>
-
+-->
 
 </div>
 </body>
diff --git a/Aberwyn/wwwroot/js/menu.js b/Aberwyn/wwwroot/js/menu.js
index 9394bcd..8917d82 100644
--- a/Aberwyn/wwwroot/js/menu.js
+++ b/Aberwyn/wwwroot/js/menu.js
@@ -44,7 +44,7 @@ angular.module('mealMenuApp', ['ngSanitize'])
                 });
         
             }).catch(err => console.error("Fel vid hämtning av meny:", err));
-            $scope.loadSchoolMeals(); // Lägg till här
+            //$scope.loadSchoolMeals(); // Lägg till här
 
         };
         $scope.schoolMeals = [];