Code

Feature/filter favorites#280

Code

Open

laurelbonal wants to merge 95 commits intoturingschool-examples:mainturingschool-examples/whats-cookin-starter-kit:mainfrom KojinKuro:feature/filter-favoritesKojinKuro/whats-cookin:feature/filter-favoritesCopy head branch name to clipboard

+1,244-30

Commits

Commits on Mar 24, 2024

• adds function to calculate cost of recipes

  BenWehrend

  committed
  489e6bd

  Copy full SHA for 489e6bd

• html layout and basic styling

  laurelbonal

  committed
  4fa308f

  Copy full SHA for 4fa308f

• Convert a recipe object to ingredients array

  KojinKuro

  committed
  343066b

  Copy full SHA for 343066b

• fixes import/export to ES6

  BenWehrend

  committed
  267ef0d

  Copy full SHA for 267ef0d

• adds toFixed and proper ES6 format

  BenWehrend

  committed
  37c0842

  Copy full SHA for 37c0842

• wip: Create search with tests

  KojinKuro

  committed
  ed722ca

  Copy full SHA for ed722ca

• Merge pull request #2 from KojinKuro/feature/ingredients

  Show description for b3b8448
  KojinKuro

  authored
  b3b8448

  Copy full SHA for b3b8448

• Merge branch 'main' into feature/search

  Show description for 0841c9e
  KojinKuro

  committed
  0841c9e

  Copy full SHA for 0841c9e

• fix: Import ingredientsData correctly

  Show description for 2935c47
  KojinKuro

  authored
  2935c47

  Copy full SHA for 2935c47

• Merge branch 'main' into feature/search

  Show description for f111998
  KojinKuro

  committed
  f111998

  Copy full SHA for f111998

• fix: use implicit returns for tests

  KojinKuro

  committed
  1997456

  Copy full SHA for 1997456

• function: Add search

  Show description for 862f12d
  KojinKuro

  committed
  862f12d

  Copy full SHA for 862f12d

• refactor: Reduce code

  KojinKuro

  committed
  88095ff

  Copy full SHA for 88095ff

• Merge branch 'main' into recipe-cost

  Show description for 1091ab4
  BenWehrend

  committed
  1091ab4

  Copy full SHA for 1091ab4

• feature: return instructions

  KojinKuro

  committed
  c973ae1

  Copy full SHA for c973ae1

• feature: sort recipes by steps first

  KojinKuro

  committed
  9b28e8d

  Copy full SHA for 9b28e8d

• Make HTML more semantic

  KojinKuro

  committed
  fa8c011

  Copy full SHA for fa8c011

• Make CSS fit new HTML

  KojinKuro

  committed
  1f74669

  Copy full SHA for 1f74669

• Add more styling

  KojinKuro

  committed
  36b5995

  Copy full SHA for 36b5995

• adds proper cost calc to dish using IDs

  BenWehrend

  committed
  f52b3b1

  Copy full SHA for f52b3b1

• fixes calculateRecipeCost function and test suite

  BenWehrend

  committed
  6024d29

  Copy full SHA for 6024d29

• Remove tag tests

  KojinKuro

  committed
  7a6d5bf

  Copy full SHA for 7a6d5bf

• refactor: Move ingredient from ID to helper

  KojinKuro

  committed
  59e2bdb

  Copy full SHA for 59e2bdb

• refactor: Change tests to be more clear

  KojinKuro

  committed
  fad537c

  Copy full SHA for fad537c

• WIP: create more styling in css

  laurelbonal

  committed
  17f499c

  Copy full SHA for 17f499c

• refactor: Uses real database instead of mock data

  KojinKuro

  committed
  06c9f6f

  Copy full SHA for 06c9f6f

• refactor: Make sure ingredients is an array

  KojinKuro

  committed
  24f7fd7

  Copy full SHA for 24f7fd7

• Merge pull request #1 from KojinKuro/recipe-cost

  Show description for 73b5530
  KojinKuro

  authored
  73b5530

  Copy full SHA for 73b5530

Commits on Mar 25, 2024

• Merge pull request #4 from KojinKuro/feature/search

  Show description for 773967b
  laurelbonal

  authored
  773967b

  Copy full SHA for 773967b

• Merge branch 'main' into feature/instructions

  KojinKuro

  authored
  717c759

  Copy full SHA for 717c759

• Merge pull request #5 from KojinKuro/feature/instructions

  Show description for 29c54fd
  BenWehrend

  authored
  29c54fd

  Copy full SHA for 29c54fd

• WIP: add more styling

  laurelbonal

  committed
  3250509

  Copy full SHA for 3250509

• adds filterByRecipeTag function

  BenWehrend

  committed
  c6a17aa

  Copy full SHA for c6a17aa

• Start mockup recipe

  KojinKuro

  committed
  a1d59ca

  Copy full SHA for a1d59ca

• Merge pull request #6 from KojinKuro/feature/tags

  Show description for 6bae420
  KojinKuro

  authored
  6bae420

  Copy full SHA for 6bae420

• Styling first draft

  laurelbonal

  committed
  0567af1

  Copy full SHA for 0567af1

• wip: Work on styling

  KojinKuro

  committed
  1e0c67e

  Copy full SHA for 1e0c67e

• Merge pull request #7 from KojinKuro/feature/html-and-style

  Show description for f55f593
  KojinKuro

  authored
  f55f593

  Copy full SHA for f55f593

• Merge branch 'main' into feature/recipe-page

  Show description for c0aa2b1
  KojinKuro

  committed
  c0aa2b1

  Copy full SHA for c0aa2b1

• Integrate recipe.css into styles.css

  KojinKuro

  committed
  efc3c8e

  Copy full SHA for efc3c8e

• Merge pull request #8 from KojinKuro/feature/recipe-page

  Show description for 0f613f3
  BenWehrend

  authored
  0f613f3

  Copy full SHA for 0f613f3

• Display tags

  laurelbonal

  committed
  fd8fd49

  Copy full SHA for fd8fd49

• Can grab quantity units from a recipe

  KojinKuro

  committed
  f5a64b2

  Copy full SHA for f5a64b2

• feature for selecting dishes by tags/updates DOM qith correctly

  BenWehrend

  committed
  e189d15

  Copy full SHA for e189d15

• Add a test to make sure an empty tag array works

  KojinKuro

  committed
  abf7949

  Copy full SHA for abf7949

Commits on Mar 26, 2024

• goes back to working commit

  BenWehrend

  committed
  91291f1

  Copy full SHA for 91291f1

• feature: Get available tags

  KojinKuro

  committed
  49203cf

  Copy full SHA for 49203cf

• Merge pull request #9 from KojinKuro/feature/recipe-quantity

  Show description for 071dad1
  BenWehrend

  authored
  071dad1

  Copy full SHA for 071dad1

• Merge pull request #11 from KojinKuro/feature/tags

  Show description for 808fcbc
  BenWehrend

  authored
  808fcbc

  Copy full SHA for 808fcbc

• adds nearly finished tag selectors for recipes

  BenWehrend

  committed
  830aac1

  Copy full SHA for 830aac1

• Merge branch 'main' of github.com:KojinKuro/whats-cookin into feature/recipes-tag-filter-dom

  Show description for 4abc07c
  BenWehrend

  committed
  4abc07c

  Copy full SHA for 4abc07c

• adds nearly complete filter option by tags

  BenWehrend

  committed
  73b1e7a

  Copy full SHA for 73b1e7a

• Update style more

  KojinKuro

  committed
  530bcca

  Copy full SHA for 530bcca

• Create infinite scroll and loading of recipes

  laurelbonal

  committed
  c58c1ff

  Copy full SHA for c58c1ff

• refactor: delete comments

  KojinKuro

  committed
  366c403

  Copy full SHA for 366c403

• refactor: Make code more SRP

  KojinKuro

  committed
  5ae2b49

  Copy full SHA for 5ae2b49

• Refactor code to be more generic

  KojinKuro

  committed
  28556f7

  Copy full SHA for 28556f7

• Update tests to new function names

  KojinKuro

  committed
  3593db7

  Copy full SHA for 3593db7

• Merge pull request #10 from KojinKuro/feature/recipes-tag-filter-dom

  Show description for d1bde2b
  KojinKuro

  authored
  d1bde2b

  Copy full SHA for d1bde2b

• staging changes for merge

  BenWehrend

  committed
  848c34d

  Copy full SHA for 848c34d

• Merge branch 'main' of github.com:KojinKuro/whats-cookin into feature/set-single-recipe-page

  BenWehrend

  committed
  fe8ddbb

  Copy full SHA for fe8ddbb

• Merge infinite scroll with main

  KojinKuro

  committed
  deaaf9b

  Copy full SHA for deaaf9b

• refactor: change tests for tags over any dataset

  KojinKuro

  committed
  f1d2a45

  Copy full SHA for f1d2a45

• fix: Make tags work with any dataset

  KojinKuro

  committed
  cb2818d

  Copy full SHA for cb2818d

• fix: can search through dataset

  KojinKuro

  committed
  6f3205e

  Copy full SHA for 6f3205e

• Rename parameter for more specificity

  KojinKuro

  committed
  7923e88

  Copy full SHA for 7923e88

Commits on Mar 27, 2024

• Update functions to use datasets

  KojinKuro

  committed
  f7a686f

  Copy full SHA for f7a686f

• Fix: infinite scrolling works on every page

  laurelbonal

  committed
  e010c50

  Copy full SHA for e010c50

• refactor infinite scrolling

  laurelbonal

  committed
  cefc0ba

  Copy full SHA for cefc0ba

• Merge pull request #13 from KojinKuro/refactor/search-tag-any

  Show description for e89aa82
  laurelbonal

  authored
  e89aa82

  Copy full SHA for e89aa82

• Merge branch 'main' into feature/infinite-scroll

  BenWehrend

  authored
  3321759

  Copy full SHA for 3321759

• adds quick commit

  BenWehrend

  committed
  af8387d

  Copy full SHA for af8387d

• Merge branch 'main' of github.com:KojinKuro/whats-cookin

  BenWehrend

  committed
  486617e

  Copy full SHA for 486617e

• Merge pull request #12 from KojinKuro/feature/infinite-scroll

  Show description for d06ddd2
  BenWehrend

  authored
  d06ddd2

  Copy full SHA for d06ddd2

• rename undefined variables

  KojinKuro

  committed
  dcc51bd

  Copy full SHA for dcc51bd

• Set view to top on change view

  KojinKuro

  committed
  a68f3bd

  Copy full SHA for a68f3bd

• Merge pull request #14 from KojinKuro/fix/merge-error

  Show description for b0c5fec
  laurelbonal

  authored
  b0c5fec

  Copy full SHA for b0c5fec

• adds partial feature for single recipe selection

  BenWehrend

  committed
  5d72233

  Copy full SHA for 5d72233

• Use functions to display ingredient/instructions

  KojinKuro

  committed
  004317a

  Copy full SHA for 004317a

• Complete search function

  laurelbonal

  committed
  1935690

  Copy full SHA for 1935690

• Merge pull request #15 from KojinKuro/feature/search-feature

  Show description for 97c568a
  BenWehrend

  authored
  97c568a

  Copy full SHA for 97c568a

• refactor/fix: Various bugfixes

  Show description for 609ac5d
  KojinKuro

  committed
  609ac5d

  Copy full SHA for 609ac5d

• adds working branch of recipe page

  BenWehrend

  committed
  e55de0d

  Copy full SHA for e55de0d

• Create favorietRecipes data

  KojinKuro

  committed
  9db6444

  Copy full SHA for 9db6444

• Can find a recipe from ID

  KojinKuro

  committed
  6f8d6e7

  Copy full SHA for 6f8d6e7

• Keep code SRP

  KojinKuro

  committed
  f5673bc

  Copy full SHA for f5673bc

• Merge branch 'main' into feature/set-single-recipe-page-2

  KojinKuro

  authored
  fb70700

  Copy full SHA for fb70700

• Merge pull request #16 from KojinKuro/feature/set-single-recipe-page-2

  Show description for 7949141
  KojinKuro

  authored
  7949141

  Copy full SHA for 7949141

• New naming convention and update functions

  Show description for 8851fb8
  KojinKuro

  committed
  8851fb8

  Copy full SHA for 8851fb8

• Merge branch 'main' into feature/recipe-page

  KojinKuro

  authored
  69d76b3

  Copy full SHA for 69d76b3

• Merge pull request #17 from KojinKuro/feature/recipe-page

  Show description for e76ac46
  KojinKuro

  authored
  e76ac46

  Copy full SHA for e76ac46

• fix: Clean up old code to match current

  KojinKuro

  committed
  2f5cee5

  Copy full SHA for 2f5cee5

• Create function to filter recipes by favorites

  laurelbonal

  committed
  71a3591

  Copy full SHA for 71a3591

• refactor: move code in right file

  KojinKuro

  committed
  2d385de

  Copy full SHA for 2d385de

• Merge branch 'main' into feature/filter-favorites

  KojinKuro

  authored
  29f4897

  Copy full SHA for 29f4897