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

Jump to bottom

Feature/change heart color #290

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

Feature/change heart color #290

wants to merge 231 commits into from

Conversation

laurelbonal
Copy link

Change color of heart on individual recipes page to match the color scheme.

BenWehrend and others added 30 commits March 24, 2024 12:06
@BenWehrend
adds function to calculate cost of recipes
489e6bd
@laurelbonal
html layout and basic styling
4fa308f
@KojinKuro
Convert a recipe object to ingredients array
343066b
@BenWehrend
fixes import/export to ES6
267ef0d
@BenWehrend
adds toFixed and proper ES6 format
37c0842
@KojinKuro
wip: Create search with tests
ed722ca
@KojinKuro
Merge pull request #2 from KojinKuro/feature/ingredients
b3b8448 
Convert a recipe object to ingredients array
@KojinKuro
Merge branch 'main' into feature/search
0841c9e 
Adds ingredient ID to name conversion. This is needed so that way we
can search what ingredients a recipe has
@KojinKuro
fix: Import ingredientsData correctly
2935c47 
Use default export
@KojinKuro
Merge branch 'main' into feature/search
f111998 
Update with bugfix
@KojinKuro
fix: use implicit returns for tests
1997456
@KojinKuro
function: Add search
862f12d 
Search will check if either the ingredient or the recipe name matches.
It matches, it will be filtered through.
@KojinKuro
refactor: Reduce code
88095ff
@BenWehrend
Merge branch 'main' into recipe-cost
1091ab4 
updated code
@KojinKuro
feature: return instructions
c973ae1
@KojinKuro
feature: sort recipes by steps first
9b28e8d
@KojinKuro
Make HTML more semantic
fa8c011
@KojinKuro
Make CSS fit new HTML
1f74669
@KojinKuro
Add more styling
36b5995
@BenWehrend
adds proper cost calc to dish using IDs
f52b3b1
@BenWehrend
fixes calculateRecipeCost function and test suite
6024d29
@KojinKuro
Remove tag tests
7a6d5bf
@KojinKuro
refactor: Move ingredient from ID to helper
59e2bdb
@KojinKuro
refactor: Change tests to be more clear
fad537c
@laurelbonal
WIP: create more styling in css
17f499c
@KojinKuro
refactor: Uses real database instead of mock data
06c9f6f
@KojinKuro
refactor: Make sure ingredients is an array
24f7fd7
@KojinKuro
Merge pull request #1 from KojinKuro/recipe-cost
73b5530 
adds function to calculate cost of recipes
@laurelbonal
Merge pull request #4 from KojinKuro/feature/search
773967b 
Add search capability
@KojinKuro
Merge branch 'main' into feature/instructions
717c759
KojinKuro and others added 30 commits April 11, 2024 11:51
@KojinKuro
refactor: Make fetching DRY
58a689b
@BenWehrend
Merge pull request #46 from KojinKuro/refactor/recipe-favorite-test
ca53330 
refactor: Add random recipes to improve test
@BenWehrend
fixes random recipe bug
a20dfd0
@BenWehrend
Merge pull request #48 from KojinKuro/refactor/DRY-fetch
b35cf09 
refactor: Make fetching DRY
@KojinKuro
Remove debug log
454cb8c
@KojinKuro
Remove debug log
0b9a713
@KojinKuro
refactor: Only use mock ingredients
60362a2
@BenWehrend
Merge pull request #50 from KojinKuro/refactor/mockIngredients
4ce7ed5 
Refactor mock ingredients
@KojinKuro
Merge pull request #49 from KojinKuro/fixes/random-recipe-bug
b700e15 
fixes random recipe bug
@KojinKuro
refactor: Make search more specific
f9a8c17
@KojinKuro
refactor: Change snake case to camel case
f07199b
@KojinKuro
refactor: made changing page to a function
f8d9535
@KojinKuro
Remove selected when you change to recipe
a97aace
@KojinKuro
Add hover feedback
041b02b
@KojinKuro
fix: Add back CSS variables so we can change with JS
f52123d
@BenWehrend
Merge pull request #51 from KojinKuro/refactor/search-test
e4dcf77 
refactor: Make search test more specific
@BenWehrend
Merge pull request #52 from KojinKuro/refactor/camelCase
8095938 
refactor: Change snake case to camel case
@BenWehrend
Merge pull request #53 from KojinKuro/fix/unselect-pagae
57121fd 
Unselect nav button on recipe page change + refactoring
@BenWehrend
adds proper warning message to user
47cc76d
@BenWehrend
adjusts to use rem instead of px
6571ecd
@KojinKuro
Merge pull request #54 from KojinKuro/fixes/catch-error-dom-display
ae42557 
Fixes/catch error dom display
@KojinKuro
refactor: various code clean up
80df720
@KojinKuro
refactor: Add set warning timeout, icons, and display mult
88a1dd0
@KojinKuro
fix: temp fix for timing bug
d8be24b
@BenWehrend
Merge pull request #58 from KojinKuro/feature/display-warning-mult
9b0b474 
Display multiple warning messages + refactoring
@laurelbonal
WIP: add POST request for favorited recipes
cb3facb
@laurelbonal
Complete POST request for favorited recipes
3cf3b71
@KojinKuro
refactor: Made catch display error
d7c0713
@laurelbonal
BUG FIX: convert API data to object from ID
6414555
@laurelbonal
Change color of heart on saved recipes page
f39b8ee
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@laurelbonal @BenWehrend @KojinKuro