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

Feat/search input branch #272

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Feat/search input branch #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8e4abed
Add sample recipe data and filter by tag function
jamiefrancisco Dec 5, 2023
8e0138a
Refactor filter by tag to include multiple tags, add filter by name f…
jamiefrancisco Dec 5, 2023
5099652
Add function to get ingredient names in recipe
jamiefrancisco Dec 5, 2023
b7f775d
Create Dom Functions w/ import export intact
EGavinG Dec 5, 2023
1680f65
Add calculate recipe cost and get recipe direction functions
jamiefrancisco Dec 5, 2023
0eb967b
Add helper functions, refactor existing functions, and add more sad p…
jamiefrancisco Dec 6, 2023
8a7c72b
Create pull_request_template.md
EGavinG Dec 6, 2023
13ad822
Merge pull request #2 from EGavinG/feat/recipe-functionality
EGavinG Dec 6, 2023
015d0fe
Create HTML skeleton/CSS fleshout
EGavinG Dec 6, 2023
0ea5c47
Merge branch 'main' into feat/css-styling-branch
EGavinG Dec 6, 2023
59d1e78
Merge pull request #3 from EGavinG/feat/css-styling-branch
EGavinG Dec 6, 2023
5dc93ae
Create more dom functions and edit html
EGavinG Dec 6, 2023
fc9eb3a
Refactor filter recipe by tag and associated tests to previous version
jamiefrancisco Dec 6, 2023
a369b26
Introduce a show all recipe page
EGavinG Dec 6, 2023
6f00cc2
Edit the results page HTML
EGavinG Dec 6, 2023
a681558
Merge pull request #16 from EGavinG/feat/refactor-filter-by-tag
EGavinG Dec 6, 2023
8f154ed
Edit and Clean up dom files and scripts
EGavinG Dec 7, 2023
f2b8fa5
Merge pull request #17 from EGavinG/feat/dom_updates_continue
jamiefrancisco Dec 7, 2023
f987321
Creates search function to take in input data
EGavinG Dec 7, 2023
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
87 changes: 81 additions & 6 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,87 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Whats Cookin</title>
<meta charset="UTF-8" />
<link
href="https://fonts.googleapis.com/css2?family=Playball&family=Playfair+Display&display=swap"
rel="stylesheet"
/>
<title>Hungry?</title>
</head>
<body>
<h1>Whats Cookin</h1>
<div class="main-container">
<div id="app">
<h1>Find a Recipe</h1>
<div class="search-container">
<div class="search-bar">
<h2>Search Bar</h2>
<form id="searchForm">
<input
type="text"
id="searchInput"
placeholder="Find something to make"
/>
<button type="button" id="submitButton">Submit</button>
</form>
</div>
<div class="tags">
<h2>Tags</h2>
<ul>
<li><a href="#">Appetizers</a></li>
<li><a href="#">Breakfast</a></li>
<li><a href="#">Lunch</a></li>
<li><a href="#">Dinner</a></li>
<li><a href="#">Dessert</a></li>
<li><a href="#">Vegan</a></li>
<li><a href="#">Gluten-free</a></li>
</ul>
</div>
</div>
<section class="recipe-carousel">
<img
src="https://spoonacular.com/recipeImages/595736-556x370.jpg"
alt="Placeholder image 1"
/>
<img
src="https://spoonacular.com/recipeImages/678353-556x370.jpg"
alt="Placeholder image 2"
/>
<img
src="https://spoonacular.com/recipeImages/412309-556x370.jpeg"
alt="Placeholder image 3"
/>
</section>
</div>
</div>

<div class="result-page hidden">
<a href="#" id="home-link"><h2>Home</h2></a>
<h1>All Recipes</h1>
<div class="results-container"></div>
<section class="filtered-results"></section>
<div class="recipe-page hidden">
<section class="recipe-page">
<img src="" alt="Recipe image" />
<h1>Recipe Title</h1>
<h4 class="ingredients">Ingredients:</h4>
<ul>
<li>Ingredient 1 (quantity)</li>
<li>Ingredient 2 (quantity)</li>
</ul>
<h3 class="directions">Directions:</h3>
<ol>
<li>Step 1 instructions...</li>
<li>Step 2 instructions...</li>
</ol>
</section>
</div>
</div>

<!-- Do not include the scripts.js file here - it is done automatically by the webpack server -->
<script src="bundle.js"></script>

<!-- <div class="show-all">
<button id="toggleButton"><h2>Show All Recipes</h2></button>
</div> -->
</body>
<!-- Do not include the scripts.js file here - it is done automatically by the webpack server -->
<script src="bundle.js"></script>
</html>
12 changes: 12 additions & 0 deletions pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
What kind of change does this PR introduce?
[] Bug fix (non-breaking change which fixes an issue)
[] New feature (non-breaking change which adds functionality)
[] Breaking change (fix or feature that would cause existing functionality to change)

Issue/feature/bug description:

Checklist before requesting a review
[] I have performed a self-review of my code
[] I have refactored my code before this push
[] The commit message follows our guidelines
[] My code follows the code style of this project.
57 changes: 57 additions & 0 deletions src/data/sample-ingredients.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
export const sampleIngredients = [
{
"id": 9079,
"name": "dried cranberries",
"estimatedCostInCents": 921
},
{
"id": 11935,
"name": "catsup",
"estimatedCostInCents": 666
},
{
"id": 12151,
"name": "pistachio",
"estimatedCostInCents": 813
},
{
"id": 11821,
"name": "red sweet peppers",
"estimatedCostInCents": 1027
},
{
"id": 6615,
"name": "vegetable stock",
"estimatedCostInCents": 613
},
{
"id": 1055062,
"name": "boneless skinless chicken breasts",
"estimatedCostInCents": 897
},
{
"id": 1002030,
"name": "black pepper",
"estimatedCostInCents": 441
},
{
"id": 6168,
"name": "tabasco sauce",
"estimatedCostInCents": 859
},
{
"id": 19296,
"name": "runny honey",
"estimatedCostInCents": 742
},
{
"id": 98871,
"name": "hawaiian sweet rolls",
"estimatedCostInCents": 535
},
{
"id": 1001,
"name": "butter",
"estimatedCostInCents": 618
},
];
Loading