diff --git a/src/application/routes/app/home.rs b/src/application/routes/app/home.rs index 86ebdd7..17477ae 100644 --- a/src/application/routes/app/home.rs +++ b/src/application/routes/app/home.rs @@ -57,16 +57,12 @@ fn count_request() -> ListRequest { async fn load_home_content(state: &AppState) -> Result { let recent_brews_req = ListRequest::new( 1, - PageSize::limited(3), + PageSize::limited(10), BrewSortKey::CreatedAt, SortDirection::Desc, ); - let open_bags_req = ListRequest::new( - 1, - PageSize::All, - BagSortKey::UpdatedAt, - SortDirection::Desc, - ); + let open_bags_req = + ListRequest::new(1, PageSize::All, BagSortKey::UpdatedAt, SortDirection::Desc); let recent_events_req = ListRequest::new( 1, PageSize::limited(5), diff --git a/src/presentation/web/views/brews.rs b/src/presentation/web/views/brews.rs index 696a299..54abd6d 100644 --- a/src/presentation/web/views/brews.rs +++ b/src/presentation/web/views/brews.rs @@ -34,6 +34,7 @@ pub struct BrewView { pub coffee_weight: String, pub grinder_id: i64, pub grinder_name: String, + pub grinder_model: String, pub grind_setting: String, pub brewer_id: i64, pub brewer_name: String, @@ -93,6 +94,10 @@ impl BrewView { roaster_slug: brew.roaster_slug, coffee_weight: format!("{:.1}g", brew.brew.coffee_weight), grinder_id: brew.brew.grinder_id.into_inner(), + grinder_model: brew + .grinder_name + .split_once(' ') + .map_or_else(|| brew.grinder_name.clone(), |(_, model)| model.to_string()), grinder_name: brew.grinder_name, grind_setting: format!("{:.1}", brew.brew.grind_setting), brewer_id: brew.brew.brewer_id.into_inner(), diff --git a/templates/pages/home.html b/templates/pages/home.html index 5827921..5156f77 100644 --- a/templates/pages/home.html +++ b/templates/pages/home.html @@ -1,4 +1,5 @@ {% extends "base.html" %} {% import "partials/bag_card.html" as bag_card %} {% import +"partials/brew_card.html" as brew_card %} {% import "partials/icons.html" as icons %} {% import "partials/scan_input.html" as scan %} {% block title %}Brewlog{% endblock %} {% block head %} {% if is_authenticated %}