Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Link recipe.html and create-recipe-blank.html #104

Open
tgomezzzz wants to merge 1 commit into
base: refactor-recipes
Choose a base branch
from
Open

Link recipe.html and create-recipe-blank.html #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/webapp/create-recipe-blank.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<title>shef</title>
</head>

<body class="page-container" onload="protectPage(); navBarSetup(); getRecipeImageUploadUrl();">
<body class="page-container" onload="protectPage(); navBarSetup(); getRecipeImageUploadUrl(); getOriginalRecipe();">
<template>
<span>
<svg class="bi bi-plus-circle bootstrap-icon" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
Expand Down
3 changes: 2 additions & 1 deletion src/main/webapp/recipe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
});
</script>

<button type="button" onclick="spinOff()">Create a Spin-Off!</button>
<div class="jumbotron text-center">
<!-- Modal -->
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
Expand Down Expand Up @@ -82,7 +83,7 @@ <h5 class="modal-title" id="exampleModalLongTitle">Share</h5>
</div>
</div>
</div>
<img src="assets/images/strawberry_sc.jpg" class="feed-img-prof" alt="...">
<img src="assets/images/strawberry_sc.jpg" id="recipe-image" class="feed-img-prof" alt="...">
<div class="small-sep">
<h2 id="recipe-title"></h2>
<p id="recipe-author"></p>
Expand Down
53 changes: 22 additions & 31 deletions src/main/webapp/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ function getRecipeInfo() {
fetch('/new-recipe?' + key).then(response => response.json()).then(recipe => {
document.getElementById('recipe-title').innerHTML = recipe.name;
document.getElementById('recipe-description').innerHTML = recipe.description;
document.getElementById('recipe-image').src = '/blob?blob-key=' + recipe.imageKey;
displayTags(recipe.tags);
displayIngredients(recipe.ingredients);
displaySteps(recipe.steps);
Expand All @@ -202,6 +203,11 @@ function displayTags(tagsList) {
});
}

function spinOff() {
var key = window.location.href.split('=')[1];
window.location.href = 'create-recipe-blank.html?key=' + key;
}

/** Formats and displays ingredients, with corresponding checkboxes, on the page. */
function displayIngredients(ingredList) {
var ingredElements = {}; // ingredElements used to dynamically name divs of class form-check small-sep, for a single ingredient.
Expand Down Expand Up @@ -245,7 +251,7 @@ function displaySteps(stepList) {
// Create and format the step text.
var stepTextElement = document.createElement("p");
stepTextElement.class = "col-sm-10 col-md-10 col-lg-10";
stepTextElement.innerText = step.instruction;
stepTextElement.innerText = step;

rowVars['stepElement' + stepCount].appendChild(stepNumElement);
rowVars['stepElement' + stepCount].appendChild(stepTextElement);
Expand Down Expand Up @@ -599,11 +605,14 @@ function updateIndices(fieldName, startIndex) {

/** Gets a parent recipe's data from Datastore. */
function getOriginalRecipe() {
const key = document.getElementById('key').value;
if (key) {
let key;
try {
key = window.location.href.split('=')[1];
fetch('/new-recipe?key=' + key).then(response => response.json()).then((recipe) => {
populateRecipeCreationForm(recipe);
});
} catch(err) {
return;
}
}

Expand All @@ -615,7 +624,7 @@ function populateRecipeCreationForm(recipe) {
document.getElementById('servingsInput').value = recipe.servings;
document.getElementById('recipe-image').src = '/blob?blob-key=' + recipe.imageKey;
populateFormField('Tag', recipe.tags);
populateIngredients(recipe.ingredients);
populateFormField('Ingredient', recipe.ingredients);
populateFormField('Equipment', recipe.equipment);
populateFormField('Step', recipe.steps);
}
Expand All @@ -624,35 +633,17 @@ function populateRecipeCreationForm(recipe) {
function populateFormField(fieldName, data) {
for (var i = 0; i < data.length; i++) {
var parameter = document.getElementById(fieldName + i);
if (parameter !== null) {
parameter.text = getText(data[i]);
} else {
var newParameter = createParameterInput(fieldName, i);
newParameter.text = getText(data[i]);
appendParameterInput(fieldName + 's', newParameter);
}
}
}

function populateIngredients(data) {
for (var i = 0; i < data.length; i++) {
var parameter = document.getElementById('Ingredient' + i);
if (!parameter) {
var parameter = createIngredientInput('Ingredient', i);
parameter = fieldName == 'Ingredient' ? createIngredientInput(fieldName, i) : createParameterInput(fieldName, i);
}
parameter.amount = data[i].amount;
parameter.unit = data[i].unit;
parameter.text = data[i].name;
appendParameterInput('Ingredients', parameter);
}
}

/** Gets the text of a tag, ingredient, or step. */
function getText(data) {
if (typeof data == 'string') {
return data;
} else {
return data.instruction;
if (fieldName == 'Ingredient') {
parameter.amount = data[i].amount;
parameter.unit = data[i].unit;
parameter.text = data[i].name;
} else {
parameter.text = data[i];
}
appendParameterInput(fieldName + 's', parameter);
}
}

Expand Down