Index: NutriMatch/Controllers/RecipesController.cs =================================================================== --- NutriMatch/Controllers/RecipesController.cs (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Controllers/RecipesController.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -36,5 +36,5 @@ return NotFound(); } - return View(recipe); + return PartialView("RecipeDetailsPartial", recipe); } public IActionResult Create() @@ -127,5 +127,8 @@ return NotFound(); } - var recipe = await _context.Recipes.FindAsync(id); + var recipe = await _context.Recipes + .Include(r => r.RecipeIngredients) + .ThenInclude(ri => ri.Ingredient) + .FirstOrDefaultAsync(r => r.Id == id); if (recipe == null) { @@ -142,23 +145,74 @@ return NotFound(); } + float ConvertType(float number, string unit) + { + switch (unit.ToLower()) + { + case "g": + return number / 100; + case "ml": + return number / 100; + case "oz": + return (float)(number * 28.3495 / 100); + default: + return 0; + } + } if (ModelState.IsValid) { - try - { - _context.Update(recipe); - await _context.SaveChangesAsync(); - } - catch (DbUpdateConcurrencyException) - { - if (!RecipeExists(recipe.Id)) - { - return NotFound(); - } - else - { - throw; - } - } + var file = Request.Form.Files.GetFile("RecipeImage"); + if (file != null && file.Length > 0) + { + var uploadsFolder = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "images"); + var uniqueFileName = Guid.NewGuid().ToString() + Path.GetExtension(file.FileName); + var filePath = Path.Combine(uploadsFolder, uniqueFileName); + using (var stream = new FileStream(filePath, FileMode.Create)) + { + await file.CopyToAsync(stream); + } + recipe.ImageUrl = "/images/" + uniqueFileName; + } else { + Console.WriteLine("No file uploaded or file is empty."); + } + string selectedIngredients = Request.Form["Ingredients"]; + List ingredients = JsonSerializer.Deserialize>(selectedIngredients); + float totalCalories = 0; + float totalProtein = 0; + float totalCarbs = 0; + float totalFat = 0; + foreach (var i in ingredients) + { + _context.RecipeIngredients.Add(new RecipeIngredient + { + RecipeId = recipe.Id, + IngredientId = i.Id, + Unit = i.Unit, + Quantity = i.Quantity + }); + Ingredient tempIngredient = _context.Ingredients.Find(i.Id); + totalCalories += ConvertType(tempIngredient.Calories, i.Unit) * i.Quantity; + totalProtein += ConvertType(tempIngredient.Protein, i.Unit) * i.Quantity; + totalCarbs += ConvertType(tempIngredient.Carbs, i.Unit) * i.Quantity; + totalFat += ConvertType(tempIngredient.Fat, i.Unit) * i.Quantity; + } + recipe.Calories = totalCalories; + recipe.Protein = totalProtein; + recipe.Carbs = totalCarbs; + recipe.Fat = totalFat; + _context.Update(recipe); + await _context.SaveChangesAsync(); return RedirectToAction(nameof(Index)); + } + else + { + foreach (var key in ModelState.Keys) + { + var errors = ModelState[key].Errors; + foreach (var error in errors) + { + Console.WriteLine($"Key: {key} - Error: {error.ErrorMessage}"); + } + } + Console.WriteLine("Model state is invalid. Please check the input data."); } return View(recipe); Index: NutriMatch/Data/AppDbContext.cs =================================================================== --- NutriMatch/Data/AppDbContext.cs (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Data/AppDbContext.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -10,4 +10,5 @@ public DbSet Ingredients { get; set; } public DbSet RestaurantMeals { get; set; } + public DbSet Restaurants { get; set; } protected override void OnModelCreating(ModelBuilder modelBuilder) { Index: NutriMatch/Migrations/20250624141408_AddRestaurantModel.Designer.cs =================================================================== --- NutriMatch/Migrations/20250624141408_AddRestaurantModel.Designer.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Migrations/20250624141408_AddRestaurantModel.Designer.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,158 @@ +// +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using NutriMatch.Data; +#nullable disable +namespace NutriMatch.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20250624141408_AddRestaurantModel")] + partial class AddRestaurantModel + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + modelBuilder.Entity("NutriMatch.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real") + .HasColumnName("energy_kcal"); + b.Property("Carbs") + .HasColumnType("real") + .HasColumnName("carbohydrates_g"); + b.Property("Fat") + .HasColumnType("real") + .HasColumnName("total_fat_g"); + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("food_name"); + b.Property("Protein") + .HasColumnType("real") + .HasColumnName("protein_g"); + b.HasKey("Id"); + b.ToTable("food_macronutrients", (string)null); + }); + modelBuilder.Entity("NutriMatch.Models.Recipe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real"); + b.Property("Carbs") + .HasColumnType("real"); + b.Property("Fat") + .HasColumnType("real"); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.Property("Instructions") + .IsRequired() + .HasColumnType("text"); + b.Property("Protein") + .HasColumnType("real"); + b.Property("Rating") + .HasColumnType("real"); + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Recipes"); + }); + modelBuilder.Entity("NutriMatch.Models.RecipeIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("IngredientId") + .HasColumnType("integer"); + b.Property("Quantity") + .HasColumnType("real"); + b.Property("RecipeId") + .HasColumnType("integer"); + b.Property("Unit") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.HasIndex("IngredientId"); + b.HasIndex("RecipeId"); + b.ToTable("RecipeIngredients"); + }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Restaurants"); + }); + modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real"); + b.Property("Carbs") + .HasColumnType("real"); + b.Property("Fat") + .HasColumnType("real"); + b.Property("ItemDescription") + .IsRequired() + .HasColumnType("text"); + b.Property("ItemName") + .IsRequired() + .HasColumnType("text"); + b.Property("Protein") + .HasColumnType("real"); + b.Property("Restaurant") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("RestaurantMeals"); + }); + modelBuilder.Entity("NutriMatch.Models.RecipeIngredient", b => + { + b.HasOne("NutriMatch.Models.Ingredient", "Ingredient") + .WithMany() + .HasForeignKey("IngredientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.HasOne("NutriMatch.Models.Recipe", null) + .WithMany("RecipeIngredients") + .HasForeignKey("RecipeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.Navigation("Ingredient"); + }); + modelBuilder.Entity("NutriMatch.Models.Recipe", b => + { + b.Navigation("RecipeIngredients"); + }); +#pragma warning restore 612, 618 + } + } +} Index: NutriMatch/Migrations/20250624141408_AddRestaurantModel.cs =================================================================== --- NutriMatch/Migrations/20250624141408_AddRestaurantModel.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Migrations/20250624141408_AddRestaurantModel.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,30 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +#nullable disable +namespace NutriMatch.Migrations +{ + public partial class AddRestaurantModel : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Restaurants", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + Name = table.Column(type: "text", nullable: false), + ImageUrl = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Restaurants", x => x.Id); + }); + } + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Restaurants"); + } + } +} Index: NutriMatch/Migrations/20250624151632_AddRestaurantMealRelationship.Designer.cs =================================================================== --- NutriMatch/Migrations/20250624151632_AddRestaurantMealRelationship.Designer.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Migrations/20250624151632_AddRestaurantMealRelationship.Designer.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,172 @@ +// +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using NutriMatch.Data; +#nullable disable +namespace NutriMatch.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20250624151632_AddRestaurantMealRelationship")] + partial class AddRestaurantMealRelationship + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + modelBuilder.Entity("NutriMatch.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real") + .HasColumnName("energy_kcal"); + b.Property("Carbs") + .HasColumnType("real") + .HasColumnName("carbohydrates_g"); + b.Property("Fat") + .HasColumnType("real") + .HasColumnName("total_fat_g"); + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("food_name"); + b.Property("Protein") + .HasColumnType("real") + .HasColumnName("protein_g"); + b.HasKey("Id"); + b.ToTable("food_macronutrients", (string)null); + }); + modelBuilder.Entity("NutriMatch.Models.Recipe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real"); + b.Property("Carbs") + .HasColumnType("real"); + b.Property("Fat") + .HasColumnType("real"); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.Property("Instructions") + .IsRequired() + .HasColumnType("text"); + b.Property("Protein") + .HasColumnType("real"); + b.Property("Rating") + .HasColumnType("real"); + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Recipes"); + }); + modelBuilder.Entity("NutriMatch.Models.RecipeIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("IngredientId") + .HasColumnType("integer"); + b.Property("Quantity") + .HasColumnType("real"); + b.Property("RecipeId") + .HasColumnType("integer"); + b.Property("Unit") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.HasIndex("IngredientId"); + b.HasIndex("RecipeId"); + b.ToTable("RecipeIngredients"); + }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Restaurants"); + }); + modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real"); + b.Property("Carbs") + .HasColumnType("real"); + b.Property("Fat") + .HasColumnType("real"); + b.Property("ItemDescription") + .IsRequired() + .HasColumnType("text"); + b.Property("ItemName") + .IsRequired() + .HasColumnType("text"); + b.Property("Protein") + .HasColumnType("real"); + b.Property("RestaurantId") + .HasColumnType("integer"); + b.Property("RestaurantName") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.HasIndex("RestaurantId"); + b.ToTable("RestaurantMeals"); + }); + modelBuilder.Entity("NutriMatch.Models.RecipeIngredient", b => + { + b.HasOne("NutriMatch.Models.Ingredient", "Ingredient") + .WithMany() + .HasForeignKey("IngredientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.HasOne("NutriMatch.Models.Recipe", null) + .WithMany("RecipeIngredients") + .HasForeignKey("RecipeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.Navigation("Ingredient"); + }); + modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => + { + b.HasOne("NutriMatch.Models.Restaurant", "Restaurant") + .WithMany("RestaurantMeals") + .HasForeignKey("RestaurantId"); + b.Navigation("Restaurant"); + }); + modelBuilder.Entity("NutriMatch.Models.Recipe", b => + { + b.Navigation("RecipeIngredients"); + }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Navigation("RestaurantMeals"); + }); +#pragma warning restore 612, 618 + } + } +} Index: NutriMatch/Migrations/20250624151632_AddRestaurantMealRelationship.cs =================================================================== --- NutriMatch/Migrations/20250624151632_AddRestaurantMealRelationship.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Migrations/20250624151632_AddRestaurantMealRelationship.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,38 @@ +using Microsoft.EntityFrameworkCore.Migrations; +#nullable disable +namespace NutriMatch.Migrations +{ + public partial class AddRestaurantMealRelationship : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "RestaurantId", + table: "RestaurantMeals", + type: "integer", + nullable: true); + migrationBuilder.CreateIndex( + name: "IX_RestaurantMeals_RestaurantId", + table: "RestaurantMeals", + column: "RestaurantId"); + migrationBuilder.AddForeignKey( + name: "FK_RestaurantMeals_Restaurants_RestaurantId", + table: "RestaurantMeals", + column: "RestaurantId", + principalTable: "Restaurants", + principalColumn: "Id"); + } + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_RestaurantMeals_Restaurants_RestaurantId", + table: "RestaurantMeals"); + migrationBuilder.DropIndex( + name: "IX_RestaurantMeals_RestaurantId", + table: "RestaurantMeals"); + migrationBuilder.DropColumn( + name: "RestaurantId", + table: "RestaurantMeals"); + } + } +} Index: NutriMatch/Migrations/20250624154122_AddRecipeInstructions.Designer.cs =================================================================== --- NutriMatch/Migrations/20250624154122_AddRecipeInstructions.Designer.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Migrations/20250624154122_AddRecipeInstructions.Designer.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,171 @@ +// +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using NutriMatch.Data; +#nullable disable +namespace NutriMatch.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20250624154122_AddRecipeInstructions")] + partial class AddRecipeInstructions + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + modelBuilder.Entity("NutriMatch.Models.Ingredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real") + .HasColumnName("energy_kcal"); + b.Property("Carbs") + .HasColumnType("real") + .HasColumnName("carbohydrates_g"); + b.Property("Fat") + .HasColumnType("real") + .HasColumnName("total_fat_g"); + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("food_name"); + b.Property("Protein") + .HasColumnType("real") + .HasColumnName("protein_g"); + b.HasKey("Id"); + b.ToTable("food_macronutrients", (string)null); + }); + modelBuilder.Entity("NutriMatch.Models.Recipe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real"); + b.Property("Carbs") + .HasColumnType("real"); + b.Property("Fat") + .HasColumnType("real"); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.PrimitiveCollection("Instructions") + .HasColumnType("text[]"); + b.Property("Protein") + .HasColumnType("real"); + b.Property("Rating") + .HasColumnType("real"); + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Recipes"); + }); + modelBuilder.Entity("NutriMatch.Models.RecipeIngredient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("IngredientId") + .HasColumnType("integer"); + b.Property("Quantity") + .HasColumnType("real"); + b.Property("RecipeId") + .HasColumnType("integer"); + b.Property("Unit") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.HasIndex("IngredientId"); + b.HasIndex("RecipeId"); + b.ToTable("RecipeIngredients"); + }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Restaurants"); + }); + modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Calories") + .HasColumnType("real"); + b.Property("Carbs") + .HasColumnType("real"); + b.Property("Fat") + .HasColumnType("real"); + b.Property("ItemDescription") + .IsRequired() + .HasColumnType("text"); + b.Property("ItemName") + .IsRequired() + .HasColumnType("text"); + b.Property("Protein") + .HasColumnType("real"); + b.Property("RestaurantId") + .HasColumnType("integer"); + b.Property("RestaurantName") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.HasIndex("RestaurantId"); + b.ToTable("RestaurantMeals"); + }); + modelBuilder.Entity("NutriMatch.Models.RecipeIngredient", b => + { + b.HasOne("NutriMatch.Models.Ingredient", "Ingredient") + .WithMany() + .HasForeignKey("IngredientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.HasOne("NutriMatch.Models.Recipe", null) + .WithMany("RecipeIngredients") + .HasForeignKey("RecipeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.Navigation("Ingredient"); + }); + modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => + { + b.HasOne("NutriMatch.Models.Restaurant", "Restaurant") + .WithMany("RestaurantMeals") + .HasForeignKey("RestaurantId"); + b.Navigation("Restaurant"); + }); + modelBuilder.Entity("NutriMatch.Models.Recipe", b => + { + b.Navigation("RecipeIngredients"); + }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Navigation("RestaurantMeals"); + }); +#pragma warning restore 612, 618 + } + } +} Index: NutriMatch/Migrations/20250624154122_AddRecipeInstructions.cs =================================================================== --- NutriMatch/Migrations/20250624154122_AddRecipeInstructions.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Migrations/20250624154122_AddRecipeInstructions.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,24 @@ +using Microsoft.EntityFrameworkCore.Migrations; +#nullable disable +namespace NutriMatch.Migrations +{ + public partial class AddRecipeInstructions : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Instructions", + table: "Recipes", + type: "text[]", + nullable: true + ); + } + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Instructions", + table: "Recipes" + ); + } + } +} Index: NutriMatch/Migrations/AppDbContextModelSnapshot.cs =================================================================== --- NutriMatch/Migrations/AppDbContextModelSnapshot.cs (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Migrations/AppDbContextModelSnapshot.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -59,7 +59,6 @@ .IsRequired() .HasColumnType("text"); - b.Property("Instructions") - .IsRequired() - .HasColumnType("text"); + b.PrimitiveCollection("Instructions") + .HasColumnType("text[]"); b.Property("Protein") .HasColumnType("real"); @@ -92,4 +91,19 @@ b.ToTable("RecipeIngredients"); }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("ImageUrl") + .IsRequired() + .HasColumnType("text"); + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + b.HasKey("Id"); + b.ToTable("Restaurants"); + }); modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => { @@ -112,8 +126,11 @@ b.Property("Protein") .HasColumnType("real"); - b.Property("Restaurant") + b.Property("RestaurantId") + .HasColumnType("integer"); + b.Property("RestaurantName") .IsRequired() .HasColumnType("text"); b.HasKey("Id"); + b.HasIndex("RestaurantId"); b.ToTable("RestaurantMeals"); }); @@ -132,7 +149,18 @@ b.Navigation("Ingredient"); }); + modelBuilder.Entity("NutriMatch.Models.RestaurantMeal", b => + { + b.HasOne("NutriMatch.Models.Restaurant", "Restaurant") + .WithMany("RestaurantMeals") + .HasForeignKey("RestaurantId"); + b.Navigation("Restaurant"); + }); modelBuilder.Entity("NutriMatch.Models.Recipe", b => { b.Navigation("RecipeIngredients"); + }); + modelBuilder.Entity("NutriMatch.Models.Restaurant", b => + { + b.Navigation("RestaurantMeals"); }); #pragma warning restore 612, 618 Index: NutriMatch/Models/Recipe.cs =================================================================== --- NutriMatch/Models/Recipe.cs (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Models/Recipe.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -13,5 +13,5 @@ public int Id { get; set; } public String Title { get; set; } - public String Instructions { get; set; } + public String[]? Instructions { get; set; } [ValidateNever] public float Rating { get; set; } @@ -27,4 +27,5 @@ public float Fat { get; set; } [ValidateNever] + public String ImageUrl { get; set; } Index: NutriMatch/Models/Restaurant.cs =================================================================== --- NutriMatch/Models/Restaurant.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Models/Restaurant.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,16 @@ +using System.ComponentModel.DataAnnotations; + +namespace NutriMatch.Models +{ + public class Restaurant + { + [Key] + public int Id { get; set; } + + public String Name { get; set; } + + public String ImageUrl { get; set; } + + virtual public List RestaurantMeals { get; set; } + } +} Index: NutriMatch/Models/RestaurantMeal.cs =================================================================== --- NutriMatch/Models/RestaurantMeal.cs (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Models/RestaurantMeal.cs (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -12,5 +12,7 @@ public int Id { get; set; } - public String Restaurant { get; set; } + virtual public int? RestaurantId { get; set; } + virtual public Restaurant Restaurant { get; set; } = null!; + public String RestaurantName { get; set; } public String ItemName { get; set; } Index: NutriMatch/Views/Recipes/Create.cshtml =================================================================== --- NutriMatch/Views/Recipes/Create.cshtml (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Views/Recipes/Create.cshtml (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -7,59 +7,575 @@ - - Create + Create Recipe - NutriMatch + -

Recipe

-
-
-
-
-
-
- - - +
+
+

Create Recipe

+

Share your culinary creation with the community

+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
No instructions added yet
+
+ +
+
+ +
+
+ + + + +
+ +
+
+
No ingredients added yet
+
+ +
+
+ +
+
📷
+

Click to upload or drag and drop

+

PNG, JPG, GIF up to 10MB

+ +
+
+
+
+ + +
+
-
- - - -
-
- -
-
- - - - -
- +
+ + ← Back to Recipes + +
+ + `; + } + } + window.useAIImage = async function(imageUrl) { + try { + const response = await fetch(imageUrl); + const blob = await response.blob(); + const file = new File([blob], `ai-generated-${Date.now()}.jpg`, { type: 'image/jpeg' }); + const dt = new DataTransfer(); + dt.items.add(file); + fileInput.files = dt.files; + imagePreview.innerHTML = ` + Selected AI generated image +

✓ AI image selected for upload

+ `; + console.log('AI image set successfully'); + } catch (error) { + console.error('Error setting AI image:', error); + alert('Error setting the AI image. Please try again.'); + } + }; +}); +const style = document.createElement('style'); +style.textContent = ` + @@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } +`; +document.head.appendChild(style); + + + Index: NutriMatch/Views/Recipes/Edit.cshtml =================================================================== --- NutriMatch/Views/Recipes/Edit.cshtml (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Views/Recipes/Edit.cshtml (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -1,50 +1,594 @@ +@using System.Text.Json @model NutriMatch.Models.Recipe - @{ Layout = null; } - - - Edit + Edit Recipe - NutriMatch + - -

Recipe

-
-
-
-
-
- -
- - - +
+
+

Create Recipe

+

Share your culinary creation with the community

+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+
+ +
+
+ +
+
+ + + + +
+ +
+
+
No ingredients added yet
+
+ +
+
+ +
+
📷
+

Click to upload or drag and drop

+

PNG, JPG, GIF up to 10MB

+ +
+
+ Recipe preview +
+
+
+ + +
+
-
- - - -
-
- - - -
-
- -
- +
+ + ← Back to Recipes +
-
- - - + + + + + Index: NutriMatch/Views/Recipes/Index.cshtml =================================================================== --- NutriMatch/Views/Recipes/Index.cshtml (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Views/Recipes/Index.cshtml (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -130,15 +130,22 @@ .recipe-grid { display: grid; - grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(350px, 1fr)); gap: 2rem; margin-top: 2rem; + justify-items: center; } .recipe-card { + width: 350px !important; background: white; border-radius: 20px; overflow: hidden; box-shadow: 0 8px 32px rgba(0,0,0,0.1); - transition: all 0.3s ease; + transition: transform 0.3s ease, box-shadow 0.3s ease; position: relative; + cursor: pointer; + min-height: 400px !important; + max-width: 350px !important; + flex-shrink: 0; + box-sizing: border-box; } .recipe-card:hover { @@ -146,23 +153,100 @@ box-shadow: 0 20px 40px rgba(0,0,0,0.15); } + .recipe-card.loading { + pointer-events: none; + } + .recipe-card.loading * { + transition: none !important; + animation: none !important; + } .recipe-image { - width: 100%; - height: 200px; + width: 100% !important; + height: 200px !important; object-fit: cover; background: linear-gradient(45deg, var(--nutri-green), var(--nutri-green-dark)); + position: relative; + display: block !important; + flex-shrink: 0; + box-sizing: border-box; + } + .favorite-btn { + position: absolute; + top: 12px; + right: 12px; + background: rgba(255, 255, 255, 0.9); + border: none; + border-radius: 50%; + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + transition: all 0.3s ease; + z-index: 10; + backdrop-filter: blur(10px); + } + .favorite-btn:hover { + background: rgba(255, 255, 255, 1); + transform: scale(1.1); + } + .favorite-btn i { + font-size: 18px; + color: #ef4444; + transition: all 0.3s ease; + } + .favorite-btn:hover i { + color: #dc2626; + } + .favorite-btn.active i { + color: #ef4444; + font-weight: 900; } .recipe-content { - padding: 1.5rem; + padding: 1.5rem !important; + height: calc(100% - 200px) !important; + display: flex !important; + flex-direction: column !important; + box-sizing: border-box; + position: relative; + flex-shrink: 0; } .recipe-title { - font-size: 1.3rem; - font-weight: 700; - color: #1f2937; - margin-bottom: 0.5rem; - } - .recipe-description { + font-size: 1.3rem !important; + font-weight: 700 !important; + color: #1f2937 !important; + margin-bottom: 0.5rem !important; + line-height: 1.3 !important; + transition: none !important; + animation: none !important; + } + .recipe-card .recipe-title, + .recipe-card:hover .recipe-title, + .recipe-card:active .recipe-title, + .recipe-card:focus .recipe-title, + .recipe-card.loading .recipe-title { + font-size: 1.3rem !important; + font-weight: 700 !important; + color: #1f2937 !important; + margin-bottom: 0.5rem !important; + line-height: 1.3 !important; + transition: none !important; + animation: none !important; + } + .recipe-meta { + display: flex; + align-items: center; + gap: 1rem; + margin-bottom: 1rem; + font-size: 0.9rem; color: var(--nutri-gray); - margin-bottom: 1rem; - font-size: 0.95rem; + flex-wrap: wrap; + } + .recipe-meta .rating { + color: #fbbf24; + font-weight: 600; + } + .recipe-meta i { + margin-right: 4px; } .recipe-macros { @@ -170,5 +254,5 @@ grid-template-columns: repeat(4, 1fr); gap: 0.5rem; - margin-bottom: 1rem; + margin-top: auto; } .macro-item { @@ -182,4 +266,5 @@ color: var(--nutri-green-dark); font-size: 1rem; + line-height: 1.2; } .macro-label { @@ -188,53 +273,37 @@ text-transform: uppercase; font-weight: 600; - } - .recipe-rating { - display: flex; - align-items: center; - gap: 0.5rem; - margin-bottom: 1rem; - } - .stars { - color: #fbbf24; - } - .rating-text { + line-height: 1; + } + .results-count { + margin: 1rem 0; + font-size: 1.1rem; color: var(--nutri-gray); - font-size: 0.9rem; - } - .view-recipe-btn { - width: 100%; - background: var(--nutri-green); - border: none; - color: white; - padding: 0.8rem; - border-radius: 12px; font-weight: 600; - transition: all 0.3s ease; - } - .view-recipe-btn:hover { - background: var(--nutri-green-dark); - color: white; - } - .chef-badge { - position: absolute; - top: 15px; - right: 15px; - background: rgba(255,255,255,0.95); - padding: 0.5rem 1rem; - border-radius: 20px; - font-size: 0.8rem; - font-weight: 600; - color: var(--nutri-green-dark); - box-shadow: 0 2px 10px rgba(0,0,0,0.1); - } - .filter-values { - font-size: 0.9rem; - color: var(--nutri-green-dark); - font-weight: 600; - } - .results-count { - color: var(--nutri-gray); - font-size: 1.1rem; - margin-bottom: 1rem; + } + #modalWindow { + position: fixed; + top: 0; + left: 0; + z-index: 9999; + pointer-events: none; + } + #modalWindow .modal { + pointer-events: all; + } + .recipe-card * { + box-sizing: border-box; + } + .recipe-card[style*="none"] { + display: none !important; + } + .recipe-card[style*="block"] { + display: block !important; + } + .recipe-card h3.recipe-title { + font-size: 1.3rem !important; + font-weight: 700 !important; + color: #1f2937 !important; + margin-bottom: 0.5rem !important; + line-height: 1.3 !important; } @@ -245,5 +314,5 @@
- +
@@ -318,231 +387,105 @@
-
-
Chef Milan
-
-
-
Mediterranean Buddha Bowl
-

A colorful mix of quinoa, roasted vegetables, and tahini dressing

-
-
-
420
-
Cal
-
-
-
18g
-
Protein
-
-
-
52g
-
Carbs
-
-
-
14g
-
Fats
+ @foreach(var recipe in Model) + { +
+ + @recipe.Title +
+

@recipe.Title

+
+ + 4.8 + + 25 min + Chef Mario +
+
+
+
@recipe.Calories
+
Cal
+
+
+
@recipe.Protein
+
Protein
+
+
+
@recipe.Carbs
+
Carbs
+
+
+
@recipe.Fat
+
Fats
+
-
-
- - - - - -
- (4.9) • 127 reviews -
-
-
-
-
Chef Sarah
-
-
-
Grilled Chicken & Avocado Salad
-

High-protein salad with mixed greens and lime vinaigrette

-
-
-
380
-
Cal
-
-
-
35g
-
Protein
-
-
-
12g
-
Carbs
-
-
-
22g
-
Fats
-
-
-
-
- - - - - -
- (4.7) • 89 reviews -
- -
-
-
-
Chef Marco
-
-
-
Salmon Teriyaki Bowl
-

Glazed salmon with brown rice and steamed vegetables

-
-
-
520
-
Cal
-
-
-
28g
-
Protein
-
-
-
45g
-
Carbs
-
-
-
24g
-
Fats
-
-
-
-
- - - - - -
- (4.8) • 156 reviews -
- -
-
-
-
Chef Lisa
-
-
-
Veggie Protein Smoothie Bowl
-

Spinach, banana and protein powder topped with berries

-
-
-
290
-
Cal
-
-
-
25g
-
Protein
-
-
-
38g
-
Carbs
-
-
-
8g
-
Fats
-
-
-
-
- - - - - -
- (4.6) • 73 reviews -
- -
-
-
-
Chef Tony
-
-
-
Turkey & Sweet Potato Hash
-

Lean ground turkey with roasted sweet potatoes and herbs

-
-
-
450
-
Cal
-
-
-
32g
-
Protein
-
-
-
35g
-
Carbs
-
-
-
18g
-
Fats
-
-
-
-
- - - - - -
- (4.9) • 201 reviews -
- -
-
-
-
Chef Elena
-
-
-
Quinoa Stuffed Bell Peppers
-

Colorful bell peppers stuffed with quinoa and black beans

-
-
-
320
-
Cal
-
-
-
14g
-
Protein
-
-
-
58g
-
Carbs
-
-
-
6g
-
Fats
-
-
-
-
- - - - - -
- (4.5) • 94 reviews -
- -
-
+ }
- + + + + Index: NutriMatch/Views/Recipes/RecipeDetailsPartial.cshtml =================================================================== --- NutriMatch/Views/Recipes/RecipeDetailsPartial.cshtml (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/Views/Recipes/RecipeDetailsPartial.cshtml (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,419 @@ +@model NutriMatch.Models.Recipe + + + Index: NutriMatch/Views/Shared/_Layout.cshtml =================================================================== --- NutriMatch/Views/Shared/_Layout.cshtml (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/Views/Shared/_Layout.cshtml (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -10,32 +10,37 @@ +
+
Index: NutriMatch/wwwroot/css/recipe-search.css =================================================================== --- NutriMatch/wwwroot/css/recipe-search.css (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/wwwroot/css/recipe-search.css (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -96,4 +96,74 @@ } + +.instructions-container { + margin-bottom: 15px; +} + +.instructions-list { + margin-top: 10px; + padding: 10px; + background-color: #f8f9fa; + border-radius: 0.375rem; + min-height: 50px; +} + +.instruction-item { + display: flex; + align-items: flex-start; + background-color: #ffffff; + padding: 12px; + margin: 8px 0; + border-radius: 8px; + border-left: 4px solid #0d6efd; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + transition: box-shadow 0.15s ease-in-out; +} + +.instruction-item:hover { + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15); +} + +.instruction-number { + background-color: #0d6efd; + color: white; + border-radius: 50%; + width: 28px; + height: 28px; + display: flex; + align-items: center; + justify-content: center; + font-size: 14px; + font-weight: bold; + margin-right: 12px; + flex-shrink: 0; +} + +.instruction-text { + flex: 1; + line-height: 1.5; + color: #333; + font-size: 14px; +} + +.instruction-item .remove { + cursor: pointer; + margin-left: 12px; + color: #dc3545; + font-weight: bold; + font-size: 20px; + width: 24px; + height: 24px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + transition: background-color 0.15s ease-in-out; +} + +.instruction-item .remove:hover { + background-color: rgba(220, 53, 69, 0.1); +} + .form-container { max-width: 800px; @@ -116,3 +186,26 @@ max-height: 150px; } -} + + .instruction-item { + padding: 10px; + margin: 6px 0; + } + + .instruction-number { + width: 24px; + height: 24px; + font-size: 12px; + margin-right: 10px; + } + + .instruction-text { + font-size: 13px; + } + + .instruction-item .remove { + font-size: 18px; + width: 20px; + height: 20px; + margin-left: 8px; + } +} Index: NutriMatch/wwwroot/js/recipe-search-edit.js =================================================================== --- NutriMatch/wwwroot/js/recipe-search-edit.js (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) +++ NutriMatch/wwwroot/js/recipe-search-edit.js (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -0,0 +1,303 @@ + +let selectedIngredients = []; +let selectedInstructions = []; +let searchTimeout; +let currentFocus = -1; +let selectedIngredient = null; +const ingredientSearch = document.getElementById('ingredientSearch'); +const ingredientDropdown = document.getElementById('ingredientDropdown'); +const ingredientsList = document.getElementById('ingredientsList'); +const hiddenIngredientsInput = document.getElementById('selectedIngredients'); +const addButton = document.getElementById('addIngredientButton'); +const qtyInput = document.getElementById('ingredientQuantity'); +const unitSelect = document.getElementById('ingredientUnit'); +const instructionInput = document.getElementById('instructionInput'); +const addInstructionButton = document.getElementById('addInstructionButton'); +const instructionsList = document.getElementById('instructionsList'); +const hiddenInstructionsInput = document.getElementById('selectedInstructions'); +document.addEventListener('DOMContentLoaded', function() { + initializeSearchFunctionality(); + initializeInstructionsFunctionality(); + var strr = JSON.parse((document.getElementById('selectedInstructionsScript').innerText))[0]; + strr = JSON.parse(strr); + var strr2 = JSON.parse((document.getElementById('selectedIngredientsScript').innerText)); + console.log(strr2) + strr2.forEach(element => { + selectedIngredients.push({ + Id: element.IngredientId, + Name: element.Ingredient.Name, + Quantity: element.Quantity, + Unit: element.Unit + }) + }); + updateIngredientsDisplay(); + updateIngredientsInput(); + strr.forEach(element => { + selectedInstructions.push(element); + }); + updateInstructionsDisplay() + updateInstructionsInput() +}); +function initializeSearchFunctionality() { + if (addButton) { + addButton.addEventListener('click', function() { + if (selectedIngredient && qtyInput && unitSelect) { + const qty = parseFloat(qtyInput.value); + const unit = unitSelect.value; + if (qty > 0 && unit && selectedIngredient.name) { + addIngredient(selectedIngredient, qty, unit); + } else { + alert('Please enter a valid quantity and select a unit.'); + } + } else { + alert('Please search and select an ingredient first.'); + } + }); + } + if (ingredientSearch) { + ingredientSearch.addEventListener('input', function() { + const query = this.value.trim(); + currentFocus = -1; + selectedIngredient = null; + if (query === '') { + hideDropdown(ingredientDropdown); + return; + } + clearTimeout(searchTimeout); + searchTimeout = setTimeout(() => { + searchIngredients(query); + }, 300); + }); + ingredientSearch.addEventListener('keydown', function(e) { + handleKeyNavigation(e, ingredientDropdown); + }); + ingredientSearch.addEventListener('focus', function() { + if (this.value.trim() !== '') { + searchIngredients(this.value.trim()); + } + }); + } + document.addEventListener('click', function(e) { + if (!e.target.closest('.search-container')) { + hideDropdown(ingredientDropdown); + } + }); +} +function initializeInstructionsFunctionality() { + if (addInstructionButton) { + addInstructionButton.addEventListener('click', function() { + addInstruction(); + }); + } + if (instructionInput) { + instructionInput.addEventListener('keydown', function(e) { + if (e.key === 'Enter') { + e.preventDefault(); + addInstruction(); + } + }); + } +} +async function searchIngredients(query) { + if (!ingredientDropdown) return; + try { + ingredientDropdown.innerHTML = '
Loading...
'; + showDropdown(ingredientDropdown); + const response = await fetch(`/Recipes/getSuggestions?query=${encodeURIComponent(query)}`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + 'X-Requested-With': 'XMLHttpRequest' + } + }); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + const suggestions = await response.json(); + displaySuggestions(suggestions, query); + } catch (error) { + console.error('Error fetching suggestions:', error); + ingredientDropdown.innerHTML = '
Error loading suggestions. Please try again.
'; + showDropdown(ingredientDropdown); + } +} +function displaySuggestions(suggestions, query) { + if (!ingredientDropdown) return; + ingredientDropdown.innerHTML = ''; + if (!suggestions || suggestions.length === 0) { + ingredientDropdown.innerHTML = '
No results found
'; + showDropdown(ingredientDropdown); + return; + } + suggestions.forEach((suggestion, index) => { + const item = document.createElement('div'); + item.className = 'dropdown-item'; + item.setAttribute('data-index', index); + const name = typeof suggestion === 'string' ? suggestion : suggestion.name; + const id = typeof suggestion === 'object' ? suggestion.id : null; + const regex = new RegExp(`(${escapeRegExp(query)})`, 'gi'); + const highlightedText = name.replace(regex, '$1'); + item.innerHTML = highlightedText; + item.addEventListener('click', function() { + selectedIngredient = { + id: id, + name: name + }; + ingredientSearch.value = name; + hideDropdown(ingredientDropdown); + }); + ingredientDropdown.appendChild(item); + }); + showDropdown(ingredientDropdown); +} +function handleKeyNavigation(e, dropdownElement) { + if (!dropdownElement) return; + const items = dropdownElement.querySelectorAll('.dropdown-item:not(.no-results):not(.loading)'); + switch(e.key) { + case 'ArrowDown': + e.preventDefault(); + currentFocus++; + if (currentFocus >= items.length) currentFocus = 0; + setActive(items); + break; + case 'ArrowUp': + e.preventDefault(); + currentFocus--; + if (currentFocus < 0) currentFocus = items.length - 1; + setActive(items); + break; + case 'Enter': + e.preventDefault(); + if (currentFocus > -1 && items[currentFocus]) { + items[currentFocus].click(); + } + break; + case 'Escape': + hideDropdown(dropdownElement); + e.target.blur(); + break; + } +} +function setActive(items) { + items.forEach(item => item.classList.remove('highlighted')); + if (currentFocus >= 0 && currentFocus < items.length) { + items[currentFocus].classList.add('highlighted'); + items[currentFocus].scrollIntoView({ block: 'nearest' }); + } +} +function addIngredient(ingredient, quantity, unit) { + if (!ingredient || !ingredient.name) { + console.error('Invalid ingredient data'); + return; + } + const existingIngredient = selectedIngredients.find(item => item.Id === ingredient.id); + if (existingIngredient) { + alert('This ingredient is already added to the recipe.'); + return; + } + const newIngredient = { + Id: ingredient.id, + Name: ingredient.name, + Quantity: quantity, + Unit: unit + }; + selectedIngredients.push(newIngredient); + updateIngredientsDisplay(); + updateIngredientsInput(); + if (ingredientSearch) ingredientSearch.value = ''; + if (qtyInput) qtyInput.value = ''; + if (unitSelect) unitSelect.value = ''; + selectedIngredient = null; + hideDropdown(ingredientDropdown); + currentFocus = -1; +} +function removeIngredient(ingredientName) { + selectedIngredients = selectedIngredients.filter(item => item.Name !== ingredientName); + updateIngredientsDisplay(); + updateIngredientsInput(); +} +function addInstruction() { + if (!instructionInput) return; + const instruction = instructionInput.value.trim(); + if (instruction === '') { + alert('Please enter an instruction.'); + return; + } + if (selectedInstructions.includes(instruction)) { + alert('This instruction is already added.'); + return; + } + selectedInstructions.push(instruction); + updateInstructionsDisplay(); + updateInstructionsInput(); + instructionInput.value = ''; +} +function removeInstruction(instructionIndex) { + selectedInstructions.splice(instructionIndex, 1); + updateInstructionsDisplay(); + updateInstructionsInput(); +} +function updateIngredientsDisplay() { + if (!ingredientsList) return; + if (selectedIngredients.length === 0) { + ingredientsList.innerHTML = 'Selected ingredients will appear here'; + } else { + ingredientsList.innerHTML = selectedIngredients.map(ingredient => + ` + ${escapeHtml(ingredient.Quantity)} ${escapeHtml(ingredient.Unit)} of ${escapeHtml(ingredient.Name)} + × + ` + ).join(''); + } +} +function updateInstructionsDisplay() { + if (!instructionsList) return; + if (selectedInstructions.length === 0) { + instructionsList.innerHTML = 'Added instructions will appear here'; + } else { + instructionsList.innerHTML = selectedInstructions.map((instruction, index) => + `
+ ${index + 1} + +${escapeHtml(instruction)} + × +
` + ).join(''); + } +} +function updateIngredientsInput() { + if (hiddenIngredientsInput) { + hiddenIngredientsInput.value = JSON.stringify(selectedIngredients); + console.log('Updated hidden ingredients input:', hiddenIngredientsInput.value); + } +} +function updateInstructionsInput() { + if (hiddenInstructionsInput) { + hiddenInstructionsInput.value = JSON.stringify(selectedInstructions); + console.log('Updated hidden instructions input:', hiddenInstructionsInput.value); + } +} +function showDropdown(dropdownElement) { + if (dropdownElement) { + dropdownElement.style.display = 'block'; + } +} +function hideDropdown(dropdownElement) { + if (dropdownElement) { + dropdownElement.style.display = 'none'; + } + currentFocus = -1; +} +function escapeHtml(text) { + if (text === null || text === undefined) return ''; + const div = document.createElement('div'); + div.textContent = text.toString(); + return div.innerHTML; +} +function escapeRegExp(string) { + return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); +} Index: NutriMatch/wwwroot/js/recipe-search.js =================================================================== --- NutriMatch/wwwroot/js/recipe-search.js (revision 1bb908bf54f2e3398c19e1688d4a2bca1fec96b6) +++ NutriMatch/wwwroot/js/recipe-search.js (revision f2b09ee1157f2f5e93f0bcfb42b366cbb520fdee) @@ -1,4 +1,5 @@ let selectedIngredients = []; +let selectedInstructions = []; let searchTimeout; let currentFocus = -1; @@ -7,10 +8,15 @@ const ingredientDropdown = document.getElementById('ingredientDropdown'); const ingredientsList = document.getElementById('ingredientsList'); -const hiddenInput = document.getElementById('selectedIngredients'); +const hiddenIngredientsInput = document.getElementById('selectedIngredients'); const addButton = document.getElementById('addIngredientButton'); const qtyInput = document.getElementById('ingredientQuantity'); const unitSelect = document.getElementById('ingredientUnit'); +const instructionInput = document.getElementById('instructionInput'); +const addInstructionButton = document.getElementById('addInstructionButton'); +const instructionsList = document.getElementById('instructionsList'); +const hiddenInstructionsInput = document.getElementById('selectedInstructions'); document.addEventListener('DOMContentLoaded', function() { initializeSearchFunctionality(); + initializeInstructionsFunctionality(); }); function initializeSearchFunctionality() { @@ -58,4 +64,19 @@ } }); +} +function initializeInstructionsFunctionality() { + if (addInstructionButton) { + addInstructionButton.addEventListener('click', function() { + addInstruction(); + }); + } + if (instructionInput) { + instructionInput.addEventListener('keydown', function(e) { + if (e.key === 'Enter') { + e.preventDefault(); + addInstruction(); + } + }); + } } async function searchIngredients(query) { @@ -177,4 +198,25 @@ updateIngredientsInput(); } +function addInstruction() { + if (!instructionInput) return; + const instruction = instructionInput.value.trim(); + if (instruction === '') { + alert('Please enter an instruction.'); + return; + } + if (selectedInstructions.includes(instruction)) { + alert('This instruction is already added.'); + return; + } + selectedInstructions.push(instruction); + updateInstructionsDisplay(); + updateInstructionsInput(); + instructionInput.value = ''; +} +function removeInstruction(instructionIndex) { + selectedInstructions.splice(instructionIndex, 1); + updateInstructionsDisplay(); + updateInstructionsInput(); +} function updateIngredientsDisplay() { if (!ingredientsList) return; @@ -192,8 +234,31 @@ } } +function updateInstructionsDisplay() { + if (!instructionsList) return; + if (selectedInstructions.length === 0) { + instructionsList.innerHTML = 'Added instructions will appear here'; + } else { + instructionsList.innerHTML = selectedInstructions.map((instruction, index) => + `
+ ${index + 1} + +${escapeHtml(instruction)} + × +
` + ).join(''); + } +} function updateIngredientsInput() { - if (hiddenInput) { - hiddenInput.value = JSON.stringify(selectedIngredients); - console.log('Updated hidden input:', hiddenInput.value); + if (hiddenIngredientsInput) { + hiddenIngredientsInput.value = JSON.stringify(selectedIngredients); + console.log('Updated hidden ingredients input:', hiddenIngredientsInput.value); + } +} +function updateInstructionsInput() { + if (hiddenInstructionsInput) { + hiddenInstructionsInput.value = JSON.stringify(selectedInstructions); + console.log('Updated hidden instructions input:', hiddenInstructionsInput.value); } }