diff --git a/Groceries/Items/Index.cshtml b/Groceries/Items/Index.cshtml index fe1d851..47e1a97 100644 --- a/Groceries/Items/Index.cshtml +++ b/Groceries/Items/Index.cshtml @@ -26,11 +26,11 @@ - - - - - @**@ + + + + + @**@ diff --git a/Groceries/Stores/Index.cshtml b/Groceries/Stores/Index.cshtml index 924ec2a..86ae0df 100644 --- a/Groceries/Stores/Index.cshtml +++ b/Groceries/Stores/Index.cshtml @@ -27,10 +27,10 @@
BrandNameLast PurchasedBarcodeBrandNameLast PurchasedBarcode
- - - - + + + + diff --git a/Groceries/Transactions/Index.cshtml b/Groceries/Transactions/Index.cshtml index 6f6338c..69ca099 100644 --- a/Groceries/Transactions/Index.cshtml +++ b/Groceries/Transactions/Index.cshtml @@ -43,23 +43,23 @@
RetailerNameTransactionsRetailerNameTransactions
- - - + - - @**@ + @**@ diff --git a/Groceries/Transactions/NewTransactionItems.cshtml b/Groceries/Transactions/NewTransactionItems.cshtml index eef4a34..b5675cb 100644 --- a/Groceries/Transactions/NewTransactionItems.cshtml +++ b/Groceries/Transactions/NewTransactionItems.cshtml @@ -20,37 +20,63 @@

New Transaction

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

Items

New item
-
-
    - @foreach (var item in Model.Items) - { -
  • - @items.Single(i => i.Id == item.ItemId).Name - @item.Price.ToString("c") - @item.Quantity - @((item.Price * item.Quantity).ToString("c")) - Edit -
  • - } -
-
- -
+ Date Store + Store Items + Amount
+ + + + + + + + + + + @foreach (var item in Model.Items) + { + + + + + + + + } + + + + + + + + +
NamePriceQtyAmount
+ @items.Single(i => i.Id == item.ItemId).Name + + @item.Price.ToString("c") + + @item.Quantity + + @((item.Price * item.Quantity).ToString("c")) + + Edit +
Total + @Model.Items.Sum(item => item.Price * item.Quantity).ToString("c") +
- + Cancel
diff --git a/Groceries/wwwroot/css/main.css b/Groceries/wwwroot/css/main.css index 6e161f1..ef383a5 100644 --- a/Groceries/wwwroot/css/main.css +++ b/Groceries/wwwroot/css/main.css @@ -301,6 +301,11 @@ html:has(.modal[open]) { margin: 1.5rem; } +.card__content--table { + border-top: 1px solid rgb(229, 231, 235); + margin: -1px 0 0 0; +} + .card__header { border-bottom: 1px solid rgb(243, 244, 246); padding: 1.25rem 1.5rem; @@ -324,13 +329,12 @@ html:has(.modal[open]) { box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1); } -.table table { +.table table, .card__content--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; @@ -342,6 +346,10 @@ html:has(.modal[open]) { white-space: nowrap; } +.table__header--shaded { + background-color: rgb(249, 250, 251); +} + .table__header--sortable a { color: inherit; text-decoration: none; @@ -373,6 +381,11 @@ html:has(.modal[open]) { white-space: nowrap; } +.table__cell--compact { + line-height: 1rem; + padding-block: 0.75rem; +} + .table__cell--icon { font-size: 1.25rem; } @@ -381,6 +394,11 @@ html:has(.modal[open]) { text-align: end; } +.table__cell--total { + font-weight: 600; + text-transform: uppercase; +} + .table__paginator { display: flex; justify-content: space-between;