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.

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

Readme #262

Open
wants to merge 96 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
d8e6e17
set up initial imports and exports
nicolerue Aug 26, 2023
b63cb0e
Merge pull request #1 from joh-ann/setting-up-import-export/nicole
pitter3 Aug 27, 2023
e694dfb
remove unfinished functions, add returnFilteredTag function
pitter3 Aug 27, 2023
ce37b71
Add a test for the returnFilteredTag function
pitter3 Aug 27, 2023
5f24733
Merge pull request #2 from joh-ann/feat/filter-by-tag
joh-ann Aug 27, 2023
63f1952
Add returnRecipeCost function
joh-ann Aug 27, 2023
f87431b
Add returnRecipeCost test
joh-ann Aug 27, 2023
0c945f5
Merge pull request #3 from joh-ann/feat/return-recipe-cost
nicolerue Aug 27, 2023
3e4bbb8
add the function and test for the names of the recipes
nicolerue Aug 27, 2023
b0a954d
add the function and test for the recipe directions
nicolerue Aug 27, 2023
cdf9656
add the function and test for filtering list names
nicolerue Aug 27, 2023
32f0312
Merge pull request #4 from joh-ann/feat/names-of-recipes
pitter3 Aug 27, 2023
60d60db
Merge pull request #5 from joh-ann/feat/filter-list-names
pitter3 Aug 27, 2023
d2a8d5c
Add basic HTML and CSS
joh-ann Aug 27, 2023
b6e263f
Merge pull request #7 from joh-ann/setup/html-css
pitter3 Aug 27, 2023
16cb4aa
display the recipes
nicolerue Aug 27, 2023
e502709
Merge pull request #8 from joh-ann/feat/linking-dom-js.file
joh-ann Aug 27, 2023
9a8c3de
just experimenting. things are breaking here
nicolerue Aug 27, 2023
0624d6f
filtering by tags, and opening modal
nicolerue Aug 28, 2023
04c1b6a
search bar bug
nicolerue Aug 28, 2023
c2183eb
Merge pull request #9 from joh-ann/bug/search-bar
joh-ann Aug 28, 2023
7b0bcdb
Fix search bar bug
joh-ann Aug 28, 2023
3a7c028
Merge pull request #10 from joh-ann/fix/search-bar
nicolerue Aug 28, 2023
3befb41
make the displayTags function dynamic
nicolerue Aug 28, 2023
fc272a1
Merge pull request #11 from joh-ann/displayTags/dynamic
pitter3 Aug 28, 2023
ba06ba2
add 2 periods to the name search field
pitter3 Aug 29, 2023
2e29205
add x-axis scrolling to tag section
pitter3 Aug 29, 2023
dd59482
features for searching and filtering recipes on the user's saved reci…
nicolerue Aug 29, 2023
8421381
fixes tag bar not updating
nicolerue Aug 29, 2023
7b31a75
add a font to html, use said font to update css
pitter3 Aug 29, 2023
6a8d93e
add borders, backgrounds, and change button shape
pitter3 Aug 29, 2023
d6139df
add a border to the tag section, make the tag buttons grow when hovered
pitter3 Aug 29, 2023
c99599e
increase height of recipe section
pitter3 Aug 29, 2023
0ce789e
update title recipe padding
pitter3 Aug 29, 2023
0d28cbc
add border radius to images
pitter3 Aug 29, 2023
b441265
separate scripts dom and functions
nicolerue Aug 29, 2023
04c6f76
Merge pull request #12 from joh-ann/separated-scripts-dom-functions
pitter3 Aug 29, 2023
3ea2dc6
finalize page load styling
pitter3 Aug 29, 2023
8effcf5
add new CSS styling
pitter3 Aug 29, 2023
fab6666
update a displayTags function
pitter3 Aug 29, 2023
63d9229
Merge pull request #13 from joh-ann/css-style-update
joh-ann Aug 29, 2023
75086db
add a second it statement to filter list by tag tag
pitter3 Aug 29, 2023
24f6d2a
Set random user on load
joh-ann Aug 30, 2023
6951cdc
Add 3 new files containing smaller versions of original data given. T…
pitter3 Aug 30, 2023
20127ab
Fetch API
joh-ann Aug 30, 2023
76dbc12
remove original data files
pitter3 Aug 30, 2023
484767e
Add a robust test for returnFilteredTag function. Remove an unnecessa…
pitter3 Aug 30, 2023
1e8949d
change wording of an it statement
pitter3 Aug 30, 2023
dbf3706
Bug in scripts.js
joh-ann Aug 30, 2023
bf6ea92
Clean up domUpdates
joh-ann Aug 30, 2023
cd253e3
Move Promise.all to scripts
joh-ann Aug 30, 2023
e248223
Replace getRandomUser/setCurrentUser with createRandomUser
joh-ann Aug 30, 2023
6b1c50c
Add a robust test for the returnFilteredListName function
pitter3 Aug 30, 2023
72a0645
Add a robust test for the returnIngredientNames function
pitter3 Aug 30, 2023
5c95ee6
Add a robust test for the returnRecipeCost function
pitter3 Aug 30, 2023
f81abf2
Add images
joh-ann Aug 30, 2023
ca8e081
Add a robust test for returnRecipeDirections function
pitter3 Aug 30, 2023
fbf4f2c
Display tag button images
joh-ann Aug 30, 2023
8097a33
Add new font api
joh-ann Aug 30, 2023
7baf48b
Finalize recipe tests
pitter3 Aug 30, 2023
d1bca15
Update input styling
joh-ann Aug 30, 2023
56d2ac5
Add input hover styling
joh-ann Aug 30, 2023
c0826b9
Update recipe card styling
joh-ann Aug 30, 2023
a008467
Change 'View Saved' to 'View Saved Recipes'
joh-ann Aug 30, 2023
63435e3
Add height to recipe card
joh-ann Aug 30, 2023
23c8adf
Update modal styling
joh-ann Aug 30, 2023
0138ce2
Update recipe recipe card styling
joh-ann Aug 30, 2023
5d3c105
Update button styling
joh-ann Aug 30, 2023
6d352b7
Add box shadow to recipe card
joh-ann Aug 30, 2023
cf54f28
Add box shadow to modal
joh-ann Aug 30, 2023
94ba9da
Update close button hover styling
joh-ann Aug 30, 2023
b594e23
Merge pull request #31 from joh-ann/feat/api
nicolerue Aug 30, 2023
2507361
Merge branch 'main' into update-tests
joh-ann Aug 30, 2023
fe0acc8
Merge pull request #32 from joh-ann/update-tests
joh-ann Aug 30, 2023
784956e
Add scripts.js
joh-ann Aug 30, 2023
ec59637
Add functions.js
joh-ann Aug 30, 2023
f5c32bd
Add domUpdates.js
joh-ann Aug 30, 2023
06566b2
Add recipe-test.js
joh-ann Aug 30, 2023
94432b9
Fix document error
joh-ann Aug 30, 2023
7de568c
Merge branch 'main' of github.com:joh-ann/whats-cookin into css-style
joh-ann Aug 30, 2023
4168d75
Merge pull request #33 from joh-ann/css-style
pitter3 Aug 30, 2023
01fc00c
Move createRandomUser to scripts
joh-ann Aug 30, 2023
28e2f22
Merge pull request #36 from joh-ann/bug/testing
nicolerue Aug 30, 2023
a8e0ae9
changes
nicolerue Aug 30, 2023
fa75b9b
add some css and clean up some commented out lines of code
nicolerue Aug 30, 2023
eb80eac
Merge pull request #37 from joh-ann/update-css-clean-up-code
joh-ann Aug 31, 2023
6efd14f
added padding-top to recipes class
alvarotorrestx Sep 1, 2023
6404e7b
Merge pull request #41 from alvarotorrestx/recipes-cut-off-top
pitter3 Sep 1, 2023
441bb1b
added padding to title-recipe class
alvarotorrestx Sep 3, 2023
9ef4412
fixed whitespace bug with tags
alvarotorrestx Sep 3, 2023
53b0eee
remove code from promise
nicolerue Sep 4, 2023
6fdfec2
Merge pull request #47 from joh-ann/wip/remove-code-from-process
pitter3 Sep 4, 2023
f0b6e5c
Merge branch 'tag-whitespace-bug-fix' of github.com:alvarotorrestx/wh…
joh-ann Sep 4, 2023
793dbfd
Clean up html
joh-ann Sep 4, 2023
ee3bf4c
Merge pull request #48 from joh-ann/fix/clean-up-html
pitter3 Sep 4, 2023
0b3677f
Add text to the README file
pitter3 Sep 4, 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
33 changes: 20 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
# What's Cookin'? Starter Kit
# What's Cookin'

The details of this project are outlined in the <a href="https://frontend.turing.edu/projects/What%27sCookin-PartOne.html" target="\__blank">project spec</a>.
### Abstract:
View delicious meals, sauces, desserts and more from over 40 different recipes! Search for specific recipes based on ingredients or name. Filter recipes with the included filters. Click on a recipe for a detailed ingredients and directions pop-up. Save a recipe to the saved recipe section by clicking the button on the bottom of the recipe container.

## Set Up
### Installation Instructions:
No need to install! View here - [GitHub Pages](DEPLOYED URL HERE)

1. Within your group, decide on **one** person to have the project repository on their Github account. This person will *fork* this repository - on the top right corner of the page, click the fork button.
1. Add all group members and your PM as collaborators on the repo
1. All group members should then clone down the forked repository. Since you don't want your project to be named "whats-cookin-starter-kit", add an optional argument after the repo url when cloning. The command should look like this: `git clone [remote-address] [what your group wants to name the repo]`.
1. Once you have cloned the repo, change into the directory and install the project dependencies. Run `npm install` or `npm i` to install project dependencies.
1. Run `npm start` in the terminal to see the HTML page (you should see some boilerplate HTML displayed on the page).
- `Control + C` is the command to stop running the local server. Closing the terminal without stopping the server first could allow the server to continue to run in the background and cause problems.
- This command is not specific to Webpack; make note of it for future use.
1. Do not run `npm audit fix --force`. This will update to the latest version of packages. We need to be using `[email protected]` which is not the latest version. If you start to run into Webpack errors, first check that all group members are using the correct version.
## Preview of App:
![WhatsCookinGif](GIF URL HERE)

## Testing

Mocha and chai are already set up, with a boilerplate test for you.
## Context:
This is our first group project of Mod 2 at Turing School of Software & Design. We were given ~1 week to create this project from scratch using a provided comp found [here](https://frontend.turing.edu/projects/module-2/whats-cookin-part-one.html).

## Contributors:
[Johann Dee](https://github.com/joh-ann), [Nicole Rue](https://github.com/nicolerue), [Patrick Eitel](https://github.com/pitter3)

## Learning Goals:
- Use object and array prototype methods to perform data manipulation.
- Create a user interface that is easy to use and clearly displays information.
- Write DRY, reusable code that follows SRP and trends toward function purity.
- Implement a robust testing suite using TDD.
- Make network requests to retrieve data.
- Collaborate productively and professionally as a team. Ensure all team members are able to be heard and contribute throughout the project.
2 changes: 1 addition & 1 deletion dist/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
alert('hello')
// alert('hello')
/******/
})()
;
88 changes: 84 additions & 4 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,92 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Whats Cookin</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Kumbh+Sans:wght@200;300;800;900&family=Manrope:wght@200;700;800&family=Merienda:wght@400;800&family=Poppins:wght@100&family=Sora:wght@200;400;700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/src/styles.css" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Cedarville+Cursive&family=Manrope:wght@400;700&family=Poppins&display=swap" rel="stylesheet"><link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Caveat:wght@400;500;600&family=Cedarville+Cursive&family=Inter:wght@100;200;300;400;500;700&family=Poppins:ital,wght@0,100;0,400;0,500;0,600;0,800;1,200&family=Quicksand:wght@300;400;500;600&family=Roboto:wght@100;300;400;500;700&display=swap" rel="stylesheet">
<title>What's Cookin'?</title>
</head>
<body>
<h1>Whats Cookin</h1>
<!-- START OF HOME PAGE -->
<main>
<header>
<h1>What's Cookin'</h1>
</header>
<section class="nav">
<input class="input-name" type="text" placeholder="Search Recipe by Name.." />
<input class="input-ingredient" type="text" placeholder="Search Recipe by Ingredient.." />

<section class="tag-buttons">
<!-- tag buttons go here -->
</section>
<button class="view-saved">View Saved Recipes</button>
</section>
<section class="recipes">
<div class="recipe-card">
<!--recipe cards go here-->
<button class="save-recipe-btn">Save Recipe</button>
</div>
<div class="recipe-card">
<button class="save-recipe-btn">Save Recipe</button>
</div>
<div class="recipe-card">
<button class="save-recipe-btn">Save Recipe</button>
</div>
<div class="recipe-card">
<button class="save-recipe-btn">Save Recipe</button>
</div>
</div>
</section>
<!-- modal -->
<section class="modal">
<div class="modal-overlay">
<div class="modal-container">
<ul class = "modal-tags">
</ul>
<div class="modal-title-directions">
<h3 class="modal-title"></h3>
<h3 class="modal-directions">
Directions
</h3>
<h4 class="modal-directions-details">
<ul class="modal-directions-list">
<li></li>
</ul>
</h4>
</div>
<div class="modal-ingredients-cost">
<h3 class="modal-cost"></h3>
<h3 class="modal-ingredients">
~Ingredients~
</h3>
<h4 class="modal-ingredients-details">
<ul class="modal-ingredients-list">
</ul>
</h4>
</div>

<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="close-btn">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>

</div>
</div>
</section>
<!-- end of modal -->
</main>
<!-- END OF HOME PAGE -->

</main>
<!-- END OF HOME PAGE -->
</body>
<!-- Do not include the scripts.js file here - it is done automatically by the webpack server -->
<script src="bundle.js"></script>
</html>
</html>
Binary file added images/antipasti.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/antipasto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/appetizer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/breakfast.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/brunch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/condiment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/dinner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/dip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/hor d'oeuvre.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/lunch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/main course.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/main dish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/morning meal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/salad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sauce.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/side dish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/snack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/spread.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/starter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/turing-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 22 additions & 1 deletion src/apiCalls.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
// Your fetch requests will live here!

export const fetchUsers = fetch(
"https://what-s-cookin-starter-kit.herokuapp.com/api/v1/users"
)
.then((response) => response.json())
.then((data) => {
return data.users;
});

console.log('I will be a fetch request!')
export const fetchIngredients = fetch(
"https://what-s-cookin-starter-kit.herokuapp.com/api/v1/ingredients"
)
.then((response) => response.json())
.then((data) => {
return data.ingredients;
});

export const fetchRecipes = fetch(
" https://what-s-cookin-starter-kit.herokuapp.com/api/v1/recipes"
)
.then((response) => response.json())
.then((data) => {
return data.recipes;
});
29 changes: 29 additions & 0 deletions src/data/ingredients-test-data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const ingredientsTestData = [
{
"id": 20081,
"name": "wheat flour",
"estimatedCostInCents": 142
},
{
"id": 18372,
"name": "bicarbonate of soda",
"estimatedCostInCents": 582
},
{
"id": 1123,
"name": "eggs",
"estimatedCostInCents": 472
},
{
"id": 19335,
"name": "sucrose",
"estimatedCostInCents": 902
},
{
"id": 19206,
"name": "instant vanilla pudding",
"estimatedCostInCents": 660
}
];

export default ingredientsTestData
Loading