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

Added dynamic ingredients scaling. #32

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open

Added dynamic ingredients scaling. #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27443c7
Added dynamic ingredients scaling.
KN4CK3R Feb 24, 2020
6e695df
Added servings parameter.
KN4CK3R Feb 24, 2020
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
106 changes: 102 additions & 4 deletions _layouts/recipe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,23 @@ <h4 class="blue mt0 mb2 xs-center">Components</h4>
{% endif %}

{% if page.ingredients %}
<h4 class="blue mt0 mb2 xs-center">Ingredients</h4>
{% assign servings = page.servings | default: 1 %}
<h4 class="blue mt0 mb2 xs-center">Ingredients for <input id="servings-count" class="servings-input" data-base-servings="{{ servings }}" type="number" step="0.5" min="0.5" max="1000" autocomplete="off" value="{{ servings }}" /> servings</h4>
<ul itemprop="ingredients">
<!-- list ingredients that make up recipe -->
{% for ingredient in page.ingredients %}
<li itemprop="recipeIngredient">{{ ingredient | markdownify }}</li>
{% assign parts = ingredient | split:"|" %}
{% assign parts_count = parts | size %}
{% if parts_count == 1 %}
<li itemprop="recipeIngredient" data-quantity="" data-unit="" data-text="{{ parts[0] }}">{{ parts[0] | markdownify }}</li>
{% elsif parts_count == 2 %}
<li itemprop="recipeIngredient" data-quantity="{{ parts[0] }}" data-unit="" data-text="{{ parts[1] }}">{{ parts[0] | append: " " | append: parts[1] | markdownify }}</li>
{% else %}
<li itemprop="recipeIngredient" data-quantity="{{ parts[0] }}" data-unit="{{ parts[1] }}" data-text="{{ parts[2] }}">{{ parts[0] | append: " " | append: parts[1] | append: " " | append: parts[2] | markdownify }}</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}

</div>

<div class="sm-col sm-col-6 lg-col-6">
Expand Down Expand Up @@ -103,7 +111,15 @@ <h4 class="blue center">{{recipe.title}}</h4>
<h4 class="blue regular xs-center">Ingredients</h4>
<ul class="ingredients" itemprop="ingredients">
{% for item in recipe.ingredients %}
<li itemprop="ingredient">{{ item | markdownify }}</li>
{% assign parts = item | split:"|" %}
{% assign parts_count = parts | size %}
{% if parts_count == 1 %}
<li itemprop="ingredient" data-quantity="" data-unit="" data-text="{{ parts[0] }}">{{ parts[0] | markdownify }}</li>
{% elsif parts_count == 2 %}
<li itemprop="ingredient" data-quantity="{{ parts[0] }}" data-unit="" data-text="{{ parts[1] }}">{{ parts[0] | append: " " | append: parts[1] | markdownify }}</li>
{% else %}
<li itemprop="ingredient" data-quantity="{{ parts[0] }}" data-unit="{{ parts[1] }}" data-text="{{ parts[2] }}">{{ parts[0] | append: " " | append: parts[1] | append: " " | append: parts[2] | markdownify }}</li>
{% endif %}
{% endfor %}
</ul>

Expand Down Expand Up @@ -154,6 +170,88 @@ <h4 class="blue regular xs-center">Steps</h4>
$('html, body').animate({scrollTop: y-height-16}, 200);
});

function numberToPretty(inNum) {
let wholeNumber = Math.trunc(inNum);
if (wholeNumber == 0) {
wholeNumber = "";
}

let fraction = inNum % 1;

let fracRep;
if (Math.abs(fraction) < 0.0001) {
fracRep = ''
} else if (Math.abs(fraction - 1 / 2) < 0.0001) {
fracRep = " &frac12;";
} else if (Math.abs(fraction - 1 / 4) < 0.0001) {
fracRep = " &frac14;";
} else if (Math.abs(fraction - 3 / 4) < 0.0001) {
fracRep = " &frac34;";
} else if (Math.abs(fraction - 1 / 3) < 0.0001) {
fracRep = " &frac13;";
} else if (Math.abs(fraction - 2 / 3) < 0.0001) {
fracRep = " &frac23;";
} else if (Math.abs(fraction - 1 / 8) < 0.0001) {
fracRep = " &frac18;";
} else if (Math.abs(fraction - 3 / 8) < 0.0001) {
fracRep = " &frac38;";
} else if (Math.abs(fraction - 5 / 8) < 0.0001) {
fracRep = " &frac58;";
} else if (Math.abs(fraction - 7 / 8) < 0.0001) {
fracRep = " &frac78;";
} else if (Math.abs(fraction - 1 / 6) < 0.0001) {
fracRep = " &frac16;";
} else if (Math.abs(fraction - 5 / 6) < 0.0001) {
fracRep = " &frac56;";
} else if (Math.abs(fraction - 1 / 9) < 0.0001) {
fracRep = " <sup>1</sup>&frasl;<sub>9</sub>";
} else if (Math.abs(fraction - 2 / 9) < 0.0001) {
fracRep = " <sup>2</sup>&frasl;<sub>9</sub>";
} else if (Math.abs(fraction - 4 / 9) < 0.0001) {
fracRep = " <sup>4</sup>&frasl;<sub>9</sub>";
} else if (Math.abs(fraction - 5 / 9) < 0.0001) {
fracRep = " <sup>5</sup>&frasl;<sub>9</sub>";
} else if (Math.abs(fraction - 7 / 9) < 0.0001) {
fracRep = " <sup>7</sup>&frasl;<sub>9</sub>";
} else if (Math.abs(fraction - 8 / 9) < 0.0001) {
fracRep = " <sup>8</sup>&frasl;<sub>9</sub>";
} else {
fracRep = '' + fraction.toFixed(3);
}

return wholeNumber + fracRep;
}

function calculateIngredients(scale) {
$('li[itemprop=recipeIngredient]').each(function(index, elem) {
let quantity = $(elem).data('quantity');
if (quantity == '') {
return;
}

let unit = $(elem).data('unit');
let text = $(elem).data('text');

let info = '' + numberToPretty(scale * quantity) + ' ';
if (unit != '') {
info += unit + ' ';
}
info += text;

$(elem).children('p').html(info);
});
}

$('#servings-count').change(function() {
let servings = $(this).val();
let baseServings = $(this).data('base-servings');
let scale = servings / baseServings;

calculateIngredients(scale);
});

calculateIngredients(1);

});

</script>
21 changes: 11 additions & 10 deletions _recipes/banana-bread.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
---

layout: recipe
title: "Banana Bread"
title: "Banana Bread"
image: banana-bread.jpg
imagecredit: https://flic.kr/p/7HZmzn
tags: breakfast, baking
servings: 1

ingredients:
- 4 bananas
- 1/2 cup butter
- 1/2 cup sugar
- 2 eggs
- 2 cups flour
- 1/2 tsp baking soda
- 1 tsp baking powder
- 4|banana(s)
- 0.5|cup(s)|butter
- 0.5|cup(s)|sugar
- 2|egg(s)
- 2|cup(s)|flour
- 0.5|tsp|baking soda
- 1|tsp|baking powder
- pinch salt
- 1/4 cup nuts (we like pecans)
- 0.25|cup(s)|nuts (we like pecans)

directions:
- Beat the eggs, then cream with the butter and sugar
Expand All @@ -25,4 +26,4 @@ directions:

---

From Angie's mom
From Angie's mom
3 changes: 3 additions & 0 deletions css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ ul li input{position: absolute; top:5px; left:0; opacity:0.5;}
.search input:focus{outline:none; border:2px solid #007FFF;}
.search{transition:.3s ease height; height:90vh; display:flex; flex-direction: column; justify-content:center;}

.servings-input{border-radius:5px; border:2px solid #eee; box-shadow:0 0 14px rgba(#007FFF,0.1); width:20%}
.servings-input:focus{outline:none; border:2px solid #007FFF;}

.hero{height:150px;}
.post h1{margin-top:6rem}
.post ol, .post ul{}
Expand Down