0 items selected
@@ -574,7 +574,6 @@ function formatDeleteDate(dateStr: string | null) {
background: #f3a642;
}
- /* Floating Bar */
.archive-floating-bar {
position: fixed;
bottom: 24px;
diff --git a/src/application/pages/app/index.astro b/src/application/pages/app/index.astro
index 6afa085..c48d41d 100644
--- a/src/application/pages/app/index.astro
+++ b/src/application/pages/app/index.astro
@@ -56,19 +56,16 @@ const filteringSearchTypes=selectedSearchTypes.length>0;
const selectedTags=Astro.url.searchParams.getAll("tag").map(t=>t.trim().toLowerCase()).filter(Boolean);
const selectedIngredients=Astro.url.searchParams.getAll("ingredient").map(i=>i.trim().toLowerCase()).filter(Boolean);
-// Default to "recipe" when not in a global search
const type = ["recipe","ingredient","book","purchase"].includes(requested ?? "")
? requested
: (query ? undefined : "recipe");
-// Recipe attention filters
const emptyRecipe=Astro.url.searchParams.get("empty_recipe")==="1";
const missingYield=Astro.url.searchParams.get("missing_yield")==="1";
const placeholderSteps=Astro.url.searchParams.get("placeholder_steps")==="1";
const attentionRecipe=Astro.url.searchParams.get("attention")==="1";
const recipeFilterActive=emptyRecipe||missingYield||placeholderSteps||attentionRecipe;
-// Ingredient attention filters
const unused=Astro.url.searchParams.get("unused")==="1";
const missingCost=Astro.url.searchParams.get("missing_cost")==="1";
const noPurchase=Astro.url.searchParams.get("no_purchase")==="1" || Astro.url.searchParams.get("no_usda")==="1";
@@ -111,7 +108,6 @@ function parseItemTags(tagsJson?: string, categoriesJson?: string): string[] {
return Array.from(set);
}
-// Compute tag counts
const activeDataset = type === "ingredient" ? ingredients : recipes;
const tagCountsMap = new Map
();
activeDataset.forEach((item) => {
diff --git a/src/application/pages/app/ingredients/[id].astro b/src/application/pages/app/ingredients/[id].astro
index 03ee7ac..c54dada 100644
--- a/src/application/pages/app/ingredients/[id].astro
+++ b/src/application/pages/app/ingredients/[id].astro
@@ -8,6 +8,12 @@ import { number, titleCase } from "../../../../lib/format";
import PurchaseItemForm from "../../../../components/PurchaseItemForm.astro";
import DetailUtility from "../../../../components/DetailUtility.astro";
import { getTabIconHtml, type TabIconKey } from "../../../../lib/icons";
+const customNutrients = [
+ ["energy_kcal", "Calories", "kcal"], ["total_fat_g", "Total fat", "g"], ["saturated_fat_g", "Saturated fat", "g"], ["trans_fat_g", "Trans fat", "g"],
+ ["cholesterol_mg", "Cholesterol", "mg"], ["sodium_mg", "Sodium", "mg"], ["carbohydrate_g", "Total carbohydrate", "g"], ["dietary_fiber_g", "Dietary fiber", "g"],
+ ["total_sugars_g", "Total sugars", "g"], ["added_sugars_g", "Added sugars", "g"], ["protein_g", "Protein", "g"], ["vitamin_d_mcg", "Vitamin D", "mcg"],
+ ["calcium_mg", "Calcium", "mg"], ["iron_mg", "Iron", "mg"], ["potassium_mg", "Potassium", "mg"], ["vitamin_c_mg", "Vitamin C", "mg"],
+] as const;
const id = Astro.params.id!;
const editing = !readOnlyMode && Astro.url.searchParams.get("edit") === "1";
const database = openDatabase({ readOnly: false });
@@ -82,6 +88,28 @@ if (Astro.request.method === "POST") {
} catch(cause) { database.exec("ROLLBACK"); throw cause; }
refreshSiteProjection(database); database.close(); return Astro.redirect(`/app/ingredients/${id}/?edit=1&message=${encodeURIComponent(`USDA mapping, nutrition, name, and ${portions.length} equivalencies updated`)}#nutrition`,303);
}
+ if (intent === "custom_nutrition") {
+ const servingWeightG=Number(form.get("serving_weight_g")), displayName=String(form.get("display_name")??"").trim(), sourceTitle=String(form.get("source_title")??"").trim();
+ if(!(servingWeightG>0))throw new Error("Serving weight must be greater than zero.");
+ if(!displayName)throw new Error("A nutrition display name is required.");
+ const nutrition:Record={};
+ for(const [key,label] of customNutrients){const value=Number(form.get(key));if(!Number.isFinite(value)||value<0)throw new Error(`${label} must be zero or greater.`);nutrition[key]=value*100/servingWeightG;}
+ const today=new Date().toISOString().slice(0,10),mappingId=`custom_nutrition_${id}`,source={source_type:"manual",title:displayName,publisher:sourceTitle||"Custom nutrition fact",retrieved_at:today,reviewed:true,reviewed_at:today,serving_weight_g:servingWeightG,notes:"Values entered per stated serving and normalized to 100 g."};
+ const current=database.prepare("SELECT source_json FROM ingredients WHERE id=?").get(id) as any,canonical=JSON.parse(current.source_json);canonical.nutrition_mapping_ids=[mappingId];
+ database.exec("BEGIN IMMEDIATE");try{database.prepare("UPDATE ingredients SET source_json=? WHERE id=?").run(JSON.stringify(canonical),id);database.prepare("DELETE FROM source_mappings WHERE subject_type='ingredient' AND subject_id=? AND mapping_type='nutrition'").run(id);database.prepare("INSERT INTO source_mappings VALUES (?,?,?,?,?,?,?)").run(mappingId,"ingredient",id,"nutrition","reviewed",JSON.stringify(source),JSON.stringify(nutrition));database.exec("COMMIT");}catch(cause){database.exec("ROLLBACK");throw cause;}
+ refreshSiteProjection(database);database.close();return Astro.redirect(`/app/ingredients/${id}/?edit=1&message=${encodeURIComponent("Custom nutrition saved")}#nutrition`,303);
+ }
+ if(intent==="non_edible_nutrition"){
+ const today=new Date().toISOString().slice(0,10),mappingId=`non_edible_${id}`,source={source_type:"non_edible",title:"Excluded from finished-food nutrition",reviewed:true,reviewed_at:today,notes:String(form.get("exclusion_reason")??"").trim()||"Ingredient is not consumed in the finished food."};
+ const current=database.prepare("SELECT source_json FROM ingredients WHERE id=?").get(id) as any,canonical=JSON.parse(current.source_json);canonical.nutrition_mapping_ids=[mappingId];
+ database.exec("BEGIN IMMEDIATE");try{database.prepare("UPDATE ingredients SET source_json=? WHERE id=?").run(JSON.stringify(canonical),id);database.prepare("DELETE FROM source_mappings WHERE subject_type='ingredient' AND subject_id=? AND mapping_type='nutrition'").run(id);database.prepare("INSERT INTO source_mappings VALUES (?,?,?,?,?,?,?)").run(mappingId,"ingredient",id,"nutrition","reviewed",JSON.stringify(source),JSON.stringify({energy_kcal:0}));database.exec("COMMIT");}catch(cause){database.exec("ROLLBACK");throw cause;}
+ refreshSiteProjection(database);database.close();return Astro.redirect(`/app/ingredients/${id}/?edit=1&message=${encodeURIComponent("Ingredient excluded from nutrition")}#nutrition`,303);
+ }
+ if(intent==="clear_nutrition"){
+ const current=database.prepare("SELECT source_json FROM ingredients WHERE id=?").get(id) as any,canonical=JSON.parse(current.source_json);canonical.nutrition_mapping_ids=[];
+ database.exec("BEGIN IMMEDIATE");try{database.prepare("UPDATE ingredients SET source_json=? WHERE id=?").run(JSON.stringify(canonical),id);database.prepare("DELETE FROM source_mappings WHERE subject_type='ingredient' AND subject_id=? AND mapping_type='nutrition'").run(id);database.exec("COMMIT");}catch(cause){database.exec("ROLLBACK");throw cause;}
+ refreshSiteProjection(database);database.close();return Astro.redirect(`/app/ingredients/${id}/?edit=1&message=${encodeURIComponent("Nutrition data cleared")}#nutrition`,303);
+ }
} catch(cause) { error=cause instanceof Error?cause.message:"Unable to save."; }
}
const ingredient = database.prepare("SELECT * FROM ingredients WHERE id=?").get(id) as any;
@@ -100,6 +128,7 @@ const nutrientLabels: Record = {
energy_kcal: ["Calories", "kcal"], protein_g: ["Protein", "g"], total_fat_g: ["Total fat", "g"], saturated_fat_g: ["Saturated fat", "g"],
carbohydrate_g: ["Carbohydrate", "g"], dietary_fiber_g: ["Dietary fiber", "g"], total_sugars_g: ["Total sugars", "g"], cholesterol_mg: ["Cholesterol", "mg"],
sodium_mg: ["Sodium", "mg"], potassium_mg: ["Potassium", "mg"], calcium_mg: ["Calcium", "mg"], iron_mg: ["Iron", "mg"], vitamin_d_mcg: ["Vitamin D", "mcg"],
+ vitamin_c_mg: ["Vitamin C", "mg"], trans_fat_g:["Trans fat","g"], added_sugars_g:["Added sugars","g"],
};
const nutritionMappings = mappings.map((mapping) => {
const source = JSON.parse(mapping.source_json);
@@ -108,6 +137,11 @@ const nutritionMappings = mappings.map((mapping) => {
return { ...mapping, source, sourceUrl, nutrients: Object.entries(nutrition).filter((entry): entry is [string, number] => typeof entry[1] === "number") as Array<[string, number]> };
});
const usdaMapping = nutritionMappings.find((mapping) => mapping.source.source_type === "usda_fdc");
+const activeNutritionMapping=nutritionMappings.find((mapping)=>mapping.status==="reviewed");
+const customMapping=nutritionMappings.find((mapping)=>mapping.source.source_type==="manual");
+const nonEdibleMapping=nutritionMappings.find((mapping)=>mapping.source.source_type==="non_edible");
+const customServingWeight=Number(customMapping?.source.serving_weight_g??100);
+const customValue=(key:string)=>{const value=customMapping?.nutrients.find(([name]:[string,number])=>name===key)?.[1];return value==null?0:value*customServingWeight/100;};
const usedIn=database.prepare("SELECT DISTINCT r.id,r.title FROM recipe_items i JOIN recipes r ON r.id=i.recipe_id WHERE i.ingredient_id=? ORDER BY r.title").all(id) as any[];
const units=database.prepare("SELECT id,name,symbol,dimension FROM units ORDER BY dimension,name").all() as any[];
const mergeCandidates=editing?database.prepare("SELECT id,name FROM ingredients WHERE id<>? AND deleted_at IS NULL ORDER BY name").all(id) as any[]:[];
@@ -404,29 +438,26 @@ database.close();
Nutrition
- Nutrition values are sourced from the ingredient's mapped USDA FoodData Central record.
+ Connect a USDA food, enter a reviewed custom nutrition fact, or explicitly exclude a non-edible item.
{editing && (
-
+
+
USDA FoodData Central
+
Custom nutrition fact
+
Exclude as non-edible
+
- {usdaMapping.source.title}
- {usdaMapping.status} · USDA FoodData Central
+ {activeNutritionMapping.source.title}
+ {activeNutritionMapping.status} · {usdaMapping?"USDA FoodData Central":nonEdibleMapping?"Non-edible exclusion":"Custom nutrition"}
- {usdaMapping.sourceUrl &&
View source ↗}
+ {usdaMapping?.sourceUrl &&
View source ↗}
- {usdaMapping.nutrients.length ? (
+ {nonEdibleMapping?Excluded from finished-food nutrition. {nonEdibleMapping.source.notes}
:activeNutritionMapping.nutrients.length ? (
- {usdaMapping.nutrients.map((entry: [string, number]) => {
+ {activeNutritionMapping.nutrients.map((entry: [string, number]) => {
const [key, value] = entry;
const [label, unit] = nutrientLabels[key] ?? [key.replaceAll("_", " "), ""];
return - {label}
- {number(value)} {unit}
;
@@ -436,12 +467,13 @@ database.close();
No reviewed nutrient values stored.
)}
) : (
- No USDA record mapped.{editing && " Enter an FDC ID above."}
+ No reviewed nutrition data.{editing && " Choose a source above."}
)}
@@ -473,7 +505,7 @@ database.close();
const editor=document.createElement('div'),chips=document.createElement('div'),entry=document.createElement('input');
editor.className='tag-chip-editor';chips.className='tag-chip-list';entry.className='tag-chip-entry';entry.placeholder='Tag Name';
let tags=tagSource.value.split(',').map(value=>value.trim()).filter(Boolean);
- const render=()=>{chips.replaceChildren(...tags.map(tag=>{const chip=document.createElement('span'),label=document.createElement('b'),remove=document.createElement('button');label.textContent=tag;remove.type='button';remove.textContent='×';remove.ariaLabel=`Remove ${tag}`;remove.onclick=()=>{tags=tags.filter(value=>value!==tag);render();setIngredientDirty()};chip.append(label,remove);return chip}));tagSource.value=tags.join(', ')};
+ const render=()=>{chips.replaceChildren(...tags.map(tag=>{const chip=document.createElement('span'),label=document.createElement('b'),remove=document.createElement('button');label.textContent=tag;remove.type='button';remove.textContent='×';remove.ariaLabel=`Remove ${tag}`;const removeTag=(e)=>{e?.stopPropagation?.();tags=tags.filter(value=>value!==tag);tagSource.value=tags.join(', ');render();setIngredientDirty()};remove.onclick=removeTag;chip.onclick=removeTag;chip.append(label,remove);return chip}));tagSource.value=tags.join(', ')};
const add=()=>{const tag=entry.value.trim().replace(/^#+/,'');if(tag&&!tags.some(value=>value.toLowerCase()===tag.toLowerCase())){tags.push(tag);setIngredientDirty()}entry.value='';render()};
entry.addEventListener('keydown',event=>{if(event.key==='Enter'||event.key===','){event.preventDefault();add()}else if(event.key==='Backspace'&&!entry.value&&tags.length){tags.pop();render();setIngredientDirty()}});entry.addEventListener('blur',add);tagSource.after(editor);editor.append(chips,entry);render();
}
diff --git a/src/application/pages/app/inventory/[id].astro b/src/application/pages/app/inventory/[id].astro
index 7d810bc..3235b3b 100644
--- a/src/application/pages/app/inventory/[id].astro
+++ b/src/application/pages/app/inventory/[id].astro
@@ -54,7 +54,6 @@ if (!count) {
return new Response("Inventory count session not found", { status: 404 });
}
-// Fetch all available units and active ingredients for the quick-add selector
const allUnits = database.prepare("SELECT id, name, symbol FROM units ORDER BY name").all() as Array<{ id: string; name: string; symbol: string }>;
const activeIngredients = database.prepare("SELECT id, name FROM ingredients WHERE status='active' AND deleted_at IS NULL ORDER BY name").all() as Array<{ id: string; name: string }>;
@@ -129,7 +128,7 @@ const isCompleted = count.status === "completed";
-
+