From a33ed400f13579f179f29d41fe5a6b3496ecfc8a Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Mon, 2 Jun 2025 23:40:47 +0200 Subject: [PATCH 001/103] Dockerfile fix --- Aberwyn/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aberwyn/Dockerfile b/Aberwyn/Dockerfile index 142b95b..153fc56 100644 --- a/Aberwyn/Dockerfile +++ b/Aberwyn/Dockerfile @@ -15,7 +15,7 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Aberwyn.csproj", "."] +COPY ["Aberwyn/Aberwyn.csproj", "."] RUN dotnet restore "Aberwyn.csproj" COPY . . RUN dotnet build "Aberwyn.csproj" -c Release -o /app/build From 2e1e0f46706eaf1fcad66a283d59582ee32058e9 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Mon, 2 Jun 2025 23:48:43 +0200 Subject: [PATCH 002/103] Clearing up proj file --- Aberwyn/Aberwyn.csproj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Aberwyn/Aberwyn.csproj b/Aberwyn/Aberwyn.csproj index 005d93a..099c10b 100644 --- a/Aberwyn/Aberwyn.csproj +++ b/Aberwyn/Aberwyn.csproj @@ -9,16 +9,6 @@ Linux - - - - - - - - - - From 628f25a8be05b9eed9df081cc0f204d4fda54c97 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Mon, 2 Jun 2025 23:52:17 +0200 Subject: [PATCH 003/103] More --- Aberwyn/Aberwyn.csproj | 5 -- Aberwyn/Data/BudgetService.cs | 148 ---------------------------------- 2 files changed, 153 deletions(-) delete mode 100644 Aberwyn/Data/BudgetService.cs diff --git a/Aberwyn/Aberwyn.csproj b/Aberwyn/Aberwyn.csproj index 099c10b..92a479f 100644 --- a/Aberwyn/Aberwyn.csproj +++ b/Aberwyn/Aberwyn.csproj @@ -9,11 +9,6 @@ Linux - - - - - diff --git a/Aberwyn/Data/BudgetService.cs b/Aberwyn/Data/BudgetService.cs deleted file mode 100644 index 17421f5..0000000 --- a/Aberwyn/Data/BudgetService.cs +++ /dev/null @@ -1,148 +0,0 @@ -using MySql.Data.MySqlClient; -using System.Collections.Generic; -using Aberwyn.Models; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; // Add this namespace - -namespace Aberwyn.Data -{ - public class BudgetService - { - private readonly IConfiguration _configuration; - private readonly IHostEnvironment _env; // Add this field - - public BudgetService(IConfiguration configuration, IHostEnvironment env) // Update constructor - { - _configuration = configuration; - _env = env; // Initialize the environment field - } - - public MySqlConnection GetConnection() - { - var connectionString = _env.IsDevelopment() // Use the injected environment variable - ? _configuration.GetConnectionString("DefaultConnection") - : _configuration.GetConnectionString("ProductionConnection"); - - return new MySqlConnection(connectionString); - } - - public bool UpdateBudgetItem(BudgetItem item) - { - using (var connection = GetConnection()) - { - connection.Open(); - - string query = @" - UPDATE tblBudgetItems - SET Name = @name, Amount = @amount - WHERE idtblBudgetItems = @id"; - - using (var cmd = new MySqlCommand(query, connection)) - { - cmd.Parameters.AddWithValue("@name", item.Name); - cmd.Parameters.AddWithValue("@amount", item.Amount); - cmd.Parameters.AddWithValue("@id", item.ID); - return cmd.ExecuteNonQuery() > 0; // Returns true if one or more rows are updated - } - } - } - - public List GetBudgetItems(int month, int year) - { - var budgetItems = new List(); - - using (var connection = GetConnection()) - { - connection.Open(); - - string query = @" - SELECT - b.idtblBudgetItems AS id, - b.Name AS item_name, - b.Amount AS amount, - c1.Name AS category, - b.Month, - b.Year, - b.Description AS description - FROM tblBudgetItems b - LEFT JOIN tblCategories c1 ON b.Category = c1.idtblCategories - WHERE b.Month = @month AND b.Year = @year"; - - using (var cmd = new MySqlCommand(query, connection)) - { - cmd.Parameters.AddWithValue("@month", month); - cmd.Parameters.AddWithValue("@year", year); - - using (var reader = cmd.ExecuteReader()) - { - while (reader.Read()) - { - budgetItems.Add(new BudgetItem - { - ID = reader.GetInt32("id"), - Name = reader.GetString("item_name"), // Updated alias - Amount = reader.GetDecimal("amount"), - Category = reader.GetString("category"), - Month = reader.GetInt32("Month"), - Year = reader.GetInt32("Year"), - Description = reader.IsDBNull(reader.GetOrdinal("description")) - ? null - : reader.GetString("description") - }); - } - } - } - } - - return budgetItems; - } - - public bool AddBudgetItem(BudgetItem item) - { - using (var connection = GetConnection()) - { - connection.Open(); - - string query = @" - INSERT INTO tblBudgetItems (Name, Amount, Category, Month, Year) - VALUES (@name, @amount, @category, @month, @year)"; - - using (var cmd = new MySqlCommand(query, connection)) - { - cmd.Parameters.AddWithValue("@name", item.Name); - cmd.Parameters.AddWithValue("@amount", item.Amount); - cmd.Parameters.AddWithValue("@category", item.Category); - cmd.Parameters.AddWithValue("@month", item.Month); - cmd.Parameters.AddWithValue("@year", item.Year); - return cmd.ExecuteNonQuery() > 0; // Returns true if a row was inserted - } - } - }*/ - - // New method to fetch all categories - public List GetCategories() - { - var categories = new List(); - - using (var connection = GetConnection()) - { - connection.Open(); - - string query = "SELECT Name FROM tblCategories"; // Adjust based on your table structure - - using (var cmd = new MySqlCommand(query, connection)) - { - using (var reader = cmd.ExecuteReader()) - { - while (reader.Read()) - { - categories.Add(reader.GetString("Name")); - } - } - } - } - - return categories; - } - } -} From 4c60508d6d8ff395ff52f11f5addbb94568a1d32 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Tue, 3 Jun 2025 00:04:28 +0200 Subject: [PATCH 004/103] Fixes! --- Aberwyn/.drone.yml | 37 ++++++++++++++++++++++++++++++++++--- Aberwyn/Dockerfile | 5 +++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Aberwyn/.drone.yml b/Aberwyn/.drone.yml index 8fa6545..4fedd7a 100644 --- a/Aberwyn/.drone.yml +++ b/Aberwyn/.drone.yml @@ -4,9 +4,9 @@ name: default steps: - name: build-dotnet - image: mcr.microsoft.com/dotnet/sdk:6.0 + image: alpine commands: - - dotnet publish Aberwyn/Aberwyn.csproj -c Release -o out + - echo "Docker build will handle dotnet publish" - name: build-docker image: plugins/docker @@ -18,6 +18,37 @@ steps: password: from_secret: gitea_token dockerfile: Aberwyn/Dockerfile - context: Aberwyn + context: . tags: - latest + insecure: true + + - name: restart-unraid-container + image: appleboy/drone-ssh + settings: + host: 192.168.1.108 + port: 22 + username: + from_secret: unraid_ssh_user + key: + from_secret: unraid_ssh_private_key + script: + - docker pull 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + - docker stop Aberwyn || true + - docker rm Aberwyn || true + - docker run -d --name='Aberwyn' --net='br0' -e TZ='Europe/Berlin' -p 80:80 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + + - name: notify-result + image: alpine + when: + status: + - success + - failure + commands: + - apk add --no-cache curl + - | + if [ "$DRONE_BUILD_STATUS" = "success" ]; then + curl -X POST http://192.168.1.196:8123/api/webhook/aberwyn_update_success + else + curl -X POST http://192.168.1.196:8123/api/webhook/aberwyn_update_failed + fi diff --git a/Aberwyn/Dockerfile b/Aberwyn/Dockerfile index 153fc56..5872d1e 100644 --- a/Aberwyn/Dockerfile +++ b/Aberwyn/Dockerfile @@ -15,9 +15,10 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Aberwyn/Aberwyn.csproj", "."] +COPY ["Aberwyn/Aberwyn.csproj", "Aberwyn/"] +WORKDIR /src/Aberwyn RUN dotnet restore "Aberwyn.csproj" -COPY . . +COPY Aberwyn/. . RUN dotnet build "Aberwyn.csproj" -c Release -o /app/build FROM build AS publish From fd6759e3d02046067f3431853fb95470cdeb7ba8 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Tue, 3 Jun 2025 00:19:40 +0200 Subject: [PATCH 005/103] Gogogo --- Aberwyn/Infrastructure/docker-compose.prod.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Aberwyn/Infrastructure/docker-compose.prod.yml b/Aberwyn/Infrastructure/docker-compose.prod.yml index d9acc43..0e24ec5 100644 --- a/Aberwyn/Infrastructure/docker-compose.prod.yml +++ b/Aberwyn/Infrastructure/docker-compose.prod.yml @@ -2,22 +2,22 @@ version: '3.8' services: aberwyn-app: - image: aberwyn:latest - build: - context: ../ - dockerfile: Dockerfile + image: 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + container_name: aberwyn-app-prod ports: - "8080:80" environment: ASPNETCORE_ENVIRONMENT: Production + DB_HOST: aberwyn-mysql-prod DB_NAME: aberwyn_prod - + DB_USER: aberwyn + DB_PASSWORD: 3edc4RFV depends_on: - - mysql + - aberwyn-mysql-prod networks: - aberwyn-net - mysql: + aberwyn-mysql-prod: image: mysql:8 container_name: aberwyn-mysql-prod restart: always From 3d6aa2d42457256320f73a5b500366dc64cdc26e Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Tue, 3 Jun 2025 00:26:13 +0200 Subject: [PATCH 006/103] Use old db --- Aberwyn/appsettings.Development.json | 2 +- Aberwyn/appsettings.Production.json | 2 +- Aberwyn/appsettings.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Aberwyn/appsettings.Development.json b/Aberwyn/appsettings.Development.json index c537901..2c041e1 100644 --- a/Aberwyn/appsettings.Development.json +++ b/Aberwyn/appsettings.Development.json @@ -6,7 +6,7 @@ } }, "ConnectionStrings": { - "DefaultConnection": "Server=mysql;Database=aberwyn_dev;User=aberwyn;Password=3edc4RFV;", + "DefaultConnection": "Server=192.168.1.108;Database=Nevyn;Uid=root;Pwd=3edc4RFV;", "ProdConnection": "Server=192.168.1.108;Database=Nevyn;Uid=root;Pwd=3edc4RFV;" } diff --git a/Aberwyn/appsettings.Production.json b/Aberwyn/appsettings.Production.json index 200eef8..9796e46 100644 --- a/Aberwyn/appsettings.Production.json +++ b/Aberwyn/appsettings.Production.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=mysql;Database=aberwyn_prod;User=aberwyn;Password=3edc4RFV;" + "DefaultConnection": "Server=192.168.1.108;Database=Nevyn;Uid=root;Pwd=3edc4RFV;" } } \ No newline at end of file diff --git a/Aberwyn/appsettings.json b/Aberwyn/appsettings.json index 6e172d0..1eaa0ce 100644 --- a/Aberwyn/appsettings.json +++ b/Aberwyn/appsettings.json @@ -7,7 +7,7 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "Server=mysql;Database=aberwyn_dev;User=aberwyn;Password=3edc4RFV;" + "DefaultConnection": "Server=192.168.1.108;Database=Nevyn;Uid=root;Pwd=3edc4RFV;" }, "VapidKeys": { "Subject": "mailto:e@zcz.se", From 908bc469c6a011a68f8e6927f4ed582500b0dde1 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Tue, 3 Jun 2025 21:36:16 +0200 Subject: [PATCH 007/103] Setup! --- Aberwyn/Aberwyn.csproj | 9 +- Aberwyn/Controllers/SetupApiController.cs | 50 +++ Aberwyn/Controllers/SetupController.cs | 151 +++++++++ Aberwyn/Data/IdentityDataInitializer.cs | 39 ++- Aberwyn/Data/SetupService.cs | 55 +++ Aberwyn/Infrastructure/setup.json | 11 + Aberwyn/Models/SetupSettings.cs | 17 + Aberwyn/Program.cs | 170 ++++++---- Aberwyn/Properties/launchSettings.json | 10 +- Aberwyn/Views/Setup/Index.cshtml | 395 ++++++++++++++++++++++ Aberwyn/Views/Setup/SetupComplete.cshtml | 17 + Aberwyn/Views/Shared/_Layout.cshtml | 57 ++-- Aberwyn/Views/Shared/_LoginPartial.cshtml | 2 +- Aberwyn/appsettings.json | 3 +- 14 files changed, 877 insertions(+), 109 deletions(-) create mode 100644 Aberwyn/Controllers/SetupApiController.cs create mode 100644 Aberwyn/Controllers/SetupController.cs create mode 100644 Aberwyn/Data/SetupService.cs create mode 100644 Aberwyn/Infrastructure/setup.json create mode 100644 Aberwyn/Models/SetupSettings.cs create mode 100644 Aberwyn/Views/Setup/Index.cshtml create mode 100644 Aberwyn/Views/Setup/SetupComplete.cshtml diff --git a/Aberwyn/Aberwyn.csproj b/Aberwyn/Aberwyn.csproj index 92a479f..cc74855 100644 --- a/Aberwyn/Aberwyn.csproj +++ b/Aberwyn/Aberwyn.csproj @@ -9,6 +9,13 @@ Linux + + + + + + + @@ -20,6 +27,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + all @@ -42,7 +50,6 @@ - diff --git a/Aberwyn/Controllers/SetupApiController.cs b/Aberwyn/Controllers/SetupApiController.cs new file mode 100644 index 0000000..5240a56 --- /dev/null +++ b/Aberwyn/Controllers/SetupApiController.cs @@ -0,0 +1,50 @@ +using Microsoft.AspNetCore.Mvc; +using MySql.Data.MySqlClient; + +namespace Aberwyn.Controllers +{ + [ApiController] + [Route("api/setup")] + public class SetupApiController : ControllerBase + { + [HttpPost("testdb")] + public IActionResult TestDbConnection([FromBody] DbTestRequest request) + { + try + { + var baseConnStr = $"server={request.Host};port={request.Port};user={request.User};password={request.Pass};"; + + var testDbName = $"testcheck_{Guid.NewGuid():N}".Substring(0, 12); // säker tillfällig databas + + using (var conn = new MySqlConnection(baseConnStr + "database=information_schema;")) + { + conn.Open(); + + // Försök skapa en temporär databas + var createCmd = new MySqlCommand($"CREATE DATABASE `{testDbName}`", conn); + createCmd.ExecuteNonQuery(); + + // Och radera den direkt + var dropCmd = new MySqlCommand($"DROP DATABASE `{testDbName}`", conn); + dropCmd.ExecuteNonQuery(); + } + + return Ok(new { success = true, message = "Anslutning OK och CREATE DATABASE tillåten." }); + } + catch (Exception ex) + { + return Ok(new { success = false, message = ex.Message }); + } + } + + + public class DbTestRequest + { + public string Host { get; set; } + public string Port { get; set; } + public string Db { get; set; } + public string User { get; set; } + public string Pass { get; set; } + } + } +} diff --git a/Aberwyn/Controllers/SetupController.cs b/Aberwyn/Controllers/SetupController.cs new file mode 100644 index 0000000..e7d7f59 --- /dev/null +++ b/Aberwyn/Controllers/SetupController.cs @@ -0,0 +1,151 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; + +namespace Aberwyn.Controllers +{ + using System.Text.Json; + using System.IO; + using Aberwyn.Models; + using Microsoft.AspNetCore.Mvc.Filters; + using MySql.Data.MySqlClient; + using Aberwyn.Data; + using Microsoft.EntityFrameworkCore; + + [Route("setup")] + public class SetupController : Controller + { + private readonly IWebHostEnvironment _env; + + public override void OnActionExecuting(ActionExecutingContext context) + { + ViewBag.IsSetupMode = true; + base.OnActionExecuting(context); + } + public SetupController(IWebHostEnvironment env) + { + _env = env; + } + + [HttpGet] + public IActionResult Index() + { + return View(new SetupSettings()); + } + + [Authorize(Roles = "Admin")] + [HttpPost("reset")] + public IActionResult Reset() + { + var path = Path.Combine(_env.ContentRootPath, "infrastructure", "setup.json"); + + var resetSettings = new SetupSettings + { + IsConfigured = false, + DbHost = "", + DbPort = 3306, + DbName = "", + DbUser = "", + DbPassword = "", + AdminUsername = "admin", + AdminEmail = "admin@localhost", + AdminPassword = "Admin123!" + }; + + var json = JsonSerializer.Serialize(resetSettings, new JsonSerializerOptions { WriteIndented = true }); + System.IO.File.WriteAllText(path, json); + + return RedirectToAction("Index"); + } + + + [HttpPost("")] + public async Task Setup([FromBody] SetupSettings model) + { + if (!ModelState.IsValid) + { + var allErrors = ModelState + .Where(e => e.Value.Errors.Count > 0) + .Select(e => new { Field = e.Key, Errors = e.Value.Errors.Select(x => x.ErrorMessage) }); + + return BadRequest(new { error = "Modellen är ogiltig", details = allErrors }); + } + + try + { + // Skapa databasen om den inte finns + var baseConnStr = $"server={model.DbHost};port={model.DbPort};user={model.DbUser};password={model.DbPassword};"; + using (var conn = new MySqlConnection(baseConnStr + "database=information_schema;")) + { + conn.Open(); + var cmd = new MySqlCommand("SELECT SCHEMA_NAME FROM SCHEMATA WHERE SCHEMA_NAME = @dbName", conn); + cmd.Parameters.AddWithValue("@dbName", model.DbName); + var exists = cmd.ExecuteScalar(); + + if (exists == null) + { + var createCmd = new MySqlCommand($"CREATE DATABASE `{model.DbName}`", conn); + createCmd.ExecuteNonQuery(); + } + } + + // Bygg services temporärt för att skapa admin + var connectionString = $"server={model.DbHost};port={model.DbPort};database={model.DbName};user={model.DbUser};password={model.DbPassword}"; + var tempProvider = SetupService.BuildTemporaryServices(connectionString); + + using var scope = tempProvider.CreateScope(); + + // Skapa databastabeller via EF + var db = scope.ServiceProvider.GetRequiredService(); + await db.Database.MigrateAsync(); + + var userManager = scope.ServiceProvider.GetRequiredService>(); + var roleManager = scope.ServiceProvider.GetRequiredService>(); + + // Skapa roller + string[] roles = { "Admin", "Chef", "Budget" }; + foreach (var role in roles) + { + if (!await roleManager.RoleExistsAsync(role)) + await roleManager.CreateAsync(new IdentityRole(role)); + } + + // Skapa adminanvändare + var adminUser = new ApplicationUser + { + UserName = model.AdminUsername, + Email = model.AdminEmail + }; + + var existingUser = await userManager.FindByNameAsync(model.AdminUsername); + if (existingUser == null) + { + var result = await userManager.CreateAsync(adminUser, model.AdminPassword); + if (!result.Succeeded) + { + return BadRequest(new { error = "Kunde inte skapa administratör", details = result.Errors }); + } + + await userManager.AddToRoleAsync(adminUser, "Admin"); + } + + model.IsConfigured = true; + + // Spara inställningarna + var json = JsonSerializer.Serialize(model, new JsonSerializerOptions { WriteIndented = true }); + var filePath = Path.Combine(_env.ContentRootPath, "infrastructure", "setup.json"); + System.IO.File.WriteAllText(filePath, json); + + return Ok(new { message = "Installation slutförd!" }); + } + catch (Exception ex) + { + return BadRequest(new { error = "Fel vid installation", details = ex.Message }); + } + } + + public IActionResult SetupComplete() => View(); + } + + +} diff --git a/Aberwyn/Data/IdentityDataInitializer.cs b/Aberwyn/Data/IdentityDataInitializer.cs index 35be21e..189f483 100644 --- a/Aberwyn/Data/IdentityDataInitializer.cs +++ b/Aberwyn/Data/IdentityDataInitializer.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Aberwyn.Models; @@ -6,10 +7,16 @@ namespace Aberwyn.Data { public static class IdentityDataInitializer { - public static async Task SeedData(IServiceProvider serviceProvider) + public static async Task SeedData(IServiceProvider serviceProvider, SetupSettings? setup = null) { var userManager = serviceProvider.GetRequiredService>(); var roleManager = serviceProvider.GetRequiredService>(); + var config = serviceProvider.GetService(); + + if (setup == null && config != null) + { + setup = config.GetSection("SetupSettings").Get() ?? new SetupSettings(); + } string[] roles = { "Admin", "Chef", "Budget" }; @@ -19,26 +26,38 @@ namespace Aberwyn.Data await roleManager.CreateAsync(new IdentityRole(role)); } - string adminUsername = "admin"; - string adminEmail = "admin@localhost"; - string password = "Admin123!"; - - if (await userManager.FindByEmailAsync(adminEmail) == null) + var existingUser = await userManager.FindByEmailAsync(setup.AdminEmail); + if (existingUser == null) { var user = new ApplicationUser { - UserName = adminUsername, - Email = adminEmail, + UserName = setup.AdminUsername, + Email = setup.AdminEmail, EmailConfirmed = true }; - var result = await userManager.CreateAsync(user, password); + var result = await userManager.CreateAsync(user, setup.AdminPassword); + + if (result.Succeeded) + await userManager.AddToRoleAsync(user, "Admin"); + + return result; + } + else + { + var token = await userManager.GeneratePasswordResetTokenAsync(existingUser); + var result = await userManager.ResetPasswordAsync(existingUser, token, setup.AdminPassword); if (result.Succeeded) { - await userManager.AddToRoleAsync(user, "Admin"); + var rolesForUser = await userManager.GetRolesAsync(existingUser); + if (!rolesForUser.Contains("Admin")) + await userManager.AddToRoleAsync(existingUser, "Admin"); } + + return result; } } + } } diff --git a/Aberwyn/Data/SetupService.cs b/Aberwyn/Data/SetupService.cs new file mode 100644 index 0000000..0166182 --- /dev/null +++ b/Aberwyn/Data/SetupService.cs @@ -0,0 +1,55 @@ +using Aberwyn.Models; +using System.Text.Json; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity; + +namespace Aberwyn.Data +{ + // SetupService.cs + public class SetupService + { + private readonly IWebHostEnvironment _env; + private readonly string _filePath; + + public SetupService(IWebHostEnvironment env) + { + _env = env; + _filePath = Path.Combine(_env.ContentRootPath, "infrastructure", "setup.json"); + } + + + public SetupSettings GetSetup() + { + if (!File.Exists(_filePath)) + return new SetupSettings { IsConfigured = false }; + + var json = File.ReadAllText(_filePath); + return JsonSerializer.Deserialize(json) ?? new SetupSettings { IsConfigured = false }; + } + + + internal static IServiceProvider BuildTemporaryServices(string connectionString) + { + var services = new ServiceCollection(); + + // Konfigurera EF + Identity + services.AddDbContext(options => + options.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString))); + + services.AddIdentity() + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); + + // Lägg till en tom konfiguration för att undvika null + services.AddSingleton(new ConfigurationBuilder().Build()); + + // Valfritt: Lägg till loggning om något kräver det + services.AddLogging(); + + return services.BuildServiceProvider(); + } + + } + +} diff --git a/Aberwyn/Infrastructure/setup.json b/Aberwyn/Infrastructure/setup.json new file mode 100644 index 0000000..f9402c6 --- /dev/null +++ b/Aberwyn/Infrastructure/setup.json @@ -0,0 +1,11 @@ +{ + "AdminUsername": "tai", + "AdminEmail": "tai@zcz.se", + "AdminPassword": "Admin123!", + "IsConfigured": true, + "DbHost": "localhost", + "DbPort": 3306, + "DbName": "aberwyn_test", + "DbUser": "root", + "DbPassword": "rootpass" +} \ No newline at end of file diff --git a/Aberwyn/Models/SetupSettings.cs b/Aberwyn/Models/SetupSettings.cs new file mode 100644 index 0000000..4b1f814 --- /dev/null +++ b/Aberwyn/Models/SetupSettings.cs @@ -0,0 +1,17 @@ +namespace Aberwyn.Models +{ + public class SetupSettings + { + public string AdminUsername { get; set; } = "admin"; + public string AdminEmail { get; set; } = "admin@localhost"; + public string AdminPassword { get; set; } = "Admin123!"; + public bool IsConfigured { get; set; } + public string DbHost { get; set; } + public int DbPort { get; set; } + public string DbName { get; set; } + public string DbUser { get; set; } + public string DbPassword { get; set; } + } + + +} diff --git a/Aberwyn/Program.cs b/Aberwyn/Program.cs index 19d3574..edcccf6 100644 --- a/Aberwyn/Program.cs +++ b/Aberwyn/Program.cs @@ -1,14 +1,12 @@ using Microsoft.EntityFrameworkCore; + using Aberwyn.Data; using System.Text; using System.Globalization; using Microsoft.AspNetCore.Localization; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Aberwyn.Models; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using System.Text.Json; var config = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) @@ -16,7 +14,6 @@ var config = new ConfigurationBuilder() .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", optional: true) .AddEnvironmentVariables() .Build(); -Console.WriteLine("📦 DEBUG: laddad raw-connectionstring: " + config.GetConnectionString("DefaultConnection")); var builder = WebApplication.CreateBuilder(new WebApplicationOptions { @@ -24,22 +21,47 @@ var builder = WebApplication.CreateBuilder(new WebApplicationOptions EnvironmentName = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production" }); builder.Configuration.AddConfiguration(config); -Console.WriteLine("🌍 Miljö: " + builder.Environment.EnvironmentName); -Console.WriteLine("🔗 Connection string: " + builder.Configuration.GetConnectionString("DefaultConnection")); + +// Läser setup.json +var setupFilePath = Path.Combine("infrastructure", "setup.json"); +SetupSettings setup; +try +{ + if (!File.Exists(setupFilePath)) + throw new Exception("setup.json saknas."); + + using var jsonStream = File.OpenRead(setupFilePath); + setup = JsonSerializer.Deserialize(jsonStream)!; + + if (setup.IsConfigured) + { + if (string.IsNullOrWhiteSpace(setup.DbHost) || + string.IsNullOrWhiteSpace(setup.DbName) || + string.IsNullOrWhiteSpace(setup.DbUser) || + string.IsNullOrWhiteSpace(setup.DbPassword)) + { + throw new Exception("Databasinställningarna är ofullständiga."); + } + } +} +catch (Exception ex) +{ + Console.WriteLine($"❌ Fel vid läsning av setup.json: {ex.Message}"); + setup = new SetupSettings { IsConfigured = false }; +} -// Add services to the container. +// Add services to the container builder.Services.AddControllersWithViews() .AddJsonOptions(opts => { - // Beh�ll propertynamn som i C#-klassen (PascalCase) opts.JsonSerializerOptions.PropertyNamingPolicy = null; - // Ignorera null-v�rden vid serialisering opts.JsonSerializerOptions.IgnoreNullValues = true; }); + builder.Services.AddSession(options => { - options.IdleTimeout = TimeSpan.FromHours(1); + options.IdleTimeout = TimeSpan.FromDays(30); options.Cookie.HttpOnly = true; options.Cookie.IsEssential = true; }); @@ -47,24 +69,32 @@ builder.Services.AddSession(options => builder.Services.AddRazorPages(); builder.Services.AddHttpClient(); -// Configure your DbContext with MySQLs -Console.WriteLine("🔗 Connection string: " + builder.Configuration.GetConnectionString("DefaultConnection")); - -builder.Services.AddDbContext(options => - options.UseMySql( - builder.Configuration.GetConnectionString("DefaultConnection"), - new MySqlServerVersion(new Version(8, 0, 36)), - mySqlOptions => mySqlOptions.EnableRetryOnFailure() - ) -); - - -builder.Services.AddIdentity(options => +// Registrera rätt databas och identity beroende på om setup är klar +if (setup.IsConfigured) { - options.SignIn.RequireConfirmedAccount = false; -}) -.AddEntityFrameworkStores() -.AddDefaultTokenProviders(); + string connectionString = $"Server={setup.DbHost};Port={setup.DbPort};Database={setup.DbName};User={setup.DbUser};Password={setup.DbPassword};"; + + builder.Services.AddDbContext(options => + options.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString))); + + builder.Services.AddIdentity(options => + { + options.SignIn.RequireConfirmedAccount = false; + }) + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); +} +else +{ + builder.Services.AddDbContext(options => + options.UseInMemoryDatabase("TempSetup")); + + builder.Services.AddIdentity() + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); +} + +// Identity inställningar builder.Services.Configure(options => { options.Password.RequireDigit = false; @@ -74,8 +104,7 @@ builder.Services.Configure(options => options.Password.RequireUppercase = false; }); -builder.Services.AddControllersWithViews(); -// Register your services +// Appens övriga tjänster builder.Services.AddScoped(); builder.Services.AddSingleton(sp => @@ -89,11 +118,14 @@ builder.Services.AddSingleton(sp => }); builder.Services.Configure(builder.Configuration.GetSection("Vapid")); + builder.Services.ConfigureApplicationCookie(options => { - options.LoginPath = "/Identity/Account/Login"; // korrekt för ditt nuvarande upplägg + options.LoginPath = "/Identity/Account/Login"; }); + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + builder.Services.Configure(options => { var supportedCultures = new[] { new CultureInfo("sv-SE") }; @@ -101,60 +133,70 @@ builder.Services.Configure(options => options.SupportedCultures = supportedCultures; options.SupportedUICultures = supportedCultures; }); - -//builder.Configuration -// .SetBasePath(Directory.GetCurrentDirectory()) -// .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true) -// .AddEnvironmentVariables(); -builder.Services.AddSingleton(sp => -{ - var config = sp.GetRequiredService(); - return new PushNotificationService( - config["VapidKeys:Subject"], - config["VapidKeys:PublicKey"], - config["VapidKeys:PrivateKey"] - ); -}); +builder.Services.AddSingleton(); var app = builder.Build(); -// Configure the HTTP request pipeline. +app.UseStaticFiles(); +// Middleware: om ej konfigurerad → redirect till /setup +app.Use(async (context, next) => +{ + var setupService = context.RequestServices.GetRequiredService(); + var currentSetup = setupService.GetSetup(); + + var path = context.Request.Path; + var method = context.Request.Method; + + if (!currentSetup.IsConfigured && + !path.StartsWithSegments("/setup") && + !(path == "/setup" && method == "POST") && // 👈 tillåt POST till /setup + !path.StartsWithSegments("/api/setup")) + { + context.Response.Redirect("/setup"); + return; + } + + await next(); +}); + + + +// Configure the HTTP request pipeline if (!app.Environment.IsDevelopment()) { app.UseExceptionHandler("/Home/Error"); app.UseHsts(); } -app.UseStaticFiles(); + app.UseRouting(); app.UseSession(); -app.UseAuthentication();; +app.UseAuthentication(); app.UseAuthorization(); -// Map controller endpoints (including AJAX JSON actions) +// Routing app.MapControllers(); - -// Conventional MVC route app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); - -// Map Razor Pages app.MapRazorPages(); -using (var scope = app.Services.CreateScope()) + +// Init: migrera databas och skapa admin +if (setup.IsConfigured) { + using var scope = app.Services.CreateScope(); var services = scope.ServiceProvider; var context = services.GetRequiredService(); - // Vänta tills databasen är redo + int retries = 10; while (retries > 0) { try { - context.Database.OpenConnection(); // bara testa öppna anslutningen + context.Database.OpenConnection(); context.Database.CloseConnection(); - break; // lyckades! + break; } catch { @@ -164,17 +206,17 @@ using (var scope = app.Services.CreateScope()) } } - // Kör alla EF-migrationer automatiskt context.Database.Migrate(); - // Skapa standardroller och admin - await IdentityDataInitializer.SeedData(services); + var userManager = services.GetRequiredService>(); + var anyUsers = await userManager.Users.AnyAsync(); - // (valfritt) Lägg in exempelbudgetdata - // await TestDataSeeder.SeedBudget(context); + if (!anyUsers) + { + Console.WriteLine("🧩 Ingen användare hittades – skapar admin..."); + await IdentityDataInitializer.SeedData(services, setup); + } } - - app.Run(); diff --git a/Aberwyn/Properties/launchSettings.json b/Aberwyn/Properties/launchSettings.json index 66d0fc0..a663ecc 100644 --- a/Aberwyn/Properties/launchSettings.json +++ b/Aberwyn/Properties/launchSettings.json @@ -8,7 +8,7 @@ } }, "profiles": { - "Aberwyn (Dev)": { + "Aberwyn": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { @@ -16,14 +16,6 @@ }, "applicationUrl": "https://localhost:7290;http://localhost:5290" }, - "Aberwyn (Prod)": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Production" - }, - "applicationUrl": "https://localhost:7290;http://localhost:5290" - }, "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, diff --git a/Aberwyn/Views/Setup/Index.cshtml b/Aberwyn/Views/Setup/Index.cshtml new file mode 100644 index 0000000..6a091aa --- /dev/null +++ b/Aberwyn/Views/Setup/Index.cshtml @@ -0,0 +1,395 @@ +@model Aberwyn.Models.SetupSettings +@{ + ViewData["Title"] = "Installera Aberwyn"; +} + +

Installera Aberwyn

+ +@if (ViewBag.Error != null) +{ +
@ViewBag.Error
+} + + + +
+
+

Steg 1: Databasinställningar

+
+ + +
Fältet är obligatoriskt
+
+
+ + +
Fältet är obligatoriskt
+
+
+ + +
Fältet är obligatoriskt
+
+
+ + +
Fältet är obligatoriskt
+
+
+ + +
Fältet är obligatoriskt
+
+ +
+ +
+ + + + + +
+ + +@if (User.IsInRole("Admin")) +{ +
+ +
+} + +@section Scripts { + + + + + +} diff --git a/Aberwyn/Views/Setup/SetupComplete.cshtml b/Aberwyn/Views/Setup/SetupComplete.cshtml new file mode 100644 index 0000000..220085f --- /dev/null +++ b/Aberwyn/Views/Setup/SetupComplete.cshtml @@ -0,0 +1,17 @@ +@{ + ViewData["Title"] = "Klart!"; +} + +

✅ Aberwyn är nu installerad

+

Du kan nu starta om applikationen för att börja använda den.

+ +Till startsidan + +
+ +

🔄 Återställ installation

+

Om du vill nollställa installationen och börja om från början, klicka här:

+ +
+ +
diff --git a/Aberwyn/Views/Shared/_Layout.cshtml b/Aberwyn/Views/Shared/_Layout.cshtml index 94388ae..e01e070 100644 --- a/Aberwyn/Views/Shared/_Layout.cshtml +++ b/Aberwyn/Views/Shared/_Layout.cshtml @@ -21,35 +21,46 @@ Ludwig - + @if (ViewBag.IsSetupMode as bool? != true) + { + + }
diff --git a/Aberwyn/Views/Shared/_LoginPartial.cshtml b/Aberwyn/Views/Shared/_LoginPartial.cshtml index 1f1c8f2..6987907 100644 --- a/Aberwyn/Views/Shared/_LoginPartial.cshtml +++ b/Aberwyn/Views/Shared/_LoginPartial.cshtml @@ -31,7 +31,7 @@ else
- +
+
From 84c6c45a0b181c7c97fad59aaa78863302364aa7 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Wed, 4 Jun 2025 11:51:08 +0200 Subject: [PATCH 016/103] Another attempt --- Aberwyn/Controllers/AdminController.cs | 4 ++-- Aberwyn/Data/ApplicationDbContextFactory.cs | 19 ++++++------------- Aberwyn/Data/MenuService.cs | 11 ++++++++++- Aberwyn/Data/SetupService.cs | 18 ++++++++++++++++++ 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/Aberwyn/Controllers/AdminController.cs b/Aberwyn/Controllers/AdminController.cs index bbc109c..95f92da 100644 --- a/Aberwyn/Controllers/AdminController.cs +++ b/Aberwyn/Controllers/AdminController.cs @@ -104,7 +104,7 @@ namespace Aberwyn.Controllers [Authorize(Roles = "Admin")] public IActionResult ImportMealsFromProd() { - var prodService = MenuService.CreateWithConfig(_configuration, _env, useProdDb: true); + var prodService = MenuService.CreateWithSetup(_env); var devService = new MenuService(_context); // injicerad context används var prodMeals = prodService.GetMealsDetailed(); @@ -184,7 +184,7 @@ namespace Aberwyn.Controllers public IActionResult ImportBudgetFromProd() { // Hämta connection till produktion - using var prodContext = ApplicationDbContextFactory.CreateWithConfig(_configuration, _env, useProdDb: true); + using var prodContext = ApplicationDbContextFactory.CreateWithConfig(_env, true); // Importera definitioner först var prodCategoryDefs = prodContext.BudgetCategoryDefinitions.ToList(); diff --git a/Aberwyn/Data/ApplicationDbContextFactory.cs b/Aberwyn/Data/ApplicationDbContextFactory.cs index 284459f..7122120 100644 --- a/Aberwyn/Data/ApplicationDbContextFactory.cs +++ b/Aberwyn/Data/ApplicationDbContextFactory.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration; using System; using System.IO; using System.Text.Json; +using static Aberwyn.Data.SetupService; namespace Aberwyn.Data { @@ -30,26 +31,18 @@ namespace Aberwyn.Data return new ApplicationDbContext(optionsBuilder.Options); } - public static ApplicationDbContext CreateWithConfig(IConfiguration config, IHostEnvironment env, bool useProdDb = false) + public static ApplicationDbContext CreateWithConfig(IHostEnvironment env, bool useProdDb = false) { - var setup = LoadSetup(); - - var csBuilder = new MySqlConnector.MySqlConnectionStringBuilder - { - Server = setup.DbHost, - Port = (uint)setup.DbPort, - Database = setup.DbName, - UserID = setup.DbUser, - Password = setup.DbPassword, - AllowUserVariables = true - }; + var setup = SetupLoader.Load(env); + var connStr = SetupLoader.GetConnectionString(setup); var optionsBuilder = new DbContextOptionsBuilder(); - optionsBuilder.UseMySql(csBuilder.ConnectionString, new MySqlServerVersion(new Version(8, 0, 36))); + optionsBuilder.UseMySql(connStr, new MySqlServerVersion(new Version(8, 0, 36))); return new ApplicationDbContext(optionsBuilder.Options); } + private static SetupSettings LoadSetup() { var basePath = Directory.GetCurrentDirectory(); diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index 334bfd0..dbecfd2 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -2,7 +2,7 @@ using Aberwyn.Models; using Microsoft.EntityFrameworkCore; using System.Globalization; - +using static Aberwyn.Data.SetupService; namespace Aberwyn.Data { @@ -47,6 +47,15 @@ public class MenuService var context = new ApplicationDbContext(builder.Options); return new MenuService(context); } + public static MenuService CreateWithSetup(IHostEnvironment env) + { + var setup = SetupLoader.Load(env); + var connStr = SetupLoader.GetConnectionString(setup); + var builder = new DbContextOptionsBuilder(); + builder.UseMySql(connStr, ServerVersion.AutoDetect(connStr)); + var context = new ApplicationDbContext(builder.Options); + return new MenuService(context); + } public void UpdateWeeklyMenu(MenuViewModel model) { diff --git a/Aberwyn/Data/SetupService.cs b/Aberwyn/Data/SetupService.cs index 0166182..282e4f5 100644 --- a/Aberwyn/Data/SetupService.cs +++ b/Aberwyn/Data/SetupService.cs @@ -3,6 +3,9 @@ using System.Text.Json; using Microsoft.Extensions.DependencyInjection; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Identity; +using System.IO; +using System.Text.Json; +using Microsoft.Extensions.Hosting; namespace Aberwyn.Data { @@ -50,6 +53,21 @@ namespace Aberwyn.Data return services.BuildServiceProvider(); } + public static class SetupLoader + { + public static SetupSettings Load(IHostEnvironment env) + { + var path = Path.Combine(env.ContentRootPath, "infrastructure", "setup.json"); + var json = File.ReadAllText(path); + return JsonSerializer.Deserialize(json)!; + } + + public static string GetConnectionString(SetupSettings setup) + { + return $"server={setup.DbHost};port={setup.DbPort};database={setup.DbName};user={setup.DbUser};password={setup.DbPassword}"; + } + } + } } From c44fbfdca9cb56c40fd9549182f6b202d44f9917 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Wed, 4 Jun 2025 18:01:05 +0200 Subject: [PATCH 017/103] Woohoo working version gooo --- Aberwyn/Controllers/AdminController.cs | 169 ++++++++++++++++--------- Aberwyn/Controllers/MealController.cs | 5 +- Aberwyn/Data/ApplicationDbContext.cs | 3 + Aberwyn/Data/MenuService.cs | 50 +++----- Aberwyn/Infrastructure/setup.json | 10 +- Aberwyn/Models/MenuViewModel.cs | 1 + Aberwyn/Views/Admin/Index.cshtml | 90 +++++++++++-- 7 files changed, 214 insertions(+), 114 deletions(-) diff --git a/Aberwyn/Controllers/AdminController.cs b/Aberwyn/Controllers/AdminController.cs index 95f92da..f07b575 100644 --- a/Aberwyn/Controllers/AdminController.cs +++ b/Aberwyn/Controllers/AdminController.cs @@ -102,54 +102,20 @@ namespace Aberwyn.Controllers } [HttpPost] [Authorize(Roles = "Admin")] - public IActionResult ImportMealsFromProd() + public IActionResult ImportMenusFromCustom(string dbHost, int dbPort, string dbName, string dbUser, string dbPassword) { - var prodService = MenuService.CreateWithSetup(_env); - var devService = new MenuService(_context); // injicerad context används + var connStr = $"Server={dbHost};Port={dbPort};Database={dbName};Uid={dbUser};Pwd={dbPassword};"; + var optionsBuilder = new DbContextOptionsBuilder(); + optionsBuilder.UseMySql(connStr, ServerVersion.AutoDetect(connStr)); - var prodMeals = prodService.GetMealsDetailed(); - - foreach (var meal in prodMeals) - { - // Kopiera utan ID (för att undvika konflikt) och spara - var newMeal = new Meal - { - Name = meal.Name, - Description = meal.Description, - ProteinType = meal.ProteinType, - Category = meal.Category, - CarbType = meal.CarbType, - RecipeUrl = meal.RecipeUrl, - ImageUrl = meal.ImageUrl, - IsAvailable = meal.IsAvailable, - CreatedAt = meal.CreatedAt, - Instructions = meal.Instructions, - ImageData = meal.ImageData, - ImageMimeType = meal.ImageMimeType, - Ingredients = meal.Ingredients.Select(i => new Ingredient - { - Quantity = i.Quantity, - Item = i.Item - }).ToList() - }; - - devService.SaveOrUpdateMealWithIngredients(newMeal); - } - - return Content("Import klar!"); - } - - [HttpPost] - [Authorize(Roles = "Admin")] - public IActionResult ImportMenusFromProd() - { - var prodService = MenuService.CreateWithConfig(_configuration, _env, useProdDb: true); + using var customContext = new ApplicationDbContext(optionsBuilder.Options); + var sourceService = new MenuService(customContext); var devService = new MenuService(_context); - var allProdMenus = prodService.GetAllWeeklyMenus(); - var allMeals = devService.GetMeals(); + var sourceMenus = sourceService.GetAllWeeklyMenus(); + var devMeals = devService.GetMeals(); - foreach (var menu in allProdMenus) + foreach (var menu in sourceMenus) { var newMenu = new WeeklyMenu { @@ -163,34 +129,92 @@ namespace Aberwyn.Controllers }; if (!string.IsNullOrEmpty(menu.BreakfastMealName)) - newMenu.BreakfastMealId = allMeals.FirstOrDefault(m => m.Name == menu.BreakfastMealName)?.Id; + newMenu.BreakfastMealId = devMeals.FirstOrDefault(m => m.Name == menu.BreakfastMealName)?.Id; if (!string.IsNullOrEmpty(menu.LunchMealName)) - newMenu.LunchMealId = allMeals.FirstOrDefault(m => m.Name == menu.LunchMealName)?.Id; + newMenu.LunchMealId = devMeals.FirstOrDefault(m => m.Name == menu.LunchMealName)?.Id; if (!string.IsNullOrEmpty(menu.DinnerMealName)) - newMenu.DinnerMealId = allMeals.FirstOrDefault(m => m.Name == menu.DinnerMealName)?.Id; + newMenu.DinnerMealId = devMeals.FirstOrDefault(m => m.Name == menu.DinnerMealName)?.Id; _context.WeeklyMenus.Add(newMenu); } _context.SaveChanges(); - TempData["Message"] = "Import av veckomenyer klar."; + TempData["Message"] = $"✅ Import av veckomenyer från extern databas klar ({sourceMenus.Count})."; return RedirectToAction("Index"); } + [HttpPost] [Authorize(Roles = "Admin")] - public IActionResult ImportBudgetFromProd() + public IActionResult ImportMealsFromCustom(string dbHost, int dbPort, string dbName, string dbUser, string dbPassword) { - // Hämta connection till produktion - using var prodContext = ApplicationDbContextFactory.CreateWithConfig(_env, true); + var connStr = $"Server={dbHost};Port={dbPort};Database={dbName};Uid={dbUser};Pwd={dbPassword};"; + var optionsBuilder = new DbContextOptionsBuilder(); + optionsBuilder.UseMySql(connStr, ServerVersion.AutoDetect(connStr), mySqlOptions => mySqlOptions.CommandTimeout(180)); + using var customContext = new ApplicationDbContext(optionsBuilder.Options); - // Importera definitioner först - var prodCategoryDefs = prodContext.BudgetCategoryDefinitions.ToList(); - var prodItemDefs = prodContext.BudgetItemDefinitions.ToList(); + var customService = new MenuService(customContext); + var devService = new MenuService(_context); - foreach (var def in prodCategoryDefs) + try + { + var importedMeals = customService.GetMealsDetailed(); // Ska inkludera Ingredients + foreach (var meal in importedMeals) + { + var newMeal = new Meal + { + Id = meal.Id, // 👈 Viktigt! + Name = meal.Name, + Description = meal.Description, + ProteinType = meal.ProteinType, + Category = meal.Category, + CarbType = meal.CarbType, + RecipeUrl = meal.RecipeUrl, + ImageUrl = meal.ImageUrl, + IsAvailable = meal.IsAvailable, + CreatedAt = meal.CreatedAt, + Instructions = meal.Instructions, + ImageData = meal.ImageData, + ImageMimeType = meal.ImageMimeType, + Ingredients = meal.Ingredients.Select(i => new Ingredient + { + MealId = meal.Id, // 👈 Koppla till rätt måltid + Quantity = i.Quantity, + Item = i.Item + }).ToList() + }; + + devService.SaveOrUpdateMealWithIngredients(newMeal); + } + + TempData["Message"] = $"✅ {importedMeals.Count} måltider importerade från extern databas."; + } + catch (Exception ex) + { + TempData["Message"] = $"❌ Fel vid import: {ex.Message}"; + } + + return RedirectToAction("Index"); + } + + + + [HttpPost] + [Authorize(Roles = "Admin")] + public IActionResult ImportBudgetFromCustom(string dbHost, int dbPort, string dbName, string dbUser, string dbPassword) + { + var connStr = $"Server={dbHost};Port={dbPort};Database={dbName};Uid={dbUser};Pwd={dbPassword};"; + var optionsBuilder = new DbContextOptionsBuilder(); + optionsBuilder.UseMySql(connStr, ServerVersion.AutoDetect(connStr)); + + using var sourceContext = new ApplicationDbContext(optionsBuilder.Options); + + var categoryDefs = sourceContext.BudgetCategoryDefinitions.ToList(); + var itemDefs = sourceContext.BudgetItemDefinitions.ToList(); + + foreach (var def in categoryDefs) { if (!_context.BudgetCategoryDefinitions.Any(d => d.Name == def.Name)) { @@ -199,11 +223,10 @@ namespace Aberwyn.Controllers Name = def.Name, Color = def.Color ?? "#cccccc" }); - } } - foreach (var def in prodItemDefs) + foreach (var def in itemDefs) { if (!_context.BudgetItemDefinitions.Any(d => d.Name == def.Name)) { @@ -211,19 +234,17 @@ namespace Aberwyn.Controllers } } - _context.SaveChanges(); // Se till att ID:n finns för FK:n nedan + _context.SaveChanges(); - // Ladda definitioner i minnet för snabb lookup var devCategoryDefs = _context.BudgetCategoryDefinitions.ToList(); var devItemDefs = _context.BudgetItemDefinitions.ToList(); - // Importera budgetperioder med kategorier och items - var prodPeriods = prodContext.BudgetPeriods + var periods = sourceContext.BudgetPeriods .Include(p => p.Categories) .ThenInclude(c => c.Items) .ToList(); - foreach (var period in prodPeriods) + foreach (var period in periods) { var exists = _context.BudgetPeriods .Any(p => p.Year == period.Year && p.Month == period.Month); @@ -259,11 +280,13 @@ namespace Aberwyn.Controllers } _context.SaveChanges(); - TempData["Message"] = "✅ Import av budgetdata från produktion är klar."; + TempData["Message"] = $"✅ Import av budgetdata från extern databas klar ({periods.Count} månader)."; return RedirectToAction("Index"); } + + //Todo [HttpGet] @@ -314,9 +337,31 @@ namespace Aberwyn.Controllers return Ok(); } + [HttpPost] + [Authorize(Roles = "Admin")] + public IActionResult TestDbConnection(string dbHost, int dbPort, string dbName, string dbUser, string dbPassword) + { + var connStr = $"Server={dbHost};Port={dbPort};Database={dbName};Uid={dbUser};Pwd={dbPassword};"; + try + { + var builder = new DbContextOptionsBuilder(); + builder.UseMySql(connStr, ServerVersion.AutoDetect(connStr)); + + using var context = new ApplicationDbContext(builder.Options); + context.Database.OpenConnection(); + context.Database.CloseConnection(); + + return Json(new { success = true, message = "✅ Anslutning lyckades!" }); + } + catch (Exception ex) + { + return Json(new { success = false, message = $"❌ Anslutning misslyckades: {ex.Message}" }); + } + } } + public class AdminUserViewModel { public string UserId { get; set; } diff --git a/Aberwyn/Controllers/MealController.cs b/Aberwyn/Controllers/MealController.cs index 5e7b194..fb0970b 100644 --- a/Aberwyn/Controllers/MealController.cs +++ b/Aberwyn/Controllers/MealController.cs @@ -10,12 +10,13 @@ namespace Aberwyn.Controllers private readonly IConfiguration _configuration; private readonly IHostEnvironment _env; private readonly MenuService _menuService; - - public MealController(IConfiguration configuration, IHostEnvironment env) + public MealController(MenuService menuService, IConfiguration configuration, IHostEnvironment env) { + _menuService = menuService; _configuration = configuration; _env = env; } + [HttpGet] public IActionResult View(int id, bool edit = false) { diff --git a/Aberwyn/Data/ApplicationDbContext.cs b/Aberwyn/Data/ApplicationDbContext.cs index e5ece4e..d6dd3b9 100644 --- a/Aberwyn/Data/ApplicationDbContext.cs +++ b/Aberwyn/Data/ApplicationDbContext.cs @@ -16,6 +16,9 @@ namespace Aberwyn.Data base.OnModelCreating(builder); builder.Entity().ToTable("WeeklyMenu"); + builder.Entity() + .Property(m => m.Id) + .ValueGeneratedNever(); } diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index dbecfd2..b95ef19 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -16,37 +16,6 @@ public class MenuService _context = context; } - // Detta är en alternativ konstruktör – används manuellt vid t.ex. import - public static MenuService CreateWithConfig(IConfiguration config, IHostEnvironment env, bool useProdDb = false) - { - var basePath = env.ContentRootPath ?? Directory.GetCurrentDirectory(); - var setupPath = Path.Combine(basePath, "infrastructure", "setup.json"); - - if (!File.Exists(setupPath)) - throw new FileNotFoundException("setup.json saknas i infrastructure/"); - - var setupJson = File.ReadAllText(setupPath); - var setup = System.Text.Json.JsonSerializer.Deserialize(setupJson)!; - - if (!setup.IsConfigured || string.IsNullOrWhiteSpace(setup.DbPassword)) - throw new InvalidOperationException("setup.json är ofullständig."); - - var csBuilder = new MySqlConnector.MySqlConnectionStringBuilder - { - Server = setup.DbHost, - Port = (uint)setup.DbPort, - Database = setup.DbName, - UserID = setup.DbUser, - Password = setup.DbPassword, - AllowUserVariables = true - }; - - var builder = new DbContextOptionsBuilder(); - builder.UseMySql(csBuilder.ConnectionString, ServerVersion.AutoDetect(csBuilder.ConnectionString)); - - var context = new ApplicationDbContext(builder.Options); - return new MenuService(context); - } public static MenuService CreateWithSetup(IHostEnvironment env) { var setup = SetupLoader.Load(env); @@ -83,15 +52,26 @@ public class MenuService meal.Name = meal.Name.Trim(); meal.CreatedAt = meal.CreatedAt == default ? DateTime.Now : meal.CreatedAt; - if (meal.Id == 0) - _context.Meals.Add(meal); + var existing = _context.Meals + .AsNoTracking() + .FirstOrDefault(m => m.Id == meal.Id); + + if (existing == null) + { + // Nytt objekt – försök behålla ID:t från prod + _context.Entry(meal).State = EntityState.Added; + } else + { + // Befintlig – uppdatera _context.Meals.Update(meal); + } _context.SaveChanges(); } -public List GetAllWeeklyMenus() + + public List GetAllWeeklyMenus() { var menus = _context.WeeklyMenus.ToList(); @@ -139,10 +119,12 @@ public List GetAllWeeklyMenus() public List GetMealsDetailed() { return _context.Meals + .Include(m => m.Ingredients) // 🧠 detta behövs! .OrderByDescending(m => m.CreatedAt) .ToList(); } + public Meal GetMealById(int id) { var meal = _context.Meals diff --git a/Aberwyn/Infrastructure/setup.json b/Aberwyn/Infrastructure/setup.json index 48eaad4..eba5681 100644 --- a/Aberwyn/Infrastructure/setup.json +++ b/Aberwyn/Infrastructure/setup.json @@ -2,10 +2,10 @@ "AdminUsername": "admin", "AdminEmail": "admin@localhost", "AdminPassword": "Admin123!", - "IsConfigured": false, - "DbHost": null, + "IsConfigured": true, + "DbHost": "192.168.1.108", "DbPort": 3306, - "DbName": null, - "DbUser": null, - "DbPassword": null + "DbName": "lewel_prod", + "DbUser": "lewel", + "DbPassword": "W542.Hl;)%ta" } \ No newline at end of file diff --git a/Aberwyn/Models/MenuViewModel.cs b/Aberwyn/Models/MenuViewModel.cs index 57ee9d0..7958f49 100644 --- a/Aberwyn/Models/MenuViewModel.cs +++ b/Aberwyn/Models/MenuViewModel.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Aberwyn.Data; using Aberwyn.Models; diff --git a/Aberwyn/Views/Admin/Index.cshtml b/Aberwyn/Views/Admin/Index.cshtml index c370eed..f30d4af 100644 --- a/Aberwyn/Views/Admin/Index.cshtml +++ b/Aberwyn/Views/Admin/Index.cshtml @@ -84,20 +84,88 @@ -
-

Importera måltider från produktion

-
- -
-
- -
-
- -
+
+
+ Importera från annan databas +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + + +
+
+ + + + +

🌐 Du är offline

+

LEWEL är inte tillgänglig just nu. Kontrollera din internetanslutning och försök igen.

+ + diff --git a/Aberwyn/Views/Home/Offline.cshtml.cs b/Aberwyn/Views/Home/Offline.cshtml.cs new file mode 100644 index 0000000..9577482 --- /dev/null +++ b/Aberwyn/Views/Home/Offline.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Aberwyn.Views.Home +{ + public class OfflineModel : PageModel + { + public void OnGet() + { + } + } +} diff --git a/Aberwyn/Views/Meal/View.cshtml b/Aberwyn/Views/Meal/View.cshtml index 5f1c96e..8ae2584 100644 --- a/Aberwyn/Views/Meal/View.cshtml +++ b/Aberwyn/Views/Meal/View.cshtml @@ -64,6 +64,10 @@ +
+ + +
@@ -79,7 +83,7 @@
- @for (int i = 0; i < Model.Ingredients.Count; i++) + @for (int i = 0; i < (Model.Ingredients?.Count ?? 0); i++) {
@@ -215,7 +219,7 @@ closeImageModal(); } }); - $(document).ready(function () { + $(document).ready(function () { if ($('#Instructions').length > 0) { $('#Instructions').trumbowyg({ autogrow: true, @@ -223,35 +227,6 @@ }); } }); - if ('serviceWorker' in navigator && 'PushManager' in window) { - navigator.serviceWorker.register('/service-worker.js') - .then(function (registration) { - console.log('Service Worker registered', registration); - return registration.pushManager.getSubscription() - .then(async function (subscription) { - if (subscription) { - console.log('Already subscribed to push notifications.'); - return subscription; - } - const response = await fetch('/api/push/vapid-public-key'); - const vapidPublicKey = await response.text(); - const convertedVapidKey = urlBase64ToUint8Array(vapidPublicKey); - - return registration.pushManager.subscribe({ - userVisibleOnly: true, - applicationServerKey: convertedVapidKey - }); - }); - }).then(function (subscription) { - return fetch('/api/push/subscribe', { - method: 'POST', - body: JSON.stringify(subscription), - headers: { - 'Content-Type': 'application/json' - } - }); - }); - } diff --git a/Aberwyn/wwwroot/manifest.json b/Aberwyn/wwwroot/manifest.json index fe813b3..9be370e 100644 --- a/Aberwyn/wwwroot/manifest.json +++ b/Aberwyn/wwwroot/manifest.json @@ -4,7 +4,7 @@ "start_url": "/", "display": "standalone", "background_color": "#1F2C3C", - "theme_color": "#6a0dad", + "theme_color": "#1F2C3C", "icons": [ { "src": "/images/lewel-icon.png", From 57bea7b54c318965c3647ce8ff1ab5106a65ef03 Mon Sep 17 00:00:00 2001 From: Tai Date: Wed, 11 Jun 2025 13:06:08 +0200 Subject: [PATCH 024/103] Meal updates --- Aberwyn/Controllers/MealController.cs | 6 +- Aberwyn/Controllers/MealMenuApiController.cs | 5 +- Aberwyn/Data/MenuService.cs | 30 +++++- Aberwyn/Models/MenuViewModel.cs | 35 ++++-- Aberwyn/Views/Meal/Index.cshtml | 48 +++++++++ Aberwyn/wwwroot/css/meal-gallery.css | 107 +++++++++++++++++++ Aberwyn/wwwroot/images/fallback.jpg | Bin 0 -> 31239 bytes 7 files changed, 218 insertions(+), 13 deletions(-) create mode 100644 Aberwyn/Views/Meal/Index.cshtml create mode 100644 Aberwyn/wwwroot/css/meal-gallery.css create mode 100644 Aberwyn/wwwroot/images/fallback.jpg diff --git a/Aberwyn/Controllers/MealController.cs b/Aberwyn/Controllers/MealController.cs index 9272520..c677423 100644 --- a/Aberwyn/Controllers/MealController.cs +++ b/Aberwyn/Controllers/MealController.cs @@ -18,7 +18,11 @@ namespace Aberwyn.Controllers _configuration = configuration; _env = env; } - + [HttpGet("/meal")] + public IActionResult Index() + { + return View("Index"); + } [HttpGet] public IActionResult View(int? id, bool edit = false) { diff --git a/Aberwyn/Controllers/MealMenuApiController.cs b/Aberwyn/Controllers/MealMenuApiController.cs index 57b7956..02d7d17 100644 --- a/Aberwyn/Controllers/MealMenuApiController.cs +++ b/Aberwyn/Controllers/MealMenuApiController.cs @@ -30,11 +30,12 @@ namespace Aberwyn.Controllers [HttpGet("getMeals")] public IActionResult GetMeals() { - var meals = _menuService.GetMealsDetailed(); // Hämtar med ImageData - var mealDtos = meals.Select(MealDto.FromMeal).ToList(); + var meals = _menuService.GetMealsSlim(true); + var mealDtos = meals.Select(m => MealDto.FromMeal(m, includeThumbnail: true)).ToList(); // 👈 fix return Ok(mealDtos); } + [HttpGet("getWeeklyMenu")] public IActionResult GetWeeklyMenu(int weekNumber, int year) { diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index 4ba0483..e0d071c 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -165,9 +165,35 @@ public class MenuService _context.SaveChanges(); return updatedCount; } - - public List GetAllWeeklyMenus() +public List GetMealsSlim(bool includeThumbnail = false) { + if (includeThumbnail) + { + return _context.Meals + .Select(m => new Meal + { + Id = m.Id, + Name = m.Name, + Description = m.Description, + ThumbnailData = m.ThumbnailData + }) + .ToList(); + } + else + { + return _context.Meals + .Select(m => new Meal + { + Id = m.Id, + Name = m.Name, + Description = m.Description + }) + .ToList(); + } +} + + public List GetAllWeeklyMenus() + { var menus = _context.WeeklyMenus.ToList(); var allMeals = _context.Meals.ToDictionary(m => m.Id, m => m.Name); diff --git a/Aberwyn/Models/MenuViewModel.cs b/Aberwyn/Models/MenuViewModel.cs index 335cd0e..449763e 100644 --- a/Aberwyn/Models/MenuViewModel.cs +++ b/Aberwyn/Models/MenuViewModel.cs @@ -104,20 +104,39 @@ public class WeeklyMenu public string? ImageData { get; set; } // base64 public string? ImageMimeType { get; set; } - public static MealDto FromMeal(Meal meal) + public static MealListDto FromMeal(Meal meal, bool includeThumbnail = false) { - return new MealDto + return new MealListDto { Id = meal.Id, Name = meal.Name, - Category = meal.Category, - IsAvailable = meal.IsAvailable, - ImageUrl = meal.ImageUrl, - ImageMimeType = meal.ImageMimeType, - ImageData = meal.ImageData != null ? Convert.ToBase64String(meal.ImageData) : null + Description = meal.Description, + ThumbnailData = includeThumbnail && meal.ThumbnailData != null + ? Convert.ToBase64String(meal.ThumbnailData) + : null }; } - } + } + public class MealListDto + { + public int Id { get; set; } + public string Name { get; set; } = ""; + public string? Description { get; set; } + public string? ThumbnailData { get; set; } + + public static MealListDto FromMeal(Meal meal, bool includeThumbnail = false) + { + return new MealListDto + { + Id = meal.Id, + Name = meal.Name, + Description = meal.Description, + ThumbnailData = includeThumbnail && meal.ThumbnailData != null + ? Convert.ToBase64String(meal.ThumbnailData) + : null + }; + } + } } diff --git a/Aberwyn/Views/Meal/Index.cshtml b/Aberwyn/Views/Meal/Index.cshtml new file mode 100644 index 0000000..2ba182a --- /dev/null +++ b/Aberwyn/Views/Meal/Index.cshtml @@ -0,0 +1,48 @@ + + + + + Måltider + + + + + +
+
+

Recept

+
+ + +
+
+ +
+
+ {{ meal.Name }} +
+

{{ meal.Name }}

+

{{ meal.Description }}

+ Läs mer +
+
+
+
+ + + + + + + + diff --git a/Aberwyn/wwwroot/css/meal-gallery.css b/Aberwyn/wwwroot/css/meal-gallery.css new file mode 100644 index 0000000..6601d7a --- /dev/null +++ b/Aberwyn/wwwroot/css/meal-gallery.css @@ -0,0 +1,107 @@ +body { + background-color: #f7f7f7; + font-family: 'Segoe UI', sans-serif; + color: #222; + margin: 0; + } + + .meal-gallery-container { + max-width: 1200px; + margin: 0 auto; + padding: 2rem 1rem; + } + + .meal-gallery-header { + text-align: center; + margin-bottom: 2rem; + } + + .meal-gallery-header h1 { + font-size: 2.4rem; + font-weight: 600; + } + + .search-container { + margin-top: 1rem; + position: relative; + max-width: 400px; + margin-inline: auto; + } + + .search-container input { + width: 100%; + padding: 10px 38px 10px 12px; + border-radius: 25px; + border: 1px solid #ccc; + font-size: 1rem; + } + + .search-container i { + position: absolute; + right: 12px; + top: 50%; + transform: translateY(-50%); + color: #888; + } + + .meal-gallery-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); + gap: 24px; + } + + .meal-card { + background: white; + border-radius: 12px; + overflow: hidden; + box-shadow: 0 2px 8px rgba(0,0,0,0.05); + transition: transform 0.2s ease, box-shadow 0.2s ease; + display: flex; + flex-direction: column; + } + + .meal-card:hover { + transform: scale(1.015); + box-shadow: 0 4px 12px rgba(0,0,0,0.1); + } + + .meal-card img { + width: 100%; + height: 200px; + object-fit: cover; + } + + .meal-card-content { + padding: 16px; + display: flex; + flex-direction: column; + flex-grow: 1; + } + + .meal-card-content h3 { + margin: 0 0 8px; + font-size: 1.2rem; + color: #111; + } + + .meal-card-content p { + flex-grow: 1; + font-size: 0.95rem; + color: #555; + } + + .btn-readmore { + align-self: flex-start; + background: #007d36; + color: white; + padding: 8px 12px; + border-radius: 6px; + text-decoration: none; + font-size: 0.95rem; + margin-top: 12px; + } + + .btn-readmore:hover { + background: #005c27; + } + \ No newline at end of file diff --git a/Aberwyn/wwwroot/images/fallback.jpg b/Aberwyn/wwwroot/images/fallback.jpg new file mode 100644 index 0000000000000000000000000000000000000000..042b1104373d6c7ea935c0ac8de1cb7714c6f0be GIT binary patch literal 31239 zcmeHv2UHZ<@^=qeL=goQMMlIxkSwAo42Wcu90Vk*1Obttg3y2>ibx&|C^O^?f*?sn zF$_t`8AL@S2}*`x!gpr?b@#n}$M@FV|Jn1=o@RP_Zr81LfEDIVxpp0#CM8Vnk9;K5SI4)bt1!J8)_%Z zf0i|{tbt_>ENfs{1Irp%*1)m`mNl@ffn^OWYhYOe%NqD&4Ujvb%g`q3v3t{|-LkuP z@0Qh*1&5x!9_6t2wWl7wi^m=6@qltvemf9I9v%r%2_sQaqlQrT(1!o|Aa{efUXJ_} zVq>BMSG0(25DgoGmJLCEfrtl52zmtdSP}!I3+U(>7@1ZuuUrGsAZTf6=xFKb=|JKE z;Y~>;(6Q043e8 z!J)D7iOH$ynb|o!$Zaf$1O6^Z^n*NXKpq-8I$AnLiaZFKbKs<9qod~$V^}M%&1mVe zZkxCt6Z@g?xZGzecqMeca#)?MXI{U3&-)!?6p^SB{hUDl|C2=D1o|cqxdURMMSuaL zWrI-Az(9Nu#P|R4Nv>N~LH)7{8kSYixU7PvWfe3ptDt3B1+B{}SjGk9Wn4gB#s%bM zTtHsN1?2xLTo3|PzGH^?v&UYPCh{nkaoluCB}4Ru#7P*NnRhJ4D+1S4Z@F1B%_N73 zlXQu8Ds^>gcRX^Yl?)l@4J0#Qn@t`mknm(^Sg$gz{JgsjQF)NWaa|E|8+*tE*@LQvIGMIiZj1H{VAqzT|C>)F`Tquq ztblC3(!0)_JNfam*|sf@eahY&NNx_sJlG{)4a*;kdI8ix7nUxrDaW@)+gNKbMCp`c zY<26zpy7t2`CIfbX?s?`TE+3iZC;^XY;tG1dNNxLE9N8_Vv{qfjz@I8Mn>Yv636i)n#*DF{uGm1(xM>ZeK~PW=jxXvPybp4V#kcJLUl)N1b+W z(#V;jD-4=`4$nVo?NZgMeXJyk zCw^T>S}U=U#Lo08@s$$4Z8C2{K}@Zmjf^KUHG?BOsqFQ3b0uU28B%La)Y4XDhyKPB z@qdtu5!|eYdUV5^9SGc>c|?=w2^SM>*)WRix@>iA*_|rHSFo&ov*pgXJuaEH839`2 zuASq__YMurXipj|NDXA48!3b*8Yj)aCeEMeAxxpd$Pn}H4bswrcfWr(f7nfiYBlTN zfb}cyaflzD*k((H9wqvquS%|r>(*?B%M*_uwVVmpY~1E6u>sB4aZiN-;`Wceb-l#p zWgT~_@_5!z|7TS12;6Nyz`u%OhRTEZurzb4-r7#N_nnLCP?DqOtIK8=Vk1~eD7D5w-5W)BPs=8t0oyvX zYC(zuPsPKOt)zA8MB{__puhN}{X1anc0}Y;4ucP)fa(5L)zaxDmJdSe1 zDn)ffh*UdCA$4b9{1ke7ghpqQW82_>tp9CAF?x0_#4h{b*r!?u#p5C6CqHQ@p(N&* zA8$eDdmCOLLky|;Ws&y8Y1iicXNOUMAiznJPK8S&xGIjr= z6aGsv{q617)@}#`pbe&ttTRx26Nl;UbR&_WS$&h3!r}uypW*H)0LTLLlefkP9gSi# z*4M$=)2MzH=vuF%egzIk=}vNFv1^x?TA9Me45t)QazD8i64AqR;2Aq*E|*ogeA*+L z@nJs;$5rcZZ3Xt5Fh%Sz<)JO?w$WW-sA&1EZkA~h%Cp{$&mg~<&jyuLDpHcQ_I*0Nog)& za#R-cUha*5kiE2uU+;e1M)sk<46>m9vS1|sj!j{x7m2pD!*@k;2wl&vcLy+*ri6*g zGxI&Z(tHE_c~ui-x4~V+fPl0WGhZ6E(CbS18AgN8d~BO|E1vOk%A#|eZNlDve7=tm z*pR8na%N`*uC=Kt|H|(sGA+Pze)Q~7`BZcfmH)@ky2^09sz@z28yQlV$_!M#@o-;< zvi-o&e#;Q|_N{|;Aqj&T$});a4z4wM*!qz>SQ_~?)s}6~hP5VpKYrxSXlqqqNt0f| zdk_|}|0H0vGopJ2HyiRoOCmWw{)$bk*miFj8JTqBzhtaXe@Vm?7M8Hfmk*Iw5%$U^ z(iinc@NVp>qR1K_FedynhCBPl_bJXN;F~?c@MIV~Om>YdU!Bt0ro|(aW&Eyx6gvcC zvkDXynJzI)Bh(-*4khRvLS4mDksWy4e`{-0owAKH;QIZTluC}i#Ha=I_ z@lF>$ZUBzUsydWjrF}*IT@dtXAVX^JtM0u03Uzp|O<5X;>yA!;c`SX7JAp8n9mKy@ zZ>@5LWOZ|ldgN)s_>GysDfU%cIM{vt5oYp(ROY_*zr@F%`DFYHf-1ocTE%aBPKA!< zyq%H71eiT89_Q`Aco%WMovQT<;XAZGh=1%=Ls5uq$|U;>RYydTcR~R2Jb;|t`g&Sd zMHwMos~bGQO7|Ftb#yi^0d5_gdJu6^*T@b?XfgC$q5eBazR(IRpdCW&(D#+3qeW8> zTDIuB^Ysdx-*!J+sH1y2R*%?7L^1cI_FdZ<{EEmrD91IzKF4c&_Z1QN>)RSiAsE-b z`-O0c&zIaufMYwdHM5-CP3Oi&;3xOIan>rfrC=ibO29(DhrUiyMeQf09{?y_G%#vsdh zl7g;PeuJzdqN(V?cRhgHbV>0MAP`OZ0ekcFA%MGHD4{1(eo!<1UQegq;KMQ(dXO%{ zB0c7%B#yx2k~Zegavx0&bV=m`G}uTJpvs;_=dU-?+2pC`rp244WGDwhVH@2H-Xj>g zPN`-%HOo`+XPw>8v_t;lILjttxAtvhd~mC1&6}4!8D|}Ib#IP#hR(#`nX8hwrfl02 zlAB`COCa(Wq@_F$kidL+?-RxJZsH{z^x2Y;koj6kc&$rkAF7eSM=O3e#L6A*8COe&OvaPzHI(%-ITb_> ziOWV6V3I3KXg8dHgQ9ID2p$TT|G^FYIrIPPGWvomwIjV>y{QlO*@gL<^_J1N?-=2g zIP$}O!oZ=mVP7TGbvtmMOt-~e`h=3#P-K=;%} zRKE-KF9d*7B352qRUO!ScFG_vd4_MpvIwP=cU#%s;Uy>_-|J}0aXlSWHxS_+A2nKi zV}ccgF**8!SBou3$1AqnbtJ_X4o6jLNKcuv%^K=uZlS23e-*{+FRjWyGwW%8VWg4a zNjjbp-gF~j>_hPvOJjV3C2wf+gE{7k=8rkorVPqm zchgqn30QQVOA~$3iSB^dsmSxk*-mY#1C$OXJ9|Fm7gd0GzD;(D;(tSI0m33;Qd6qA zo&-AgH_jR8J0H)Uw`0V1q23*A;Sgo+Y3%V%4;?)L3uBTj46>sMmB{+QaZ(hGWa=-< zZ2roS;CWMw6mwa(<|kks4`rI|9WG}2EJyH7pR8OnnT;V1IXQ$njj1r0vNB@n zBC?fXvq}`GMvrO`qIBx0R_~j2&{@1eh3;UD)3fJ;S-XQB%GU;%T~(d>hXU3q2!4kU z#2%&n4a(E#)GI<1+d{pd#AY1VE{eH%H)~Fk(1k|$tHg2SG%6g+%wF7~;JF6oRg`@4 z9t|K;XN-xd|OGU7a&G0P~R8z4L|_nnTVy1{*qs$xweBA#hfE zy1Hzk0ismh2z9y?@D(_Ye6QRwy4XUCVT1#aS#0H2v@X%{rHEC~4KGS{ z6JC&t+U>X0wQRdP=vEVSOKtw67T}4d1ucMXzX=1xUF>&(%SB=Sh0E{S$(b9XsL!`M z{{9oHjFiqoA0A)eE5+jX%Kr_U-=z92n?FcpzQE;@RKHi|qEz3Mu+W?z@mST!{QFof zX?1a^ejITOm>`f-{bFm%I4D!cJ`Ie$F0Dsifk@eg`7FXq!|y{7q-qm&Nze&*6w~0# zdBnK{Ohiq4I(IQRU2{fxJf&4yL^z86*gh_VABjWU-f-niImk>uu`@c^$6@exd~+z; z$AC0QLfil88YJ>hM_ci++H^wvB(|qBBXaCHIV^C|<@co+d6MLH^~(KDsvqk$!s2~b z@aWmZ`s$IP6UAWiAHi$Uv7@a&7osLA%hWXUy1=^HN#vv1B;dSsJug&C7)-I|p4 zq}r7X9gLYwSZohniAY)eIW!N<-G6zqmHH%4eDb^y_3~RQX5*O8h31q#&6gg0EOcbr z1T*)sCrPB;sjNTJCkjE&fogYxDVN^S{iF+0gK}%Mb%_g?%8S1s%%TBxDvLK4NkaZX zfI3wo*+q`AOne#0MTvF35z}b`YAB(qL3`RHhtfA>7@z4KJxuBBhaQ%sj9e1jKPY$c zfn7^{&~pGaQbp2S5{X#=xA-e&u^XW6@2b~X6h)3>AdU2U)&83vR&huzk}LaxT+i<% zP*BwT&f9__S5Xv6y~KPU_JSqlerIkEdgxG7|>Q4|)<6Y0O79noB`t-yC@2O7TWHaVSU$NszI;(wJjhyP?KEGVIOS}7d= z5auy<4^I!BQYOB~Gegz!5y3WAw|5dRuVkmuxcElg=U#wWddt}rLSZ3TN0j!;cH5$~CsPkva?x;T*?+V-_D4AFnreA#il~V4j;-igZ*DtMxA5@QrhR>NhYwO!Z znC41V-=^0sfvBzaUs!og7Q1g1#L(X?)uSv)x z)A*o2mF_|Qf@+`t2ZYOt;ICdtg^uDprhS&62GUScQd5>MGCvzw!&oDuJR3x3-H;(J z>b8$JE;-~bz*UbOyt!tT%T)*4h^X=$!yV5yN=loW9v0)e%z89oD*kzKqqgbSvQp%W zvYFQ+(*doZRM&$ddK%DT`Q)1-W-K5Emp` z>^6y1SNgkdmY4%{zwx#pk^7=Vp(88H7PV!x+Mm+V5)IJNqJk+M`4Qum9*O*cwS^)2 zCQZUpnKNpa}*g?}kn}q4#VvLz<6u8b_GnL^V;|XsEog z+ZBJ1F#f|d&mX0Kez?#0i*hH`rT4ou9`?o#4^L)>%pPRx1S>g5CQ}M|(X~C0!Oy6l zFJs*9K?**P%SV|YkYUob>+Q8N1g1~puwK+irgR$8FR{Olq~yCcI`k7{sPXKSC;KvG8lcR}fz= zk*QiBtpvy`QOSI?{jnh$c=Ux%K!4xJtWXsB9qErCMNA<<;S!3{Au*1FUckdqWqyP- z3J)|5-)`<;2R8vbi_iQ4M-k1R&;#o)%ffumSS@9){wbfoBz5x76`wLpe>#-?XNyl&!SWj_e=@%Kr>yt? z#OF_feg2IjI^Og`do_!C6bPxb;#)MT#&V(<#u?uZV#*5~ZWe$F9OHcTaYY(R()qtC z{iJU&Ozx217`)d|#${yCaF|tx426P?j;{DRhJySaTfY;Xh5LJR6oT%g4U(a;PZ$F- zRCmJ^xPRbr^0M7mtkq=~C^B2&Y~E1dAkeRQE~;`RqBLSN-pW_lxXU|P=!GN53K006 zQs(!VSsd^33+~NY|L{YH(Cx}y+nc@BNiw+kVL8_PQmNflx+m*cO{WNqNyjt2MTj<- z(VPj%+=ZHrZfWV>B@l9m1XvAvZ09n4s~X*Yr8Bty{xrwQ2l-`F ztfV>8q5Q>?bDDYecCC!Vok!p8!>L`@jI|5)H|Wk6-bdS7r^SF)a1kxMT&3jll)K+g zS5LS6!3(Q{r{X4YYEaE}otrf@Cypof_VsdR1yx)>5~jjZQ)+luZW zM;-52c`wPtL8NfwWKw?qyr`9l>t2ahj9chw){pjouJ>m+76OgvkBG$D9Zb`sQKt7U zwaV-^Ss4YMIx3$kwEJSsVWUvNmxHftrG zMt%`;XJ5g2PO9Pgfx|(GkaT}hnlaJZU+P3nNZiBFiKm&vUuFq#JQ)(WQ}y~3w_8_^ zB6m^m_!cOcc6E|#XEk>ls#gb>R)i{(Q%-jYEzf`Q+A;WoDhODEsvhU7K+(eNci9F9 zgP;xr%3Bbuhxi=?)x!v1r#D*8PG!ujom-Rt(Y{?M z4Y!x-Lg+^cqnBlZf(_V%#-ze`5gzP9hNcuiPVH}I*fyL&uqbmk+dr7Bot<%>shv#e zd1HB1fJ@@5OrWcZwUZ>%duuLhuhoxz(;0O@K%Hz&$<8$H9`UJbJE(Neg%IGFm6f+D zV-rb_sU}o63i%exOAJ9N80V^URd7p$>kIGR7Or}k&Zq4ivOI6()ZPh(gZy)*KA0rP z%{|gJ^$1IYQhMSpjsCh#E!k%$NV0wSP$Hd{Z_^#3r9R{ombz~XV@oO-vNN3?$30}7 zZEEqjE>4W^{nTBDbP{(^{@l`ri@HUI+_V_njBmdYW=9bFMrI9)wg!iw1H9}X_L-rI zx~%J(AB!KU-=jRsid2x>q(@mj&zs76``|88L9vnNO~S>Tc}&aYZQY6W&n!ZDo>s#H z%6|GbO?|Z$>6eJvnv^e`&pc??jZDO=?|io9vVAO!+PBeWAMad{g*(T+a~F26W2)D?ft|p> zU$f{>oM3s(RDn0xnLvh+3dEPBlVPt-jv0Hop?&E~SEEgIfq``);hXNjgbTPy)SCp5 zW$x{QpX4*;B$1)aNMbXoAlC?Qj<1Bf&4-N*!3^3{G_a4GNDp0ga<(o!0D&xg_m(G5 z(0APhF)B~-$T1EBzPA?+TM%AXqH0V-f##|FHRV}r>38_{HYD8l=dAJ9UzIP6GPV-wFq5nnk6M{e+ls2wPupyBx_4F{ z6_%{%NJn=oO!)kVXn1NZTmqwcZnv~f9NFWNm%3^YqtWu%)dM*;#o9}Tu&qjbYxiG( zTgr%TC_IO|WVJd8xWVB#;GQzluxzh;U|dsAAjx0Qvxg)D9&mxtmgYHn$J?laP$(Ru6CA6a+y;YgdrR;Q`3XrX;w9(%4d@HeeBve;!%?-7WaIM5h zFl^jd@F=9W?-h@R!h8n zm~kucT0C+jXCgb^_prnft`$!d{OVTsw;8Apxvm=*07>TeTvta>52g8K*)Z)m)=*^{zDOyUD)O=x3mN*H9EOvJOLj%Sqi2@e z>^0Vq{v<^VwJn|1M{_cL`r)Tfnj-u3KawF~K^I5IFiUIm>OD+V$JO3>_bG9=g9Xwu z!`8KPVE&B!kU-Y!%NhY#t?UD<5z{YEwyXDb@oYi%p+eOx-1ONSaZWKG@sKno>4@p; znzt9Tc3GB(T9Wo$G4?)s)<;pFn*er)Z?kv3G(l%Mu#XIFDs;5m#Anwef#<%|$pH*f zm!oa#IBpz!m|<*FbAMp^YQ5=HN9PlFT-K%g`Jb;nt$!fHBi}hPDvYCl4h|5;fR$%W zd_{_S`ZoI*+`@_Tl94{+qT4KkA|31{!1ol=G_=>#_rm5g%CmK15A4-a980d?#<($o zS^A`gV&p{aI3)pktb-VL&57;&zEN+%6OLI;jz+CWc@0H%Z+RO_uIH8qY1@FP3NFA- z=4}&rFMUe(cA8WEZ1+mJIFtE=xM`gItMD4Xd&S#fo*-yQYgEy?i}q;hdorYl84d0G zVT0-Kw`~3J9r2TihHtL(^pfk``)^z)7x4?h2UQQF9oiwGZMYeF8#6M5>m_cOGkA$1 zcq)?Kk@TMC>J_lgPQqaRiW%C+f;GtPJZ1igpCv9Cw5Gqj)C;ZN zn04o6Qx~U>7(qal02B4L?jFR9jrM%O4C+hr#srv;Vu_ldWRUg!F3)weY${4YgRb!L z{J}$F>qk}JxDW;45hYO5L(R^B#`jJ+I!Kn3#z%idK5fR_ZwK|w9f|asKeTvo(pj>* zd}P%d6m$3dDhy%V*!;dRT)QKg?*85ZUe|5}QIKJVBnt#Zl?%q}GsUr6Abe#4Tnl@~ zCZy&_Y^sRI&M(;ffFIBoQe?yf*Vc`!O2VG>NC8?JCe4!cSEFZ=@Vlnc3II#yGq~|o zx17f!^{6Zw$pP>x2}dAEP~)n|P%+Wr?ENW`**WtWR2GwBw z)_%kM<{v+w+g979%9yuy9u?G$*(5MXwW$+D>k zGE`Dl)6@}1Y@iG-kJcbOyn_t6!?)848NcEsMBBrt(`P!$F@PT9djNKy$bZ@h=P*^#pY zL-5L(@14_=HhgOc`78x4F^yxGKUkm(~<~a7` zsz8Fb!YmmYkgN~t-;L@WLgL7fe0H$b_OoE!X2JLY7?=pb-@*8pCqPMQWvoOxgQ+q+ z*p$>|-e)A$Gd3j!mLxXlZ6O)bM$TU+q|&*%-mT=H@<3(_rZThBoB3M!aMYOcA3I_8 zJ_L0u`!<)#^=*?DOxQI;N?JqOC895d#Fg2U8l)6Cv8N=RNe{t0&vUK1rUgYW?q4EK zk=z?qKJ2k$Riq>7typ7v{H3#R`)*IZVKUT`&ZrkTYlXZH`({oa+ZDyy8#WHtVzXY{ zFOUzW12w z(0vg1g<-i()5x*@4GkGXm?7XOVNmpzw0cfD_yMo){oPTlYA8{kqMgh#u4*8CF8jjT zXPm!^Sr830aBRc;Fkv{IquK<(m+OFgH=ZrqYjk#5wyP2aV;{)1u1Pr^T6YR>s3`E| zMi{(?cQV_lMN`-|QRZsx2Qj%VG9VVIx;eC|o(#2b4t#&i6DD|v&Y0j0?#*A$cOia> z@<9>pUpIo0{tTD&H27_9t`@;RBSXg-Ndd=?oUJC^hg;=A+@>Ob|nU7Qx%4a*;Kcl2r+>9FnuG`d&m-Zyiv@)v>^8Yi`#+ zC#9jl%1)#hYaObw{;5Em_9ru<-;A{qr%poAOUQNolC92E*)x3Wso~_^UwP*3XKzK{RKhqSVhlDvpwUu+hGz~%!dP8 zD*Ui3#fL<q_4(9~mwBfrq#jd-5O z2N%4)*A3bIs^@E?aXDPb=L7-2Mklxp6$*^M@1CTx!r+UUTT1Es!PFJxu=c8)E;QWl zY)LxL;j*VPw8veWREv6V9A@&;snmLlXJk_yT^nTKmhCi8l08Ya_=%ZbF)Oc~j5y36 zICvM27(7IKlywTc@l=9Bt83g)Q%d#pW&FrL$?|5=QgHxl-v_LH#?AYxE^AaC`fud+ zwD1-SAK&?zpw8qDQiM7m&*}sp71Vj#A$X$PT}E}t&QCf$ z{<0a3FJs*g!Azl``1qR({cDvBH_P?QJQ(0d$Wj)P3z2mqbqaVeUa}z{3C-bv;)|J=0RrI!npbe^896UV2a%!N>uAQ>Y zadKQQoVTwHq-6=DgT+kh%}mt9x%elYn37G~m0c#haZ|`90|&cS-e6wVY*dn{6$Aw?QnR+rq zdzMl~_DNA|OSL z+T(6&Sitpd*7c=6+x#}!?GeA1Tart=kKq~_YC_GY%o%tmp|ODU>A`RV@+$?n}cclkG74>dK!$1iyg}w3>T{r>YKOb9UqZf zFWY@8c^OW%CpxxPXQP%C?)nA{LwvOz1Q@GupAAChEKG}xO zI}nBw(FZGHWn-dp`c0b)@on&1;~_peS2mTpsywzTZsh?*H?b~xzM9jlg)X!DUNP)< z=Yl*?13vK&VvZJ*hNOVQX-Q_tZw))N-{N(!@hJm>KAi&H!cv^l&DyjTq1 zbLY6W{@&RL-nF+37=tGn2jy;5^*aj@u4y89$IF@w6^@*5P~;mf*0g6h(P__|&RaZE zU-l}iU@AU%&Ub#b=0|~yL2Fb=r0t|7=4*0xbo*RiFA=0uH__=A-5YItC>ow-A;UO( z#|Nw#YKVgN{KS`)X`}K=Tx@DrP(n&@cc_i?pvEeEpW(O6TXu3TL(Ew&u4LL%Wg7hr zVVm74t_?s!;M#sL4O;tabM9kT6JB~OO`rYv(xRLYjfL$#WTNpWYJjjyeYH-LFD(VS6Fn0 z$x33IF14}tX?}Z4=s#`2q5U6AV*>jVCM<1BoPb}_i_&70WXW+Bb-kOzQcS?j8W0TE z)JSZm9jOZ~k1Ng#dH03U8Xr0&C^R`7=8|hZpgfh#d(z>S1@Zt3Fs1H<3{14@uBZy- znl|QyNe*$lnZvzSxG7%n#&AKDNB@O6Ol#u+AC1HL%WEqa>w{fbL1MPi2xq4IiU=)tHfDbdHlAii-sYPgMW(yR<)Zy|B?@}sxs zzTz4wn3ALT$YGVb?bgiuXzu;{cUw$HJ|E$De)gI9Co|0tDCU85@D8ur_(x7;^`IPw zqjLiKP}QNLsdvbfS^ZaT^2N6hUyK?CBSr9eTfA8r2?9lpqpmNu`UuKhb9M@NwgQPS z=pTZg>Su|sO+V$_``+gg!ES5gh3>Ne#hvi<*;zo%-BaJC)ZcPwXT++?yK!$AQ+&{# zLD18@()FJeBCMT=XW;U}wJIMsCs;ghYhE$g=lX>9erylGYAu=5jiV1psZvF}_z$;k zsK*R^(8*oX;6aN8>6`%T&Zno)RzuRc(_qav-^%a2@_zai_%91q3tBPp79I%?O&hhP z0dF0I{Y<@|b-9uW{mD(3|EWCoPx)=Rk_r7}CG(#$qW=q@KUuN*Ur7H`p83hl<3B~5 z|Ao(=jOYIs(*Kla{zn-1PZ95D_*}*X%eVmSb6fsDc$aYjw2TX&Wn2I);{s?I7eM6p F{|7WL@;?9o literal 0 HcmV?d00001 From fc78ec08136f323b1b019a6f57c2a25f6a007710 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Wed, 11 Jun 2025 13:51:45 +0200 Subject: [PATCH 025/103] Meal fix --- Aberwyn/.drone.yml | 4 +++ Aberwyn/Views/Meal/Index.cshtml | 39 ++++++++++++++-------------- Aberwyn/Views/Shared/_Layout.cshtml | 2 +- Aberwyn/wwwroot/images/fallback.jpg | Bin 31239 -> 13161 bytes 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Aberwyn/.drone.yml b/Aberwyn/.drone.yml index 4fedd7a..d52e248 100644 --- a/Aberwyn/.drone.yml +++ b/Aberwyn/.drone.yml @@ -52,3 +52,7 @@ steps: else curl -X POST http://192.168.1.196:8123/api/webhook/aberwyn_update_failed fi + +trigger: + branch: + - master diff --git a/Aberwyn/Views/Meal/Index.cshtml b/Aberwyn/Views/Meal/Index.cshtml index 2ba182a..07e4abf 100644 --- a/Aberwyn/Views/Meal/Index.cshtml +++ b/Aberwyn/Views/Meal/Index.cshtml @@ -1,3 +1,6 @@ +@{ + +} @@ -8,31 +11,27 @@ -
-
-

Recept

-
- - +
+
+

Recept

+
+ + +
-
-
-
- {{ meal.Name }} -
-

{{ meal.Name }}

-

{{ meal.Description }}

- Läs mer +
+
+ {{ meal.Name }} +
+

{{ meal.Name }}

+

{{ meal.Description }}

+ Läs mer +
-
- - - - diff --git a/Aberwyn/Views/FoodMenu/Veckomeny.cshtml b/Aberwyn/Views/FoodMenu/Veckomeny.cshtml index 7c79926..8d36044 100644 --- a/Aberwyn/Views/FoodMenu/Veckomeny.cshtml +++ b/Aberwyn/Views/FoodMenu/Veckomeny.cshtml @@ -145,7 +145,7 @@ @foreach (var meal in (List)ViewBag.AvailableMeals) { - + } diff --git a/Aberwyn/Views/Home/Budget.cshtml b/Aberwyn/Views/Home/Budget.cshtml index 28b9226..431ee8c 100644 --- a/Aberwyn/Views/Home/Budget.cshtml +++ b/Aberwyn/Views/Home/Budget.cshtml @@ -7,16 +7,21 @@ + Budget Overview - +
-

Budget Overview

+

Budget Overview

-
+
+ ⏳ Laddar budget... +
+ +
{{ category }} @@ -55,7 +64,7 @@ angular.module('budgetApp', []) .controller('BudgetController', function ($scope, $http) { const today = new Date(); - + $scope.isLoadingBudget = true; // Initialize months and years $scope.months = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']; $scope.years = [...Array(11).keys()].map(i => today.getFullYear() - 10 + i); @@ -72,11 +81,16 @@ // Automatically filter when month or year changes $scope.filterBudget = function () { + $scope.isLoadingBudget = true; $http.get('/api/budgetapi/items', { params: { month: $scope.selectedMonth, year: $scope.selectedYear } }).then(response => { $scope.budgetItems = response.data; - }).catch(error => console.error("Error fetching budget items:", error)); + $scope.isLoadingBudget = false; + }).catch(error => { + console.error("Error fetching budget items:", error); + $scope.isLoadingBudget = false; + }); }; $scope.getItemsByCategory = function (category) { diff --git a/Aberwyn/Views/Home/Index.cshtml b/Aberwyn/Views/Home/Index.cshtml index 193cfcc..8578759 100644 --- a/Aberwyn/Views/Home/Index.cshtml +++ b/Aberwyn/Views/Home/Index.cshtml @@ -1,18 +1,44 @@ -@{ - ViewData["Title"] = "Welcome to Lewel!"; +@model Aberwyn.Models.WeeklyMenu +@{ + var showDate = (DateTime)ViewBag.ShowDate; + var day = showDate.ToString("dddd", new System.Globalization.CultureInfo("sv-SE")); } + - - - - - - @ViewData["Title"] +
+
+

Välkommen till + L + E + W + E + L

+

Idag är det @day – dagens meny är:

- - -
-

Välkommen

Kika på Menyn om du vill. + @if (Model != null) + { +
+ @if (!string.IsNullOrWhiteSpace(Model.BreakfastMealName)) { +

Frukost: @Model.BreakfastMealName

+ } + @if (!string.IsNullOrWhiteSpace(Model.LunchMealName)) { +

Lunch: @Model.LunchMealName

+ } + @if (!string.IsNullOrWhiteSpace(Model.DinnerMealName)) { +

Middag: @Model.DinnerMealName

+ } + + @if (ViewBag.RestaurantIsOpen as bool? == true) + { +

Pizzerian är öppen!

Klicka här för att Beställa pizza + } +
+ } + else + { +

Ingen meny är inlagd för denna dag.

+ } + + Visa hela veckomenyn
- - +
diff --git a/Aberwyn/Views/Home/Menu.cshtml b/Aberwyn/Views/Home/Menu.cshtml index 461db06..9634090 100644 --- a/Aberwyn/Views/Home/Menu.cshtml +++ b/Aberwyn/Views/Home/Menu.cshtml @@ -32,13 +32,13 @@
{{day}}
- Frukost: {{menu[day].breakfastMealName}} + Frukost: {{menu[day].breakfastMealName}}
- Lunch: {{menu[day].lunchMealName}} + Lunch: {{menu[day].lunchMealName}}
- Middag: {{menu[day].dinnerMealName}} + Middag: {{menu[day].dinnerMealName}}
diff --git a/Aberwyn/Views/Meal/Index.cshtml b/Aberwyn/Views/Meal/Index.cshtml index 07e4abf..c3e324d 100644 --- a/Aberwyn/Views/Meal/Index.cshtml +++ b/Aberwyn/Views/Meal/Index.cshtml @@ -1,6 +1,3 @@ -@{ - -} @@ -9,6 +6,11 @@ + +
@@ -21,7 +23,8 @@
-
+
{{ meal.Name }}
@@ -37,10 +40,25 @@ angular.module("mealGalleryApp", []).controller("MealGalleryController", function ($scope, $http) { $scope.meals = []; $scope.search = ""; + $scope.visibleCount = 12; $http.get("/api/mealMenuApi/getMeals").then(res => { $scope.meals = res.data; }); + + // Lazy loading on scroll + window.addEventListener('scroll', function () { + if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight - 150) { + $scope.$applyAsync(() => { + $scope.visibleCount += 8; + }); + } + }); + + // Show all when searching + $scope.$watch('search', function (newVal) { + $scope.visibleCount = newVal ? 9999 : 12; + }); }); diff --git a/Aberwyn/Views/Shared/_Layout.cshtml b/Aberwyn/Views/Shared/_Layout.cshtml index e2424f8..9ca3990 100644 --- a/Aberwyn/Views/Shared/_Layout.cshtml +++ b/Aberwyn/Views/Shared/_Layout.cshtml @@ -4,6 +4,11 @@ + LEWEL - Dashboard @@ -28,42 +33,51 @@
-
@RenderBody() @@ -72,6 +86,45 @@
+ + diff --git a/Aberwyn/wwwroot/css/Welcome.css b/Aberwyn/wwwroot/css/Welcome.css new file mode 100644 index 0000000..7d9f3dc --- /dev/null +++ b/Aberwyn/wwwroot/css/Welcome.css @@ -0,0 +1,80 @@ +.welcome-section.light-mode { + display: flex; + justify-content: center; + align-items: center; + min-height: 90vh; + text-align: center; + padding: 0 20px; + background: linear-gradient(to bottom right, #f9fafb, #e2e8f0); + animation: fadeIn 0.6s ease-in; +} + +@keyframes fadeIn { + from { + opacity: 0; + transform: translateY(10px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +.welcome-content { + max-width: 700px; + color: #1e293b; + font-family: 'Segoe UI', sans-serif; +} + +.welcome-title { + font-size: 3rem; + font-weight: 700; + margin-bottom: 10px; + color: #1e293b; +} + +.highlight { + color: #eab308; +} + +.welcome-subtitle { + font-size: 1.35rem; + color: #334155; + margin-bottom: 28px; +} + +.meal-lines p { + font-size: 1.2rem; + margin: 8px 0; + color: #0f172a; +} + +.meal-lines strong { + color: #475569; +} + +.no-menu { + font-size: 1.1rem; + color: #64748b; + margin-bottom: 24px; +} + +.nav-button { + background: #3b82f6; + color: white; + text-decoration: none; + padding: 12px 26px; + border-radius: 10px; + font-size: 1rem; + font-weight: 600; + display: inline-block; + margin-top: 24px; + transition: background 0.2s ease, transform 0.2s ease; + box-shadow: 0 2px 6px rgba(0,0,0,0.1); +} + + .nav-button:hover { + background: #2563eb; + transform: translateY(-2px); + } diff --git a/Aberwyn/wwwroot/css/budget.css b/Aberwyn/wwwroot/css/budget.css index 75785f7..0201bdc 100644 --- a/Aberwyn/wwwroot/css/budget.css +++ b/Aberwyn/wwwroot/css/budget.css @@ -669,3 +669,13 @@ canvas { height: auto; } } +.loading-indicator { + text-align: center; + margin-top: 40px; + font-size: 18px; + color: #64748B; + font-style: italic; +} +[ng-cloak] { + display: none !important; +} \ No newline at end of file diff --git a/Aberwyn/wwwroot/css/meal-gallery.css b/Aberwyn/wwwroot/css/meal-gallery.css index 6601d7a..f5672a2 100644 --- a/Aberwyn/wwwroot/css/meal-gallery.css +++ b/Aberwyn/wwwroot/css/meal-gallery.css @@ -3,105 +3,157 @@ body { font-family: 'Segoe UI', sans-serif; color: #222; margin: 0; - } - - .meal-gallery-container { - max-width: 1200px; +} + +.meal-gallery-container { margin: 0 auto; padding: 2rem 1rem; - } - - .meal-gallery-header { + width: 100%; + max-width: 1200px; +} + +/* === Header och skflt === */ +.meal-gallery-header { text-align: center; - margin-bottom: 2rem; - } - - .meal-gallery-header h1 { - font-size: 2.4rem; - font-weight: 600; - } - - .search-container { + margin-bottom: 1.5rem; +} + + .meal-gallery-header h1 { + font-size: 2.2rem; + font-weight: 600; + margin: 0; + } + +.search-container { margin-top: 1rem; position: relative; - max-width: 400px; - margin-inline: auto; - } - - .search-container input { width: 100%; - padding: 10px 38px 10px 12px; - border-radius: 25px; - border: 1px solid #ccc; - font-size: 1rem; - } - - .search-container i { - position: absolute; - right: 12px; - top: 50%; - transform: translateY(-50%); - color: #888; - } - - .meal-gallery-grid { + max-width: 500px; + margin-inline: auto; +} + + .search-container input { + width: 100%; + padding: 8px 34px 8px 12px; + border-radius: 20px; + border: 1px solid #ccc; + font-size: 1rem; + box-sizing: border-box; + } + + .search-container i { + position: absolute; + right: 10px; + top: 50%; + transform: translateY(-50%); + color: #888; + font-size: 0.9rem; + } + +/* === Grid layout === */ +.meal-gallery-grid { display: grid; - grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); - gap: 24px; - } - - .meal-card { + grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); + gap: 20px; + padding-top: 16px; +} + +/* === Kortstruktur === */ +.meal-card { background: white; border-radius: 12px; overflow: hidden; - box-shadow: 0 2px 8px rgba(0,0,0,0.05); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05); transition: transform 0.2s ease, box-shadow 0.2s ease; display: flex; flex-direction: column; - } - - .meal-card:hover { - transform: scale(1.015); - box-shadow: 0 4px 12px rgba(0,0,0,0.1); - } - - .meal-card img { - width: 100%; - height: 200px; - object-fit: cover; - } - - .meal-card-content { - padding: 16px; +} + + .meal-card:hover { + transform: scale(1.015); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); + } + + .meal-card img { + width: 100%; + height: 180px; + object-fit: cover; + } + +.meal-card-content { + padding: 14px; display: flex; flex-direction: column; flex-grow: 1; - } - - .meal-card-content h3 { - margin: 0 0 8px; - font-size: 1.2rem; - color: #111; - } - - .meal-card-content p { - flex-grow: 1; - font-size: 0.95rem; - color: #555; - } - - .btn-readmore { +} + + .meal-card-content h3 { + margin: 0 0 6px; + font-size: 1.15rem; + color: #111; + } + + .meal-card-content p { + flex-grow: 1; + font-size: 0.95rem; + color: #555; + margin: 0; + } + +/* === Ls mer-knapp === */ +.btn-readmore { align-self: flex-start; background: #007d36; color: white; - padding: 8px 12px; + padding: 7px 12px; border-radius: 6px; text-decoration: none; - font-size: 0.95rem; - margin-top: 12px; - } - - .btn-readmore:hover { - background: #005c27; - } - \ No newline at end of file + font-size: 0.9rem; + margin-top: auto; + transition: background-color 0.2s ease; +} + + .btn-readmore:hover { + background: #005c27; + } + +/* === Mobilanpassning === */ +@media (max-width: 600px) { + .meal-gallery-grid { + grid-template-columns: repeat(2, 1fr); /* exakt 2 per rad */ + } + .meal-gallery-header h1 { + font-size: 1.6rem; + } + + .search-container { + max-width: 90%; + } + + .search-container input { + padding: 6px 30px 6px 10px; + font-size: 0.9rem; + border-radius: 18px; + } + + .meal-card img { + height: 130px; + } + + .meal-card-content { + padding: 10px; + } + + .meal-card-content h3 { + font-size: 1rem; + } + + .meal-card-content p { + font-size: 0.85rem; + } + + .btn-readmore { + padding: 6px 10px; + font-size: 0.85rem; + } +} diff --git a/Aberwyn/wwwroot/css/menu.css b/Aberwyn/wwwroot/css/menu.css index 1c8efdf..8a7a08e 100644 --- a/Aberwyn/wwwroot/css/menu.css +++ b/Aberwyn/wwwroot/css/menu.css @@ -1,5 +1,4 @@ :root { - --bg: #F9FAFB; --bg-mid: #EDF2F7; --text: #2D3748; --accent: #3182CE; @@ -34,6 +33,10 @@ body { background-color: var(--bg); color: var(--text); } +.fade-out { + opacity: 0; + transition: opacity 0.1s ease-out; +} .meal-menu-page { position: relative; diff --git a/Aberwyn/wwwroot/css/site.css b/Aberwyn/wwwroot/css/site.css index ce9b107..5315aba 100644 --- a/Aberwyn/wwwroot/css/site.css +++ b/Aberwyn/wwwroot/css/site.css @@ -147,25 +147,25 @@ body { .page-content { display: flex; + flex-direction: column; flex-grow: 1; - padding: 16px; - gap: 16px; background-color: #223344; + width: 100%; /* force full width */ + max-width: unset; + position: relative; + z-index: 0; } -.sidebar { - width: 155px; - background-color: #f9f9f9; - border-radius: 8px; - padding: 4px; - box-shadow: 0 1px 4px rgba(0,0,0,0.1); -} + + + + .main-panel { flex: 1; background-color: #ffffff; - border-radius: 10px; - padding: 20px; + border-radius: 0 0 10px 10px; + padding: 0px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); display: flex; flex-direction: column; @@ -173,11 +173,20 @@ body { color: #2C3E50; font-size: 16px; line-height: 1.7; + margin-top: 0; } /* ========================================================================== NAVIGATIONSLISTA � KOMPAKT STIL ========================================================================== */ + +/*.sidebar { + width: 155px; + background-color: #f9f9f9; + border-radius: 8px; + padding: 4px; + box-shadow: 0 1px 4px rgba(0,0,0,0.1); +} .nav-list { list-style: none; padding: 0; @@ -210,6 +219,70 @@ body { width: 14px; text-align: center; } + */ + +.main-nav { + position: fixed; + top: 54px; + left: 0; + right: 0; + z-index: 2000; /* Högt nog för att ligga över allt annat */ + background-color: #f3f4f6; + box-shadow: 0 1px 2px rgba(0,0,0,0.1); + padding: 5px 8px; + font-size: 13px; + overflow-x: auto; /* behåll för horisontell scroll */ + overflow-y: visible; /* tillåt dropdown att spilla ut */ +} + + + + +@media (min-width: 769px) { + .main-nav { + position: fixed; + top: 54px; + left: 0; + right: 0; + z-index: 1001; + } + + .main-panel { + margin-top: 24px; /* justera beroende på hur hög nav-baren är */ + } +} + + +.nav-list-horizontal { + display: flex; + flex-wrap: nowrap; + gap: 5px 0px 0px 0px; + margin: 5px 0px 0px 0px; + padding: 0; + list-style: none; + white-space: nowrap; + /* Viktigt: ta bort all overflow här */ + overflow: visible; + position: relative; + z-index: 1; +} + + .nav-list-horizontal li a { + text-decoration: none; + color: #1F2C3C; + padding: 0px 5px; + border-radius: 4px; + font-weight: 500; + font-size: 14px; + display: flex; + align-items: center; + gap: 5px; + transition: background-color 0.2s; + } + + .nav-list-horizontal li a:hover { + background-color: #e5e7eb; + } /* ========================================================================== RESPONSIVT @@ -223,3 +296,70 @@ body { width: 100%; } } + +/* ========================================================================== + Dropdown + ========================================================================== */ + +.dropdown { + position: relative; +} + +.dropdown-toggle { + font-family: inherit; + font-size: 14px; + font-weight: 500; + color: #1F2C3C; + padding: 0px 5px; + border: none; + background: none; + display: flex; + align-items: center; + gap: 5px; + cursor: pointer; + border-radius: 4px; + transition: background-color 0.2s; + height: 100%; /* viktigt för vertikal alignment */ +} + + .dropdown-toggle:hover { + background-color: #e5e7eb; + } + +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + transform: translateY(4px); /* lite spacing nedåt */ + background-color: #ffffff; + border: 1px solid #ccc; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15); + border-radius: 8px; + display: none; + flex-direction: column; + min-width: 180px; + z-index: 3000; + padding: 4px 0; + font-size: 14px; +} + + +.dropdown.open .dropdown-menu { + display: flex; +} +.dropdown-menu li { + list-style: none; +} + +.dropdown-menu li a { + padding: 8px 12px; + font-size: 13px; + color: #1F2C3C; + text-decoration: none; + display: block; +} + + .dropdown-menu li a:hover { + background-color: #f0f0f0; + } + diff --git a/Aberwyn/wwwroot/js/budget.js b/Aberwyn/wwwroot/js/budget.js index 8417002..e1c0aef 100644 --- a/Aberwyn/wwwroot/js/budget.js +++ b/Aberwyn/wwwroot/js/budget.js @@ -2,7 +2,7 @@ console.log("budget.js loaded"); app.controller('BudgetController', function ($scope, $http) { $scope.budget = null; - $scope.loading = false; + $scope.loading = true; $scope.error = null; $scope.menuOpen = false; $scope.chartMode = "pie"; @@ -823,7 +823,7 @@ $scope.addItemFromDefinition = function (cat) { }); }; - + $scope.loading = true; $scope.loadItemDefinitions().then(() => { $scope.loadBudget(); }); diff --git a/Aberwyn/wwwroot/js/menu.js b/Aberwyn/wwwroot/js/menu.js index 1690db3..9394bcd 100644 --- a/Aberwyn/wwwroot/js/menu.js +++ b/Aberwyn/wwwroot/js/menu.js @@ -94,8 +94,13 @@ angular.module('mealMenuApp', ['ngSanitize']) $scope.openMeal = function (mealId) { - if (!mealId) return; - window.open('/Meal/View/' + mealId, '_blank'); + if (mealId) { + const page = document.querySelector('.meal-menu-page'); + page.classList.add('fade-out'); + setTimeout(() => { + window.location.href = "/Meal/View/" + mealId; + }, 400); // matchar CSS-transition + } }; $scope.getDayImage = function (day) { From f71be26ae46d443de8ead90795e9517a8044756e Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 12 Jun 2025 13:23:58 +0200 Subject: [PATCH 027/103] Layout fix --- Aberwyn/Views/Shared/_Layout.cshtml | 5 +++-- Aberwyn/wwwroot/css/Welcome.css | 4 +++- Aberwyn/wwwroot/css/site.css | 13 +++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Aberwyn/Views/Shared/_Layout.cshtml b/Aberwyn/Views/Shared/_Layout.cshtml index 9ca3990..a6d5878 100644 --- a/Aberwyn/Views/Shared/_Layout.cshtml +++ b/Aberwyn/Views/Shared/_Layout.cshtml @@ -50,7 +50,7 @@ @if (User.IsInRole("Chef")) {
  • -
      @@ -63,7 +63,7 @@ @if (User.IsInRole("Admin")) {
    • -
        @@ -95,6 +95,7 @@ document.addEventListener("DOMContentLoaded", () => { const menu = dropdown.querySelector(".dropdown-menu"); toggle.addEventListener("click", e => { + e.preventDefault(); e.stopPropagation(); const isOpen = dropdown.classList.contains("open"); diff --git a/Aberwyn/wwwroot/css/Welcome.css b/Aberwyn/wwwroot/css/Welcome.css index 7d9f3dc..468bb4a 100644 --- a/Aberwyn/wwwroot/css/Welcome.css +++ b/Aberwyn/wwwroot/css/Welcome.css @@ -8,7 +8,9 @@ background: linear-gradient(to bottom right, #f9fafb, #e2e8f0); animation: fadeIn 0.6s ease-in; } - +*, *::before, *::after { + box-sizing: border-box; +} @keyframes fadeIn { from { opacity: 0; diff --git a/Aberwyn/wwwroot/css/site.css b/Aberwyn/wwwroot/css/site.css index 5315aba..a1f9926 100644 --- a/Aberwyn/wwwroot/css/site.css +++ b/Aberwyn/wwwroot/css/site.css @@ -163,8 +163,9 @@ body { .main-panel { flex: 1; - background-color: #ffffff; + background: linear-gradient(to bottom right, #f9fafb, #e2e8f0); border-radius: 0 0 10px 10px; + overflow: hidden; padding: 0px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); display: flex; @@ -222,7 +223,7 @@ body { */ .main-nav { - position: fixed; + position: sticky; top: 54px; left: 0; right: 0; @@ -240,7 +241,7 @@ body { @media (min-width: 769px) { .main-nav { - position: fixed; + position: sticky; top: 54px; left: 0; right: 0; @@ -248,7 +249,7 @@ body { } .main-panel { - margin-top: 24px; /* justera beroende på hur hög nav-baren är */ + margin-top: 0px; /* justera beroende på hur hög nav-baren är */ } } @@ -320,6 +321,8 @@ body { border-radius: 4px; transition: background-color 0.2s; height: 100%; /* viktigt för vertikal alignment */ + user-select: none; + touch-action: manipulation; } .dropdown-toggle:hover { @@ -341,6 +344,8 @@ body { z-index: 3000; padding: 4px 0; font-size: 14px; + max-width: 90vw; + overflow-wrap: break-word; } From 6a43435950df62d733e8a2df13a021ec7f75b4f1 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Fri, 13 Jun 2025 10:41:00 +0200 Subject: [PATCH 028/103] Layout fixad --- Aberwyn/Properties/launchSettings.json | 2 +- Aberwyn/Views/Shared/_Layout.cshtml | 50 +-------- Aberwyn/wwwroot/css/site.css | 149 +++++++++++++++++-------- Aberwyn/wwwroot/js/site.js | 89 +++++++++++++++ 4 files changed, 200 insertions(+), 90 deletions(-) diff --git a/Aberwyn/Properties/launchSettings.json b/Aberwyn/Properties/launchSettings.json index a663ecc..2ef5bcb 100644 --- a/Aberwyn/Properties/launchSettings.json +++ b/Aberwyn/Properties/launchSettings.json @@ -14,7 +14,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:7290;http://localhost:5290" + "applicationUrl": "https://localhost:7290;http://localhost:5290;http://0.0.0.0:5000" }, "IIS Express": { "commandName": "IISExpress", diff --git a/Aberwyn/Views/Shared/_Layout.cshtml b/Aberwyn/Views/Shared/_Layout.cshtml index a6d5878..9e7cfc6 100644 --- a/Aberwyn/Views/Shared/_Layout.cshtml +++ b/Aberwyn/Views/Shared/_Layout.cshtml @@ -50,9 +50,9 @@ @if (User.IsInRole("Chef")) {
      • - +
    • - + - - diff --git a/Aberwyn/wwwroot/css/site.css b/Aberwyn/wwwroot/css/site.css index a1f9926..7e59509 100644 --- a/Aberwyn/wwwroot/css/site.css +++ b/Aberwyn/wwwroot/css/site.css @@ -1,5 +1,5 @@ /* ========================================================================== - HEADER � LEWEL DESIGN (utan meny) + HEADER LEWEL DESIGN (utan meny) ========================================================================== */ .top-bar { display: flex; @@ -151,21 +151,17 @@ body { flex-grow: 1; background-color: #223344; width: 100%; /* force full width */ - max-width: unset; - position: relative; + max-width: unset; + position: relative; z-index: 0; + overflow: visible !important; } - - - - - .main-panel { flex: 1; background: linear-gradient(to bottom right, #f9fafb, #e2e8f0); border-radius: 0 0 10px 10px; - overflow: hidden; + overflow: visible; padding: 0px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); display: flex; @@ -175,6 +171,8 @@ body { font-size: 16px; line-height: 1.7; margin-top: 0; + position: static !important; + z-index: auto !important; } /* ========================================================================== @@ -227,47 +225,38 @@ body { top: 54px; left: 0; right: 0; - z-index: 2000; /* Högt nog för att ligga över allt annat */ + z-index: 1000; background-color: #f3f4f6; box-shadow: 0 1px 2px rgba(0,0,0,0.1); padding: 5px 8px; font-size: 13px; - overflow-x: auto; /* behåll för horisontell scroll */ - overflow-y: visible; /* tillåt dropdown att spilla ut */ + overflow-x: auto; + overflow-y: visible; + overflow: visible !important; + -webkit-overflow-scrolling: touch; } - - - @media (min-width: 769px) { - .main-nav { - position: sticky; - top: 54px; - left: 0; - right: 0; - z-index: 1001; - } - - .main-panel { - margin-top: 0px; /* justera beroende på hur hög nav-baren är */ + .nav-list-horizontal { + overflow: visible; } } - - .nav-list-horizontal { display: flex; flex-wrap: nowrap; - gap: 5px 0px 0px 0px; - margin: 5px 0px 0px 0px; + gap: 5px; + margin: 5px 0 0 0; padding: 0; list-style: none; white-space: nowrap; - /* Viktigt: ta bort all overflow här */ - overflow: visible; position: relative; z-index: 1; + overflow-y: visible; + -webkit-overflow-scrolling: touch; } - + .nav-list-horizontal > li { + position: relative; + } .nav-list-horizontal li a { text-decoration: none; color: #1F2C3C; @@ -288,15 +277,8 @@ body { /* ========================================================================== RESPONSIVT ========================================================================== */ -@media (max-width: 768px) { - .page-content { - flex-direction: column; - } - .sidebar { - width: 100%; - } -} + /* ========================================================================== Dropdown @@ -323,6 +305,7 @@ body { height: 100%; /* viktigt för vertikal alignment */ user-select: none; touch-action: manipulation; + -webkit-tap-highlight-color: transparent; } .dropdown-toggle:hover { @@ -333,7 +316,7 @@ body { position: absolute; top: 100%; left: 0; - transform: translateY(4px); /* lite spacing nedåt */ + transform: translateY(4px); background-color: #ffffff; border: 1px solid #ccc; box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15); @@ -341,14 +324,12 @@ body { display: none; flex-direction: column; min-width: 180px; - z-index: 3000; + z-index: 1001; padding: 4px 0; font-size: 14px; max-width: 90vw; - overflow-wrap: break-word; } - .dropdown.open .dropdown-menu { display: flex; } @@ -368,3 +349,83 @@ body { background-color: #f0f0f0; } + + +@media (max-width: 768px) { + html, body { + overflow-x: hidden; + overscroll-behavior-x: contain; + } + + .main-panel { + position: relative !important; + z-index: 1 !important; + } + + .main-nav { + position: sticky; + top: 0; + z-index: 1000; + overflow-x: auto; + overflow-y: visible; + -webkit-overflow-scrolling: touch; + background-color: #f3f4f6; + padding: 5px 8px; + box-shadow: 0 1px 2px rgba(0,0,0,0.1); + } + + .nav-list-horizontal { + display: flex; + overflow-x: auto; + overflow-y: hidden; + white-space: nowrap; + -webkit-overflow-scrolling: touch; + padding: 0; + margin: 0; + gap: 5px; + list-style: none; + } + + .dropdown-menu { + position: fixed !important; + right: 12px; + background-color: #ffffff; + border: 1px solid #ccc; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.25); + border-radius: 8px; + display: none; + flex-direction: column; + padding: 4px 0; + font-size: 14px; + z-index: 99999; + width: max-content; + max-width: 90vw; + min-width: 160px; /* valfritt, för att undvika att det blir för smalt */ + } + + .dropdown.open .dropdown-menu { + display: flex !important; + } + + .dropdown, + .auth-menu, + .auth-links { + position: relative; + z-index: 99998; + } + + .dropdown-menu li { + list-style: none; + } + + .dropdown-menu li a { + padding: 8px 12px; + color: #1F2C3C; + text-decoration: none; + font-size: 13px; + } + + .dropdown-menu li a:hover { + background-color: #f0f0f0; + } +} diff --git a/Aberwyn/wwwroot/js/site.js b/Aberwyn/wwwroot/js/site.js index 0fa32e7..4e9d351 100644 --- a/Aberwyn/wwwroot/js/site.js +++ b/Aberwyn/wwwroot/js/site.js @@ -13,6 +13,95 @@ if ('serviceWorker' in navigator) { }); }); } +document.addEventListener("DOMContentLoaded", () => { + const dropdowns = document.querySelectorAll(".dropdown"); + const globalContainer = document.getElementById("global-dropdown-container"); + + dropdowns.forEach((dropdown, index) => { + const toggle = dropdown.querySelector(".dropdown-toggle"); + const menu = dropdown.querySelector(".dropdown-menu"); + + if (!toggle || !menu) return; + + let originalParent = dropdown; + + toggle.addEventListener("click", e => { + e.preventDefault(); + e.stopPropagation(); + + const isOpen = dropdown.classList.contains("open"); + + // Stäng andra + document.querySelectorAll(".dropdown.open").forEach(d => { + d.classList.remove("open"); + const m = d.querySelector(".dropdown-menu"); + if (m && d !== dropdown) { + d.appendChild(m); + resetStyles(m); + } + }); + + dropdown.classList.toggle("open", !isOpen); + + if (!isOpen && window.innerWidth <= 768) { + const rect = toggle.getBoundingClientRect(); + const scrollTop = window.scrollY || document.documentElement.scrollTop; + const scrollLeft = window.scrollX || document.documentElement.scrollLeft; + + let top = rect.bottom + scrollTop - 20; + let left = rect.left + scrollLeft; + const vw = window.innerWidth; + const mw = menu.offsetWidth; + + if (left + mw > vw) { + left = vw - mw - 10; + } + if (left < 10) left = 10; + + // Flytta till global container + globalContainer.appendChild(menu); + + Object.assign(menu.style, { + position: "fixed", + top: `${top}px`, + left: `${left}px`, + zIndex: "99999", + display: "flex" + }); + } else { + // Återställ till original + originalParent.appendChild(menu); + resetStyles(menu); + } + }); + }); + + document.addEventListener("click", () => { + document.querySelectorAll(".dropdown.open").forEach(d => { + d.classList.remove("open"); + const m = d.querySelector(".dropdown-menu"); + if (m) { + d.appendChild(m); + resetStyles(m); + } + }); + + // Töm extra container + if (globalContainer) globalContainer.innerHTML = ''; + }); + + function resetStyles(menu) { + Object.assign(menu.style, { + position: "", + top: "", + left: "", + zIndex: "", + display: "" + }); + } +}); + + async function subscribeToPush() { const registration = await navigator.serviceWorker.ready; From fb62f076a0d8de3e668c070d2d06448f92f4e9f8 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Fri, 13 Jun 2025 15:46:57 +0200 Subject: [PATCH 029/103] Mostly css changes and welcome page thumbnails --- Aberwyn/Controllers/BudgetController.cs | 18 ++++-- Aberwyn/Data/MenuService.cs | 27 ++++++--- Aberwyn/Models/MenuViewModel.cs | 3 + Aberwyn/Views/Budget/Index.cshtml | 16 +++-- Aberwyn/Views/Home/Index.cshtml | 70 ++++++++++++++++++++-- Aberwyn/wwwroot/css/Welcome.css | 77 ++++++++++++++++++++++++ Aberwyn/wwwroot/css/budget.css | 78 ++++++++++++++++++++++--- Aberwyn/wwwroot/js/budget.js | 43 +++++++++----- 8 files changed, 285 insertions(+), 47 deletions(-) diff --git a/Aberwyn/Controllers/BudgetController.cs b/Aberwyn/Controllers/BudgetController.cs index e6cbdab..35cb859 100644 --- a/Aberwyn/Controllers/BudgetController.cs +++ b/Aberwyn/Controllers/BudgetController.cs @@ -3,13 +3,23 @@ using Microsoft.AspNetCore.Mvc; namespace Aberwyn.Controllers { + [Authorize(Roles = "Budget")] public class BudgetController : Controller { - [Authorize(Roles = "Budget")] - public IActionResult Index() + [Route("budget/{year:int}/{month:int}")] + public IActionResult Index(int year, int month) { - ViewData["HideSidebar"] = true; + ViewBag.Year = year; + ViewBag.Month = month; return View(); } + + // För fallback när ingen månad/år anges + [Route("budget")] + public IActionResult Index() + { + var now = DateTime.Now; + return RedirectToAction("Index", new { year = now.Year, month = now.Month }); + } } -} \ No newline at end of file +} diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index c5d24de..3c91cfc 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -344,7 +344,6 @@ public List GetWeeklyMenu(int weekNumber, int year) int week = ISOWeek.GetWeekOfYear(date); int year = date.Year; - // Gör om till ISO 8601: Måndag = 1, Söndag = 7 int dayOfWeek = (int)date.DayOfWeek; if (dayOfWeek == 0) dayOfWeek = 7; @@ -361,20 +360,30 @@ public List GetWeeklyMenu(int weekNumber, int year) var allMeals = _context.Meals .Where(m => mealIds.Contains(m.Id)) - .ToDictionary(m => m.Id, m => m.Name); + .ToDictionary(m => m.Id); - if (menu.BreakfastMealId.HasValue && allMeals.TryGetValue(menu.BreakfastMealId.Value, out var breakfast)) - menu.BreakfastMealName = breakfast; - if (menu.LunchMealId.HasValue && allMeals.TryGetValue(menu.LunchMealId.Value, out var lunch)) - menu.LunchMealName = lunch; - if (menu.DinnerMealId.HasValue && allMeals.TryGetValue(menu.DinnerMealId.Value, out var dinner)) - menu.DinnerMealName = dinner; + if (menu.BreakfastMealId is int bId && allMeals.TryGetValue(bId, out var breakfast)) + { + menu.BreakfastMealName = breakfast.Name; + menu.BreakfastThumbnail = breakfast.ThumbnailData; + } + + if (menu.LunchMealId is int lId && allMeals.TryGetValue(lId, out var lunch)) + { + menu.LunchMealName = lunch.Name; + menu.LunchThumbnail = lunch.ThumbnailData; + } + + if (menu.DinnerMealId is int dId && allMeals.TryGetValue(dId, out var dinner)) + { + menu.DinnerMealName = dinner.Name; + menu.DinnerThumbnail = dinner.ThumbnailData; + } } return menu; } - public List GetMenuEntriesByDateRange(DateTime startDate, DateTime endDate) { var results = new List(); diff --git a/Aberwyn/Models/MenuViewModel.cs b/Aberwyn/Models/MenuViewModel.cs index 449763e..34f452e 100644 --- a/Aberwyn/Models/MenuViewModel.cs +++ b/Aberwyn/Models/MenuViewModel.cs @@ -43,6 +43,9 @@ public class WeeklyMenu public int WeekNumber { get; set; } public int Year { get; set; } public DateTime CreatedAt { get; set; } + [NotMapped] public byte[]? BreakfastThumbnail { get; set; } + [NotMapped] public byte[]? LunchThumbnail { get; set; } + [NotMapped] public byte[]? DinnerThumbnail { get; set; } [NotMapped] public string? BreakfastMealName { get; set; } [NotMapped] public string? LunchMealName { get; set; } diff --git a/Aberwyn/Views/Budget/Index.cshtml b/Aberwyn/Views/Budget/Index.cshtml index 788539d..beb37df 100644 --- a/Aberwyn/Views/Budget/Index.cshtml +++ b/Aberwyn/Views/Budget/Index.cshtml @@ -4,6 +4,7 @@ @{ ViewData["Title"] = "Budget"; } +
    @@ -93,7 +94,7 @@ on-category-drop="handleCategoryDrop(data, targetCategory)">
    -
    {{ cat.name }}
    +
    {{ cat.name }}
    @@ -129,11 +130,10 @@ ng-show="cat.editing" style="opacity: 0.5; padding-right: 6px; cursor: grab;"> - - {{ item.name }} - - - {{ item.amount | number:0 }} + + {{ item.name }} + + {{ item.amount | number:0 }}
    @@ -231,5 +231,9 @@ + \ No newline at end of file diff --git a/Aberwyn/Views/Home/Index.cshtml b/Aberwyn/Views/Home/Index.cshtml index 8578759..be36cc8 100644 --- a/Aberwyn/Views/Home/Index.cshtml +++ b/Aberwyn/Views/Home/Index.cshtml @@ -18,27 +18,87 @@ @if (Model != null) {
    + @if (!string.IsNullOrWhiteSpace(Model.BreakfastMealName)) { -

    Frukost: @Model.BreakfastMealName

    +
    + @if (Model.BreakfastThumbnail != null) + { + var b64 = Convert.ToBase64String(Model.BreakfastThumbnail); + + } +

    Frukost: @Model.BreakfastMealName

    +
    } + @if (!string.IsNullOrWhiteSpace(Model.LunchMealName)) { -

    Lunch: @Model.LunchMealName

    +
    + @if (Model.LunchThumbnail != null) + { + var b64 = Convert.ToBase64String(Model.LunchThumbnail); + + } +

    Lunch: @Model.LunchMealName

    +
    } + @if (!string.IsNullOrWhiteSpace(Model.DinnerMealName)) { -

    Middag: @Model.DinnerMealName

    +
    + @if (Model.DinnerThumbnail != null) + { + var b64 = Convert.ToBase64String(Model.DinnerThumbnail); + + } +

    Middag: @Model.DinnerMealName

    +
    } @if (ViewBag.RestaurantIsOpen as bool? == true) { -

    Pizzerian är öppen!

    Klicka här för att Beställa pizza +

    Pizzerian är öppen!

    + Klicka här för att Beställa pizza } +
    + + } else {

    Ingen meny är inlagd för denna dag.

    } - Visa hela veckomenyn
    + + diff --git a/Aberwyn/wwwroot/css/Welcome.css b/Aberwyn/wwwroot/css/Welcome.css index 468bb4a..1f8881d 100644 --- a/Aberwyn/wwwroot/css/Welcome.css +++ b/Aberwyn/wwwroot/css/Welcome.css @@ -80,3 +80,80 @@ background: #2563eb; transform: translateY(-2px); } +.thumb-button { + border: none; + background: none; + padding: 0; + cursor: pointer; +} + +.meal-line { + display: flex; + align-items: center; + gap: 12px; + margin-bottom: 10px; +} + +.meal-thumb { + width: 48px; + height: 48px; + object-fit: cover; + border-radius: 6px; + box-shadow: 0 2px 4px rgba(0,0,0,0.1); +} + +.lightbox-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0,0,0,0.8); + display: flex; + align-items: center; + justify-content: center; + z-index: 10000; + padding: 20px; +} + +.lightbox-content { + position: relative; + max-width: 90%; + max-height: 90%; + display: flex; + flex-direction: column; + align-items: center; +} + +.lightbox-image { + max-width: 100%; + max-height: 80vh; + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0,0,0,0.5); +} + +.lightbox-caption { + color: white; + margin-top: 10px; + font-size: 16px; + text-align: center; +} + +.close-lightbox { + position: absolute; + top: -10px; + right: -10px; + background: #fff; + color: #333; + border: none; + border-radius: 50%; + font-size: 20px; + width: 32px; + height: 32px; + cursor: pointer; + box-shadow: 0 2px 6px rgba(0,0,0,0.3); +} + +.no-scroll { + overflow: hidden; +} diff --git a/Aberwyn/wwwroot/css/budget.css b/Aberwyn/wwwroot/css/budget.css index 0201bdc..9d74fbd 100644 --- a/Aberwyn/wwwroot/css/budget.css +++ b/Aberwyn/wwwroot/css/budget.css @@ -1,18 +1,23 @@ :root { - --text-main: #1E293B; - --text-sub: #64748B; - --bg-main: #f9fafb; - --bg-card: #f1f5f9; - --border-color: #e5e7eb; - --card-income: #f97316; + --text-main: #1F2937; /* Mörkblågrå – tydlig men mjuk */ + --text-sub: #64748B; /* Sekundär gråblå */ + --bg-main: #1F2C3C; /* SID-bakgrund */ + --bg-card: #dbe3ec; + --bg-card-summary: #d6dde6; + --border-color: #cbd5e1; /* Ljus kant men inte skarp */ + --item-divider: rgba(0, 0, 0, 0.05); /* ljus standard */ + + --card-income: #fb923c; --card-expense: #ef4444; --card-savings: #facc15; - --card-leftover: #86efac; + --card-leftover: #4ade80; --btn-edit: #3b82f6; --btn-check: #10b981; --btn-delete: #ef4444; } + + body { background-color: var(--bg-main); color: var(--text-main); @@ -105,6 +110,7 @@ body { height: 350px; border: 1px solid var(--border-color); border-radius: 12px; + color: var(--text-main); background-color: var(--bg-card); box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05); overflow: hidden; @@ -134,6 +140,7 @@ body { border-top: 1px solid var(--border-color); border-radius: 0 0 12px 12px; flex-shrink: 0; + background: var(--bg-card-summary); } .card-header { @@ -521,7 +528,10 @@ color: var(--btn-check); padding: 8px 12px; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,0.04); + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); min-width: 220px; + background-color: var(--bg-card); + color: var(--text-main); } .budget-summary-box h3, @@ -601,7 +611,18 @@ canvas { height: auto; } + +body.dark-mode { + --item-divider: rgba(255, 255, 255, 0.05); /* för mörk bakgrund */ +} + +.item-row:not(.total-row) { + border-bottom: 1px solid var(--item-divider); + padding-bottom: 4px; + margin-bottom: 4px; +} @media (min-width: 769px) { + .budget-overview-row { display: grid; grid-template-columns: 1fr 1fr; @@ -634,10 +655,51 @@ canvas { max-width: 100%; height: auto; } + .item-row { + display: flex; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 4px 8px; + border-bottom: 1px solid var(--border-color); + } + + .item-label { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 100%; + display: inline-block; + } + + .amount { + flex-shrink: 0; + white-space: nowrap; + font-weight: bold; + } + } @media (max-width: 768px) { + .item-label { + white-space: normal; + overflow-wrap: break-word; + word-break: break-word; + flex: 1 1 auto; + max-width: 100%; + + } + + .amount { + white-space: nowrap; + text-align: right; + flex-shrink: 0; + } + + .budget-grid { + grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); + } .budget-overview-row { display: flex; flex-direction: column; @@ -662,6 +724,8 @@ canvas { width: 100%; text-align: center; padding-bottom: 10px; + color: #1E293B; /* djupare textfärg */ + font-weight: 600; } .chart-area canvas { diff --git a/Aberwyn/wwwroot/js/budget.js b/Aberwyn/wwwroot/js/budget.js index e1c0aef..ec3e44f 100644 --- a/Aberwyn/wwwroot/js/budget.js +++ b/Aberwyn/wwwroot/js/budget.js @@ -7,13 +7,17 @@ app.controller('BudgetController', function ($scope, $http) { $scope.menuOpen = false; $scope.chartMode = "pie"; - const today = new Date(); - $scope.selectedYear = today.getFullYear(); - $scope.selectedMonth = today.getMonth() + 1; - $scope.tempMonth = $scope.monthNames?.[today.getMonth()] || ""; - $scope.tempYear = $scope.selectedYear; - $scope.monthNames = ["Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"]; + $scope.getMonthName = function (month) { + return $scope.monthNames[month - 1] || ""; + }; + + $scope.selectedYear = window.initialYear || new Date().getFullYear(); + $scope.selectedMonth = window.initialMonth || new Date().getMonth() + 1; + + $scope.tempMonth = $scope.monthNames[$scope.selectedMonth - 1]; + $scope.tempYear = $scope.selectedYear; + $scope.selectedMonthName = $scope.getMonthName($scope.selectedMonth); $scope.getMonthName = function (month) { return $scope.monthNames[month - 1] || ""; @@ -42,6 +46,17 @@ app.controller('BudgetController', function ($scope, $http) { }; $scope.menuVisible = true; }; + $scope.updateMonthAndUrl = function () { + const year = $scope.selectedYear; + const month = $scope.selectedMonth.toString(); + const newUrl = `/budget/${year}/${month}`; + window.history.replaceState(null, '', newUrl); // Uppdaterar URL utan reload + $scope.selectedMonthName = $scope.getMonthName($scope.selectedMonth); + $scope.tempMonth = $scope.selectedMonthName; + $scope.tempYear = $scope.selectedYear; + $scope.loadBudget(); + }; + $scope.setItemType = function (item, type) { if (type === 'expense') { @@ -307,12 +322,12 @@ app.controller('BudgetController', function ($scope, $http) { if (monthIndex >= 0 && $scope.tempYear) { $scope.selectedMonth = monthIndex + 1; $scope.selectedYear = parseInt($scope.tempYear); - $scope.selectedMonthName = $scope.getMonthName($scope.selectedMonth); + $scope.updateMonthAndUrl(); $scope.showMonthPicker = false; - $scope.loadBudget(); } }; + $scope.previousMonth = function () { if ($scope.selectedMonth === 1) { $scope.selectedMonth = 12; @@ -320,12 +335,10 @@ app.controller('BudgetController', function ($scope, $http) { } else { $scope.selectedMonth--; } - $scope.tempMonth = $scope.getMonthName($scope.selectedMonth); - $scope.tempYear = $scope.selectedYear; - $scope.selectedMonthName = $scope.getMonthName($scope.selectedMonth); - $scope.loadBudget(); + $scope.updateMonthAndUrl(); }; + $scope.nextMonth = function () { if ($scope.selectedMonth === 12) { $scope.selectedMonth = 1; @@ -333,12 +346,10 @@ app.controller('BudgetController', function ($scope, $http) { } else { $scope.selectedMonth++; } - $scope.tempMonth = $scope.getMonthName($scope.selectedMonth); - $scope.tempYear = $scope.selectedYear; - $scope.selectedMonthName = $scope.getMonthName($scope.selectedMonth); - $scope.loadBudget(); + $scope.updateMonthAndUrl(); }; + $scope.handleCategoryDrop = function (data, targetCategory) { if (data.type !== 'category') return; // ⛔ stoppa om det är ett item-drag From 113cce73ad67451641e4d50c24139444e0dd58dc Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Fri, 13 Jun 2025 15:50:50 +0200 Subject: [PATCH 030/103] New manifest with correct color --- Aberwyn/Views/Shared/_Layout.cshtml | 3 ++- Aberwyn/wwwroot/{manifest.json => manifest-v2.json} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename Aberwyn/wwwroot/{manifest.json => manifest-v2.json} (100%) diff --git a/Aberwyn/Views/Shared/_Layout.cshtml b/Aberwyn/Views/Shared/_Layout.cshtml index 9e7cfc6..e37a20b 100644 --- a/Aberwyn/Views/Shared/_Layout.cshtml +++ b/Aberwyn/Views/Shared/_Layout.cshtml @@ -1,7 +1,7 @@  - + + LEWEL - Dashboard diff --git a/Aberwyn/wwwroot/manifest.json b/Aberwyn/wwwroot/manifest-v2.json similarity index 100% rename from Aberwyn/wwwroot/manifest.json rename to Aberwyn/wwwroot/manifest-v2.json From 76656bb6a89789409385afe51c144f9c8422e2e2 Mon Sep 17 00:00:00 2001 From: elias Date: Sun, 15 Jun 2025 10:49:04 +0200 Subject: [PATCH 031/103] Lots of fixes --- Aberwyn/Controllers/ErrorController.cs | 23 + Aberwyn/Controllers/FoodMenuController.cs | 21 +- Aberwyn/Controllers/HomeController.cs | 2 +- Aberwyn/Controllers/MealController.cs | 35 +- Aberwyn/Data/ApplicationDbContext.cs | 14 + Aberwyn/Data/MenuService.cs | 65 +- ...4211356_AddMealCategorySupport.Designer.cs | 821 ++++++++++++++++++ .../20250614211356_AddMealCategorySupport.cs | 19 + .../ApplicationDbContextModelSnapshot.cs | 55 +- Aberwyn/Models/MenuViewModel.cs | 72 +- Aberwyn/Program.cs | 13 +- Aberwyn/Properties/launchSettings.json | 2 +- Aberwyn/Views/Error/Error.cshtml | 75 ++ Aberwyn/Views/FoodMenu/PizzaOrder.cshtml | 2 +- Aberwyn/Views/Home/Index.cshtml | 2 +- Aberwyn/Views/Meal/MealCategories.cshtml | 74 ++ Aberwyn/Views/Meal/View.cshtml | 35 +- Aberwyn/Views/Shared/_Layout.cshtml | 1 + Aberwyn/wwwroot/css/meal-categories.css | 110 +++ 19 files changed, 1395 insertions(+), 46 deletions(-) create mode 100644 Aberwyn/Controllers/ErrorController.cs create mode 100644 Aberwyn/Migrations/20250614211356_AddMealCategorySupport.Designer.cs create mode 100644 Aberwyn/Migrations/20250614211356_AddMealCategorySupport.cs create mode 100644 Aberwyn/Views/Error/Error.cshtml create mode 100644 Aberwyn/Views/Meal/MealCategories.cshtml create mode 100644 Aberwyn/wwwroot/css/meal-categories.css diff --git a/Aberwyn/Controllers/ErrorController.cs b/Aberwyn/Controllers/ErrorController.cs new file mode 100644 index 0000000..d17e1fb --- /dev/null +++ b/Aberwyn/Controllers/ErrorController.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Diagnostics; +using Microsoft.AspNetCore.Mvc; + +namespace Aberwyn.Controllers +{ + public class ErrorController : Controller + { + [Route("Error/{statusCode}")] + public IActionResult HttpStatusCodeHandler(int statusCode) + { + ViewData["ErrorCode"] = statusCode; + return View("Error"); + } + + [Route("Error")] + public IActionResult Error() + { + var exceptionFeature = HttpContext.Features.Get(); + ViewData["Exception"] = exceptionFeature?.Error; + return View("Error"); + } + } +} diff --git a/Aberwyn/Controllers/FoodMenuController.cs b/Aberwyn/Controllers/FoodMenuController.cs index e76b821..0e37d8a 100644 --- a/Aberwyn/Controllers/FoodMenuController.cs +++ b/Aberwyn/Controllers/FoodMenuController.cs @@ -32,12 +32,12 @@ namespace Aberwyn.Controllers [HttpGet] public IActionResult PizzaOrder() { - var pizzas = _menuService.GetMealsByCategory("Pizza") - .Where(p => p.IsAvailable) - .ToList(); + var meals = _menuService.GetMealsByCategoryName("Pizza", onlyAvailable: true); + Console.WriteLine("Pizzas: ", meals); + var dtoList = meals.Select(m => MealListDto.FromMeal(m)).ToList(); + ViewBag.Pizzas = dtoList; - ViewBag.Pizzas = pizzas; - ViewBag.RestaurantIsOpen = GetRestaurantStatus(); + ViewBag.RestaurantIsOpen = GetRestaurantStatus(); int? lastId = HttpContext.Session.GetInt32("LastPizzaOrderId"); if (lastId.HasValue) @@ -53,6 +53,7 @@ namespace Aberwyn.Controllers } + [HttpGet] public IActionResult EditPizzaOrder(int id) { @@ -152,10 +153,14 @@ namespace Aberwyn.Controllers var allMeals = _menuService.GetMeals(); + var categories = _menuService.GetMealCategories(); + var pizzaCategory = categories.FirstOrDefault(c => c.Name.Equals("Pizza", StringComparison.OrdinalIgnoreCase)); + viewModel.AvailablePizzas = allMeals - .Where(m => m.Category == "Pizza") - .OrderBy(m => m.Name) - .ToList(); + .Where(m => m.MealCategoryId == pizzaCategory?.Id) + .OrderBy(m => m.Name) + .ToList(); + ViewBag.RestaurantIsOpen = GetRestaurantStatus(); diff --git a/Aberwyn/Controllers/HomeController.cs b/Aberwyn/Controllers/HomeController.cs index 81bdb1b..9ae735c 100644 --- a/Aberwyn/Controllers/HomeController.cs +++ b/Aberwyn/Controllers/HomeController.cs @@ -29,7 +29,7 @@ namespace Aberwyn.Controllers ViewBag.RestaurantIsOpen = isOpen; var now = DateTime.Now; - var showDate = now.Hour >= 18 ? now.Date.AddDays(1) : now.Date; + var showDate = now.Hour >= 20 ? now.Date.AddDays(1) : now.Date; var todaysMenu = _menuService.GetMenuForDate(showDate); diff --git a/Aberwyn/Controllers/MealController.cs b/Aberwyn/Controllers/MealController.cs index c677423..7ce7725 100644 --- a/Aberwyn/Controllers/MealController.cs +++ b/Aberwyn/Controllers/MealController.cs @@ -45,7 +45,10 @@ namespace Aberwyn.Controllers CreatedAt = DateTime.Now }; } - + ViewBag.Categories = _menuService.GetMealCategories() + .Where(c => c.IsActive) + .OrderBy(c => c.Name) + .ToList(); ViewData["IsEditing"] = edit; return View("View", meal); } @@ -164,5 +167,35 @@ namespace Aberwyn.Controllers //service.DeleteMeal(id); return RedirectToAction("Edit"); // eller tillbaka till lista } + + [Authorize(Roles = "Admin,Chef")] + [HttpGet("/meal/categories")] + public IActionResult Categories() + { + var categories = _menuService.GetMealCategories() + .Select(cat => { + cat.MealCount = _menuService.GetMealCountForCategory(cat.Id); + return cat; + }).ToList(); + + return View("MealCategories", categories); + } + + [Authorize(Roles = "Admin,Chef")] + [HttpPost("/meal/categories/save")] + public IActionResult SaveCategory(MealCategory category) + { + _menuService.SaveOrUpdateCategory(category); + return RedirectToAction("Categories"); + } + + [Authorize(Roles = "Admin,Chef")] + [HttpPost("/meal/categories/delete")] + public IActionResult DeleteCategory(int id) + { + _menuService.DeleteCategory(id); + return RedirectToAction("Categories"); + } + } } diff --git a/Aberwyn/Data/ApplicationDbContext.cs b/Aberwyn/Data/ApplicationDbContext.cs index 5599d1c..f072826 100644 --- a/Aberwyn/Data/ApplicationDbContext.cs +++ b/Aberwyn/Data/ApplicationDbContext.cs @@ -16,7 +16,20 @@ namespace Aberwyn.Data base.OnModelCreating(builder); builder.Entity().ToTable("WeeklyMenu"); + builder.Entity().HasData( + new MealCategory + { + Id = 1, + Name = "Pizza", + Slug = "pizza", + Icon = "🍕", + Color = "#f97316", + IsActive = true, + DisplayOrder = 1 + } + ); } + public DbSet BudgetPeriods { get; set; } @@ -33,6 +46,7 @@ namespace Aberwyn.Data public DbSet Ingredients { get; set; } public DbSet UserPreferences { get; set; } public DbSet PushSubscriptions { get; set; } + public DbSet MealCategories { get; set; } } } diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index 3c91cfc..2b0c856 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -292,7 +292,7 @@ public List GetMealsSlim(bool includeThumbnail = false) public List GetMealsByCategory(string category) { return _context.Meals - .Where(m => m.Category == category) + //.Where(m => m.Category == category) .Include(m => m.Ingredients) .OrderBy(m => m.Name) .ToList(); @@ -383,6 +383,27 @@ public List GetWeeklyMenu(int weekNumber, int year) return menu; } + public List GetMealsByCategoryName(string categoryName, string? searchTerm = null, bool onlyAvailable = false) + { + var query = _context.Meals + .Include(m => m.Category) + .Include(m => m.Ingredients) + .Where(m => m.Category != null && m.Category.Name == categoryName); + + if (onlyAvailable) + query = query.Where(m => m.IsAvailable); + + if (!string.IsNullOrWhiteSpace(searchTerm)) + { + string lowered = searchTerm.Trim().ToLower(); + query = query.Where(m => m.Name.ToLower().Contains(lowered)); + } + + return query + .OrderBy(m => m.Name) + .ToList(); + } + public List GetMenuEntriesByDateRange(DateTime startDate, DateTime endDate) { @@ -414,5 +435,47 @@ public List GetWeeklyMenu(int weekNumber, int year) } return results; } + public List GetMealCategories() + { + return _context.MealCategories.OrderBy(c => c.DisplayOrder).ToList(); + } + public int GetMealCountForCategory(int categoryId) + { + return _context.Meals.Count(m => m.MealCategoryId == categoryId); + } + + public void SaveOrUpdateCategory(MealCategory cat) + { + if (cat.Id == 0) + { + _context.MealCategories.Add(cat); + } + else + { + var existing = _context.MealCategories.Find(cat.Id); + if (existing != null) + { + existing.Name = cat.Name; + existing.Slug = cat.Slug; + existing.Description = cat.Description; + existing.Icon = cat.Icon; + existing.Color = cat.Color; + existing.IsActive = cat.IsActive; + existing.DisplayOrder = cat.DisplayOrder; + } + } + _context.SaveChanges(); + } + + public void DeleteCategory(int id) + { + var cat = _context.MealCategories.Find(id); + if (cat != null) + { + _context.MealCategories.Remove(cat); + _context.SaveChanges(); + } + } + } } diff --git a/Aberwyn/Migrations/20250614211356_AddMealCategorySupport.Designer.cs b/Aberwyn/Migrations/20250614211356_AddMealCategorySupport.Designer.cs new file mode 100644 index 0000000..aae57e5 --- /dev/null +++ b/Aberwyn/Migrations/20250614211356_AddMealCategorySupport.Designer.cs @@ -0,0 +1,821 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250614211356_AddMealCategorySupport")] + partial class AddMealCategorySupport + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", "BudgetCategory") + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetCategory"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250614211356_AddMealCategorySupport.cs b/Aberwyn/Migrations/20250614211356_AddMealCategorySupport.cs new file mode 100644 index 0000000..0a41d0e --- /dev/null +++ b/Aberwyn/Migrations/20250614211356_AddMealCategorySupport.cs @@ -0,0 +1,19 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddMealCategorySupport : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs index d71eed8..1cc00ef 100644 --- a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs @@ -267,9 +267,6 @@ namespace Aberwyn.Migrations b.Property("CarbType") .HasColumnType("longtext"); - b.Property("Category") - .HasColumnType("longtext"); - b.Property("CreatedAt") .HasColumnType("datetime(6)"); @@ -291,6 +288,9 @@ namespace Aberwyn.Migrations b.Property("IsAvailable") .HasColumnType("tinyint(1)"); + b.Property("MealCategoryId") + .HasColumnType("int"); + b.Property("Name") .IsRequired() .HasColumnType("longtext"); @@ -306,9 +306,44 @@ namespace Aberwyn.Migrations b.HasKey("Id"); + b.HasIndex("MealCategoryId"); + b.ToTable("Meals"); }); + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + }); + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => { b.Property("Id") @@ -660,6 +695,15 @@ namespace Aberwyn.Migrations .IsRequired(); }); + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => { b.HasOne("Aberwyn.Models.ApplicationUser", "User") @@ -764,6 +808,11 @@ namespace Aberwyn.Migrations { b.Navigation("Ingredients"); }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); #pragma warning restore 612, 618 } } diff --git a/Aberwyn/Models/MenuViewModel.cs b/Aberwyn/Models/MenuViewModel.cs index 34f452e..a6fa81f 100644 --- a/Aberwyn/Models/MenuViewModel.cs +++ b/Aberwyn/Models/MenuViewModel.cs @@ -13,8 +13,8 @@ namespace Aberwyn.Models public int WeekNumber { get; set; } // Week number for the menu public int Year { get; set; } // Year for the menu } - public class WeeklyMenuDto -{ + public class WeeklyMenuDto + { public int Id { get; set; } public int DayOfWeek { get; set; } @@ -73,7 +73,10 @@ public class WeeklyMenu public string? Description { get; set; } public string? ProteinType { get; set; } - public string? Category { get; set; } + public int? MealCategoryId { get; set; } + + [ForeignKey("MealCategoryId")] + public MealCategory? Category { get; set; } public string? CarbType { get; set; } public string? RecipeUrl { get; set; } public string? ImageUrl { get; set; } @@ -122,24 +125,57 @@ public class WeeklyMenu } public class MealListDto - { - public int Id { get; set; } - public string Name { get; set; } = ""; - public string? Description { get; set; } - public string? ThumbnailData { get; set; } +{ + public int Id { get; set; } + public string Name { get; set; } = ""; + public string? Description { get; set; } + public string? ThumbnailData { get; set; } - public static MealListDto FromMeal(Meal meal, bool includeThumbnail = false) + public List Ingredients { get; set; } = new(); + + public static MealListDto FromMeal(Meal meal, bool includeThumbnail = false) + { + return new MealListDto { - return new MealListDto + Id = meal.Id, + Name = meal.Name, + Description = meal.Description, + ThumbnailData = includeThumbnail && meal.ThumbnailData != null + ? Convert.ToBase64String(meal.ThumbnailData) + : null, + Ingredients = meal.Ingredients?.Select(i => new IngredientDto { - Id = meal.Id, - Name = meal.Name, - Description = meal.Description, - ThumbnailData = includeThumbnail && meal.ThumbnailData != null - ? Convert.ToBase64String(meal.ThumbnailData) - : null - }; - } + Item = i.Item + }).ToList() ?? new List() + }; + } + + public class IngredientDto + { + public string Item { get; set; } = ""; } } + public class MealCategory + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + + [Required] + public string Name { get; set; } + + public string? Slug { get; set; } + public string? Description { get; set; } + public string? Icon { get; set; } + public string? Color { get; set; } + public bool IsActive { get; set; } = true; + public int DisplayOrder { get; set; } = 0; + [NotMapped] // krävs om du inte har kolumnen i databasen + public int MealCount { get; set; } + + public List Meals { get; set; } = new(); + } + +} + diff --git a/Aberwyn/Program.cs b/Aberwyn/Program.cs index 876091a..c95c694 100644 --- a/Aberwyn/Program.cs +++ b/Aberwyn/Program.cs @@ -191,14 +191,6 @@ app.Use(async (context, next) => -// Configure the HTTP request pipeline -if (!app.Environment.IsDevelopment()) -{ - app.UseExceptionHandler("/Home/Error"); - app.UseHsts(); -} - - app.UseRouting(); app.UseSession(); app.UseAuthentication(); @@ -211,6 +203,11 @@ app.MapControllerRoute( pattern: "{controller=Home}/{action=Index}/{id?}"); app.MapRazorPages(); + app.UseExceptionHandler("/Error"); + app.UseStatusCodePagesWithReExecute("/Error/{0}"); + app.UseHsts(); + + // Init: migrera databas och skapa admin if (setup.IsConfigured) { diff --git a/Aberwyn/Properties/launchSettings.json b/Aberwyn/Properties/launchSettings.json index 2ef5bcb..a663ecc 100644 --- a/Aberwyn/Properties/launchSettings.json +++ b/Aberwyn/Properties/launchSettings.json @@ -14,7 +14,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:7290;http://localhost:5290;http://0.0.0.0:5000" + "applicationUrl": "https://localhost:7290;http://localhost:5290" }, "IIS Express": { "commandName": "IISExpress", diff --git a/Aberwyn/Views/Error/Error.cshtml b/Aberwyn/Views/Error/Error.cshtml new file mode 100644 index 0000000..27b626d --- /dev/null +++ b/Aberwyn/Views/Error/Error.cshtml @@ -0,0 +1,75 @@ +@{ + Layout = "_Layout"; + var errorCode = ViewData["ErrorCode"] as int?; + var exception = ViewData["Exception"] as Exception; + var isDebug = System.Diagnostics.Debugger.IsAttached; +} + + + +
    +

    🚨 Något gick fel

    + Till startsidan + + @if (errorCode.HasValue) + { +
    Statuskod: @errorCode
    + } + + @if (exception != null) + { +

    Felmeddelande:

    + 
    @exception.Message
    + + @if (isDebug) + { +
    + Visa stacktrace + 
    @exception.StackTrace
    +
    + } + } + else + { +

    Vi kunde tyvärr inte visa sidan. Det kan bero på ett tillfälligt fel.

    + } +
    diff --git a/Aberwyn/Views/FoodMenu/PizzaOrder.cshtml b/Aberwyn/Views/FoodMenu/PizzaOrder.cshtml index 201a119..3c5186b 100644 --- a/Aberwyn/Views/FoodMenu/PizzaOrder.cshtml +++ b/Aberwyn/Views/FoodMenu/PizzaOrder.cshtml @@ -2,7 +2,7 @@ @using Newtonsoft.Json.Serialization @{ ViewData["Title"] = "Beställ pizza"; - var pizzas = ViewBag.Pizzas as List; + var pizzas = ViewBag.Pizzas as List ?? new List(); var previousOrder = ViewBag.PreviousOrder as PizzaOrder; var lastId = Context.Session.GetInt32("LastPizzaOrderId"); var isCurrentOrder = previousOrder?.Id == lastId; diff --git a/Aberwyn/Views/Home/Index.cshtml b/Aberwyn/Views/Home/Index.cshtml index be36cc8..f7e1dd9 100644 --- a/Aberwyn/Views/Home/Index.cshtml +++ b/Aberwyn/Views/Home/Index.cshtml @@ -13,7 +13,7 @@ W E L -

    Idag är det @day – dagens meny är:

    +

    Meny för @day är:

    @if (Model != null) { diff --git a/Aberwyn/Views/Meal/MealCategories.cshtml b/Aberwyn/Views/Meal/MealCategories.cshtml new file mode 100644 index 0000000..6c81a61 --- /dev/null +++ b/Aberwyn/Views/Meal/MealCategories.cshtml @@ -0,0 +1,74 @@ +@model List +@{ + ViewData["Title"] = "Måltidskategorier"; +} + +

    Måltidskategorier

    + +
    + @foreach (var cat in Model) + { +
    + + +
    +
    + @if (!string.IsNullOrWhiteSpace(cat.Icon)) + { + @cat.Icon + } + else + { + 🍽️ + } +
    + +
    + + + + + + + + @cat.MealCount st + +
    + + + + + +
    + + } + + +
    +
    +
    ➕
    + +
    + + + + + + + + + +
    + +
    +
    +
    + + + diff --git a/Aberwyn/Views/Meal/View.cshtml b/Aberwyn/Views/Meal/View.cshtml index 8ae2584..1faf3e1 100644 --- a/Aberwyn/Views/Meal/View.cshtml +++ b/Aberwyn/Views/Meal/View.cshtml @@ -14,7 +14,7 @@ } else { - imageSrc = "/images/placeholder-meal.jpg"; + imageSrc = "/images/fallback.jpg"; } bool isChef = HttpContextAccessor.HttpContext.User.IsInRole("Chef"); @@ -64,11 +64,16 @@
    +
    - - + + +
    +
    @@ -171,6 +176,30 @@ +} diff --git a/Aberwyn/wwwroot/js/site.js b/Aberwyn/wwwroot/js/site.js index 4e9d351..c56b640 100644 --- a/Aberwyn/wwwroot/js/site.js +++ b/Aberwyn/wwwroot/js/site.js @@ -6,7 +6,7 @@ if ('serviceWorker' in navigator) { navigator.serviceWorker.register('/service-worker.js') .then(function (registration) { //console.log('✅ Service Worker registrerad med scope:', registration.scope); - subscribeToPush().catch(console.error); + //subscribeToPush().catch(console.error); }) .catch(function (error) { console.log('❌ Service Worker-registrering misslyckades:', error); @@ -127,6 +127,11 @@ async function subscribeToPush() { async function enablePush() { const permission = await Notification.requestPermission(); + const existingSub = await registration.pushManager.getSubscription(); + if (existingSub) { + alert("🔔 Du är redan prenumererad på notiser."); + return; + } if (permission !== "granted") { alert("Du måste tillåta notiser för att få push."); From 22ae26d48861a7ccd39d174b1668d0b34b3d22a0 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Sun, 15 Jun 2025 22:32:13 +0200 Subject: [PATCH 034/103] Notifications --- Aberwyn/Controllers/PushController.cs | 30 +++++++++++++++++++++++++++ Aberwyn/Views/User/Profile.cshtml | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Aberwyn/Controllers/PushController.cs b/Aberwyn/Controllers/PushController.cs index 9fecf03..2f5a56b 100644 --- a/Aberwyn/Controllers/PushController.cs +++ b/Aberwyn/Controllers/PushController.cs @@ -38,6 +38,36 @@ namespace Aberwyn.Controllers return Ok(new { message = $"Skickade pizzanotiser till {count} användare." }); } + [HttpPost("subscribe-user")] + public async Task SubscribeUser([FromBody] PushSubscription subscription) + { + var user = await _userManager.GetUserAsync(User); + if (user == null) return Unauthorized(); + + var existing = await _context.PushSubscribers + .FirstOrDefaultAsync(s => s.Endpoint == subscription.Endpoint); + + if (existing == null) + { + var newSub = new PushSubscriber + { + Endpoint = subscription.Endpoint, + P256DH = subscription.Keys["p256dh"], + Auth = subscription.Keys["auth"], + UserId = user.Id + }; + _context.PushSubscribers.Add(newSub); + } + else + { + existing.P256DH = subscription.Keys["p256dh"]; + existing.Auth = subscription.Keys["auth"]; + existing.UserId = user.Id; + } + + await _context.SaveChangesAsync(); + return Ok(); + } [HttpPost("subscribe")] public async Task Subscribe([FromBody] PushSubscriptionWithOrder dto) diff --git a/Aberwyn/Views/User/Profile.cshtml b/Aberwyn/Views/User/Profile.cshtml index 6347da9..be43988 100644 --- a/Aberwyn/Views/User/Profile.cshtml +++ b/Aberwyn/Views/User/Profile.cshtml @@ -98,7 +98,7 @@ applicationServerKey: urlBase64ToUint8Array(vapidPublicKey.trim()) }); - await fetch("/api/push/subscribe", { + await fetch("/api/push/subscribe-user", { method: "POST", body: JSON.stringify(sub), headers: { "Content-Type": "application/json" } From 871fe3a07010db4388fc43d4bac48a8fc755a28a Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Wed, 18 Jun 2025 23:26:41 +0200 Subject: [PATCH 035/103] Budget paymentdue --- Aberwyn/Controllers/BudgetApiController.cs | 18 +- Aberwyn/Controllers/ReportApiController.cs | 38 - ...7_AddPaymentStatusToBudgetItem.Designer.cs | 848 ++++++++++++++++++ ...0618203117_AddPaymentStatusToBudgetItem.cs | 36 + .../ApplicationDbContextModelSnapshot.cs | 10 +- Aberwyn/Models/Budget.cs | 19 +- Aberwyn/Views/Budget/Index.cshtml | 7 +- Aberwyn/wwwroot/css/budget.css | 28 + Aberwyn/wwwroot/js/budget.js | 26 +- 9 files changed, 984 insertions(+), 46 deletions(-) create mode 100644 Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.Designer.cs create mode 100644 Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.cs diff --git a/Aberwyn/Controllers/BudgetApiController.cs b/Aberwyn/Controllers/BudgetApiController.cs index 6f198aa..42fef4a 100644 --- a/Aberwyn/Controllers/BudgetApiController.cs +++ b/Aberwyn/Controllers/BudgetApiController.cs @@ -61,7 +61,8 @@ namespace Aberwyn.Controllers Amount = i.Amount, IsExpense = i.IsExpense, IncludeInSummary = i.IncludeInSummary, - BudgetItemDefinitionId = i.BudgetItemDefinitionId + BudgetItemDefinitionId = i.BudgetItemDefinitionId, + PaymentStatus = i.PaymentStatus }).ToList() }).ToList() }; @@ -73,6 +74,21 @@ namespace Aberwyn.Controllers return StatusCode(500, $"Fel: {ex.Message} \n{ex.StackTrace}"); } } + [HttpPut("updatePaymentStatus")] + public IActionResult UpdatePaymentStatus([FromBody] PaymentStatusUpdateDto dto) + { + if (dto == null) + return BadRequest("dto is null"); + + var item = _context.BudgetItems.Find(dto.ItemId); + if (item == null) return NotFound(); + + item.PaymentStatus = (PaymentStatus)dto.Status; + _context.SaveChanges(); + + return Ok(); + } + [HttpPut("category/{id}")] public async Task UpdateCategory(int id, [FromBody] BudgetCategoryDto updatedCategory) diff --git a/Aberwyn/Controllers/ReportApiController.cs b/Aberwyn/Controllers/ReportApiController.cs index 256da90..9329760 100644 --- a/Aberwyn/Controllers/ReportApiController.cs +++ b/Aberwyn/Controllers/ReportApiController.cs @@ -22,43 +22,5 @@ namespace Aberwyn.Controllers _context = context; } - [HttpPost] - public async Task GetReport([FromBody] BudgetReportRequestDto request) - { - var start = new DateTime(request.StartYear, request.StartMonth, 1); - var end = new DateTime(request.EndYear, request.EndMonth, 1); - - var items = await _context.BudgetItems - .Include(i => i.BudgetItemDefinition) - .Include(i => i.BudgetCategory) - .ThenInclude(c => c.BudgetPeriod) - .Where(i => - i.BudgetCategory.BudgetPeriod.Year * 12 + i.BudgetCategory.BudgetPeriod.Month >= start.Year * 12 + start.Month && - i.BudgetCategory.BudgetPeriod.Year * 12 + i.BudgetCategory.BudgetPeriod.Month <= end.Year * 12 + end.Month && - request.DefinitionIds.Contains(i.BudgetItemDefinitionId ?? -1)) - .ToListAsync(); - - var grouped = items - .GroupBy(i => new { i.BudgetCategory.BudgetPeriod.Year, i.BudgetCategory.BudgetPeriod.Month }) - .Select(g => new BudgetReportResultDto - { - Year = g.Key.Year, - Month = g.Key.Month, - Definitions = g - .GroupBy(i => new { i.BudgetItemDefinitionId, i.BudgetItemDefinition.Name }) - .Select(dg => new DefinitionSumDto - { - DefinitionId = dg.Key.BudgetItemDefinitionId ?? 0, - DefinitionName = dg.Key.Name, - TotalAmount = dg.Sum(x => x.Amount) - }).ToList() - }) - .OrderBy(r => r.Year).ThenBy(r => r.Month) - .ToList(); - - return Ok(grouped); - } - - } } diff --git a/Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.Designer.cs b/Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.Designer.cs new file mode 100644 index 0000000..af55b1d --- /dev/null +++ b/Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.Designer.cs @@ -0,0 +1,848 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250618203117_AddPaymentStatusToBudgetItem")] + partial class AddPaymentStatusToBudgetItem + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("PaymentStatus") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + + b.HasData( + new + { + Id = 1, + Color = "#f97316", + DisplayOrder = 1, + Icon = "🍕", + IsActive = true, + Name = "Pizza", + Slug = "pizza" + }); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("PizzaOrderId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("PizzaOrderId"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", null) + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") + .WithMany() + .HasForeignKey("PizzaOrderId"); + + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PizzaOrder"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.cs b/Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.cs new file mode 100644 index 0000000..3b66deb --- /dev/null +++ b/Aberwyn/Migrations/20250618203117_AddPaymentStatusToBudgetItem.cs @@ -0,0 +1,36 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddPaymentStatusToBudgetItem : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "PaymentStatus", + table: "BudgetItems", + type: "int", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "DefaultPaymentStatus", + table: "BudgetItemDefinitions", + type: "int", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "PaymentStatus", + table: "BudgetItems"); + + migrationBuilder.DropColumn( + name: "DefaultPaymentStatus", + table: "BudgetItemDefinitions"); + } + } +} diff --git a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs index d98183d..6f35a94 100644 --- a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs @@ -181,6 +181,9 @@ namespace Aberwyn.Migrations b.Property("Order") .HasColumnType("int"); + b.Property("PaymentStatus") + .HasColumnType("int"); + b.HasKey("Id"); b.HasIndex("BudgetCategoryId"); @@ -199,6 +202,9 @@ namespace Aberwyn.Migrations b.Property("DefaultCategory") .HasColumnType("longtext"); + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + b.Property("IncludeInSummary") .HasColumnType("tinyint(1)"); @@ -688,7 +694,7 @@ namespace Aberwyn.Migrations modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => { - b.HasOne("Aberwyn.Models.BudgetCategory", "BudgetCategory") + b.HasOne("Aberwyn.Models.BudgetCategory", null) .WithMany("Items") .HasForeignKey("BudgetCategoryId") .OnDelete(DeleteBehavior.Cascade) @@ -698,8 +704,6 @@ namespace Aberwyn.Migrations .WithMany() .HasForeignKey("BudgetItemDefinitionId"); - b.Navigation("BudgetCategory"); - b.Navigation("BudgetItemDefinition"); }); diff --git a/Aberwyn/Models/Budget.cs b/Aberwyn/Models/Budget.cs index 4bacdaf..93a2440 100644 --- a/Aberwyn/Models/Budget.cs +++ b/Aberwyn/Models/Budget.cs @@ -47,7 +47,16 @@ namespace Aberwyn.Models [JsonIgnore] [ValidateNever] - public BudgetCategory BudgetCategory { get; set; } + + + public PaymentStatus PaymentStatus { get; set; } = PaymentStatus.None; + + } + public enum PaymentStatus + { + None = 0, + Due = 1, + Paid = 2 } // DTOs/BudgetDto.cs public class BudgetDto @@ -84,6 +93,7 @@ namespace Aberwyn.Models public bool IsExpense { get; set; } public bool IncludeInSummary { get; set; } + public PaymentStatus PaymentStatus { get; set; } } @@ -91,6 +101,11 @@ namespace Aberwyn.Models { public List BudgetItems { get; set; } = new List(); } + public class PaymentStatusUpdateDto + { + public int ItemId { get; set; } + public PaymentStatus Status { get; set; } + } public class BudgetItemDefinition { @@ -99,6 +114,8 @@ namespace Aberwyn.Models public string? DefaultCategory { get; set; } // valfritt, kan föreslå "Bilar" public bool IsExpense { get; set; } public bool IncludeInSummary { get; set; } + public PaymentStatus? DefaultPaymentStatus { get; set; } + } public class BudgetCategoryDefinition { diff --git a/Aberwyn/Views/Budget/Index.cshtml b/Aberwyn/Views/Budget/Index.cshtml index beb37df..609f132 100644 --- a/Aberwyn/Views/Budget/Index.cshtml +++ b/Aberwyn/Views/Budget/Index.cshtml @@ -125,7 +125,12 @@ item="item" category="cat" on-item-drop="handleItemDrop(event, data, cat)" - ng-class="{ dragging: dragInProgress && draggedItemId === item.id }"> + ng-class="{ + dragging: dragInProgress && draggedItemId === item.id, + due: item.paymentStatus === 1, + paid: item.paymentStatus === 2 + }" + ng-click="ctrlClick($event, item)"> diff --git a/Aberwyn/wwwroot/css/budget.css b/Aberwyn/wwwroot/css/budget.css index 9d74fbd..c953e23 100644 --- a/Aberwyn/wwwroot/css/budget.css +++ b/Aberwyn/wwwroot/css/budget.css @@ -242,7 +242,35 @@ body { text-align: right; font-weight: 600; } +@keyframes fadeRed { + 0% { + color: rgb(200, 50, 50); + } + 100% { + color: rgb(80, 0, 0); + } +} + +@keyframes fadeGreen { + 0% { + color: rgb(50, 200, 50); + } + + 100% { + color: rgb(0, 80, 0); + } +} + +.item-row.due { + animation: fadeRed 0.2s ease-in-out; + animation-fill-mode: forwards; +} + +.item-row.paid { + animation: fadeGreen 0.2s ease-in-out; + animation-fill-mode: forwards; +} .icon-button { diff --git a/Aberwyn/wwwroot/js/budget.js b/Aberwyn/wwwroot/js/budget.js index ec3e44f..ee3c27c 100644 --- a/Aberwyn/wwwroot/js/budget.js +++ b/Aberwyn/wwwroot/js/budget.js @@ -85,11 +85,32 @@ app.controller('BudgetController', function ($scope, $http) { } }); - document.addEventListener('click', function () { + document.addEventListener('click', function () { $scope.$apply(() => { $scope.menuOpen = false; }); }); + $scope.ctrlClick = function (event, item) { + if (!event.ctrlKey) return; + + const current = typeof item.paymentStatus === 'number' && !isNaN(item.paymentStatus) + ? item.paymentStatus + : 0; + + item.paymentStatus = (current + 1) % 3; + + $http.put("/api/budget/updatePaymentStatus", { + itemId: item.id, + status: item.paymentStatus + }).then(() => { + $scope.showToast("Betalstatus uppdaterad"); + }).catch(err => { + console.error("Fel vid uppdatering:", err); + }); + }; + + + $scope.showToast = function (message, isError = false) { const toast = document.createElement("div"); @@ -128,7 +149,8 @@ app.controller('BudgetController', function ($scope, $http) { includeInSummary: item.IncludeInSummary === true, order: item.Order ?? index, budgetItemDefinitionId: item.BudgetItemDefinitionId, - definitionName: definition?.Name || null + definitionName: definition?.Name || null, + paymentStatus: item.PaymentStatus }; }).sort((a, b) => a.order - b.order) From 6cb2ebf3c855b95581fe8a11458d99abb06c38b3 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Wed, 18 Jun 2025 23:35:22 +0200 Subject: [PATCH 036/103] Mobile fix for paymentstatus --- Aberwyn/Views/Budget/Index.cshtml | 2 +- Aberwyn/wwwroot/js/budget.js | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Aberwyn/Views/Budget/Index.cshtml b/Aberwyn/Views/Budget/Index.cshtml index 609f132..86a33a3 100644 --- a/Aberwyn/Views/Budget/Index.cshtml +++ b/Aberwyn/Views/Budget/Index.cshtml @@ -130,7 +130,7 @@ due: item.paymentStatus === 1, paid: item.paymentStatus === 2 }" - ng-click="ctrlClick($event, item)"> + ng-click="handleItemInteraction($event, item)"> diff --git a/Aberwyn/wwwroot/js/budget.js b/Aberwyn/wwwroot/js/budget.js index ee3c27c..af1c44d 100644 --- a/Aberwyn/wwwroot/js/budget.js +++ b/Aberwyn/wwwroot/js/budget.js @@ -90,24 +90,36 @@ app.controller('BudgetController', function ($scope, $http) { $scope.menuOpen = false; }); }); - $scope.ctrlClick = function (event, item) { - if (!event.ctrlKey) return; + let lastTapTime = 0; - const current = typeof item.paymentStatus === 'number' && !isNaN(item.paymentStatus) - ? item.paymentStatus - : 0; + $scope.handleItemInteraction = function (event, item) { + const now = new Date().getTime(); - item.paymentStatus = (current + 1) % 3; + // Ctrl-klick på desktop + if (event.ctrlKey) { + togglePaymentStatus(item); + return; + } + + // Dubbeltap på mobil (inom 400ms) + if (now - lastTapTime < 400) { + togglePaymentStatus(item); + event.preventDefault(); + } + + lastTapTime = now; + }; + + function togglePaymentStatus(item) { + item.paymentStatus = (item.paymentStatus + 1) % 3; $http.put("/api/budget/updatePaymentStatus", { itemId: item.id, status: item.paymentStatus }).then(() => { $scope.showToast("Betalstatus uppdaterad"); - }).catch(err => { - console.error("Fel vid uppdatering:", err); }); - }; + } From 9f40b3f8a06cf9fdea170cab86496a435af75ca8 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 09:32:38 +0200 Subject: [PATCH 037/103] Optimizing drone compiling --- .drone.yml | 36 +++++++++++++++++----------------- Aberwyn/Dockerfile | 19 ++++++++++++++++-- Aberwyn/wwwroot/css/budget.css | 4 ++-- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1834909..2304b94 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,25 +3,25 @@ type: docker name: default steps: - - name: build-dotnet - image: alpine - commands: - - echo "Docker build will handle dotnet publish" +- name: build-docker + image: plugins/docker + settings: + registry: 192.168.1.9:3000 + repo: 192.168.1.9:3000/tai/aberwyn/aberwyn + username: + from_secret: gitea_username + password: + from_secret: gitea_token + dockerfile: Aberwyn/Dockerfile + context: . + tags: + - latest + - ${DRONE_COMMIT_SHA:0:7} + cache_from: + - 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + insecure: true + - - name: build-docker - image: plugins/docker - settings: - registry: 192.168.1.9:3000 - repo: 192.168.1.9:3000/tai/aberwyn/aberwyn - username: - from_secret: gitea_username - password: - from_secret: gitea_token - dockerfile: Aberwyn/Dockerfile - context: . - tags: - - latest - insecure: true - name: restart-unraid-container image: appleboy/drone-ssh diff --git a/Aberwyn/Dockerfile b/Aberwyn/Dockerfile index 5872d1e..f04364e 100644 --- a/Aberwyn/Dockerfile +++ b/Aberwyn/Dockerfile @@ -1,9 +1,12 @@ +# Basimage för runtime FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +# Installera svenska språkinställningar RUN apt-get update && \ apt-get install -y locales && \ locale-gen sv_SE.UTF-8 +# Ställ in svenska som standard ENV LANG=sv_SE.UTF-8 ENV LANGUAGE=sv_SE:sv ENV LC_ALL=sv_SE.UTF-8 @@ -13,18 +16,30 @@ WORKDIR /app EXPOSE 80 EXPOSE 443 +# Byggimage med SDK FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src + +# Kopiera endast .csproj först för att kunna cacha restore COPY ["Aberwyn/Aberwyn.csproj", "Aberwyn/"] WORKDIR /src/Aberwyn + +# Restore beroenden RUN dotnet restore "Aberwyn.csproj" + +# Kopiera övrig kod COPY Aberwyn/. . -RUN dotnet build "Aberwyn.csproj" -c Release -o /app/build +# Bygg utan att köra restore igen +RUN dotnet build "Aberwyn.csproj" -c Release -o /app/build --no-restore + +# Publicera utan att köra restore eller build igen FROM build AS publish -RUN dotnet publish "Aberwyn.csproj" -c Release -o /app/publish +RUN dotnet publish "Aberwyn.csproj" -c Release -o /app/publish --no-restore +# Slutgiltig image baserad på runtime FROM base AS final WORKDIR /app COPY --from=publish /app/publish . + ENTRYPOINT ["dotnet", "Aberwyn.dll"] diff --git a/Aberwyn/wwwroot/css/budget.css b/Aberwyn/wwwroot/css/budget.css index c953e23..a7e39ba 100644 --- a/Aberwyn/wwwroot/css/budget.css +++ b/Aberwyn/wwwroot/css/budget.css @@ -248,7 +248,7 @@ body { } 100% { - color: rgb(80, 0, 0); + color: rgb(160, 0, 0); } } @@ -258,7 +258,7 @@ body { } 100% { - color: rgb(0, 80, 0); + color: rgb(0, 160, 0); } } From 46299cb7f2543b05eab19861a731d095c07798cf Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 09:33:55 +0200 Subject: [PATCH 038/103] Drone fix --- .drone.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2304b94..17ff60f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,25 +3,23 @@ type: docker name: default steps: -- name: build-docker - image: plugins/docker - settings: - registry: 192.168.1.9:3000 - repo: 192.168.1.9:3000/tai/aberwyn/aberwyn - username: - from_secret: gitea_username - password: - from_secret: gitea_token - dockerfile: Aberwyn/Dockerfile - context: . - tags: - - latest - - ${DRONE_COMMIT_SHA:0:7} - cache_from: - - 192.168.1.9:3000/tai/aberwyn/aberwyn:latest - insecure: true - - + - name: build-docker + image: plugins/docker + settings: + registry: 192.168.1.9:3000 + repo: 192.168.1.9:3000/tai/aberwyn/aberwyn + username: + from_secret: gitea_username + password: + from_secret: gitea_token + dockerfile: Aberwyn/Dockerfile + context: . + tags: + - latest + - ${DRONE_COMMIT_SHA:0:7} + cache_from: + - 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + insecure: true - name: restart-unraid-container image: appleboy/drone-ssh From c84699fd162e9a627a2546ebe50a34d2cdb67bf0 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 10:55:11 +0200 Subject: [PATCH 039/103] Drone test --- Aberwyn/Views/Budget/Index.cshtml | 1 + 1 file changed, 1 insertion(+) diff --git a/Aberwyn/Views/Budget/Index.cshtml b/Aberwyn/Views/Budget/Index.cshtml index 86a33a3..ddf575d 100644 --- a/Aberwyn/Views/Budget/Index.cshtml +++ b/Aberwyn/Views/Budget/Index.cshtml @@ -112,6 +112,7 @@
    +
    Date: Thu, 19 Jun 2025 11:01:45 +0200 Subject: [PATCH 040/103] Drone test --- .drone.yml | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 17ff60f..792b772 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,24 +2,27 @@ kind: pipeline type: docker name: default +volumes: + - name: dockersock + host: + path: /var/run/docker.sock + steps: - - name: build-docker - image: plugins/docker - settings: - registry: 192.168.1.9:3000 - repo: 192.168.1.9:3000/tai/aberwyn/aberwyn - username: - from_secret: gitea_username - password: - from_secret: gitea_token - dockerfile: Aberwyn/Dockerfile - context: . - tags: - - latest - - ${DRONE_COMMIT_SHA:0:7} - cache_from: - - 192.168.1.9:3000/tai/aberwyn/aberwyn:latest - insecure: true + - name: docker-build + image: docker:24 + volumes: + - name: dockersock + path: /var/run/docker.sock + commands: + - docker buildx create --use || true + - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN + - docker buildx build \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ + --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ + --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ + --push \ + -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From e26a8091220be8ffb66e207ad4ef28aea95e606f Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 11:07:46 +0200 Subject: [PATCH 041/103] docker login 192.168.1.9:3000 -u ${GITEA_USERNAME} -p ${GITEA_TOKEN} --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 792b772..2cf5334 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,14 +15,14 @@ steps: path: /var/run/docker.sock commands: - docker buildx create --use || true - - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN + - docker login 192.168.1.9:3000 -u ${GITEA_USERNAME} -p ${GITEA_TOKEN} - docker buildx build \ --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ --push \ - -f Aberwyn/Dockerfile . + -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 67670cc380d78cdb9ccec4cc2ebd7614fc6758df Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 11:09:27 +0200 Subject: [PATCH 042/103] Drone --- .drone.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2cf5334..86d68be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,16 +13,21 @@ steps: volumes: - name: dockersock path: /var/run/docker.sock + environment: + GITEA_USERNAME: + from_secret: gitea_username + GITEA_TOKEN: + from_secret: gitea_token commands: - docker buildx create --use || true - - docker login 192.168.1.9:3000 -u ${GITEA_USERNAME} -p ${GITEA_TOKEN} + - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN - docker buildx build \ --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ --push \ - -f Aberwyn/Dockerfile . + -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 55a254457b36a3cc89c4820be70f6b5a9461e26c Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 11:10:58 +0200 Subject: [PATCH 043/103] drone multiline removal --- .drone.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 86d68be..1257e2f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,13 +21,7 @@ steps: commands: - docker buildx create --use || true - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN - - docker buildx build \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ - --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ - --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ - --push \ - -f Aberwyn/Dockerfile . + - docker buildx build --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From a4229594bf165542e8eee07f4aa3a70b18ea04bb Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:16:58 +0200 Subject: [PATCH 044/103] Another drone optimization --- .drone.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1257e2f..8a5d8ce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,21 +7,24 @@ volumes: host: path: /var/run/docker.sock -steps: - name: docker-build image: docker:24 volumes: - name: dockersock path: /var/run/docker.sock - environment: - GITEA_USERNAME: - from_secret: gitea_username - GITEA_TOKEN: - from_secret: gitea_token commands: - - docker buildx create --use || true - - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN - - docker buildx build --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push -f Aberwyn/Dockerfile . + - export DOCKER_BUILDKIT=1 + - docker buildx create --use --driver docker-container || true + - docker login 192.168.1.9:3000 -u ${GITEA_USERNAME} -p ${GITEA_TOKEN} + - docker buildx build \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ + --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ + --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ + --push \ + --builder default \ + --allow insecure \ + -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 2504fab3e7e07eff069234ae8b2e69146cc00aef Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:18:56 +0200 Subject: [PATCH 045/103] Drone optimization --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8a5d8ce..2bd7e19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,7 @@ volumes: host: path: /var/run/docker.sock +steps: - name: docker-build image: docker:24 volumes: @@ -17,12 +18,12 @@ volumes: - docker buildx create --use --driver docker-container || true - docker login 192.168.1.9:3000 -u ${GITEA_USERNAME} -p ${GITEA_TOKEN} - docker buildx build \ + --builder default \ --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ --push \ - --builder default \ --allow insecure \ -f Aberwyn/Dockerfile . From f0642e45875088630abd06c5c00a2fe2ce6cfd24 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:20:51 +0200 Subject: [PATCH 046/103] More optimization --- .drone.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2bd7e19..e19d5b4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,16 +16,8 @@ steps: commands: - export DOCKER_BUILDKIT=1 - docker buildx create --use --driver docker-container || true - - docker login 192.168.1.9:3000 -u ${GITEA_USERNAME} -p ${GITEA_TOKEN} - - docker buildx build \ - --builder default \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ - --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ - --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ - --push \ - --allow insecure \ - -f Aberwyn/Dockerfile . + - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN + - docker buildx build --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 004ac0c696754e00d6803ecf6668638043f6238f Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:21:42 +0200 Subject: [PATCH 047/103] Test --- .drone.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index e19d5b4..83903ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,11 +13,24 @@ steps: volumes: - name: dockersock path: /var/run/docker.sock + environment: + GITEA_USERNAME: + from_secret: gitea_username + GITEA_TOKEN: + from_secret: gitea_token commands: - export DOCKER_BUILDKIT=1 - docker buildx create --use --driver docker-container || true - - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN - - docker buildx build --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push -f Aberwyn/Dockerfile . + - echo "$GITEA_TOKEN" | docker login 192.168.1.9:3000 -u "$GITEA_USERNAME" --password-stdin + - docker buildx build \ + --builder default \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ + --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ + --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ + --push \ + --allow insecure \ + -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 95bb989e07d8795b4d0d53a3c63242ea2b287bae Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:23:45 +0200 Subject: [PATCH 048/103] Test 2 --- .drone.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 83903ff..d6b0ce5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,14 +23,15 @@ steps: - docker buildx create --use --driver docker-container || true - echo "$GITEA_TOKEN" | docker login 192.168.1.9:3000 -u "$GITEA_USERNAME" --password-stdin - docker buildx build \ - --builder default \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ - --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ - --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ - --push \ - --allow insecure \ - -f Aberwyn/Dockerfile . + --builder default \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ + --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ + --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ + --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ + --push \ + --allow insecure \ + -f Aberwyn/Dockerfile . + - name: restart-unraid-container image: appleboy/drone-ssh From f8a33123d0398e40504564a79818b46ec35ce58d Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:25:12 +0200 Subject: [PATCH 049/103] Test 3 --- .drone.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index d6b0ce5..8dd861c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,19 +18,12 @@ steps: from_secret: gitea_username GITEA_TOKEN: from_secret: gitea_token - commands: + commands: - export DOCKER_BUILDKIT=1 - docker buildx create --use --driver docker-container || true - echo "$GITEA_TOKEN" | docker login 192.168.1.9:3000 -u "$GITEA_USERNAME" --password-stdin - - docker buildx build \ - --builder default \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \ - --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \ - --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \ - --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \ - --push \ - --allow insecure \ - -f Aberwyn/Dockerfile . + - docker buildx build --builder default --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push --allow insecure -f Aberwyn/Dockerfile . + - name: restart-unraid-container From 4f14918b02234262a10b3dac28970a76d9669d7f Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:26:31 +0200 Subject: [PATCH 050/103] Test 4 --- .drone.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8dd861c..5c9a58e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,14 +18,12 @@ steps: from_secret: gitea_username GITEA_TOKEN: from_secret: gitea_token - commands: + commands: - export DOCKER_BUILDKIT=1 - docker buildx create --use --driver docker-container || true - echo "$GITEA_TOKEN" | docker login 192.168.1.9:3000 -u "$GITEA_USERNAME" --password-stdin - docker buildx build --builder default --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push --allow insecure -f Aberwyn/Dockerfile . - - - name: restart-unraid-container image: appleboy/drone-ssh settings: From aefc653e22a24451a78e8aab7f7017834690fe70 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:28:01 +0200 Subject: [PATCH 051/103] Test 5 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5c9a58e..6033985 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ steps: - export DOCKER_BUILDKIT=1 - docker buildx create --use --driver docker-container || true - echo "$GITEA_TOKEN" | docker login 192.168.1.9:3000 -u "$GITEA_USERNAME" --password-stdin - - docker buildx build --builder default --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push --allow insecure -f Aberwyn/Dockerfile . + - docker buildx build --builder default --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 979b05f2cae1166d65663e16424becc209c11b19 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:32:24 +0200 Subject: [PATCH 052/103] Test 6 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6033985..d654121 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ steps: - export DOCKER_BUILDKIT=1 - docker buildx create --use --driver docker-container || true - echo "$GITEA_TOKEN" | docker login 192.168.1.9:3000 -u "$GITEA_USERNAME" --password-stdin - - docker buildx build --builder default --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max --push -f Aberwyn/Dockerfile . + - docker buildx build --builder default --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache --push -f Aberwyn/Dockerfile . - name: restart-unraid-container image: appleboy/drone-ssh From 07f6451c5a4ce9b9e58e2cc8fbb0b9d4f68fde6d Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:43:53 +0200 Subject: [PATCH 053/103] Drone session persistance fixes --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d654121..6718eb9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,8 @@ steps: - docker stop aberwyn || true - docker rm aberwyn || true - docker volume create aberwyn_config || true - - docker run -d --name=aberwyn --net=br0 -e TZ=Europe/Berlin -p 80:80 -v aberwyn_config:/app/infrastructure 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + - docker volume create aberwyn_keys || true + - docker run -d --name=aberwyn --net=br0 -e TZ=Europe/Berlin -p 80:80 -v aberwyn_config:/app/infrastructure -v aberwyn_keys:/root/.aspnet/DataProtection-Keys 192.168.1.9:3000/tai/aberwyn/aberwyn:latest - name: notify-result image: alpine From 051ef625ba92c2a16dc60d0847de6fe01ab66e1c Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 19 Jun 2025 12:46:42 +0200 Subject: [PATCH 054/103] =?UTF-8?q?Changes=20K=C3=B6k=20to=20Mat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aberwyn/Views/Shared/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aberwyn/Views/Shared/_Layout.cshtml b/Aberwyn/Views/Shared/_Layout.cshtml index a93c69b..82e7fd8 100644 --- a/Aberwyn/Views/Shared/_Layout.cshtml +++ b/Aberwyn/Views/Shared/_Layout.cshtml @@ -52,7 +52,7 @@ {
  • - Kök + Mat
    • Planera Veckomeny
      • From 3ef872ac8c66f2599b6f3310e00f5bb99b12029e Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Tue, 24 Jun 2025 17:20:08 +0200 Subject: [PATCH 055/103] Recipe publishing --- Aberwyn/Controllers/MealMenuApiController.cs | 17 + ...24150426_AddIsPublishedToMeals.Designer.cs | 851 ++++++++++++++++++ .../20250624150426_AddIsPublishedToMeals.cs | 26 + .../ApplicationDbContextModelSnapshot.cs | 3 + Aberwyn/Models/MenuViewModel.cs | 2 +- Aberwyn/Views/Budget/Index.cshtml | 30 +- Aberwyn/Views/Meal/Index.cshtml | 2 +- Aberwyn/Views/Meal/View.cshtml | 7 +- Aberwyn/wwwroot/css/budget.css | 28 +- Aberwyn/wwwroot/js/budget.js | 57 ++ 10 files changed, 1007 insertions(+), 16 deletions(-) create mode 100644 Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.Designer.cs create mode 100644 Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.cs diff --git a/Aberwyn/Controllers/MealMenuApiController.cs b/Aberwyn/Controllers/MealMenuApiController.cs index 02d7d17..ceb16ed 100644 --- a/Aberwyn/Controllers/MealMenuApiController.cs +++ b/Aberwyn/Controllers/MealMenuApiController.cs @@ -27,6 +27,23 @@ namespace Aberwyn.Controllers return Ok(menu ?? new List()); } + [HttpGet("getPublishedMeals")] + public IActionResult GetPublishedMeals() + { + var meals = _menuService.GetMeals() + .Where(m => m.IsPublished) // 🟢 filtrera här! + .Select(m => new { + m.Id, + m.Name, + m.Description, + ThumbnailData = m.ThumbnailData != null ? Convert.ToBase64String(m.ThumbnailData) : null + }) + .ToList(); + + return Ok(meals); + } + + [HttpGet("getMeals")] public IActionResult GetMeals() { diff --git a/Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.Designer.cs b/Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.Designer.cs new file mode 100644 index 0000000..180d2e6 --- /dev/null +++ b/Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.Designer.cs @@ -0,0 +1,851 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250624150426_AddIsPublishedToMeals")] + partial class AddIsPublishedToMeals + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("PaymentStatus") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("IsPublished") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + + b.HasData( + new + { + Id = 1, + Color = "#f97316", + DisplayOrder = 1, + Icon = "🍕", + IsActive = true, + Name = "Pizza", + Slug = "pizza" + }); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("PizzaOrderId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("PizzaOrderId"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", null) + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") + .WithMany() + .HasForeignKey("PizzaOrderId"); + + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PizzaOrder"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.cs b/Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.cs new file mode 100644 index 0000000..c926903 --- /dev/null +++ b/Aberwyn/Migrations/20250624150426_AddIsPublishedToMeals.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddIsPublishedToMeals : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsPublished", + table: "Meals", + type: "tinyint(1)", + nullable: false, + defaultValue: false); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsPublished", + table: "Meals"); + } + } +} diff --git a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs index 6f35a94..41987bd 100644 --- a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs @@ -294,6 +294,9 @@ namespace Aberwyn.Migrations b.Property("IsAvailable") .HasColumnType("tinyint(1)"); + b.Property("IsPublished") + .HasColumnType("tinyint(1)"); + b.Property("MealCategoryId") .HasColumnType("int"); diff --git a/Aberwyn/Models/MenuViewModel.cs b/Aberwyn/Models/MenuViewModel.cs index a6fa81f..0aea362 100644 --- a/Aberwyn/Models/MenuViewModel.cs +++ b/Aberwyn/Models/MenuViewModel.cs @@ -84,7 +84,7 @@ public class WeeklyMenu public bool IsAvailable { get; set; } public DateTime CreatedAt { get; set; } public byte[]? ThumbnailData { get; set; } - + public bool IsPublished { get; set; } = false; public byte[]? ImageData { get; set; } public string? ImageMimeType { get; set; } public string? Instructions { get; set; } diff --git a/Aberwyn/Views/Budget/Index.cshtml b/Aberwyn/Views/Budget/Index.cshtml index ddf575d..e560fa7 100644 --- a/Aberwyn/Views/Budget/Index.cshtml +++ b/Aberwyn/Views/Budget/Index.cshtml @@ -26,10 +26,10 @@
      - - - + + +
    • @@ -232,7 +232,31 @@
    +
    + +

    📥 Importera rader till {{ importTargetCategory.name }}

    + + + + + + + +
    +

    Förhandsvisning:

    +
    + {{ item.name }} + {{ item.amount | number:0 }} kr +
    + +
    + + +
    + diff --git a/Aberwyn/Views/Meal/Index.cshtml b/Aberwyn/Views/Meal/Index.cshtml index c3e324d..8304d75 100644 --- a/Aberwyn/Views/Meal/Index.cshtml +++ b/Aberwyn/Views/Meal/Index.cshtml @@ -42,7 +42,7 @@ $scope.search = ""; $scope.visibleCount = 12; - $http.get("/api/mealMenuApi/getMeals").then(res => { + $http.get("/api/mealMenuApi/getPublishedMeals").then(res => { $scope.meals = res.data; }); diff --git a/Aberwyn/Views/Meal/View.cshtml b/Aberwyn/Views/Meal/View.cshtml index 1faf3e1..384a8da 100644 --- a/Aberwyn/Views/Meal/View.cshtml +++ b/Aberwyn/Views/Meal/View.cshtml @@ -99,7 +99,12 @@
    - +
    + +
    diff --git a/Aberwyn/wwwroot/css/budget.css b/Aberwyn/wwwroot/css/budget.css index a7e39ba..691624a 100644 --- a/Aberwyn/wwwroot/css/budget.css +++ b/Aberwyn/wwwroot/css/budget.css @@ -296,11 +296,17 @@ color: var(--btn-edit); .icon-button.confirm { color: var(--btn-check); } +.menu-container { + position: relative; + display: inline-block; +} .dropdown-menu { position: absolute; - right: 0; top: calc(100% + 6px); + left: auto; + right: 0; + transform: translateX(-100%) translateX(100%); /* Effektivt: ingen förskjutning */ background-color: #ffffff; border: 1px solid var(--border-color); border-radius: 6px; @@ -308,27 +314,29 @@ color: var(--btn-check); z-index: 1000; padding: 6px; display: none; - gap: 4px; - flex-wrap: wrap; - min-width: 200px; + flex-direction: column; + min-width: 160px; + max-width: 240px; + box-sizing: border-box; } + .menu-container.open .dropdown-menu { display: flex; } .dropdown-menu button { - padding: 5px 8px; + padding: 6px 10px; border-radius: 6px; - border: 1px solid #ddd; + border: none; background: #f3f4f6; cursor: pointer; - font-size: 12px; - flex: 1; - font-weight: 500; + font-size: 13px; + text-align: left; + width: 100%; } -.dropdown-menu button:hover { + .dropdown-menu button:hover { background-color: #e5e7eb; } diff --git a/Aberwyn/wwwroot/js/budget.js b/Aberwyn/wwwroot/js/budget.js index af1c44d..3400222 100644 --- a/Aberwyn/wwwroot/js/budget.js +++ b/Aberwyn/wwwroot/js/budget.js @@ -868,6 +868,63 @@ $scope.addItemFromDefinition = function (cat) { }); }; + + // Import + $scope.importing = false; + $scope.importText = ''; + $scope.importPreview = []; + $scope.importTargetCategory = null; + + $scope.openImportModule = function () { + // Välj första redigerbara kategori som standard (eller be om val senare) + const editable = $scope.budget.categories.find(c => c.editing); + if (!editable) { + alert("Redigera en kategori först!"); + return; + } + $scope.importTargetCategory = editable; + $scope.importText = ''; + $scope.importPreview = []; + $scope.importing = true; + }; + + $scope.cancelImport = function () { + $scope.importing = false; + $scope.importText = ''; + $scope.importPreview = []; + }; + + $scope.parseImportText = function () { + const lines = $scope.importText.trim().split('\n'); + $scope.importPreview = lines.map(l => { + const parts = l.trim().match(/^(.+?)\s+(-?\d+(?:[,.]\d+)?)/); + return { + name: parts?.[1] || '', + amount: parseFloat((parts?.[2] || '0').replace(',', '.')) + }; + }).filter(item => item.name && !isNaN(item.amount)); + }; + + $scope.applyImport = function () { + const cat = $scope.importTargetCategory; + $scope.importPreview.forEach(p => { + cat.items.push({ + id: -1 * Math.floor(Math.random() * 1000000), // temporärt ID + name: p.name, + amount: p.amount, + isExpense: true, + includeInSummary: true, + paymentStatus: 0 + }); + }); + + $scope.importing = false; + $scope.importText = ''; + $scope.importPreview = []; + }; + + + $scope.loading = true; $scope.loadItemDefinitions().then(() => { $scope.loadBudget(); From 45994a9439fa55ddc1167907c86d8cca412269d4 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Wed, 25 Jun 2025 09:19:16 +0200 Subject: [PATCH 056/103] Today menu api --- Aberwyn/Controllers/MealMenuApiController.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Aberwyn/Controllers/MealMenuApiController.cs b/Aberwyn/Controllers/MealMenuApiController.cs index ceb16ed..b62d317 100644 --- a/Aberwyn/Controllers/MealMenuApiController.cs +++ b/Aberwyn/Controllers/MealMenuApiController.cs @@ -62,6 +62,23 @@ namespace Aberwyn.Controllers } + [HttpGet("today")] + public IActionResult GetTodayMenu() + { + var today = DateTime.Today; + var menu = _menuService.GetMenuForDate(today); + + if (menu == null) + return NotFound(new { message = "Ingen meny hittades för idag." }); + + return Ok(new + { + date = today.ToString("yyyy-MM-dd"), + lunch = menu.LunchMealName ?? "", + dinner = menu.DinnerMealName ?? "", + breakfast = menu.BreakfastMealName ?? "" + }); + } [HttpPut("menu")] From 072369fa17fbb57ebc73e3f64edafc1733dbe311 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Thu, 3 Jul 2025 22:00:56 +0200 Subject: [PATCH 057/103] Meal lab v0.1 --- Aberwyn/Controllers/MealController.cs | 67 ++ Aberwyn/Data/ApplicationDbContext.cs | 5 + Aberwyn/Data/MenuService.cs | 49 +- .../20250630123620_AddRecipeLab.Designer.cs | 949 +++++++++++++++ .../Migrations/20250630123620_AddRecipeLab.cs | 95 ++ ...30133813_AddLabIngredientModel.Designer.cs | 1026 +++++++++++++++++ .../20250630133813_AddLabIngredientModel.cs | 80 ++ ...50630141059_AddRecipeLabModels.Designer.cs | 1023 ++++++++++++++++ .../20250630141059_AddRecipeLabModels.cs | 26 + .../ApplicationDbContextModelSnapshot.cs | 172 +++ Aberwyn/Models/RecipeLab.cs | 81 ++ Aberwyn/Views/Meal/Lab.cshtml | 99 ++ 12 files changed, 3671 insertions(+), 1 deletion(-) create mode 100644 Aberwyn/Migrations/20250630123620_AddRecipeLab.Designer.cs create mode 100644 Aberwyn/Migrations/20250630123620_AddRecipeLab.cs create mode 100644 Aberwyn/Migrations/20250630133813_AddLabIngredientModel.Designer.cs create mode 100644 Aberwyn/Migrations/20250630133813_AddLabIngredientModel.cs create mode 100644 Aberwyn/Migrations/20250630141059_AddRecipeLabModels.Designer.cs create mode 100644 Aberwyn/Migrations/20250630141059_AddRecipeLabModels.cs create mode 100644 Aberwyn/Models/RecipeLab.cs create mode 100644 Aberwyn/Views/Meal/Lab.cshtml diff --git a/Aberwyn/Controllers/MealController.cs b/Aberwyn/Controllers/MealController.cs index 7ce7725..ddd1da4 100644 --- a/Aberwyn/Controllers/MealController.cs +++ b/Aberwyn/Controllers/MealController.cs @@ -197,5 +197,72 @@ namespace Aberwyn.Controllers return RedirectToAction("Categories"); } + + [HttpGet("/meal/lab")] + public IActionResult Lab(int? id) + { + if (id.HasValue) + { + var entry = _menuService.GetRecipeLabEntryById(id.Value); + if (entry == null) return NotFound(); + + return View("Lab", entry); + } + + // Skapa ett tomt labb-entry för formulär + var newEntry = new RecipeLabEntry + { + Title = "", + Inspiration = "", + Notes = "", + Tags = "" + }; + + return View("Lab", newEntry); + } + [HttpPost("/meal/lab/create")] + public IActionResult CreateLabEntry(RecipeLabEntry entry) + { + entry.CreatedAt = DateTime.Now; + _menuService.AddLabEntry(entry); + + return RedirectToAction("Lab", new { id = entry.Id }); + } + + [HttpPost("/meal/lab/save-ingredients")] + public IActionResult SaveLabIngredients(int RecipeLabEntryId, List Ingredients) + { + _menuService.SaveIngredientsForLabEntry(RecipeLabEntryId, Ingredients); + return RedirectToAction("Lab", new { id = RecipeLabEntryId }); + } + + + [HttpPost("/meal/lab/addversion")] + public IActionResult AddLabVersion(RecipeLabVersion version) + { + if (!ModelState.IsValid) + return RedirectToAction("Lab", new { id = version.RecipeLabEntryId }); + + var entry = _menuService.GetRecipeLabEntryById(version.RecipeLabEntryId); + if (entry == null) return NotFound(); + + version.CreatedAt = DateTime.Now; + + // Kopiera nuvarande ingredienser + var copiedIngredients = entry.Ingredients + .Select(i => new LabVersionIngredient + { + Quantity = i.Quantity, + Item = i.Item + }) + .ToList(); + + _menuService.SaveLabVersionWithIngredients(version, copiedIngredients); + + return RedirectToAction("Lab", new { id = version.RecipeLabEntryId }); + } + + } + } diff --git a/Aberwyn/Data/ApplicationDbContext.cs b/Aberwyn/Data/ApplicationDbContext.cs index f072826..9d09f9e 100644 --- a/Aberwyn/Data/ApplicationDbContext.cs +++ b/Aberwyn/Data/ApplicationDbContext.cs @@ -47,6 +47,11 @@ namespace Aberwyn.Data public DbSet UserPreferences { get; set; } public DbSet PushSubscriptions { get; set; } public DbSet MealCategories { get; set; } + public DbSet RecipeLabEntries { get; set; } + public DbSet RecipeLabVersions { get; set; } + public DbSet LabIngredients { get; set; } + public DbSet LabVersionIngredients { get; set; } + } } diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index 2b0c856..2d5e862 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -466,7 +466,7 @@ public List GetWeeklyMenu(int weekNumber, int year) } _context.SaveChanges(); } - + #region Lab public void DeleteCategory(int id) { var cat = _context.MealCategories.Find(id); @@ -476,6 +476,53 @@ public List GetWeeklyMenu(int weekNumber, int year) _context.SaveChanges(); } } + public RecipeLabEntry? GetRecipeLabEntryById(int id) + { + return _context.RecipeLabEntries + .Include(e => e.Versions) + .FirstOrDefault(e => e.Id == id); + } + + public void AddVersionToLabEntry(RecipeLabVersion version) + { + _context.RecipeLabVersions.Add(version); + _context.SaveChanges(); + } + + public void AddLabEntry(RecipeLabEntry entry) + { + _context.RecipeLabEntries.Add(entry); + _context.SaveChanges(); + } + public void SaveLabVersionWithIngredients(RecipeLabVersion version, List ingredients) + { + _context.RecipeLabVersions.Add(version); + _context.SaveChanges(); // så vi får ett ID + + foreach (var ing in ingredients) + { + ing.RecipeLabVersionId = version.Id; + } + + _context.LabVersionIngredients.AddRange(ingredients); + _context.SaveChanges(); + } + public void SaveIngredientsForLabEntry(int labEntryId, List ingredients) + { + var existing = _context.LabIngredients + .Where(i => i.RecipeLabEntryId == labEntryId) + .ToList(); + + _context.LabIngredients.RemoveRange(existing); + + foreach (var ing in ingredients) + ing.RecipeLabEntryId = labEntryId; + + _context.LabIngredients.AddRange(ingredients); + _context.SaveChanges(); + } + + #endregion } } diff --git a/Aberwyn/Migrations/20250630123620_AddRecipeLab.Designer.cs b/Aberwyn/Migrations/20250630123620_AddRecipeLab.Designer.cs new file mode 100644 index 0000000..a6e72c8 --- /dev/null +++ b/Aberwyn/Migrations/20250630123620_AddRecipeLab.Designer.cs @@ -0,0 +1,949 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250630123620_AddRecipeLab")] + partial class AddRecipeLab + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("PaymentStatus") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("IsPublished") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + + b.HasData( + new + { + Id = 1, + Color = "#f97316", + DisplayOrder = 1, + Icon = "🍕", + IsActive = true, + Name = "Pizza", + Slug = "pizza" + }); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("PizzaOrderId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("PizzaOrderId"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseMealId") + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Inspiration") + .HasColumnType("longtext"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("Tags") + .HasColumnType("longtext"); + + b.Property("TestedBy") + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("BaseMealId"); + + b.ToTable("RecipeLabEntries"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ingredients") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.Property("ResultNotes") + .HasColumnType("longtext"); + + b.Property("VersionLabel") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("RecipeLabVersions"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", null) + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") + .WithMany() + .HasForeignKey("PizzaOrderId"); + + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PizzaOrder"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.HasOne("Aberwyn.Models.Meal", "BaseMeal") + .WithMany() + .HasForeignKey("BaseMealId"); + + b.Navigation("BaseMeal"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Versions") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Navigation("Versions"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250630123620_AddRecipeLab.cs b/Aberwyn/Migrations/20250630123620_AddRecipeLab.cs new file mode 100644 index 0000000..d086dda --- /dev/null +++ b/Aberwyn/Migrations/20250630123620_AddRecipeLab.cs @@ -0,0 +1,95 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddRecipeLab : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "RecipeLabEntries", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + Title = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Category = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + Inspiration = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + BaseMealId = table.Column(type: "int", nullable: true), + Notes = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + Rating = table.Column(type: "int", nullable: true), + TestedBy = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + Tags = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + CreatedAt = table.Column(type: "datetime(6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RecipeLabEntries", x => x.Id); + table.ForeignKey( + name: "FK_RecipeLabEntries_Meals_BaseMealId", + column: x => x.BaseMealId, + principalTable: "Meals", + principalColumn: "Id"); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "RecipeLabVersions", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + RecipeLabEntryId = table.Column(type: "int", nullable: false), + VersionLabel = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Ingredients = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + Instructions = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + ResultNotes = table.Column(type: "longtext", nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"), + CreatedAt = table.Column(type: "datetime(6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RecipeLabVersions", x => x.Id); + table.ForeignKey( + name: "FK_RecipeLabVersions_RecipeLabEntries_RecipeLabEntryId", + column: x => x.RecipeLabEntryId, + principalTable: "RecipeLabEntries", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_RecipeLabEntries_BaseMealId", + table: "RecipeLabEntries", + column: "BaseMealId"); + + migrationBuilder.CreateIndex( + name: "IX_RecipeLabVersions_RecipeLabEntryId", + table: "RecipeLabVersions", + column: "RecipeLabEntryId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "RecipeLabVersions"); + + migrationBuilder.DropTable( + name: "RecipeLabEntries"); + } + } +} diff --git a/Aberwyn/Migrations/20250630133813_AddLabIngredientModel.Designer.cs b/Aberwyn/Migrations/20250630133813_AddLabIngredientModel.Designer.cs new file mode 100644 index 0000000..88e7ff7 --- /dev/null +++ b/Aberwyn/Migrations/20250630133813_AddLabIngredientModel.Designer.cs @@ -0,0 +1,1026 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250630133813_AddLabIngredientModel")] + partial class AddLabIngredientModel + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("PaymentStatus") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("LabIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabVersionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabVersionId"); + + b.ToTable("LabVersionIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("IsPublished") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + + b.HasData( + new + { + Id = 1, + Color = "#f97316", + DisplayOrder = 1, + Icon = "🍕", + IsActive = true, + Name = "Pizza", + Slug = "pizza" + }); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("PizzaOrderId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("PizzaOrderId"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseMealId") + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Inspiration") + .HasColumnType("longtext"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("Tags") + .HasColumnType("longtext"); + + b.Property("TestedBy") + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("BaseMealId"); + + b.ToTable("RecipeLabEntries"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ingredients") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.Property("ResultNotes") + .HasColumnType("longtext"); + + b.Property("VersionLabel") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("RecipeLabVersions"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", null) + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabVersion", "Version") + .WithMany("VersionIngredients") + .HasForeignKey("RecipeLabVersionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Version"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") + .WithMany() + .HasForeignKey("PizzaOrderId"); + + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PizzaOrder"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.HasOne("Aberwyn.Models.Meal", "BaseMeal") + .WithMany() + .HasForeignKey("BaseMealId"); + + b.Navigation("BaseMeal"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Versions") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Navigation("Ingredients"); + + b.Navigation("Versions"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Navigation("VersionIngredients"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250630133813_AddLabIngredientModel.cs b/Aberwyn/Migrations/20250630133813_AddLabIngredientModel.cs new file mode 100644 index 0000000..1dbc211 --- /dev/null +++ b/Aberwyn/Migrations/20250630133813_AddLabIngredientModel.cs @@ -0,0 +1,80 @@ +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddLabIngredientModel : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "LabIngredients", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + RecipeLabEntryId = table.Column(type: "int", nullable: false), + Quantity = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Item = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_LabIngredients", x => x.Id); + table.ForeignKey( + name: "FK_LabIngredients_RecipeLabEntries_RecipeLabEntryId", + column: x => x.RecipeLabEntryId, + principalTable: "RecipeLabEntries", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "LabVersionIngredients", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + RecipeLabVersionId = table.Column(type: "int", nullable: false), + Quantity = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Item = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_LabVersionIngredients", x => x.Id); + table.ForeignKey( + name: "FK_LabVersionIngredients_RecipeLabVersions_RecipeLabVersionId", + column: x => x.RecipeLabVersionId, + principalTable: "RecipeLabVersions", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_LabIngredients_RecipeLabEntryId", + table: "LabIngredients", + column: "RecipeLabEntryId"); + + migrationBuilder.CreateIndex( + name: "IX_LabVersionIngredients_RecipeLabVersionId", + table: "LabVersionIngredients", + column: "RecipeLabVersionId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "LabIngredients"); + + migrationBuilder.DropTable( + name: "LabVersionIngredients"); + } + } +} diff --git a/Aberwyn/Migrations/20250630141059_AddRecipeLabModels.Designer.cs b/Aberwyn/Migrations/20250630141059_AddRecipeLabModels.Designer.cs new file mode 100644 index 0000000..701e6e5 --- /dev/null +++ b/Aberwyn/Migrations/20250630141059_AddRecipeLabModels.Designer.cs @@ -0,0 +1,1023 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250630141059_AddRecipeLabModels")] + partial class AddRecipeLabModels + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("PaymentStatus") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("LabIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabVersionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabVersionId"); + + b.ToTable("LabVersionIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("IsPublished") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + + b.HasData( + new + { + Id = 1, + Color = "#f97316", + DisplayOrder = 1, + Icon = "🍕", + IsActive = true, + Name = "Pizza", + Slug = "pizza" + }); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("PizzaOrderId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("PizzaOrderId"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseMealId") + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Inspiration") + .HasColumnType("longtext"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("Tags") + .HasColumnType("longtext"); + + b.Property("TestedBy") + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("BaseMealId"); + + b.ToTable("RecipeLabEntries"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.Property("ResultNotes") + .HasColumnType("longtext"); + + b.Property("VersionLabel") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("RecipeLabVersions"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", null) + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabVersion", "Version") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabVersionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Version"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") + .WithMany() + .HasForeignKey("PizzaOrderId"); + + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PizzaOrder"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.HasOne("Aberwyn.Models.Meal", "BaseMeal") + .WithMany() + .HasForeignKey("BaseMealId"); + + b.Navigation("BaseMeal"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Versions") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Navigation("Ingredients"); + + b.Navigation("Versions"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Navigation("Ingredients"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250630141059_AddRecipeLabModels.cs b/Aberwyn/Migrations/20250630141059_AddRecipeLabModels.cs new file mode 100644 index 0000000..84d2f6d --- /dev/null +++ b/Aberwyn/Migrations/20250630141059_AddRecipeLabModels.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddRecipeLabModels : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Ingredients", + table: "RecipeLabVersions"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Ingredients", + table: "RecipeLabVersions", + type: "longtext", + nullable: true) + .Annotation("MySql:CharSet", "utf8mb4"); + } + } +} diff --git a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs index 41987bd..b4a443b 100644 --- a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs @@ -264,6 +264,54 @@ namespace Aberwyn.Migrations b.ToTable("Ingredients"); }); + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("LabIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabVersionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabVersionId"); + + b.ToTable("LabVersionIngredients"); + }); + modelBuilder.Entity("Aberwyn.Models.Meal", b => { b.Property("Id") @@ -428,6 +476,76 @@ namespace Aberwyn.Migrations b.ToTable("PushSubscribers"); }); + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseMealId") + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Inspiration") + .HasColumnType("longtext"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("Tags") + .HasColumnType("longtext"); + + b.Property("TestedBy") + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("BaseMealId"); + + b.ToTable("RecipeLabEntries"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.Property("ResultNotes") + .HasColumnType("longtext"); + + b.Property("VersionLabel") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("RecipeLabVersions"); + }); + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => { b.Property("Id") @@ -719,6 +837,28 @@ namespace Aberwyn.Migrations .IsRequired(); }); + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabVersion", "Version") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabVersionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Version"); + }); + modelBuilder.Entity("Aberwyn.Models.Meal", b => { b.HasOne("Aberwyn.Models.MealCategory", "Category") @@ -745,6 +885,26 @@ namespace Aberwyn.Migrations b.Navigation("User"); }); + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.HasOne("Aberwyn.Models.Meal", "BaseMeal") + .WithMany() + .HasForeignKey("BaseMealId"); + + b.Navigation("BaseMeal"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Versions") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => { b.HasOne("Aberwyn.Models.ApplicationUser", "User") @@ -843,6 +1003,18 @@ namespace Aberwyn.Migrations { b.Navigation("Meals"); }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Navigation("Ingredients"); + + b.Navigation("Versions"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Navigation("Ingredients"); + }); #pragma warning restore 612, 618 } } diff --git a/Aberwyn/Models/RecipeLab.cs b/Aberwyn/Models/RecipeLab.cs new file mode 100644 index 0000000..2435109 --- /dev/null +++ b/Aberwyn/Models/RecipeLab.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Aberwyn.Models +{ + public class RecipeLabEntry + { + [Key] + public int Id { get; set; } + + [Required] + public string Title { get; set; } + + public string? Category { get; set; } + public string? Inspiration { get; set; } + + public int? BaseMealId { get; set; } + + [ForeignKey("BaseMealId")] + public Meal? BaseMeal { get; set; } + + public string? Notes { get; set; } + public int? Rating { get; set; } + public string? TestedBy { get; set; } + public string? Tags { get; set; } // "vego,snabbt" + public DateTime CreatedAt { get; set; } = DateTime.Now; + public List Ingredients { get; set; } = new(); + + + public List Versions { get; set; } = new(); + } + public class RecipeLabVersion + { + [Key] + public int Id { get; set; } + + public int RecipeLabEntryId { get; set; } + + [ForeignKey("RecipeLabEntryId")] + public RecipeLabEntry Entry { get; set; } + + public string VersionLabel { get; set; } = "v1"; + + public List Ingredients { get; set; } = new(); + + public string? Instructions { get; set; } + public string? ResultNotes { get; set; } + public DateTime CreatedAt { get; set; } = DateTime.Now; + } + + + public class LabIngredient + { + [Key] + public int Id { get; set; } + + public int RecipeLabEntryId { get; set; } + + [ForeignKey("RecipeLabEntryId")] + public RecipeLabEntry Entry { get; set; } + + public string Quantity { get; set; } = ""; + public string Item { get; set; } = ""; + } + public class LabVersionIngredient + { + public int Id { get; set; } + + public int RecipeLabVersionId { get; set; } + + [ForeignKey("RecipeLabVersionId")] + public RecipeLabVersion Version { get; set; } + + public string Quantity { get; set; } = ""; + public string Item { get; set; } = ""; + } + + +} diff --git a/Aberwyn/Views/Meal/Lab.cshtml b/Aberwyn/Views/Meal/Lab.cshtml new file mode 100644 index 0000000..fcbd7a7 --- /dev/null +++ b/Aberwyn/Views/Meal/Lab.cshtml @@ -0,0 +1,99 @@ +@model Aberwyn.Models.RecipeLabEntry +@{ + ViewData["Title"] = "Matlabb"; +} + +

    Matlabb: @Model.Title

    + +
    + + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    + +

    Ingredienser

    +
    + + +
    + @for (int i = 0; i < Model.Ingredients.Count; i++) + { +
    + + +
    + } +
    + +
    + +
    +

    Versioner

    +
    + + +
    + + +
    + + +
    + +@if (Model.Versions.Any()) +{ +
    + @foreach (var version in Model.Versions) + { +
    +
    + @version.VersionLabel (@version.CreatedAt.ToShortDateString()) +
    +
    +
    Ingredienser
    + @if (version.Ingredients != null && version.Ingredients.Any()) + { +
      + @foreach (var ing in version.Ingredients) + { +
    • @ing.Quantity @ing.Item
      • + } +
    + } + else + { + Inga ingredienser kopplade. + } + +
    Instruktioner
    +

    @version.Instructions

    + +
    Kommentar
    +

    @version.ResultNotes

    +
    +
    + } +
    +} \ No newline at end of file From 380978959b44ad19d95b80a0f8f2ca1341b332d6 Mon Sep 17 00:00:00 2001 From: elias Date: Mon, 7 Jul 2025 09:37:56 +0200 Subject: [PATCH 058/103] Lab changes --- Aberwyn/Controllers/MealController.cs | 57 ++++-- Aberwyn/Data/MenuService.cs | 34 +++- Aberwyn/Views/Meal/Lab.cshtml | 242 +++++++++++++++++--------- Aberwyn/wwwroot/css/lab.css | 116 ++++++++++++ 4 files changed, 346 insertions(+), 103 deletions(-) create mode 100644 Aberwyn/wwwroot/css/lab.css diff --git a/Aberwyn/Controllers/MealController.cs b/Aberwyn/Controllers/MealController.cs index ddd1da4..e71ca72 100644 --- a/Aberwyn/Controllers/MealController.cs +++ b/Aberwyn/Controllers/MealController.cs @@ -199,27 +199,48 @@ namespace Aberwyn.Controllers [HttpGet("/meal/lab")] - public IActionResult Lab(int? id) + public IActionResult Lab(int? id) + { + if (id.HasValue) { - if (id.HasValue) - { - var entry = _menuService.GetRecipeLabEntryById(id.Value); - if (entry == null) return NotFound(); + var entry = _menuService.GetRecipeLabEntryById(id.Value); + if (entry == null) return NotFound(); - return View("Lab", entry); - } - - // Skapa ett tomt labb-entry för formulär - var newEntry = new RecipeLabEntry - { - Title = "", - Inspiration = "", - Notes = "", - Tags = "" - }; - - return View("Lab", newEntry); + // Hämta versioner först när vi vet att entry finns + entry.Versions = _menuService.GetLabVersionsForEntry(id.Value); + return View("Lab", entry); } + + // Skapa ett tomt labb-entry för formulär + var newEntry = new RecipeLabEntry + { + Title = "", + Inspiration = "", + Notes = "", + Tags = "" + }; + + return View("Lab", newEntry); + } + // Lägg till dessa actions i din MealController + + [HttpPost("/meal/lab/save")] + public IActionResult SaveLabEntry(RecipeLabEntry entry) + { + if (entry.Id == 0) + { + // Ny entry + entry.CreatedAt = DateTime.Now; + _menuService.AddLabEntry(entry); + } + else + { + // Uppdatera befintlig + _menuService.UpdateLabEntry(entry); + } + + return RedirectToAction("Lab", new { id = entry.Id }); + } [HttpPost("/meal/lab/create")] public IActionResult CreateLabEntry(RecipeLabEntry entry) { diff --git a/Aberwyn/Data/MenuService.cs b/Aberwyn/Data/MenuService.cs index 2d5e862..79bde2d 100644 --- a/Aberwyn/Data/MenuService.cs +++ b/Aberwyn/Data/MenuService.cs @@ -404,7 +404,7 @@ public List GetWeeklyMenu(int weekNumber, int year) .ToList(); } - + public List GetMenuEntriesByDateRange(DateTime startDate, DateTime endDate) { var results = new List(); @@ -507,6 +507,28 @@ public List GetWeeklyMenu(int weekNumber, int year) _context.LabVersionIngredients.AddRange(ingredients); _context.SaveChanges(); } + // Lägg till dessa metoder i din MenuService klass + + public void UpdateLabEntry(RecipeLabEntry entry) + { + var existing = _context.RecipeLabEntries.Find(entry.Id); + if (existing != null) + { + existing.Title = entry.Title; + existing.Inspiration = entry.Inspiration; + existing.Notes = entry.Notes; + existing.Tags = entry.Tags; + _context.SaveChanges(); + } + } + + public RecipeLabEntry GetRecipeLabEntryWithIngredients(int id) + { + return _context.RecipeLabEntries + .Include(e => e.Versions) + .Include(e => e.Ingredients) + .FirstOrDefault(e => e.Id == id); + } public void SaveIngredientsForLabEntry(int labEntryId, List ingredients) { var existing = _context.LabIngredients @@ -522,6 +544,16 @@ public List GetWeeklyMenu(int weekNumber, int year) _context.SaveChanges(); } + public List GetLabVersionsForEntry(int entryId) + { + return _context.RecipeLabVersions + .Where(v => v.RecipeLabEntryId == entryId) + .Include(v => v.Ingredients) + .OrderByDescending(v => v.CreatedAt) + .ToList(); + } + + #endregion } diff --git a/Aberwyn/Views/Meal/Lab.cshtml b/Aberwyn/Views/Meal/Lab.cshtml index fcbd7a7..4e94887 100644 --- a/Aberwyn/Views/Meal/Lab.cshtml +++ b/Aberwyn/Views/Meal/Lab.cshtml @@ -1,99 +1,173 @@ @model Aberwyn.Models.RecipeLabEntry + @{ ViewData["Title"] = "Matlabb"; } -

    Matlabb: @Model.Title

    + -
    - +
    + +
    +

    Matlabb – @(string.IsNullOrEmpty(Model.Title) ? "Ny" : Model.Title)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    - - - -
    - -

    Ingredienser

    -
    - - -
    - @for (int i = 0; i < Model.Ingredients.Count; i++) - { -
    - - + + +
    + +
    - } -
    - - +
    + + +
    +
    + + +
    +
    + + +
    + + -
    -

    Versioner

    -
    - - -
    - - -
    - - -
    - -@if (Model.Versions.Any()) -{ -
    - @foreach (var version in Model.Versions) + @if (Model.Id > 0) { -
    -
    - @version.VersionLabel (@version.CreatedAt.ToShortDateString()) -
    -
    -
    Ingredienser
    - @if (version.Ingredients != null && version.Ingredients.Any()) - { -
      - @foreach (var ing in version.Ingredients) +
      + + +

      Ingredienser

      +
      +
      + +
      + @if (Model.Ingredients?.Any() == true) + { + @for (int i = 0; i < Model.Ingredients.Count; i++) { -
    • @ing.Quantity @ing.Item
      • +
      + + + +
      } -
    - } - else - { - Inga ingredienser kopplade. - } - -
    Instruktioner
    -

    @version.Instructions

    - -
    Kommentar
    -

    @version.ResultNotes

    -
    + } + else + { +
    + + + +
    + } +
    + + +
    + +
    + + +

    Ny version

    +
    + +
    + + +
    +
    + + +
    +
    + + +
    + +
    + } + else + { +

    Spara labbet först för att kunna lägga till ingredienser och versioner.

    }
    -} \ No newline at end of file + + +
    +

    Versioner

    + @if (Model.Versions?.Any() == true) + { +
    + @foreach (var version in Model.Versions.OrderByDescending(v => v.CreatedAt)) + { +
    +

    @version.VersionLabel

    +

    Skapat: @version.CreatedAt.ToString("yyyy-MM-dd")

    + + @if (!string.IsNullOrEmpty(version.Instructions)) + { +

    Instruktioner:
    @version.Instructions

    + } + + @if (!string.IsNullOrEmpty(version.ResultNotes)) + { +

    Resultat:
    @version.ResultNotes

    + } + + @if (version.Ingredients?.Any() == true) + { +

    Ingredienser:

    +
      + @foreach (var ing in version.Ingredients) + { +
    • @ing.Quantity @ing.Item
      • + } +
    + } +
    + } +
    + } + else + { +

    Inga tidigare versioner ännu.

    + } +
    +
    + + \ No newline at end of file diff --git a/Aberwyn/wwwroot/css/lab.css b/Aberwyn/wwwroot/css/lab.css new file mode 100644 index 0000000..68a85c7 --- /dev/null +++ b/Aberwyn/wwwroot/css/lab.css @@ -0,0 +1,116 @@ +.lab-flex-layout { + display: flex; + gap: 24px; + padding: 24px; + box-sizing: border-box; +} + +.lab-section { + background: #fff; + padding: 16px; + border-radius: 8px; + box-shadow: 0 2px 6px rgba(0,0,0,0.1); + flex-grow: 1; + min-width: 0; + color: #1F2C3C; +} + +.lab-section.info { + flex: 1; +} + +.lab-section.ingredients { + flex: 2; +} + +.lab-section.versions { + flex: 1; + max-width: 300px; + overflow-y: auto; + position: sticky; + top: 70px; +} + +.lab-section h2 { + margin-top: 0; + font-size: 1.2rem; +} + +.lab-field { + margin-bottom: 12px; + display: flex; + flex-direction: column; +} + +.lab-field input, +.lab-field textarea { + padding: 6px; + border-radius: 4px; + border: 1px solid #ccc; + font-size: 14px; +} + +.ingredient-row { + display: flex; + gap: 10px; + margin-bottom: 8px; +} + +.ingredient-row input { + flex: 1; +} + +.add-version-form { + margin-top: 24px; +} + +.lab-version { + border-top: 1px solid #ddd; + padding-top: 12px; + margin-top: 12px; +} + +.version-notes { + font-style: italic; + margin-bottom: 4px; +} + +.version-result { + margin-bottom: 6px; +} +input[type="text"], +input[type="number"], +textarea { + width: 100%; + padding: 10px; + font-size: 14px; + border-radius: 6px; + border: 1px solid #ccc; + box-sizing: border-box; + margin-bottom: 12px; + background: #f9f9f9; +} + +input:focus, +textarea:focus { + outline: none; + border-color: #6a0dad; + background-color: #fff; +} + +button { + background-color: #6a0dad; + color: #fff; + padding: 10px 16px; + border: none; + border-radius: 6px; + font-weight: bold; + font-size: 14px; + cursor: pointer; + margin-top: 12px; + transition: background 0.2s ease; +} + +button:hover { + background-color: #5a0ca0; +} From 8ebbb803e81fef8eb30d5b4cda9664d8ecfb62b6 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Mon, 7 Jul 2025 15:22:12 +0200 Subject: [PATCH 059/103] Meal rating and some fixes to meals --- Aberwyn/Controllers/MealMenuApiController.cs | 5 +- .../Controllers/MealRatingApiController.cs | 79 ++ Aberwyn/Data/ApplicationDbContext.cs | 1 + .../20250707125951_AddMealRating.Designer.cs | 1060 +++++++++++++++++ .../20250707125951_AddMealRating.cs | 49 + .../ApplicationDbContextModelSnapshot.cs | 37 + Aberwyn/Models/MenuViewModel.cs | 17 + Aberwyn/Views/Home/Index.cshtml | 79 +- Aberwyn/Views/Meal/Index.cshtml | 76 +- Aberwyn/Views/Meal/View.cshtml | 250 ++-- Aberwyn/wwwroot/css/Welcome.css | 47 +- Aberwyn/wwwroot/css/meal-gallery.css | 84 +- Aberwyn/wwwroot/css/meal.css | 199 ++++ Aberwyn/wwwroot/css/site.css | 36 + 14 files changed, 1770 insertions(+), 249 deletions(-) create mode 100644 Aberwyn/Controllers/MealRatingApiController.cs create mode 100644 Aberwyn/Migrations/20250707125951_AddMealRating.Designer.cs create mode 100644 Aberwyn/Migrations/20250707125951_AddMealRating.cs create mode 100644 Aberwyn/wwwroot/css/meal.css diff --git a/Aberwyn/Controllers/MealMenuApiController.cs b/Aberwyn/Controllers/MealMenuApiController.cs index b62d317..32eb005 100644 --- a/Aberwyn/Controllers/MealMenuApiController.cs +++ b/Aberwyn/Controllers/MealMenuApiController.cs @@ -28,10 +28,10 @@ namespace Aberwyn.Controllers } [HttpGet("getPublishedMeals")] - public IActionResult GetPublishedMeals() + public IActionResult GetPublishedMeals([FromQuery] bool includeUnpublished = false) { var meals = _menuService.GetMeals() - .Where(m => m.IsPublished) // 🟢 filtrera här! + .Where(m => includeUnpublished || m.IsPublished) .Select(m => new { m.Id, m.Name, @@ -44,6 +44,7 @@ namespace Aberwyn.Controllers } + [HttpGet("getMeals")] public IActionResult GetMeals() { diff --git a/Aberwyn/Controllers/MealRatingApiController.cs b/Aberwyn/Controllers/MealRatingApiController.cs new file mode 100644 index 0000000..0b8b63b --- /dev/null +++ b/Aberwyn/Controllers/MealRatingApiController.cs @@ -0,0 +1,79 @@ +using Aberwyn.Data; +using Aberwyn.Models; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace Aberwyn.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class MealRatingApiController : ControllerBase + { + private readonly ApplicationDbContext _context; + private readonly UserManager _userManager; + + public MealRatingApiController(ApplicationDbContext context, UserManager userManager) + { + _context = context; + _userManager = userManager; + } + + [HttpGet("{mealId}")] + public async Task GetRating(int mealId) + { + var user = await _userManager.GetUserAsync(User); + if (user == null) return Unauthorized(); + + var rating = await _context.MealRatings + .FirstOrDefaultAsync(r => r.MealId == mealId && r.UserId == user.Id); + + return Ok(rating?.Rating ?? 0); + } + [HttpGet("average/{mealId}")] + public async Task GetAverageRating(int mealId) + { + var ratings = await _context.MealRatings + .Where(r => r.MealId == mealId) + .ToListAsync(); + + if (ratings.Count == 0) + return Ok(0); + + var avg = ratings.Average(r => r.Rating); + return Ok(avg); + } + + + [HttpPost] + public async Task SetRating([FromBody] MealRatingDto model) + { + var user = await _userManager.GetUserAsync(User); + if (user == null) return Unauthorized(); + + var existing = await _context.MealRatings + .FirstOrDefaultAsync(r => r.MealId == model.MealId && r.UserId == user.Id); + + if (existing != null) + { + existing.Rating = model.Rating; + existing.CreatedAt = DateTime.UtcNow; + } + else + { + _context.MealRatings.Add(new MealRating + { + MealId = model.MealId, + UserId = user.Id, + Rating = model.Rating, + CreatedAt = DateTime.UtcNow + }); + } + + await _context.SaveChangesAsync(); + return Ok(); + } + + } + +} diff --git a/Aberwyn/Data/ApplicationDbContext.cs b/Aberwyn/Data/ApplicationDbContext.cs index 9d09f9e..869840d 100644 --- a/Aberwyn/Data/ApplicationDbContext.cs +++ b/Aberwyn/Data/ApplicationDbContext.cs @@ -51,6 +51,7 @@ namespace Aberwyn.Data public DbSet RecipeLabVersions { get; set; } public DbSet LabIngredients { get; set; } public DbSet LabVersionIngredients { get; set; } + public DbSet MealRatings { get; set; } } diff --git a/Aberwyn/Migrations/20250707125951_AddMealRating.Designer.cs b/Aberwyn/Migrations/20250707125951_AddMealRating.Designer.cs new file mode 100644 index 0000000..9e0f186 --- /dev/null +++ b/Aberwyn/Migrations/20250707125951_AddMealRating.Designer.cs @@ -0,0 +1,1060 @@ +// +using System; +using Aberwyn.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Aberwyn.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250707125951_AddMealRating")] + partial class AddMealRating + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.36") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("longtext"); + + b.Property("PhoneNumber") + .HasColumnType("longtext"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BudgetCategoryDefinitionId") + .HasColumnType("int"); + + b.Property("BudgetPeriodId") + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryDefinitionId"); + + b.HasIndex("BudgetPeriodId"); + + b.ToTable("BudgetCategories"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategoryDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetCategoryDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("decimal(65,30)"); + + b.Property("BudgetCategoryId") + .HasColumnType("int"); + + b.Property("BudgetItemDefinitionId") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("PaymentStatus") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BudgetCategoryId"); + + b.HasIndex("BudgetItemDefinitionId"); + + b.ToTable("BudgetItems"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItemDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultCategory") + .HasColumnType("longtext"); + + b.Property("DefaultPaymentStatus") + .HasColumnType("int"); + + b.Property("IncludeInSummary") + .HasColumnType("tinyint(1)"); + + b.Property("IsExpense") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("BudgetItemDefinitions"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Month") + .HasColumnType("int"); + + b.Property("Order") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("BudgetPeriods"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("LabIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Item") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipeLabVersionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabVersionId"); + + b.ToTable("LabVersionIngredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CarbType") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("ImageData") + .HasColumnType("longblob"); + + b.Property("ImageMimeType") + .HasColumnType("longtext"); + + b.Property("ImageUrl") + .HasColumnType("longtext"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("IsAvailable") + .HasColumnType("tinyint(1)"); + + b.Property("IsPublished") + .HasColumnType("tinyint(1)"); + + b.Property("MealCategoryId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ProteinType") + .HasColumnType("longtext"); + + b.Property("RecipeUrl") + .HasColumnType("longtext"); + + b.Property("ThumbnailData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("MealCategoryId"); + + b.ToTable("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Color") + .HasColumnType("longtext"); + + b.Property("Description") + .HasColumnType("longtext"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("Icon") + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Slug") + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("MealCategories"); + + b.HasData( + new + { + Id = 1, + Color = "#f97316", + DisplayOrder = 1, + Icon = "🍕", + IsActive = true, + Name = "Pizza", + Slug = "pizza" + }); + }); + + modelBuilder.Entity("Aberwyn.Models.MealRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("MealRatings"); + }); + + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CustomerName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IngredientsJson") + .HasColumnType("longtext"); + + b.Property("OrderedAt") + .HasColumnType("datetime(6)"); + + b.Property("PizzaName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PizzaOrders"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("PizzaOrderId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("PizzaOrderId"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscribers"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseMealId") + .HasColumnType("int"); + + b.Property("Category") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Inspiration") + .HasColumnType("longtext"); + + b.Property("Notes") + .HasColumnType("longtext"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("Tags") + .HasColumnType("longtext"); + + b.Property("TestedBy") + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("BaseMealId"); + + b.ToTable("RecipeLabEntries"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Instructions") + .HasColumnType("longtext"); + + b.Property("RecipeLabEntryId") + .HasColumnType("int"); + + b.Property("ResultNotes") + .HasColumnType("longtext"); + + b.Property("VersionLabel") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("RecipeLabEntryId"); + + b.ToTable("RecipeLabVersions"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Auth") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Endpoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("P256DH") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("PushSubscriptions"); + }); + + modelBuilder.Entity("Aberwyn.Models.TodoTask", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AssignedTo") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsArchived") + .HasColumnType("tinyint(1)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("Status") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Tags") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Title") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("TodoTasks"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("NotifyBudget") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyMenu") + .HasColumnType("tinyint(1)"); + + b.Property("NotifyPizza") + .HasColumnType("tinyint(1)"); + + b.HasKey("UserId"); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("Aberwyn.Models.WeeklyMenu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BreakfastMealId") + .HasColumnType("int"); + + b.Property("Cook") + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DayOfWeek") + .HasColumnType("int"); + + b.Property("DinnerMealId") + .HasColumnType("int"); + + b.Property("LunchMealId") + .HasColumnType("int"); + + b.Property("WeekNumber") + .HasColumnType("int"); + + b.Property("Year") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("WeeklyMenu", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("varchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext"); + + b.Property("ClaimValue") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("ProviderKey") + .HasColumnType("varchar(255)"); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("RoleId") + .HasColumnType("varchar(255)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255)"); + + b.Property("LoginProvider") + .HasColumnType("varchar(255)"); + + b.Property("Name") + .HasColumnType("varchar(255)"); + + b.Property("Value") + .HasColumnType("longtext"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.HasOne("Aberwyn.Models.BudgetCategoryDefinition", "Definition") + .WithMany() + .HasForeignKey("BudgetCategoryDefinitionId"); + + b.HasOne("Aberwyn.Models.BudgetPeriod", "BudgetPeriod") + .WithMany("Categories") + .HasForeignKey("BudgetPeriodId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BudgetPeriod"); + + b.Navigation("Definition"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetItem", b => + { + b.HasOne("Aberwyn.Models.BudgetCategory", null) + .WithMany("Items") + .HasForeignKey("BudgetCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.BudgetItemDefinition", "BudgetItemDefinition") + .WithMany() + .HasForeignKey("BudgetItemDefinitionId"); + + b.Navigation("BudgetItemDefinition"); + }); + + modelBuilder.Entity("Aberwyn.Models.Ingredient", b => + { + b.HasOne("Aberwyn.Models.Meal", null) + .WithMany("Ingredients") + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.LabIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.LabVersionIngredient", b => + { + b.HasOne("Aberwyn.Models.RecipeLabVersion", "Version") + .WithMany("Ingredients") + .HasForeignKey("RecipeLabVersionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Version"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.HasOne("Aberwyn.Models.MealCategory", "Category") + .WithMany("Meals") + .HasForeignKey("MealCategoryId"); + + b.Navigation("Category"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealRating", b => + { + b.HasOne("Aberwyn.Models.Meal", "Meal") + .WithMany() + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Meal"); + }); + + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => + { + b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") + .WithMany() + .HasForeignKey("PizzaOrderId"); + + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PizzaOrder"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.HasOne("Aberwyn.Models.Meal", "BaseMeal") + .WithMany() + .HasForeignKey("BaseMealId"); + + b.Navigation("BaseMeal"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.HasOne("Aberwyn.Models.RecipeLabEntry", "Entry") + .WithMany("Versions") + .HasForeignKey("RecipeLabEntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Aberwyn.Models.StoredPushSubscription", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Aberwyn.Models.UserPreferences", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", "User") + .WithOne("Preferences") + .HasForeignKey("Aberwyn.Models.UserPreferences", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Aberwyn.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.ApplicationUser", b => + { + b.Navigation("Preferences") + .IsRequired(); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetCategory", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("Aberwyn.Models.BudgetPeriod", b => + { + b.Navigation("Categories"); + }); + + modelBuilder.Entity("Aberwyn.Models.Meal", b => + { + b.Navigation("Ingredients"); + }); + + modelBuilder.Entity("Aberwyn.Models.MealCategory", b => + { + b.Navigation("Meals"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabEntry", b => + { + b.Navigation("Ingredients"); + + b.Navigation("Versions"); + }); + + modelBuilder.Entity("Aberwyn.Models.RecipeLabVersion", b => + { + b.Navigation("Ingredients"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Aberwyn/Migrations/20250707125951_AddMealRating.cs b/Aberwyn/Migrations/20250707125951_AddMealRating.cs new file mode 100644 index 0000000..0d8a04e --- /dev/null +++ b/Aberwyn/Migrations/20250707125951_AddMealRating.cs @@ -0,0 +1,49 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Aberwyn.Migrations +{ + public partial class AddMealRating : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "MealRatings", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + MealId = table.Column(type: "int", nullable: false), + UserId = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Rating = table.Column(type: "int", nullable: false), + CreatedAt = table.Column(type: "datetime(6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_MealRatings", x => x.Id); + table.ForeignKey( + name: "FK_MealRatings_Meals_MealId", + column: x => x.MealId, + principalTable: "Meals", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_MealRatings_MealId", + table: "MealRatings", + column: "MealId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "MealRatings"); + } + } +} diff --git a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs index b4a443b..f21702a 100644 --- a/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Aberwyn/Migrations/ApplicationDbContextModelSnapshot.cs @@ -413,6 +413,32 @@ namespace Aberwyn.Migrations }); }); + modelBuilder.Entity("Aberwyn.Models.MealRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("MealId") + .HasColumnType("int"); + + b.Property("Rating") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("MealId"); + + b.ToTable("MealRatings"); + }); + modelBuilder.Entity("Aberwyn.Models.PizzaOrder", b => { b.Property("Id") @@ -868,6 +894,17 @@ namespace Aberwyn.Migrations b.Navigation("Category"); }); + modelBuilder.Entity("Aberwyn.Models.MealRating", b => + { + b.HasOne("Aberwyn.Models.Meal", "Meal") + .WithMany() + .HasForeignKey("MealId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Meal"); + }); + modelBuilder.Entity("Aberwyn.Models.PushSubscriber", b => { b.HasOne("Aberwyn.Models.PizzaOrder", "PizzaOrder") diff --git a/Aberwyn/Models/MenuViewModel.cs b/Aberwyn/Models/MenuViewModel.cs index 0aea362..22d8586 100644 --- a/Aberwyn/Models/MenuViewModel.cs +++ b/Aberwyn/Models/MenuViewModel.cs @@ -177,5 +177,22 @@ public class WeeklyMenu public List Meals { get; set; } = new(); } + public class MealRating + { + public int Id { get; set; } + public int MealId { get; set; } + public string UserId { get; set; } + public int Rating { get; set; } + public DateTime CreatedAt { get; set; } + + public Meal Meal { get; set; } + } + public class MealRatingDto + { + public int MealId { get; set; } + public int Rating { get; set; } + } + + } diff --git a/Aberwyn/Views/Home/Index.cshtml b/Aberwyn/Views/Home/Index.cshtml index f7e1dd9..58d8754 100644 --- a/Aberwyn/Views/Home/Index.cshtml +++ b/Aberwyn/Views/Home/Index.cshtml @@ -19,44 +19,51 @@ {
    - @if (!string.IsNullOrWhiteSpace(Model.BreakfastMealName)) { -
    - @if (Model.BreakfastThumbnail != null) - { - var b64 = Convert.ToBase64String(Model.BreakfastThumbnail); - - } -

    Frukost: @Model.BreakfastMealName

    -
    - } +@if (!string.IsNullOrWhiteSpace(Model.BreakfastMealName)) { +
    +

    Frukost: + @Model.BreakfastMealName +

    + @if (Model.BreakfastThumbnail != null) + { + var b64 = Convert.ToBase64String(Model.BreakfastThumbnail); +
    + @Model.BreakfastMealName +
    + } +
    +} - @if (!string.IsNullOrWhiteSpace(Model.LunchMealName)) { -
    - @if (Model.LunchThumbnail != null) - { - var b64 = Convert.ToBase64String(Model.LunchThumbnail); - - } -

    Lunch: @Model.LunchMealName

    -
    - } +@if (!string.IsNullOrWhiteSpace(Model.LunchMealName)) { +
    +

    Lunch: + @Model.LunchMealName +

    + @if (Model.LunchThumbnail != null) + { + var b64 = Convert.ToBase64String(Model.LunchThumbnail); +
    + @Model.LunchMealName +
    + } +
    +} + +@if (!string.IsNullOrWhiteSpace(Model.DinnerMealName)) { +
    +

    Middag: + @Model.DinnerMealName +

    + @if (Model.DinnerThumbnail != null) + { + var b64 = Convert.ToBase64String(Model.DinnerThumbnail); +
    + @Model.DinnerMealName +
    + } +
    +} - @if (!string.IsNullOrWhiteSpace(Model.DinnerMealName)) { -
    - @if (Model.DinnerThumbnail != null) - { - var b64 = Convert.ToBase64String(Model.DinnerThumbnail); - - } -

    Middag: @Model.DinnerMealName

    -
    - } @if (ViewBag.RestaurantIsOpen as bool? == true) { diff --git a/Aberwyn/Views/Meal/Index.cshtml b/Aberwyn/Views/Meal/Index.cshtml index 8304d75..de02dd1 100644 --- a/Aberwyn/Views/Meal/Index.cshtml +++ b/Aberwyn/Views/Meal/Index.cshtml @@ -1,4 +1,11 @@ +@using Microsoft.AspNetCore.Http +@inject IHttpContextAccessor HttpContextAccessor + +@{ + bool isChef = HttpContextAccessor.HttpContext.User.IsInRole("Chef"); +} + @@ -6,7 +13,7 @@ - + diff --git a/Aberwyn/wwwroot/css/Welcome.css b/Aberwyn/wwwroot/css/Welcome.css index 1f8881d..c0ec9e4 100644 --- a/Aberwyn/wwwroot/css/Welcome.css +++ b/Aberwyn/wwwroot/css/Welcome.css @@ -46,16 +46,51 @@ margin-bottom: 28px; } -.meal-lines p { - font-size: 1.2rem; - margin: 8px 0; - color: #0f172a; +.meal-line { + margin-bottom: 0rem; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; } -.meal-lines strong { - color: #475569; + .meal-line p { + font-size: 1rem; + margin-bottom: 0.5rem; + } + + .meal-line a { + color: #007d36; + text-decoration: none; + font-weight: 500; + } + + .meal-line a:hover { + text-decoration: underline; + } + +.meal-large-thumb-container { + margin-top: 0rem; + width: 100%; + max-width: 300px; + height: 100px; + overflow: hidden; + border-radius: 12px; + box-shadow: 0 2px 8px rgba(0,0,0,0.1); } +.meal-large-thumb { + width: 100%; + max-width: 300px; + height: 160px; + object-fit: cover; + object-position: center%; + display: block; + border-radius: 8px; + margin-top: 0rem; +} + + .no-menu { font-size: 1.1rem; color: #64748b; diff --git a/Aberwyn/wwwroot/css/meal-gallery.css b/Aberwyn/wwwroot/css/meal-gallery.css index f5672a2..f78ddbc 100644 --- a/Aberwyn/wwwroot/css/meal-gallery.css +++ b/Aberwyn/wwwroot/css/meal-gallery.css @@ -24,30 +24,51 @@ body { margin: 0; } +/* Skflt + checkbox */ .search-container { margin-top: 1rem; position: relative; width: 100%; - max-width: 500px; + max-width: 600px; margin-inline: auto; + display: flex; + align-items: center; + gap: 1rem; + background: #e9eef3; + padding: 0.5rem 1rem; + border-radius: 12px; + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05); } - .search-container input { - width: 100%; - padding: 8px 34px 8px 12px; - border-radius: 20px; + .search-container input[type="text"] { + flex-grow: 1; + padding: 8px 12px; + border-radius: 8px; border: 1px solid #ccc; font-size: 1rem; box-sizing: border-box; } .search-container i { - position: absolute; - right: 10px; - top: 50%; - transform: translateY(-50%); color: #888; - font-size: 0.9rem; + font-size: 1rem; + } + +/* Checkboxdel */ +.toggle-published { + display: flex; + align-items: center; + gap: 0.4rem; + font-size: 0.9rem; + color: #222; + user-select: none; + white-space: nowrap; +} + + .toggle-published input[type="checkbox"] { + accent-color: #3399ff; + transform: scale(1.1); + cursor: pointer; } /* === Grid layout === */ @@ -120,22 +141,29 @@ body { /* === Mobilanpassning === */ @media (max-width: 600px) { .meal-gallery-grid { - grid-template-columns: repeat(2, 1fr); /* exakt 2 per rad */ + grid-template-columns: repeat(2, 1fr); } + .meal-gallery-header h1 { font-size: 1.6rem; } .search-container { + flex-direction: column; + align-items: stretch; + padding: 1rem; + gap: 0.75rem; max-width: 90%; } - .search-container input { - padding: 6px 30px 6px 10px; - font-size: 0.9rem; - border-radius: 18px; + .search-container input[type="text"] { + font-size: 0.95rem; } + .toggle-published { + justify-content: center; + } + .meal-card img { height: 130px; } @@ -157,3 +185,29 @@ body { font-size: 0.85rem; } } + + +.btn-create-meal { + background-color: #3399ff; + color: white; + padding: 8px 14px; + border-radius: 8px; + font-size: 0.95rem; + font-weight: 500; + text-decoration: none; + border: none; + cursor: pointer; + transition: background-color 0.2s ease; + white-space: nowrap; +} + + .btn-create-meal:hover { + background-color: #2389e0; + } + +@media (max-width: 600px) { + .btn-create-meal { + width: 100%; + text-align: center; + } +} diff --git a/Aberwyn/wwwroot/css/meal.css b/Aberwyn/wwwroot/css/meal.css new file mode 100644 index 0000000..68a0460 --- /dev/null +++ b/Aberwyn/wwwroot/css/meal.css @@ -0,0 +1,199 @@ +.admin-actions a.btn, .admin-actions a.btn-outline { + font-size: 1rem; + padding: 0.5rem 1.2rem; +} + +.dragging { + outline: 2px dashed #6a0dad; +} + +.meal-image-wrapper { + position: relative; +} + +.meal-container { + max-width: 900px; + margin: 2rem auto; + background: #fff; + padding: 2rem; + border-radius: 16px; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.08); + font-family: 'Segoe UI', sans-serif; +} + +.meal-header { + display: flex; + flex-direction: row; + gap: 1.5rem; + align-items: center; +} + +.meal-meta { + flex: 1; +} + +.meal-title { + font-size: 2.5rem; + font-weight: bold; + margin-bottom: 1rem; + color: #333; +} + +.meal-image { + width: 250px; + height: 250px; + object-fit: cover; + border-radius: 12px; + border: 1px solid #ccc; +} + +.description { + font-size: 1.1rem; + color: #555; + margin-top: 0.5rem; + margin-bottom: 1.5rem; +} + +.meal-details p { + font-size: 1rem; + color: #333; + margin: 0.3rem 0; +} + +.label { + font-weight: bold; + color: #6a0dad; +} + +.form-group { + margin-bottom: 1rem; +} + + .form-group label { + font-weight: 600; + margin-bottom: 0.3rem; + display: block; + } + +.form-control { + width: 100%; + padding: 0.5rem; + border: 1px solid #ccc; + border-radius: 6px; + font-size: 1rem; +} + +.buttons { + margin-top: 1.5rem; +} + +.btn, +.btn-outline { + background-color: #6a0dad; + color: white; + border: none; + padding: 0.6rem 1.4rem; + border-radius: 6px; + margin: 0.4rem; + cursor: pointer; + font-size: 1rem; + text-decoration: none; +} + +.btn-outline { + background-color: transparent; + border: 2px solid #6a0dad; + color: #6a0dad; +} + +.recipe-link { + color: #6a0dad; + text-decoration: underline; + font-weight: 500; +} + +.placeholder { + color: #999; + font-style: italic; +} + +.ingredient-row { + display: flex; + gap: 0.5rem; + margin-bottom: 0.5rem; +} + +.ingredient-qty { + flex: 1 0 30%; +} + +.ingredient-item { + flex: 2 0 60%; +} + +@@media (max-width: 768px) { + .meal-container { + padding: 1rem; + } + + .meal-header { + flex-direction: column; + align-items: center; + text-align: center; + } + + .meal-meta { + width: 100%; + } + + .meal-title { + font-size: 2rem; + } + + .meal-image { + width: 100%; + max-width: 300px; + height: auto; + } + + .form-control { + font-size: 1rem; + } + + .ingredient-row { + flex-direction: column; + } + + .ingredient-qty, + .ingredient-item { + flex: 1 0 auto; + width: 100%; + } + + .btn, + .btn-outline { + width: 100%; + margin: 0.25rem 0; + } + + .buttons { + display: flex; + flex-direction: column; + gap: 0.5rem; + } +} +.star-container { + display: inline-flex; + gap: 5px; + cursor: pointer; +} + +.fa-star { + font-size: 1.5rem; + color: #ccc; + transition: color 0.2s ease; +} + + .fa-star.rated { + color: #ffcc00; + } diff --git a/Aberwyn/wwwroot/css/site.css b/Aberwyn/wwwroot/css/site.css index 7e59509..fbd325c 100644 --- a/Aberwyn/wwwroot/css/site.css +++ b/Aberwyn/wwwroot/css/site.css @@ -429,3 +429,39 @@ body { background-color: #f0f0f0; } } +.btn-lewel { + background-color: #3399ff; /* blå accent */ + color: white; + border: none; + padding: 0.5rem 1.2rem; + border-radius: 6px; + font-size: 1rem; + font-weight: 500; + text-decoration: none; + display: inline-block; + cursor: pointer; + transition: background-color 0.2s ease; +} + + .btn-lewel:hover { + background-color: #2389e0; + } + +.btn-lewel-outline { + background-color: transparent; + color: #3399ff; + border: 2px solid #3399ff; + padding: 0.5rem 1.2rem; + border-radius: 6px; + font-size: 1rem; + font-weight: 500; + text-decoration: none; + display: inline-block; + cursor: pointer; + transition: background-color 0.2s ease, color 0.2s ease; +} + + .btn-lewel-outline:hover { + background-color: #e0f0ff; + color: #1F2C3C; + } From 4a7a2c30c958654a76f7ddbc645894c6f6215a5f Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Mon, 7 Jul 2025 15:33:49 +0200 Subject: [PATCH 060/103] Meal CSS fix --- Aberwyn/wwwroot/css/meal.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Aberwyn/wwwroot/css/meal.css b/Aberwyn/wwwroot/css/meal.css index 68a0460..76a3d8c 100644 --- a/Aberwyn/wwwroot/css/meal.css +++ b/Aberwyn/wwwroot/css/meal.css @@ -27,6 +27,11 @@ gap: 1.5rem; align-items: center; } +@media (max-width: 769px) { + .meal-header { + flex-direction: column; /* <-- sätt till 'row' om du vill ha bild till höger på desktop */ + } +} .meal-meta { flex: 1; From 95811ce3f85a3c1ce09006e33cf4498620cc4b75 Mon Sep 17 00:00:00 2001 From: Elias Jansson Date: Mon, 7 Jul 2025 15:47:26 +0200 Subject: [PATCH 061/103] More css and button fixes --- Aberwyn/Views/Meal/View.cshtml | 22 +++++++++++++--------- Aberwyn/wwwroot/css/meal.css | 12 ++++++------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Aberwyn/Views/Meal/View.cshtml b/Aberwyn/Views/Meal/View.cshtml index 190c5a9..afb87e5 100644 --- a/Aberwyn/Views/Meal/View.cshtml +++ b/Aberwyn/Views/Meal/View.cshtml @@ -30,7 +30,7 @@ @if (isEditing) {
    - +
    } @@ -101,8 +101,9 @@
    - - + + +
    @@ -113,9 +114,10 @@
    - - - Avbryt + + + Avbryt +
    } @@ -149,14 +151,16 @@
    } -
    +
    @if (isChef) { - Redigera + Redigera } - +
    + +