Tai/Aberwyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pizza fixes and removed school menu since summer
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
elias
2025-06-15 20:48:05 +02:00
parent 76656bb6a8
commit 0e58ffb735
6 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Aberwyn/Areas/Identity/Pages/Account/Login.cshtml
View File

@@ -19,32 +19,13 @@
<span asp-validation-for="Input.UserName" class="text-danger"></span> <span asp-validation-for="Input.UserName" class="text-danger"></span>
</div> </div>
<div class="form-floating"> <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> <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> <span asp-validation-for="Input.Password" class="text-danger"></span>
</div> </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> <div>
<button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button> <button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
</div> </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> </form>
</section> </section>
</div> </div>

2
Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs
View File

@@ -62,7 +62,7 @@ namespace Aberwyn.Areas.Identity.Pages.Account
public class InputModel public class InputModel
{ {
[Required] [Required]
[Display(Name = "Användarnamn")] [Display(Name = "Username")]
public string UserName { get; set; } public string UserName { get; set; }
[Required] [Required]

1
Aberwyn/Views/Admin/Todo.cshtml
View File

@@ -35,7 +35,6 @@
} }
.todo-board { .todo-board {
padding: 20px;
font-family: sans-serif; font-family: sans-serif;
} }
.todo-columns { .todo-columns {

2
Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml
View File

@@ -3,7 +3,7 @@
@{ @{
ViewData["Title"] = "Pizza Admin"; ViewData["Title"] = "Pizza Admin";
var availablePizzas = Model.AvailablePizzas as List<Meal> ?? new List<Meal>(); 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" /> <link rel="stylesheet" href="~/css/pizza-admin.css" />

3
Aberwyn/Views/Home/Menu.cshtml
View File

@@ -65,6 +65,7 @@
</div> </div>
</div> </div>
<!--
<div class="school-meals card-view"> <div class="school-meals card-view">
<h2>Skolmat</h2> <h2>Skolmat</h2>
@@ -85,7 +86,7 @@
</div> </div>
</div> </div>
</div> </div>
-->
</div> </div>
</body> </body>

2
Aberwyn/wwwroot/js/menu.js
View File

@@ -44,7 +44,7 @@ angular.module('mealMenuApp', ['ngSanitize'])
}); });
}).catch(err => console.error("Fel vid hämtning av meny:", err)); }).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 = []; $scope.schoolMeals = [];