commit 967c16b6bfa78248a33d9632ffd68507aa73c13f Author: James Chapman Date: Sun Jul 23 13:34:00 2023 +0100 Initial commit diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b9085fe --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +end_of_line = crlf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.cs] +csharp_style_namespace_declarations = file_scoped:suggestion +csharp_using_directive_placement = inside_namespace:suggestion + +# CA1710 Identifiers should have correct suffix +dotnet_diagnostic.CA1710.severity = suggestion diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3fd5c89 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.vs/ +**/bin/ +**/obj/ +*.csproj.user + +Groceries/wwwroot/lib/ +Groceries/config_development.ini diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..af886f9 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "ms-dotnettools.csdevkit" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..4f4edd5 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dotnet.defaultSolution": "Groceries.sln" +} diff --git a/Groceries.Data/AppDbContext.cs b/Groceries.Data/AppDbContext.cs new file mode 100644 index 0000000..64c2e41 --- /dev/null +++ b/Groceries.Data/AppDbContext.cs @@ -0,0 +1,103 @@ +namespace Groceries.Data; + +using Microsoft.EntityFrameworkCore; + +public class AppDbContext : DbContext +{ + public AppDbContext(DbContextOptions options) : base(options) + { + } + + public DbSet Items => Set(); + public DbSet ItemPurchases => Set(); + public DbSet ItemTagQuantities => Set(); + public DbSet Lists => Set(); + public DbSet Retailers => Set(); + public DbSet Stores => Set(); + public DbSet Transactions => Set(); + public DbSet TransactionTotals => Set(); + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity(entity => + { + entity.Property(e => e.UpdatedAt) + .HasDefaultValueSql(); + }); + + modelBuilder.Entity(entity => + { + entity.ToTable("item_barcodes"); + entity.HasKey(e => new { e.ItemId, e.BarcodeData }); + + entity.Property(e => e.Format) + .HasDefaultValueSql(); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + entity.ToView("item_purchases"); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + }); + + modelBuilder.Entity(entity => + { + entity.Property(e => e.UpdatedAt) + .HasDefaultValueSql(); + + entity.OwnsMany(entity => entity.Items, entity => + { + entity.ToTable("list_items"); + }); + }); + + modelBuilder.Entity(entity => + { + entity.Property(e => e.CreatedAt) + .HasDefaultValueSql(); + + entity.OwnsMany(e => e.Items, entity => + { + entity.ToTable("transaction_items"); + + entity.HasKey(e => new { e.TransactionId, e.ItemId }); + + entity.Property(e => e.Price) + .HasPrecision(5, 2); + }); + }); + + modelBuilder.Entity(entity => + { + entity.ToTable("transaction_promotions"); + + entity.Property(e => e.Amount) + .HasPrecision(5, 2); + + entity.HasMany(e => e.Items) + .WithMany(e => e.TransactionPromotions) + .UsingEntity(); + }); + + modelBuilder.Entity(entity => + { + entity.HasNoKey(); + entity.ToView("transaction_totals"); + }); + + foreach (var entity in modelBuilder.Model.GetEntityTypes()) + { + var idProperty = entity.FindProperty("Id"); + if (idProperty != null) + { + idProperty.SetColumnName($"{entity.ClrType.Name.ToLowerInvariant()}_id"); + idProperty.SetDefaultValueSql(string.Empty); + } + } + } +} diff --git a/Groceries.Data/Groceries.Data.csproj b/Groceries.Data/Groceries.Data.csproj new file mode 100644 index 0000000..bafd69e --- /dev/null +++ b/Groceries.Data/Groceries.Data.csproj @@ -0,0 +1,16 @@ + + + + net7.0 + enable + enable + nullable + recommended + + + + + + + + diff --git a/Groceries.Data/Items/Item.cs b/Groceries.Data/Items/Item.cs new file mode 100644 index 0000000..3f7e801 --- /dev/null +++ b/Groceries.Data/Items/Item.cs @@ -0,0 +1,27 @@ +namespace Groceries.Data; + +public class Item +{ + public Item(Guid id, string brand, string name) + { + Id = id; + Brand = brand; + Name = name; + } + + public Item(Guid id) : this(id, default!, default!) + { + } + + public Item(string brand, string name) : this(default, brand, name) + { + } + + public Guid Id { get; init; } + public DateTime UpdatedAt { get; set; } + public string Brand { get; set; } + public string Name { get; set; } + + public ICollection Barcodes { get; init; } = new List(); + public IEnumerable? TransactionPromotions { get; init; } +} diff --git a/Groceries.Data/Items/ItemBarcode.cs b/Groceries.Data/Items/ItemBarcode.cs new file mode 100644 index 0000000..a3479f1 --- /dev/null +++ b/Groceries.Data/Items/ItemBarcode.cs @@ -0,0 +1,15 @@ +namespace Groceries.Data; + +public class ItemBarcode +{ + public ItemBarcode(Guid itemId, long barcodeData, string format) + { + ItemId = itemId; + BarcodeData = barcodeData; + Format = format; + } + + public Guid ItemId { get; init; } + public long BarcodeData { get; init; } + public string Format { get; init; } +} diff --git a/Groceries.Data/Items/ItemPurchase.cs b/Groceries.Data/Items/ItemPurchase.cs new file mode 100644 index 0000000..de44b8f --- /dev/null +++ b/Groceries.Data/Items/ItemPurchase.cs @@ -0,0 +1,15 @@ +namespace Groceries.Data; + +public class ItemPurchase +{ + public Guid ItemId { get; init; } + public Guid TransactionId { get; init; } + public DateTime CreatedAt { get; init; } + public Guid StoreId { get; init; } + public decimal Price { get; init; } + public int Quantity { get; init; } + + public Item? Item { get; init; } + public Transaction? Transaction { get; init; } + public Store? Store { get; init; } +} diff --git a/Groceries.Data/Items/ItemTagQuantity.cs b/Groceries.Data/Items/ItemTagQuantity.cs new file mode 100644 index 0000000..7da4d45 --- /dev/null +++ b/Groceries.Data/Items/ItemTagQuantity.cs @@ -0,0 +1,10 @@ +namespace Groceries.Data; + +public class ItemTagQuantity +{ + public required string Tag { get; init; } + public required decimal Quantity { get; init; } + public string? Unit { get; init; } + public bool IsMetric { get; init; } + public bool IsDivisible { get; init; } +} diff --git a/Groceries.Data/Lists/List.cs b/Groceries.Data/Lists/List.cs new file mode 100644 index 0000000..570ec89 --- /dev/null +++ b/Groceries.Data/Lists/List.cs @@ -0,0 +1,20 @@ +namespace Groceries.Data; + +public class List +{ + public List(Guid id, string name) + { + Id = id; + Name = name; + } + + public List(string name) : this(default, name) + { + } + + public Guid Id { get; init; } + public DateTime UpdatedAt { get; set; } + public string Name { get; set; } + + public ICollection? Items { get; init; } +} diff --git a/Groceries.Data/Lists/ListItem.cs b/Groceries.Data/Lists/ListItem.cs new file mode 100644 index 0000000..734c021 --- /dev/null +++ b/Groceries.Data/Lists/ListItem.cs @@ -0,0 +1,20 @@ +namespace Groceries.Data; + +public class ListItem +{ + public ListItem(Guid id, Guid listId, string name) + { + Id = id; + ListId = listId; + Name = name; + } + + public ListItem(Guid listId, string name) : this(default, listId, name) + { + } + + public Guid Id { get; init; } + public Guid ListId { get; init; } + public string Name { get; set; } + public bool Completed { get; set; } +} diff --git a/Groceries.Data/Stores/Retailer.cs b/Groceries.Data/Stores/Retailer.cs new file mode 100644 index 0000000..4c0c5be --- /dev/null +++ b/Groceries.Data/Stores/Retailer.cs @@ -0,0 +1,17 @@ +namespace Groceries.Data; + +public class Retailer +{ + public Retailer(Guid id, string name) + { + Id = id; + Name = name; + } + + public Retailer(string name) : this(default, name) + { + } + + public Guid Id { get; init; } + public string Name { get; set; } +} diff --git a/Groceries.Data/Stores/Store.cs b/Groceries.Data/Stores/Store.cs new file mode 100644 index 0000000..b1237ef --- /dev/null +++ b/Groceries.Data/Stores/Store.cs @@ -0,0 +1,25 @@ +namespace Groceries.Data; + +public class Store +{ + public Store(Guid id, Guid retailerId, string name, string? address = null) + { + Id = id; + RetailerId = retailerId; + Name = name; + Address = address; + } + + public Store(Guid retailerId, string name, string? address = null) + : this(default, retailerId, name, address) + { + } + + public Guid Id { get; init; } + public Guid RetailerId { get; init; } + public string Name { get; set; } + public string? Address { get; set; } + + public Retailer? Retailer { get; init; } + public IEnumerable? Transactions { get; init; } +} diff --git a/Groceries.Data/Transactions/Transaction.cs b/Groceries.Data/Transactions/Transaction.cs new file mode 100644 index 0000000..7a22c64 --- /dev/null +++ b/Groceries.Data/Transactions/Transaction.cs @@ -0,0 +1,27 @@ +namespace Groceries.Data; + +using System.Text.Json.Serialization; + +public class Transaction +{ + [JsonConstructor] + public Transaction(Guid id, DateTime createdAt, Guid storeId) + { + Id = id; + CreatedAt = createdAt; + StoreId = storeId; + } + + public Transaction(DateTime createdAt, Guid storeId) : this(default, createdAt, storeId) + { + } + + public Guid Id { get; init; } + public DateTime CreatedAt { get; init; } + public Guid StoreId { get; init; } + + public ICollection Items { get; init; } = new List(); + public ICollection Promotions { get; init; } = new List(); + + public Store? Store { get; init; } +} diff --git a/Groceries.Data/Transactions/TransactionItem.cs b/Groceries.Data/Transactions/TransactionItem.cs new file mode 100644 index 0000000..35cf335 --- /dev/null +++ b/Groceries.Data/Transactions/TransactionItem.cs @@ -0,0 +1,26 @@ +namespace Groceries.Data; + +using System.Text.Json.Serialization; + +public class TransactionItem +{ + [JsonConstructor] + public TransactionItem(Guid transactionId, Guid itemId, decimal price, int quantity) + { + TransactionId = transactionId; + ItemId = itemId; + Price = price; + Quantity = quantity; + } + + public TransactionItem(Guid itemId, decimal price, int quantity) : this(default, itemId, price, quantity) + { + } + + public Guid TransactionId { get; init; } + public Guid ItemId { get; init; } + public decimal Price { get; set; } + public int Quantity { get; set; } + + public Item? Item { get; init; } +} diff --git a/Groceries.Data/Transactions/TransactionPromotion.cs b/Groceries.Data/Transactions/TransactionPromotion.cs new file mode 100644 index 0000000..60f9aa6 --- /dev/null +++ b/Groceries.Data/Transactions/TransactionPromotion.cs @@ -0,0 +1,21 @@ +namespace Groceries.Data; + +public class TransactionPromotion +{ + public TransactionPromotion(Guid id, Guid transactionId, string name, decimal amount) + { + Id = id; + TransactionId = transactionId; + Name = name; + Amount = amount; + } + + public Guid Id { get; set; } + public Guid TransactionId { get; set; } + public string Name { get; set; } = null!; + public decimal Amount { get; set; } + + public ICollection Items { get; init; } = new List(); + + public Transaction? Transaction { get; init; } +} diff --git a/Groceries.Data/Transactions/TransactionPromotionItem.cs b/Groceries.Data/Transactions/TransactionPromotionItem.cs new file mode 100644 index 0000000..80a6a6c --- /dev/null +++ b/Groceries.Data/Transactions/TransactionPromotionItem.cs @@ -0,0 +1,7 @@ +namespace Groceries.Data; + +internal sealed class TransactionPromotionItem +{ + public Guid TransactionPromotionId { get; init; } + public Guid ItemId { get; init; } +} diff --git a/Groceries.Data/Transactions/TransactionTotal.cs b/Groceries.Data/Transactions/TransactionTotal.cs new file mode 100644 index 0000000..f74c680 --- /dev/null +++ b/Groceries.Data/Transactions/TransactionTotal.cs @@ -0,0 +1,9 @@ +namespace Groceries.Data; + +public class TransactionTotal +{ + public Guid TransactionId { get; init; } + public decimal Total { get; init; } + + public Transaction? Transaction { get; init; } +} diff --git a/Groceries.sln b/Groceries.sln new file mode 100644 index 0000000..5e1be9b --- /dev/null +++ b/Groceries.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Groceries", "Groceries\Groceries.csproj", "{C370C8DD-B7A0-46F9-8AA0-569D7D98B354}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Groceries.Data", "Groceries.Data\Groceries.Data.csproj", "{4B8D5F1B-0F09-4626-A598-1400BF985637}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3B5FF09-44D2-491B-9663-0962BE0D1EBE}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + .gitignore = .gitignore + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C370C8DD-B7A0-46F9-8AA0-569D7D98B354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C370C8DD-B7A0-46F9-8AA0-569D7D98B354}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C370C8DD-B7A0-46F9-8AA0-569D7D98B354}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C370C8DD-B7A0-46F9-8AA0-569D7D98B354}.Release|Any CPU.Build.0 = Release|Any CPU + {4B8D5F1B-0F09-4626-A598-1400BF985637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B8D5F1B-0F09-4626-A598-1400BF985637}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B8D5F1B-0F09-4626-A598-1400BF985637}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B8D5F1B-0F09-4626-A598-1400BF985637}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BA46DEBB-75D8-4AFD-B07C-8B3F89820BF0} + EndGlobalSection +EndGlobal diff --git a/Groceries/Common/TurboControllerExtensions.cs b/Groceries/Common/TurboControllerExtensions.cs new file mode 100644 index 0000000..cfb1e9b --- /dev/null +++ b/Groceries/Common/TurboControllerExtensions.cs @@ -0,0 +1,32 @@ +namespace Groceries.Common; + +using Microsoft.AspNetCore.Mvc; + +public static class TurboControllerExtensions +{ + public static TurboStreamResult TurboStream( + this Controller controller, + TurboStreamAction action, + string target, + object? model) + { + return controller.TurboStream(action, target, null, model); + } + + public static TurboStreamResult TurboStream( + this Controller controller, + TurboStreamAction action, + string target, + string? viewName, + object? model) + { + controller.ViewData.Model = model; + + return new TurboStreamResult(action, target) + { + ViewName = viewName, + ViewData = controller.ViewData, + TempData = controller.TempData, + }; + } +} diff --git a/Groceries/Common/TurboHttpRequestExtensions.cs b/Groceries/Common/TurboHttpRequestExtensions.cs new file mode 100644 index 0000000..89e51b2 --- /dev/null +++ b/Groceries/Common/TurboHttpRequestExtensions.cs @@ -0,0 +1,19 @@ +namespace Groceries.Common; + +public static class TurboHttpRequestExtensions +{ + public static bool IsTurboFrameRequest(this HttpRequest request) + { + return request.Headers.ContainsKey("Turbo-Frame"); + } + + public static bool IsTurboFrameRequest(this HttpRequest request, string frameId) + { + return request.Headers.TryGetValue("Turbo-Frame", out var values) && values.Contains(frameId); + } + + public static bool AcceptsTurboStream(this HttpRequest request) + { + return request.GetTypedHeaders().Accept.Any(value => value.MediaType == "text/vnd.turbo-stream.html"); + } +} diff --git a/Groceries/Common/TurboStreamResult.cs b/Groceries/Common/TurboStreamResult.cs new file mode 100644 index 0000000..ba5949e --- /dev/null +++ b/Groceries/Common/TurboStreamResult.cs @@ -0,0 +1,182 @@ +namespace Groceries.Common; + +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; +using Microsoft.AspNetCore.Mvc.Infrastructure; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.AspNetCore.Mvc.ViewEngines; +using Microsoft.AspNetCore.Mvc.ViewFeatures; +using Microsoft.Extensions.Options; +using System.Diagnostics; +using System.Globalization; + +public enum TurboStreamAction +{ + Append, + Prepend, + Replace, + Update, + Remove, + Before, + After, +} + +public class TurboStreamResult : ActionResult, IStatusCodeActionResult +{ + public TurboStreamResult(TurboStreamAction action, string target) + { + Action = action; + Target = target; + } + + public TurboStreamAction Action { get; set; } + + public string Target { get; set; } + + public string ContentType => "text/vnd.turbo-stream.html"; + + ///

+ /// Gets or sets the HTTP status code. + ///

+ public int? StatusCode { get; set; } + + ///

+ /// Gets or sets the name or path of the partial view that is rendered to the response. + ///

+ /// + /// When null, defaults to . + /// + public string? ViewName { get; set; } + + ///

+ /// Gets the view data model. + ///

+ public object? Model => ViewData.Model; + + ///

+ /// Gets or sets the for this result. + ///

+ public ViewDataDictionary ViewData { get; set; } = null!; + + ///

+ /// Gets or sets the for this result. + ///

+ public ITempDataDictionary TempData { get; set; } = null!; + + ///

+ /// Gets or sets the used to locate views. + ///

+ /// + /// When null, an instance of from + /// ActionContext.HttpContext.RequestServices is used. + /// + public IViewEngine? ViewEngine { get; set; } + + /// + public override Task ExecuteResultAsync(ActionContext context) + { + var services = context.HttpContext.RequestServices; + var executor = services.GetRequiredService>(); + return executor.ExecuteAsync(context, this); + } +} + +public class TurboStreamResultExecutor : PartialViewResultExecutor, IActionResultExecutor +{ + public TurboStreamResultExecutor( + IOptions viewOptions, + IHttpResponseStreamWriterFactory writerFactory, + ICompositeViewEngine viewEngine, + ITempDataDictionaryFactory tempDataFactory, + DiagnosticListener diagnosticListener, + ILoggerFactory loggerFactory, + IModelMetadataProvider modelMetadataProvider) + : base(viewOptions, writerFactory, viewEngine, tempDataFactory, diagnosticListener, loggerFactory, modelMetadataProvider) + { + } + + /// + public Task ExecuteAsync(ActionContext context, TurboStreamResult result) + { + var viewEngine = result.ViewEngine ?? ViewEngine; + var viewName = result.ViewName ?? GetActionName(context)!; + + var viewEngineResult = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: false); + var originalViewEngineResult = viewEngineResult; + if (!viewEngineResult.Success) + { + viewEngineResult = viewEngine.FindView(context, viewName, isMainPage: false); + } + + viewEngineResult.EnsureSuccessful(originalViewEngineResult.SearchedLocations); + + var action = result.Action.ToString().ToLowerInvariant(); + var preContent = result.Action switch + { + TurboStreamAction.Remove => $"\n", + _ => $"\n\n", + }; + + result.ViewData["RenderingToTurboStream"] = true; + + using var view = new WrapperView(viewEngineResult.View, preContent, postContent); + return ExecuteAsync(context, view, result.ViewData, result.TempData, result.ContentType, result.StatusCode); + } + + private static string? GetActionName(ActionContext context) + { + const string actionNameKey = "action"; + if (!context.RouteData.Values.TryGetValue(actionNameKey, out var routeValue)) + { + return null; + } + + string? normalizedValue = null; + if (context.ActionDescriptor.RouteValues.TryGetValue(actionNameKey, out var value) && !string.IsNullOrEmpty(value)) + { + normalizedValue = value; + } + + var stringRouteValue = Convert.ToString(routeValue, CultureInfo.InvariantCulture); + if (string.Equals(normalizedValue, stringRouteValue, StringComparison.OrdinalIgnoreCase)) + { + return normalizedValue; + } + + return stringRouteValue; + } +} + +public sealed class WrapperView : IDisposable, IView +{ + private readonly IView innerView; + private readonly string preContent; + private readonly string postContent; + + public WrapperView(IView innerView, string preContent, string postContent) + { + this.innerView = innerView; + this.preContent = preContent; + this.postContent = postContent; + } + + public string Path => string.Empty; + + public void Dispose() + { + (innerView as IDisposable)?.Dispose(); + } + + public async Task RenderAsync(ViewContext context) + { + context.Writer.Write(preContent); + await innerView.RenderAsync(context); + context.Writer.Write(postContent); + } +} diff --git a/Groceries/Common/_Layout.cshtml b/Groceries/Common/_Layout.cshtml new file mode 100644 index 0000000..ac9edb3 --- /dev/null +++ b/Groceries/Common/_Layout.cshtml @@ -0,0 +1,27 @@ + + + + + + + Groceries@(ViewBag.Title != null ? Html.Raw($" – {ViewBag.Title}") : "") + + + + + @RenderSection("head", required: false) + + + + +

+ @**@ + @RenderBody() + @**@ +

+ + + + diff --git a/Groceries/Common/_LayoutSidebar.cshtml b/Groceries/Common/_LayoutSidebar.cshtml new file mode 100644 index 0000000..7a88e55 --- /dev/null +++ b/Groceries/Common/_LayoutSidebar.cshtml @@ -0,0 +1,53 @@ +@{ + var controller = ViewContext.RouteData.Values["controller"]?.ToString() ?? string.Empty; +} + + +Menu + +

+ +

+ @* dashboard squares icon *@ + + Dashboard +
+ @* receipt long icon *@ + + Lists +
+ @* shopping cart icon *@ + + Transactions +
+ @* category shapes icon *@ + + Items +
+ @* store building icon *@ + + Stores +

+ @*

+ + + Light + + + + + Dark + + +

*@ +

diff --git a/Groceries/Common/_Modal.cshtml b/Groceries/Common/_Modal.cshtml new file mode 100644 index 0000000..339c011 --- /dev/null +++ b/Groceries/Common/_Modal.cshtml @@ -0,0 +1,9 @@ + diff --git a/Groceries/Common/_TablePaginator.cshtml b/Groceries/Common/_TablePaginator.cshtml new file mode 100644 index 0000000..d745f46 --- /dev/null +++ b/Groceries/Common/_TablePaginator.cshtml @@ -0,0 +1,33 @@ +@model IListPageModel +@{ + var routeData = new Dictionary( + ViewContext.RouteData.Values + .Where(data => data.Value != null) + .Select(data => KeyValuePair.Create(data.Key, (string)data.Value!)) + .Concat(Context.Request.Query.Select(param => KeyValuePair.Create(param.Key, (string)param.Value!)))); +} + +

+ + Showing @(Model!.Offset + 1) to @(Model.Offset + Model.Count) of @Model.Total results + + +

diff --git a/Groceries/Common/_TurboStream.cshtml b/Groceries/Common/_TurboStream.cshtml new file mode 100644 index 0000000..a873a41 --- /dev/null +++ b/Groceries/Common/_TurboStream.cshtml @@ -0,0 +1,12 @@ + + @if (ViewBag.Action != "remove") + { + + } + else + { + IgnoreBody(); + } + diff --git a/Groceries/Groceries.csproj b/Groceries/Groceries.csproj new file mode 100644 index 0000000..8d0f4cd --- /dev/null +++ b/Groceries/Groceries.csproj @@ -0,0 +1,25 @@ + + + + net7.0 + enable + enable + nullable + recommended + + + + + + + + + + + + + + + + + diff --git a/Groceries/Home/HomeController.cs b/Groceries/Home/HomeController.cs new file mode 100644 index 0000000..bacfc06 --- /dev/null +++ b/Groceries/Home/HomeController.cs @@ -0,0 +1,47 @@ +namespace Groceries.Home; + +using Groceries.Data; + +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +[Route("/")] +public class HomeController : Controller +{ + private readonly AppDbContext dbContext; + + public HomeController(AppDbContext dbContext) + { + this.dbContext = dbContext; + } + + [HttpGet] + public async Task IndexAsync() + { + var randomTagQuantity = await dbContext.ItemTagQuantities + .FromSql($""" + SELECT tag, quantity, coalesce(unit_name, unit) AS unit, is_metric, is_divisible + FROM ( + SELECT + unnest(tags) AS tag, + round(sum((item_quantity->'amount')::numeric * quantity), 1) AS quantity, + item_quantity->>'unit' AS unit, + item_quantity->'is_metric' AS is_metric, + item_quantity->'is_divisible' AS is_divisible + FROM item_purchases + JOIN items USING (item_id) + CROSS JOIN item_quantity(name) + WHERE array_length(tags, 1) > 0 + AND age(created_at) <= '90 days' + AND item_quantity IS NOT NULL + GROUP BY tag, item_quantity->>'unit', item_quantity->'is_metric', item_quantity->'is_divisible' + ORDER BY random() + FETCH FIRST ROW ONLY + ) AS random_item_tag_quantity + LEFT JOIN item_tags USING (tag) + """) + .FirstOrDefaultAsync(); + + return View(randomTagQuantity); + } +} diff --git a/Groceries/Home/Index.cshtml b/Groceries/Home/Index.cshtml new file mode 100644 index 0000000..b295c62 --- /dev/null +++ b/Groceries/Home/Index.cshtml @@ -0,0 +1,42 @@ +@using Groceries.Data +@using Humanizer + +@model ItemTagQuantity? + +@section head { + @**@ +} + +

+ +

+ @if (Model != null) + { + @if (Model.IsDivisible) + { + var quantity = Convert.ToDouble(Model.Quantity); + var weekQuantity = Math.Round(quantity / 12); + + @(Model.IsMetric ? quantity.ToMetric() : quantity)@Model.Unit @Model.Tag + (@(Model.IsMetric ? weekQuantity.ToMetric() : weekQuantity)@Model.Unit per week) + } + else + { + var name = Model.Unit != null ? $"{Model.Tag} {Model.Unit}" : Model.Tag; + + var avgQuantity = Model.Quantity / 12; + var avgPeriod = "week"; + if (avgQuantity < 1) + { + avgQuantity *= 4; + avgPeriod = "month"; + } + + @name.ToQuantity(Convert.ToInt32(Model.Quantity)) + (@name.ToQuantity(Convert.ToInt32(avgQuantity)) per @avgPeriod) + } + } +

diff --git a/Groceries/Items/EditItem.cshtml b/Groceries/Items/EditItem.cshtml new file mode 100644 index 0000000..261394f --- /dev/null +++ b/Groceries/Items/EditItem.cshtml @@ -0,0 +1,25 @@ +@using Groceries.Data +@model Item +@{ + Layout = ViewBag.RenderingToTurboStream == true ? null : "_Modal"; + ViewBag.Title = "Edit Item"; +} + +

Edit Item

+ + diff --git a/Groceries/Items/Index.cshtml b/Groceries/Items/Index.cshtml new file mode 100644 index 0000000..fe1d851 --- /dev/null +++ b/Groceries/Items/Index.cshtml @@ -0,0 +1,55 @@ +@using Groceries.Items +@model ItemListModel +@{ + ViewBag.Title = "Items"; +} + +

Items

+ +

+ + +

+ + + + + + + + @**@ + + + + @foreach (var item in Model.Items) + { + + + + + + @**@ + + } + +

Brand	Name	Last Purchased	Barcode
@item.Brand	@item.Name	+ @item.LastPurchasedAt?.ToLongDateString() +	@(item.HasBarcode ? "✓" : "")	+ Edit +

+ +

+ diff --git a/Groceries/Items/ItemListModel.cs b/Groceries/Items/ItemListModel.cs new file mode 100644 index 0000000..b265bd3 --- /dev/null +++ b/Groceries/Items/ItemListModel.cs @@ -0,0 +1,10 @@ +namespace Groceries.Items; + +public record ItemListModel(string? Search, ListPageModel Items) +{ + public record Item(Guid Id, string Brand, string Name) + { + public bool HasBarcode { get; init; } + public DateTime? LastPurchasedAt { get; init; } + } +} diff --git a/Groceries/Items/ItemsController.cs b/Groceries/Items/ItemsController.cs new file mode 100644 index 0000000..2252690 --- /dev/null +++ b/Groceries/Items/ItemsController.cs @@ -0,0 +1,94 @@ +namespace Groceries.Items; + +using Groceries.Common; +using Groceries.Data; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +[Route("/items")] +public class ItemsController : Controller +{ + private readonly AppDbContext dbContext; + + public ItemsController(AppDbContext dbContext) + { + this.dbContext = dbContext; + } + + [HttpGet] + public async Task Index(int page, string? search) + { + var itemsQuery = dbContext.Items.AsQueryable(); + if (!string.IsNullOrEmpty(search)) + { + var searchPattern = $"%{search}%"; + itemsQuery = itemsQuery.Where(item => EF.Functions.ILike(item.Brand + ' ' + item.Name, searchPattern)); + } + + var lastPurchasesQuery = dbContext.ItemPurchases + .GroupBy(purchase => purchase.ItemId) + .Select(purchases => new + { + ItemId = purchases.Key, + CreatedAt = purchases.Max(purchase => purchase.CreatedAt), + }); + + var items = await itemsQuery + .OrderBy(item => item.Brand) + .ThenBy(item => item.Name) + .GroupJoin( + lastPurchasesQuery, + item => item.Id, + lastPurchase => lastPurchase.ItemId, + (item, lastPurchase) => new { item, lastPurchase }) + .SelectMany( + group => group.lastPurchase.DefaultIfEmpty(), + (group, lastPurchase) => new ItemListModel.Item(group.item.Id, group.item.Brand, group.item.Name) + { + HasBarcode = group.item.Barcodes.Any(), + LastPurchasedAt = lastPurchase != null ? lastPurchase.CreatedAt : null, + }) + .ToListPageModelAsync(page, cancellationToken: HttpContext.RequestAborted); + + if (items.Page != page) + { + return RedirectToAction(nameof(Index), new { page = items.Page, search }); + } + + var model = new ItemListModel(search, items); + return View(model); + } + + [HttpGet("{id}")] + public async Task EditItem(Guid id) + { + var item = await dbContext.Items + .SingleOrDefaultAsync(item => item.Id == id, HttpContext.RequestAborted); + + if (item == null) + { + return NotFound(); + } + + return View(item); + } + + [HttpPost("{id}")] + public async Task EditItem(Guid id, string brand, string name) + { + var item = await dbContext.Items + .SingleOrDefaultAsync(item => item.Id == id, HttpContext.RequestAborted); + + if (item == null) + { + return NotFound(); + } + + if (Request.AcceptsTurboStream()) + { + return this.TurboStream(TurboStreamAction.Replace, "modal-body", item); + } + + return RedirectToAction(nameof(EditItem)); + } +} diff --git a/Groceries/ListPageModel.cs b/Groceries/ListPageModel.cs new file mode 100644 index 0000000..efda7df --- /dev/null +++ b/Groceries/ListPageModel.cs @@ -0,0 +1,88 @@ +namespace Groceries; + +using Microsoft.EntityFrameworkCore; +using System.Collections; + +public interface IListPageModel +{ + int Offset { get; } + int Page { get; } + int PageSize { get; } + int LastPage { get; } + int Total { get; } + int Count { get; } +} + +public record ListPageModel : IListPageModel, IReadOnlyCollection +{ + public ListPageModel(IList items) + { + Items = items; + } + + public int Offset { get; init; } + public int Page { get; init; } + public int PageSize { get; init; } + public int LastPage { get; init; } + public int Total { get; init; } + public IList Items { get; init; } + + public int Count => Items.Count; + + public IEnumerator GetEnumerator() + { + return Items.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return Items.GetEnumerator(); + } +} + +public static class ListPageModel +{ + public static ListPageModel Empty() + { + return new ListPageModel(Array.Empty()); + } +} + +public static class ListPageModelExtensions +{ + public static async Task> ToListPageModelAsync( + this IQueryable query, + int page, + int pageSize = 10, + CancellationToken cancellationToken = default) + { + if (page < 1) + { + return new ListPageModel(Array.Empty()) { Page = 1 }; + } + + var total = await query.CountAsync(cancellationToken); + var lastPage = Math.Max(1, (int)Math.Ceiling((float)total / pageSize)); + + if (page > lastPage) + { + return new ListPageModel(Array.Empty()) { Page = lastPage }; + } + + var offset = (page - 1) * pageSize; + + var items = await query + .Skip(offset) + .Take(pageSize) + .ToArrayAsync(cancellationToken); + + return new ListPageModel(items) + { + Offset = offset, + Page = page, + PageSize = pageSize, + LastPage = lastPage, + Total = total, + }; + } +} diff --git a/Groceries/Program.cs b/Groceries/Program.cs new file mode 100644 index 0000000..00bf397 --- /dev/null +++ b/Groceries/Program.cs @@ -0,0 +1,48 @@ +using Groceries.Common; +using Groceries.Data; +using Microsoft.AspNetCore.Mvc.Infrastructure; +using Microsoft.AspNetCore.Mvc.Razor; +using Microsoft.EntityFrameworkCore; + +var builder = WebApplication.CreateBuilder(args); + +builder.Configuration + .AddIniFile("config.ini", optional: true, reloadOnChange: true) + .AddIniFile($"config_{builder.Environment.EnvironmentName}.ini", optional: true, reloadOnChange: true); + +var mvc = builder.Services + .AddControllersWithViews() + .AddRazorOptions(options => + { + options.ViewLocationFormats.Clear(); + options.ViewLocationFormats.Add("/{1}/{0}" + RazorViewEngine.ViewExtension); + options.ViewLocationFormats.Add("/Common/{0}" + RazorViewEngine.ViewExtension); + }) + .AddSessionStateTempDataProvider(); + +if (builder.Environment.IsDevelopment()) +{ + mvc.AddRazorRuntimeCompilation(); +} + +builder.Services.AddDistributedMemoryCache(); +builder.Services.AddSession(); + +builder.Services.AddSingleton, TurboStreamResultExecutor>(); + +builder.Services.AddDbContextPool(options => options + .EnableDetailedErrors(builder.Environment.IsDevelopment()) + .EnableSensitiveDataLogging(builder.Environment.IsDevelopment()) + .UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking) + .UseSnakeCaseNamingConvention() + .UseNpgsql(builder.Configuration["Database"]!)); + +var app = builder.Build(); + +app.UseStaticFiles(); +app.UseRouting(); +app.UseSession(); + +app.MapControllers(); + +app.Run(); diff --git a/Groceries/Properties/launchSettings.json b/Groceries/Properties/launchSettings.json new file mode 100644 index 0000000..9e4e354 --- /dev/null +++ b/Groceries/Properties/launchSettings.json @@ -0,0 +1,13 @@ +{ + "profiles": { + "Groceries": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7021;http://localhost:5021", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Groceries/Stores/EditStore.cshtml b/Groceries/Stores/EditStore.cshtml new file mode 100644 index 0000000..4a932a8 --- /dev/null +++ b/Groceries/Stores/EditStore.cshtml @@ -0,0 +1,36 @@ +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Extensions; + +@model Groceries.Data.Store +@{ + ViewBag.Title = "Edit Store"; + + var returnUrl = Url.Action("Index", new { page = 1 }); + if (Context.Request.GetTypedHeaders().Referer is Uri referer && referer.Host == Context.Request.Host.Host) + { + var requestUrl = new UriBuilder + { + Scheme = Context.Request.Scheme, + Host = Context.Request.Host.Host, + Port = Context.Request.Host.Port.GetValueOrDefault(-1), + Path = Context.Request.Path.ToString(), + Query = Context.Request.QueryString.ToString(), + }.Uri; + + if (referer != requestUrl) + { + returnUrl = referer.PathAndQuery; + } + } +} + +

Edit Store

+ +

+ + +

+ + Cancel +

+ diff --git a/Groceries/Stores/EditStore_Modal.cshtml b/Groceries/Stores/EditStore_Modal.cshtml new file mode 100644 index 0000000..a21e4a7 --- /dev/null +++ b/Groceries/Stores/EditStore_Modal.cshtml @@ -0,0 +1,14 @@ +@model Groceries.Data.Store +@{ + Layout = "_Modal"; + ViewBag.Title = "Edit Store"; +} + +

+ + + + diff --git a/Groceries/Stores/Index.cshtml b/Groceries/Stores/Index.cshtml new file mode 100644 index 0000000..924ec2a --- /dev/null +++ b/Groceries/Stores/Index.cshtml @@ -0,0 +1,52 @@ +@using Groceries.Stores +@model StoreListModel +@{ + ViewBag.Title = "Stores"; +} + +

Stores

+ + New store +

+ + +

+ + + + + + + + + + + @foreach (var store in Model.Stores) + { + + + + + + + } + +

Retailer	Name	Transactions
@store.Retailer	@store.Name	@store.TotalTransactions	+ Edit +

+ +

+ diff --git a/Groceries/Stores/NewStore.cshtml b/Groceries/Stores/NewStore.cshtml new file mode 100644 index 0000000..eb9f6c6 --- /dev/null +++ b/Groceries/Stores/NewStore.cshtml @@ -0,0 +1,35 @@ +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Extensions; + +@{ + ViewBag.Title = "New Store"; + + var returnUrl = Url.Action("Index", new { page = 1 }); + if (Context.Request.GetTypedHeaders().Referer is Uri referer && referer.Host == Context.Request.Host.Host) + { + var requestUrl = new UriBuilder + { + Scheme = Context.Request.Scheme, + Host = Context.Request.Host.Host, + Port = Context.Request.Host.Port.GetValueOrDefault(-1), + Path = Context.Request.Path.ToString(), + Query = Context.Request.QueryString.ToString(), + }.Uri; + + if (referer != requestUrl) + { + returnUrl = referer.PathAndQuery; + } + } +} + +

New Store

+ +

+ + +

+ + Cancel +

+ diff --git a/Groceries/Stores/NewStore_Modal.cshtml b/Groceries/Stores/NewStore_Modal.cshtml new file mode 100644 index 0000000..a563269 --- /dev/null +++ b/Groceries/Stores/NewStore_Modal.cshtml @@ -0,0 +1,13 @@ +@{ + Layout = "_Modal"; + ViewBag.Title = "New Store"; +} + +

+ + + + diff --git a/Groceries/Stores/StoreListModel.cs b/Groceries/Stores/StoreListModel.cs new file mode 100644 index 0000000..c78e60d --- /dev/null +++ b/Groceries/Stores/StoreListModel.cs @@ -0,0 +1,9 @@ +namespace Groceries.Stores; + +public record StoreListModel(string? Search, ListPageModel Stores) +{ + public record Store(Guid Id, string Retailer, string Name) + { + public int TotalTransactions { get; init; } + } +} diff --git a/Groceries/Stores/StoresController.cs b/Groceries/Stores/StoresController.cs new file mode 100644 index 0000000..455ae2c --- /dev/null +++ b/Groceries/Stores/StoresController.cs @@ -0,0 +1,95 @@ +namespace Groceries.Stores; + +using Groceries.Common; +using Groceries.Data; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +[Route("/stores")] +public class StoresController : Controller +{ + private readonly AppDbContext dbContext; + + public StoresController(AppDbContext dbContext) + { + this.dbContext = dbContext; + } + + [HttpGet] + public async Task Index(int page, string? search) + { + var storesQuery = dbContext.Stores.AsQueryable(); + if (!string.IsNullOrEmpty(search)) + { + var searchPattern = $"%{search}%"; + storesQuery = storesQuery.Where(store => EF.Functions.ILike(store.Retailer!.Name + ' ' + store.Name, searchPattern)); + } + + var stores = await storesQuery + .OrderBy(store => store.Retailer!.Name) + .ThenBy(store => store.Name) + .Select(store => new StoreListModel.Store(store.Id, store.Retailer!.Name, store.Name) + { + TotalTransactions = store.Transactions!.Count(), + }) + .ToListPageModelAsync(page, cancellationToken: HttpContext.RequestAborted); + + if (stores.Page != page) + { + return RedirectToAction(nameof(Index), new { page = stores.Page, search }); + } + + var model = new StoreListModel(search, stores); + return View(model); + } + + [HttpGet("new")] + public IActionResult NewStore() + { + return Request.IsTurboFrameRequest("modal") + ? View($"{nameof(NewStore)}_Modal") + : View(); + } + + [HttpPost("new")] + public async Task NewStore(Guid retailerId, string name, string? address) + { + var store = new Store(retailerId, name, address); + dbContext.Stores.Add(store); + + await dbContext.SaveChangesAsync(HttpContext.RequestAborted); + + return Request.IsTurboFrameRequest("modal") + ? NoContent() + : RedirectToAction(nameof(Index), new { page = 1 }); + } + + [HttpGet("edit/{id}")] + public async Task EditStore(Guid id) + { + var store = await dbContext.Stores + .SingleOrDefaultAsync(store => store.Id == id, HttpContext.RequestAborted); + + if (store == null) + { + return NotFound(); + } + + return Request.IsTurboFrameRequest("modal") + ? View($"{nameof(EditStore)}_Modal", store) + : View(store); + } + + [HttpPost("edit/{id}")] + public async Task EditStore(Guid id, Guid retailerId, string name, string? address) + { + var store = new Store(id, retailerId, name, address); + dbContext.Stores.Update(store); + + await dbContext.SaveChangesAsync(HttpContext.RequestAborted); + + return Request.IsTurboFrameRequest("modal") + ? NoContent() + : RedirectToAction(nameof(EditStore)); + } +} diff --git a/Groceries/Stores/_StoreForm.cshtml b/Groceries/Stores/_StoreForm.cshtml new file mode 100644 index 0000000..b9d7f7f --- /dev/null +++ b/Groceries/Stores/_StoreForm.cshtml @@ -0,0 +1,35 @@ +@using Groceries.Data +@using Microsoft.EntityFrameworkCore + +@model Store? +@inject AppDbContext dbContext +@{ + var retailers = await dbContext.Retailers + .OrderBy(retailer => retailer.Name) + .ToListAsync(); +} + +

+ Retailer + +

+ +

+ Name +

+ +

+ + Address + Optional + + +

diff --git a/Groceries/Transactions/EditTransactionItem.cshtml b/Groceries/Transactions/EditTransactionItem.cshtml new file mode 100644 index 0000000..0fcf521 --- /dev/null +++ b/Groceries/Transactions/EditTransactionItem.cshtml @@ -0,0 +1,26 @@ +@using Groceries.Data; +@using Microsoft.EntityFrameworkCore; + +@model (Transaction Transaction, TransactionItem TransactionItem) +@inject AppDbContext dbContext +@{ + ViewBag.Title = "Edit Transaction Item"; + + var store = await dbContext.Stores + .Where(store => store.Id == Model.Transaction.StoreId) + .Select(store => string.Concat(store.Retailer!.Name, " ", store.Name)) + .SingleAsync(); +} + +

Edit Transaction Item

+ +

@Model.Transaction.CreatedAt.ToShortDateString() @Model.Transaction.CreatedAt.ToShortTimeString() – @store

+ +

+ + +

+ + Cancel +

+ diff --git a/Groceries/Transactions/EditTransactionItem_Modal.cshtml b/Groceries/Transactions/EditTransactionItem_Modal.cshtml new file mode 100644 index 0000000..abe7864 --- /dev/null +++ b/Groceries/Transactions/EditTransactionItem_Modal.cshtml @@ -0,0 +1,20 @@ +@using Groceries.Data + +@model (Transaction Transaction, TransactionItem TransactionItem) +@{ + Layout = "_Modal"; + ViewBag.Title = "Edit Transaction Item"; +} + +

+ + + + + + diff --git a/Groceries/Transactions/Index.cshtml b/Groceries/Transactions/Index.cshtml new file mode 100644 index 0000000..6f6338c --- /dev/null +++ b/Groceries/Transactions/Index.cshtml @@ -0,0 +1,81 @@ +@using Groceries.Transactions +@using Microsoft.AspNetCore.Html; +@model TransactionListModel +@{ + ViewBag.Title = "Transactions"; + + string? GetNextSortDir(string col) + { + if (col != Model.Sort) + { + return "asc"; + } + + return Model.Dir switch + { + null or "" => "asc", + "asc" => "desc", + _ => null, + }; + } + + string? GetSortDir(string col) + { + if (col != Model.Sort) + { + return null; + } + + return Model.Dir switch + { + "asc" or "desc" => Model.Dir, + _ => null, + }; + } +} + +

Transactions

+ New transaction +

+ +

+ + + + + + + + @**@ + + + + @foreach (var transaction in Model.Transactions) + { + + + + + + @**@ + + } + +

+ + Date + +	Store	+ + Items + +	+ + Amount + +
+ @transaction.CreatedAt.ToLongDateString() +	@transaction.Store	@transaction.TotalItems	@transaction.TotalAmount.ToString("c")	View

+ +

diff --git a/Groceries/Transactions/NewTransaction.cshtml b/Groceries/Transactions/NewTransaction.cshtml new file mode 100644 index 0000000..c69a562 --- /dev/null +++ b/Groceries/Transactions/NewTransaction.cshtml @@ -0,0 +1,41 @@ +@using Groceries.Data; +@using Microsoft.EntityFrameworkCore; + +@inject AppDbContext dbContext +@{ + ViewBag.Title = "New Transaction"; + + var datetime = DateTime.Now.ToString("s"); + + var stores = await dbContext.Stores + .OrderBy(store => store.Retailer!.Name) + .ThenBy(store => store.Name) + .Select(store => new { store.Id, Name = string.Concat(store.Retailer!.Name, " ", store.Name) }) + .ToListAsync(); +} + +

New Transaction

+ + diff --git a/Groceries/Transactions/NewTransactionItem.cshtml b/Groceries/Transactions/NewTransactionItem.cshtml new file mode 100644 index 0000000..8c69512 --- /dev/null +++ b/Groceries/Transactions/NewTransactionItem.cshtml @@ -0,0 +1,26 @@ +@using Groceries.Data; +@using Microsoft.EntityFrameworkCore; + +@model Transaction +@inject AppDbContext dbContext +@{ + ViewBag.Title = "New Transaction Item"; + + var store = await dbContext.Stores + .Where(store => store.Id == Model.StoreId) + .Select(store => string.Concat(store.Retailer!.Name, " ", store.Name)) + .SingleAsync(); +} + +

New Transaction Item

+ +

@Model.CreatedAt.ToShortDateString() @Model.CreatedAt.ToShortTimeString() – @store

+ +

+ + +

+ + Cancel +

+ diff --git a/Groceries/Transactions/NewTransactionItem_Modal.cshtml b/Groceries/Transactions/NewTransactionItem_Modal.cshtml new file mode 100644 index 0000000..79d7c77 --- /dev/null +++ b/Groceries/Transactions/NewTransactionItem_Modal.cshtml @@ -0,0 +1,16 @@ +@using Groceries.Data + +@model Transaction +@{ + Layout = "_Modal"; + ViewBag.Title = "New Transaction Item"; +} + +

+ + + + diff --git a/Groceries/Transactions/NewTransactionItems.cshtml b/Groceries/Transactions/NewTransactionItems.cshtml new file mode 100644 index 0000000..eef4a34 --- /dev/null +++ b/Groceries/Transactions/NewTransactionItems.cshtml @@ -0,0 +1,56 @@ +@using Groceries.Data; +@using Microsoft.EntityFrameworkCore; + +@model Transaction +@inject AppDbContext dbContext +@{ + ViewBag.Title = "New Transaction"; + + var store = await dbContext.Stores + .Where(store => store.Id == Model.StoreId) + .Select(store => string.Concat(store.Retailer!.Name, " ", store.Name)) + .SingleAsync(); + + var itemIds = Model.Items.Select(item => item.ItemId); + var items = await dbContext.Items + .Where(item => itemIds.Contains(item.Id)) + .Select(item => new { item.Id, Name = string.Concat(item.Brand, " ", item.Name) }) + .ToListAsync(); +} + +

New Transaction

+ +

@Model.CreatedAt.ToShortDateString() @Model.CreatedAt.ToLongTimeString() – @store

+ + diff --git a/Groceries/Transactions/TransactionListModel.cs b/Groceries/Transactions/TransactionListModel.cs new file mode 100644 index 0000000..18fc46c --- /dev/null +++ b/Groceries/Transactions/TransactionListModel.cs @@ -0,0 +1,10 @@ +namespace Groceries.Transactions; + +public record TransactionListModel(string? Sort, string? Dir, ListPageModel Transactions) +{ + public record Transaction(Guid Id, DateTime CreatedAt, string Store) + { + public decimal TotalAmount { get; init; } + public int TotalItems { get; init; } + } +} diff --git a/Groceries/Transactions/TransactionsController.cs b/Groceries/Transactions/TransactionsController.cs new file mode 100644 index 0000000..e5096eb --- /dev/null +++ b/Groceries/Transactions/TransactionsController.cs @@ -0,0 +1,237 @@ +namespace Groceries.Transactions; + +using Groceries.Common; +using Groceries.Data; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using System.Text.Json; + +[Route("/transactions")] +public class TransactionsController : Controller +{ + private readonly AppDbContext dbContext; + + public TransactionsController(AppDbContext dbContext) + { + this.dbContext = dbContext; + } + + [HttpGet] + public async Task Index(int page, string? sort, string? dir) + { + var transactionsQuery = dbContext.Transactions + .Join( + dbContext.TransactionTotals, + transaction => transaction.Id, + transactionTotal => transactionTotal.TransactionId, + (transaction, transactionTotal) => new + { + transaction.Id, + transaction.CreatedAt, + Store = string.Concat(transaction.Store!.Retailer!.Name, " ", transaction.Store.Name), + TotalAmount = transactionTotal.Total, + TotalItems = transaction.Items.Sum(item => item.Quantity), + }); + + transactionsQuery = sort?.ToLowerInvariant() switch + { + "date" when dir == "desc" => transactionsQuery.OrderByDescending(transaction => transaction.CreatedAt), + "amount" when dir == "desc" => transactionsQuery.OrderByDescending(transaction => transaction.TotalAmount), + "items" when dir == "desc" => transactionsQuery.OrderByDescending(transaction => transaction.TotalItems), + "date" => transactionsQuery.OrderBy(transaction => transaction.CreatedAt), + "amount" => transactionsQuery.OrderBy(transaction => transaction.TotalAmount), + "items" => transactionsQuery.OrderBy(transaction => transaction.TotalItems), + _ => transactionsQuery.OrderByDescending(transaction => transaction.CreatedAt), + }; + + var transactions = await transactionsQuery + .Select(transaction => new TransactionListModel.Transaction(transaction.Id, transaction.CreatedAt, transaction.Store) + { + TotalAmount = transaction.TotalAmount, + TotalItems = transaction.TotalItems, + }) + .ToListPageModelAsync(page); + + if (transactions.Page != page) + { + return RedirectToAction(nameof(Index), new { page = transactions.Page }); + } + + var model = new TransactionListModel(sort, dir, transactions); + return View(model); + } + + [HttpGet("new")] + public IActionResult NewTransaction() + { + return View(); + } + + [HttpPost("new")] + public IActionResult NewTransaction(DateTime createdAt, Guid storeId) + { + var transaction = new Transaction(createdAt.ToUniversalTime(), storeId); + TempData["NewTransaction"] = JsonSerializer.Serialize(transaction); + + return RedirectToAction(nameof(NewTransactionItems)); + } + + [HttpGet("new/items")] + public IActionResult NewTransactionItems() + { + if (TempData.Peek("NewTransaction") is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + return View(transaction); + } + + [HttpPost("new/items")] + public async Task PostNewTransactionItems() + { + if (TempData["NewTransaction"] is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + dbContext.Transactions.Add(transaction); + await dbContext.SaveChangesAsync(); + + return RedirectToAction(nameof(Index), new { page = 1 }); + } + + [HttpGet("new/items/new")] + public IActionResult NewTransactionItem() + { + if (TempData.Peek("NewTransaction") is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + return Request.IsTurboFrameRequest("modal") + ? View($"{nameof(NewTransactionItem)}_Modal", transaction) + : View(transaction); + } + + [HttpPost("new/items/new")] + public async Task NewTransactionItem(string brand, string name, decimal price, int quantity) + { + if (TempData.Peek("NewTransaction") is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + var itemId = await dbContext.Items + .Where(item => EF.Functions.ILike(item.Brand, brand) && EF.Functions.ILike(item.Name, name)) + .Select(item => item.Id) + .SingleOrDefaultAsync(); + + if (itemId == default) + { + var item = new Item(brand, name); + dbContext.Items.Add(item); + await dbContext.SaveChangesAsync(); + itemId = item.Id; + } + + // TODO: Handle item already in transaction - merge, replace, error? + + var transactionItem = new TransactionItem(itemId, price, quantity); + transaction.Items.Add(transactionItem); + + TempData["NewTransaction"] = JsonSerializer.Serialize(transaction); + + return Request.IsTurboFrameRequest("modal") + ? NoContent() + : RedirectToAction(nameof(NewTransactionItems)); + } + + [HttpGet("new/items/edit/{id}")] + public IActionResult EditTransactionItem(Guid id) + { + if (TempData.Peek("NewTransaction") is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + var transactionItem = transaction.Items.SingleOrDefault(item => item.ItemId == id); + if (transactionItem == null) + { + return RedirectToAction(nameof(NewTransactionItems)); + } + + var model = (transaction, transactionItem); + return Request.IsTurboFrameRequest("modal") + ? View($"{nameof(EditTransactionItem)}_Modal", model) + : View(model); + } + + [HttpPost("new/items/edit/{id}")] + public async Task EditTransactionItem(Guid id, string brand, string name, decimal price, int quantity) + { + if (TempData.Peek("NewTransaction") is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + var transactionItem = transaction.Items.SingleOrDefault(item => item.ItemId == id); + if (transactionItem == null) + { + return RedirectToAction(nameof(NewTransactionItems)); + } + + var itemId = await dbContext.Items + .Where(item => EF.Functions.ILike(item.Brand, brand) && EF.Functions.ILike(item.Name, name)) + .Select(item => item.Id) + .SingleOrDefaultAsync(); + + if (itemId == transactionItem.ItemId) + { + transactionItem.Price = price; + transactionItem.Quantity = quantity; + } + else + { + if (itemId == default) + { + var item = new Item(brand, name); + dbContext.Items.Add(item); + await dbContext.SaveChangesAsync(); + itemId = item.Id; + } + + transaction.Items.Remove(transactionItem); + + transactionItem = new TransactionItem(itemId, price, quantity); + transaction.Items.Add(transactionItem); + } + + TempData["NewTransaction"] = JsonSerializer.Serialize(transaction); + + return Request.IsTurboFrameRequest("modal") + ? NoContent() + : RedirectToAction(nameof(NewTransactionItems)); + } + + [HttpPost("new/items/delete/{id}")] + public IActionResult DeleteTransactionItem(Guid id) + { + if (TempData.Peek("NewTransaction") is not string json || JsonSerializer.Deserialize(json) is not Transaction transaction) + { + return RedirectToAction(nameof(NewTransaction)); + } + + var transactionItem = transaction.Items.SingleOrDefault(item => item.ItemId == id); + if (transactionItem != null) + { + transaction.Items.Remove(transactionItem); + } + + TempData["NewTransaction"] = JsonSerializer.Serialize(transaction); + + return Request.IsTurboFrameRequest("modal") + ? NoContent() + : RedirectToAction(nameof(NewTransactionItems)); + } +} diff --git a/Groceries/Transactions/_TransactionItemForm.cshtml b/Groceries/Transactions/_TransactionItemForm.cshtml new file mode 100644 index 0000000..4d92d3c --- /dev/null +++ b/Groceries/Transactions/_TransactionItemForm.cshtml @@ -0,0 +1,49 @@ +@using Groceries.Data +@using Microsoft.EntityFrameworkCore + +@model TransactionItem? +@inject AppDbContext dbContext +@{ + var items = await dbContext.Items + .OrderBy(item => item.Brand) + .ToListAsync(); + + var selectedItem = items.SingleOrDefault(item => item.Id == Model?.ItemId); +} + +

+ Item +

+ + + + + @foreach (var item in items.DistinctBy(item => item.Brand)) + { + + + + @foreach (var item in items.OrderBy(item => item.Name)) + { + +

+ +

+ Price +

+ @*@CultureInfo.CurrentCulture.NumberFormat.CurrencySymbol*@ + +

+ +

+ Quantity +

+ +

diff --git a/Groceries/_ViewImports.cshtml b/Groceries/_ViewImports.cshtml new file mode 100644 index 0000000..aeef269 --- /dev/null +++ b/Groceries/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using Groceries +@namespace Groceries.Views +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Groceries/_ViewStart.cshtml b/Groceries/_ViewStart.cshtml new file mode 100644 index 0000000..1d539d5 --- /dev/null +++ b/Groceries/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = ViewBag.RenderingToTurboStream == true ? null : "_Layout"; +} diff --git a/Groceries/config.ini b/Groceries/config.ini new file mode 100644 index 0000000..c87eddf --- /dev/null +++ b/Groceries/config.ini @@ -0,0 +1,5 @@ +Database="Host=127.0.0.1;Username=groceries;Password=password;Database=groceries" + +[Logging:LogLevel] +Default=Information +Microsoft=Warning diff --git a/Groceries/libman.json b/Groceries/libman.json new file mode 100644 index 0000000..3689da3 --- /dev/null +++ b/Groceries/libman.json @@ -0,0 +1,14 @@ +{ + "version": "1.0", + "defaultProvider": "unpkg", + "libraries": [ + { + "library": "@hotwired/turbo@7.3.0", + "destination": "wwwroot/lib/hotwired/turbo/" + }, + { + "library": "@hotwired/stimulus@3.2.1", + "destination": "wwwroot/lib/hotwired/stimulus/" + } + ] +} diff --git a/Groceries/wwwroot/css/main.css b/Groceries/wwwroot/css/main.css new file mode 100644 index 0000000..6e161f1 --- /dev/null +++ b/Groceries/wwwroot/css/main.css @@ -0,0 +1,644 @@ +@import url("https://rsms.me/inter/inter.css"); + +:root { + font-family: "Inter", sans-serif; + color-scheme: light; +} + +@supports (font-variation-settings: normal) { + :root { + font-family: "Inter var", sans-serif; + } +} + +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +[hidden] { + display: none !important; +} + +body { + display: flex; + background-color: rgb(243, 244, 246); +} + +h1 { + font-size: 2rem; + font-weight: 800; + letter-spacing: -0.025em; + margin-bottom: 1rem; +} + +h1, h2, h3, h4, h5, h6 { + color: rgb(17, 24, 39); +} + +/*@media (prefers-color-scheme: dark) { + :root { + color-scheme: dark; + } + + body { + background-color: rgb(17, 24, 39); + } + + h1, h2, h3, h4, h5, h6 { + color: rgb(255, 255, 255); + } +}*/ + +.main-content { + height: 100vh; + width: 100%; + max-width: 80rem; + overflow-y: auto; + padding: 2.5rem 4rem; + margin: 0 auto; + background-color: inherit; +} + +@media (max-width: 40rem) { + .main-content { + padding-inline: 0; + } +} + +/* Layout */ + +.flex-2 { + flex: 2; +} + +.flex-5 { + flex: 5; +} + +.row { + display: flex; + align-items: baseline; + gap: 0.75rem; +} + +.row__fill { + flex: auto; +} + +/* Icon */ + +.icon { + fill: currentColor; + height: 1.5rem; + width: 1.5rem; +} + +.icon--sm { + height: 1.25rem; + width: 1.25rem; +} + +/* Sidebar */ + +.sidebar { + flex: none; + height: 100vh; + width: 16rem; + padding: 0.5rem; + display: flex; + flex-direction: column; + border-right: 1px solid rgb(229, 231, 235); + background-color: rgb(255, 255, 255); +} + +.sidebar__toggle, .sidebar__toggle + label { + display: none; +} + +@media (max-width: 40rem) { + .sidebar { + position: fixed; + transform: translateX(-100%); + transition: transform 0.5s cubic-bezier(0.19, 1, 0.22, 1); + will-change: transform; + } + + .sidebar__toggle:checked ~ .sidebar { + transform: translateX(0); + } + + .sidebar__toggle { + display: initial; + position: fixed; + visibility: hidden; + } + + .sidebar__toggle + label { + background: none; + border: none; + outline: none; + cursor: pointer; + display: initial; + position: absolute; + transform: translateX(0); + transition: transform 0.5s cubic-bezier(0.19, 1, 0.22, 1); + will-change: transform; + z-index: 2; + } + + .sidebar__toggle:checked + label { + transform: translateX(16rem); + } + + .sidebar__toggle + label::before { + content: ""; + pointer-events: none; + position: fixed; + width: 100vw; + height: 100vh; + background-color: rgba(0, 0, 0, 0.2); + opacity: 0; + transition: opacity 0.5s cubic-bezier(0.19, 1, 0.22, 1); + will-change: opacity; + z-index: 1; + } + + .sidebar__toggle:checked + label::before { + opacity: 100%; + pointer-events: auto; + } + + .main-content { + transform: translateX(0); + transition: transform 0.5s cubic-bezier(0.19, 1, 0.22, 1); + will-change: transform; + } + + .sidebar__toggle:checked ~ .main-content { + transform: translateX(16rem); + } +} + +.sidebar__header { + color: rgb(17, 24, 39); + font-size: 1.5rem; + font-weight: 800; + letter-spacing: -0.025em; + padding: 1.5rem 0.75rem; +} + +.sidebar__body { + flex: 1; +} + +.sidebar__item { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.75rem 0.5rem; + border-radius: 0.375rem; + color: rgb(107, 114, 128); + font-weight: 500; +} + +.sidebar__item--active { + background-color: rgb(243, 244, 246); + color: rgb(75, 85, 99); +} + +.sidebar__link { + color: inherit; + text-decoration: none; +} + +/*@media (prefers-color-scheme: dark) { + .sidebar { + border-color: rgb(75, 85, 99); + background-color: rgb(31, 41, 55); + } + + .sidebar__header { + color: rgb(255, 255, 255); + } + + .sidebar__item { + color: rgb(209, 213, 219); + } + + .sidebar__item:where(:hover) { + background-color: rgb(55, 65, 81); + color: rgb(255, 255, 255); + } + + .sidebar__item--active { + background-color: rgb(17, 24, 39); + color: rgb(255, 255, 255); + } +}*/ + +/* Modal */ + +.modal { + background-color: transparent; + border: none; + overflow: visible; + margin: auto; + min-width: min(28rem, 100%); +} + +.modal::backdrop { + background: rgba(0, 0, 0, 0.2); + backdrop-filter: blur(4px); +} + +html:has(.modal[open]) { + overflow: hidden; +} + +/* HACK: should probably be a .button--icon */ +.modal__close-button { + padding: 0 !important; + margin-block: -1rem; + width: 2rem; + height: 2rem; +} + +/* Slide toggle */ + +.slide-toggle { + padding: 0.125rem; + border-radius: 0.5rem; + background-color: rgb(243, 244, 246); +} + +.slide-toggle__option { + display: inline-flex; + align-items: center; +} + +.slide-toggle__control { + appearance: none; +} + +/*@media (prefers-color-scheme: dark) { + .slide-toggle { + background-color: rgb(17, 24, 39); + } +}*/ + +/* Card */ + +.card { + overflow: hidden; + background-color: rgb(255, 255, 255); + border-radius: 0.5rem; + box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1); +} + +.card__content { + margin: 1.5rem; +} + +.card__header { + border-bottom: 1px solid rgb(243, 244, 246); + padding: 1.25rem 1.5rem; +} + +.card__footer { + border-top: 1px solid rgb(243, 244, 246); + padding: 0.75rem 1.5rem; +} + +.card__footer--shaded { + background-color: rgb(249, 250, 251); + border-color: transparent; +} + +/* Table */ + +.table { + overflow: hidden; + border-radius: 0.5rem; + box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1); +} + +.table table { + min-width: 100%; + border-collapse: collapse; +} + +.table__header { + background-color: rgb(249, 250, 251); + color: rgb(107, 114, 128); + font-size: 0.75rem; + font-weight: 500; + letter-spacing: 0.05em; + line-height: 1rem; + text-align: start; + text-transform: uppercase; + padding: 0.75rem 1.5rem; + white-space: nowrap; +} + +.table__header--sortable a { + color: inherit; + text-decoration: none; + position: relative; +} + +.table__header--sortable a::after { + position: absolute; + margin-left: 0.3rem; +} + +.table__header--sortable a[data-dir=asc]::after { + content: "\25B2"; +} + +.table__header--sortable a[data-dir=desc]::after { + content: "\25BC"; +} + +.table__cell { + background-color: rgb(255, 255, 255); + color: rgb(17, 24, 39); + border-top: 1px solid rgb(229, 231, 235); + font-size: 0.875rem; + line-height: 1.25rem; + padding: 1rem 1.5rem; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.table__cell--icon { + font-size: 1.25rem; +} + +.table__cell--numeric { + text-align: end; +} + +.table__paginator { + display: flex; + justify-content: space-between; + background-color: rgb(255, 255, 255); + color: rgb(55, 65, 81); + border-top: 1px solid rgb(229, 231, 235); + font-size: 0.875rem; + line-height: 1.25rem; + padding: 0.75rem 1.5rem; +} + +/*@media (prefers-color-scheme: dark) { + .table__header { + background-color: rgb(55, 65, 81); + color: rgb(156, 163, 175); + } + + .table__cell { + background-color: rgb(31, 41, 55); + border-color: rgb(55, 65, 81); + color: rgb(255, 255, 255); + } + + .table__paginator { + background-color: rgb(55, 65, 81); + border-color: rgb(55, 65, 81); + color: rgb(156, 163, 175); + } +}*/ + +/* Link */ + +.link { + display: inline-block; + text-decoration: none; + appearance: none; + font-weight: 600; + color: rgb(26, 86, 219); + cursor: pointer; +} + +.link:focus-visible:not(.link--disabled, [disabled]), .link:hover { + outline: none; + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} + +.link--disabled, .link[disabled] { + pointer-events: none; + opacity: 50%; +} + +/* Button */ + +.button { + display: inline-block; + text-decoration: none; + appearance: none; + background-color: rgb(255, 255, 255); + border: 1px solid rgb(209, 213, 219); + border-radius: 0.375rem; + color: rgb(55, 65, 81); + font-size: 0.875rem; + font-weight: 500; + line-height: 1.25rem; + padding: 0.5rem 1rem; + cursor: pointer; +} + +.button--primary { + background-color: rgb(26, 86, 219); + border-color: transparent; + color: rgb(255, 255, 255); +} + +.button--danger { + background-color: rgb(220, 38, 38); + border-color: transparent; + color: rgb(255, 255, 255); +} + +.button:focus-visible:not(.button--disabled, [disabled]), .button:hover { + outline: none; + filter: brightness(0.85); +} + +.button--disabled, .button[disabled] { + pointer-events: none; + opacity: 50%; +} + +.button-group { + display: flex; + gap: 1rem; +} + +/* Form field */ + +.form-field { + border: none; + margin-bottom: 1.5rem; +} + +.form-field__label { + display: flex; + align-items: baseline; + justify-content: space-between; + font-size: 0.875rem; + font-weight: 500; + line-height: 1.25rem; + color: rgb(55, 65, 81); +} + +.form-field__control { + flex: auto; + position: relative; + margin-top: 0.25rem; + border-radius: 0.375rem; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); +} + +.form-field__corner-hint { + font-size: 0.65rem; + line-height: 1rem; + text-transform: uppercase; +} + +/* Input */ + +.input { + display: flex; + position: relative; +} + +.input__control { + appearance: none; + width: 100%; + padding: 0.5rem 0.75rem; + border-radius: 0.375rem; + font-family: inherit; + font-size: 0.875rem; + line-height: 1.25rem; + text-overflow: ellipsis; + background-color: rgb(255, 255, 255); + border: 1px solid rgb(209, 213, 219); + z-index: 1; +} + +.input__control[list]::-webkit-calendar-picker-indicator { + display: none !important; +} + +/* +.input--leading-addon-sm .input__control { + padding-left: 1.75rem; +} +*/ + +.input__inset + .input__control { + padding-left: 2.25rem; +} + +.input__control:has(+ .input__control), .input__control:has(+ .input__addon:not([hidden])) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} + +.input__control:focus { + outline: 2px solid rgb(63, 131, 248); + outline-offset: -1px; + z-index: 2; +} + +.input__control::placeholder { + opacity: 1; + color: rgb(156, 163, 175); +} + +.input__inset { + display: flex; + align-items: center; + color: rgb(107, 114, 128); + font-size: 0.875rem; + line-height: 1.25rem; + pointer-events: none; + padding: 0 0.75rem; + position: absolute; + height: 100%; + z-index: 3; +} + +.input__addon { + color: rgb(107, 114, 128); + background-color: rgb(249, 250, 251); + border-color: rgb(209, 213, 219); +} + +.input__control + .input__control, .input__control ~ .input__addon { + border-bottom-left-radius: 0; + border-top-left-radius: 0; + border-left-width: 0; +} + +/*@media (prefers-color-scheme: dark) { + .input__control { + background-color: rgb(55, 65, 81); + border-color: rgb(75, 85, 99); + } + + .input__addon { + color: rgb(156, 163, 175); + } +}*/ + +/* Text area */ + +.textarea { + appearance: none; + width: 100%; + padding: 0.5rem 0.75rem; + border-radius: 0.375rem; + font-family: inherit; + font-size: 0.875rem; + line-height: 1.25rem; + background-color: rgb(255, 255, 255); + border: 1px solid rgb(209, 213, 219); +} + +.textarea:focus { + outline: 1px solid rgb(63, 131, 248); + border-color: rgb(63, 131, 248); +} + +.textarea::placeholder { + opacity: 1; + color: rgb(156, 163, 175); +} + +/* Select */ + +.select { + appearance: none; + width: 100%; + padding: 0.5rem 0.75rem; + border-radius: 0.375rem; + font-family: inherit; + font-size: 0.875rem; + line-height: 1.25rem; + background-color: rgb(255, 255, 255); + border: 1px solid rgb(209, 213, 219); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3E%3Cpath stroke='%236B7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='m6 8 4 4 4-4'/%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-size: 1.5rem 1.5rem; + background-position: right 0.5rem center; +} + +.select:focus { + outline: 1px solid rgb(63, 131, 248); + border-color: rgb(63, 131, 248); +} diff --git a/Groceries/wwwroot/js/controllers/list-filter.js b/Groceries/wwwroot/js/controllers/list-filter.js new file mode 100644 index 0000000..3c6a2a0 --- /dev/null +++ b/Groceries/wwwroot/js/controllers/list-filter.js @@ -0,0 +1,17 @@ +import { Controller } from "/lib/hotwired/stimulus/dist/stimulus.js"; + +export default class ListFilterController extends Controller { + static targets = ["option"]; + + filter(event) { + for (const option of this.optionTargets) { + if (!event.target.value) { + option.disabled = false; + continue; + } + + const value = option.getAttribute("data-list-filter-value"); + option.disabled = value !== event.target.value; + } + } +} diff --git a/Groceries/wwwroot/js/controllers/modal.js b/Groceries/wwwroot/js/controllers/modal.js new file mode 100644 index 0000000..a3dd297 --- /dev/null +++ b/Groceries/wwwroot/js/controllers/modal.js @@ -0,0 +1,33 @@ +import { Controller } from "/lib/hotwired/stimulus/dist/stimulus.js"; + +export default class ModalController extends Controller { + static targets = ["frame"]; + + open() { + if (!this.element.open) { + this.element.showModal(); + } + } + + close(event) { + if (!this.element.open) { + return; + } + + event.preventDefault(); + + this.element.close(); + this.frameTarget.src = undefined; + this.frameTarget.innerHTML = ""; + + switch (event.type) { + case "turbo:submit-end": + Turbo.visit(location.href, { action: "replace" }); + break; + case "popstate": + event.stopImmediatePropagation(); + history.go(1); + break; + } + } +} diff --git a/Groceries/wwwroot/js/controllers/search-form.js b/Groceries/wwwroot/js/controllers/search-form.js new file mode 100644 index 0000000..e8d29a6 --- /dev/null +++ b/Groceries/wwwroot/js/controllers/search-form.js @@ -0,0 +1,21 @@ +import { Controller } from "/lib/hotwired/stimulus/dist/stimulus.js"; + +export default class SearchFormController extends Controller { + static targets = ["button"]; + + #timeoutHandle; + + connect() { + this.buttonTarget.hidden = true; + } + + disconnect() { + clearTimeout(this.#timeoutHandle); + this.buttonTarget.hidden = false; + } + + input() { + clearTimeout(this.#timeoutHandle); + this.#timeoutHandle = setTimeout(() => this.element.requestSubmit(), 500); + } +} diff --git a/Groceries/wwwroot/js/main.js b/Groceries/wwwroot/js/main.js new file mode 100644 index 0000000..cfd8708 --- /dev/null +++ b/Groceries/wwwroot/js/main.js @@ -0,0 +1,37 @@ +import { Application } from "/lib/hotwired/stimulus/dist/stimulus.js"; + +import ListFilterController from "./controllers/list-filter.js"; +import ModalController from "./controllers/modal.js"; +import SearchFormController from "./controllers/search-form.js"; + +const app = Application.start(); +app.register("list-filter", ListFilterController); +app.register("modal", ModalController); +app.register("search-form", SearchFormController); + +let timeout; +document.addEventListener("turbo:visit", () => { + clearTimeout(timeout); +}); +document.addEventListener("turbo:render", () => { + clearTimeout(timeout); + if (document.getElementById("sidebarToggle").checked) { + timeout = setTimeout(() => document.getElementById("sidebarToggle").checked = false, 500); + } +}); + +let transition; +document.addEventListener("turbo:before-render", async event => { + if (document.startViewTransition) { + event.preventDefault(); + + if (transition == undefined) { + transition = document.startViewTransition(() => event.detail.resume()); + await transition.finished; + transition = undefined; + } else { + await transition.finished; + event.detail.resume(); + } + } +});