Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add handling of numeric values for scraping nutritional information #382

Merged
merged 12 commits into from
Jul 4, 2024
+1,671 −1,489
Merged

Add handling of numeric values for scraping nutritional information #382

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2445637
Added handling of numeric values for nutritional information, as well…
mblennegard Jun 28, 2024
5e5cf3c
Added handling of number values for nutritional.servingSize property
mblennegard Jun 28, 2024
225ed23
Adjustments as discussed in PR https://github.com/reaper47/recipya/pu…
mblennegard Jun 29, 2024
36ea5bd
Updated scraper to only extract digits from nutritional information
mblennegard Jul 1, 2024
df964dc
Changed placeholder texts to not confuse when moving between view and…
mblennegard Jul 1, 2024
71a1de1
Added missing nutrition propery (unsaturated fat) to front end
mblennegard Jul 1, 2024
228f34d
Grouped fat properties in case
mblennegard Jul 1, 2024
c4d57af
Added handling of commas as decimal separator in nutrition scraper
mblennegard Jul 1, 2024
5813331
Verified and updated all testcases to accomodate digits only scraping…
mblennegard Jul 1, 2024
748a5e9
Minor changes as discussed in PR https://github.com/reaper47/recipya/…
mblennegard Jul 4, 2024
db723aa
Merge branch 'main' into 375-extract-nutritional-data-from-scraped-we…
reaper47 Jul 4, 2024
3d62cea
Bump templ version to build the project
reaper47 Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changed placeholder texts to not confuse when moving between view and… 
… edit mode for a recipe
@mblennegard
mblennegard committed Jul 1, 2024
commit df964dc16d46979b975a4cc2c443908846ee6137
18 changes: 9 additions & 9 deletions web/components/recipes.templ
View file
Original file line number Diff line number Diff line change
@@ -1361,7 +1361,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="calories"
autocomplete="off"
placeholder="368kcal"
placeholder="kcal"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.Calories }
/>
@@ -1376,7 +1376,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="total-carbohydrates"
autocomplete="off"
placeholder="35g"
placeholder="g"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.TotalCarbohydrates }
/>
@@ -1391,7 +1391,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="sugars"
autocomplete="off"
placeholder="3g"
placeholder="g"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.Sugars }
/>
@@ -1406,7 +1406,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="protein"
autocomplete="off"
placeholder="21g"
placeholder="g"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.Protein }
/>
@@ -1421,7 +1421,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="total-fat"
autocomplete="off"
placeholder="15g"
placeholder="g"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.TotalFat }
/>
@@ -1436,7 +1436,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="saturated-fat"
autocomplete="off"
placeholder="1.8g"
placeholder="g"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.SaturatedFat }
/>
@@ -1451,7 +1451,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="cholesterol"
autocomplete="off"
placeholder="1.1mg"
placeholder="mg"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.Cholesterol }
/>
@@ -1466,7 +1466,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="sodium"
autocomplete="off"
placeholder="100mg"
placeholder="mg"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.Sodium }
/>
@@ -1481,7 +1481,7 @@ templ editRecipe(data *templates.ViewRecipeData) {
type="text"
name="fiber"
autocomplete="off"
placeholder="8g"
placeholder="g"
class="input input-bordered input-xs max-w-24"
value={ data.Recipe.Nutrition.Fiber }
/>