Code

Return recipe cost bug fix#265

Code

Open

pitter3 wants to merge 143 commits intoturingschool-examples:mainturingschool-examples/whats-cookin-starter-kit:mainfrom joh-ann:returnRecipeCost-bug-fixjoh-ann/whats-cookin:returnRecipeCost-bug-fixCopy head branch name to clipboard

+3,021-13,159

Commits

Commits on Aug 26, 2023

• set up initial imports and exports

  nicolerue

  committed
  d8e6e17

  Copy full SHA for d8e6e17

Commits on Aug 27, 2023

• Merge pull request #1 from joh-ann/setting-up-import-export/nicole

  Show description for b63cb0e
  pitter3

  authored
  b63cb0e

  Copy full SHA for b63cb0e

• remove unfinished functions, add returnFilteredTag function

  pitter3

  committed
  e694dfb

  Copy full SHA for e694dfb

• Add a test for the returnFilteredTag function

  pitter3

  committed
  ce37b71

  Copy full SHA for ce37b71

• Merge pull request #2 from joh-ann/feat/filter-by-tag

  Show description for 5f24733
  joh-ann

  authored
  5f24733

  Copy full SHA for 5f24733

• Add returnRecipeCost function

  joh-ann

  committed
  63f1952

  Copy full SHA for 63f1952

• Add returnRecipeCost test

  joh-ann

  committed
  f87431b

  Copy full SHA for f87431b

• Merge pull request #3 from joh-ann/feat/return-recipe-cost

  Show description for 0c945f5
  nicolerue

  authored
  0c945f5

  Copy full SHA for 0c945f5

• add the function and test for the names of the recipes

  nicolerue

  committed
  3e4bbb8

  Copy full SHA for 3e4bbb8

• add the function and test for the recipe directions

  nicolerue

  committed
  b0a954d

  Copy full SHA for b0a954d

• add the function and test for filtering list names

  nicolerue

  committed
  cdf9656

  Copy full SHA for cdf9656

• Merge pull request #4 from joh-ann/feat/names-of-recipes

  Show description for 32f0312
  pitter3

  authored
  32f0312

  Copy full SHA for 32f0312

• Merge pull request #5 from joh-ann/feat/filter-list-names

  Show description for 60d60db
  pitter3

  authored
  60d60db

  Copy full SHA for 60d60db

• Add basic HTML and CSS

  joh-ann

  committed
  d2a8d5c

  Copy full SHA for d2a8d5c

• Merge pull request #7 from joh-ann/setup/html-css

  Show description for b6e263f
  pitter3

  authored
  b6e263f

  Copy full SHA for b6e263f

• display the recipes

  nicolerue

  committed
  16cb4aa

  Copy full SHA for 16cb4aa

• Merge pull request #8 from joh-ann/feat/linking-dom-js.file

  Show description for e502709
  joh-ann

  authored
  e502709

  Copy full SHA for e502709

• just experimenting. things are breaking here

  nicolerue

  committed
  9a8c3de

  Copy full SHA for 9a8c3de

Commits on Aug 28, 2023

• filtering by tags, and opening modal

  nicolerue

  committed
  0624d6f

  Copy full SHA for 0624d6f

• search bar bug

  nicolerue

  committed
  04c1b6a

  Copy full SHA for 04c1b6a

• Merge pull request #9 from joh-ann/bug/search-bar

  Show description for c2183eb
  joh-ann

  authored
  c2183eb

  Copy full SHA for c2183eb

• Fix search bar bug

  joh-ann

  committed
  7b0bcdb

  Copy full SHA for 7b0bcdb

• Merge pull request #10 from joh-ann/fix/search-bar

  Show description for 3a7c028
  nicolerue

  authored
  3a7c028

  Copy full SHA for 3a7c028

• make the displayTags function dynamic

  nicolerue

  committed
  3befb41

  Copy full SHA for 3befb41

• Merge pull request #11 from joh-ann/displayTags/dynamic

  Show description for fc272a1
  pitter3

  authored
  fc272a1

  Copy full SHA for fc272a1

Commits on Aug 29, 2023

• add 2 periods to the name search field

  pitter3

  committed
  ba06ba2

  Copy full SHA for ba06ba2

• add x-axis scrolling to tag section

  pitter3

  committed
  2e29205

  Copy full SHA for 2e29205

• features for searching and filtering recipes on the user's saved recipes page

  nicolerue

  committed
  dd59482

  Copy full SHA for dd59482

• fixes tag bar not updating

  nicolerue

  committed
  8421381

  Copy full SHA for 8421381

• add a font to html, use said font to update css

  pitter3

  committed
  7b31a75

  Copy full SHA for 7b31a75

• add borders, backgrounds, and change button shape

  pitter3

  committed
  6a8d93e

  Copy full SHA for 6a8d93e

• add a border to the tag section, make the tag buttons grow when hovered

  pitter3

  committed
  d6139df

  Copy full SHA for d6139df

• increase height of recipe section

  pitter3

  committed
  c99599e

  Copy full SHA for c99599e

• update title recipe padding

  pitter3

  committed
  0ce789e

  Copy full SHA for 0ce789e

• add border radius to images

  pitter3

  committed
  0d28cbc

  Copy full SHA for 0d28cbc

• separate scripts dom and functions

  nicolerue

  committed
  b441265

  Copy full SHA for b441265

• Merge pull request #12 from joh-ann/separated-scripts-dom-functions

  Show description for 04c6f76
  pitter3

  authored
  04c6f76

  Copy full SHA for 04c6f76

• finalize page load styling

  pitter3

  committed
  3ea2dc6

  Copy full SHA for 3ea2dc6

• add new CSS styling

  pitter3

  committed
  8effcf5

  Copy full SHA for 8effcf5

• update a displayTags function

  pitter3

  committed
  fab6666

  Copy full SHA for fab6666

• Merge pull request #13 from joh-ann/css-style-update

  Show description for 63d9229
  joh-ann

  authored
  63d9229

  Copy full SHA for 63d9229

• add a second it statement to filter list by tag tag

  pitter3

  committed
  75086db

  Copy full SHA for 75086db

Commits on Aug 30, 2023

• Set random user on load

  joh-ann

  committed
  24f6d2a

  Copy full SHA for 24f6d2a

• Add 3 new files containing smaller versions of original data given. These smaller versions will be used solely for testing

  pitter3

  committed
  6951cdc

  Copy full SHA for 6951cdc

• Fetch API

  joh-ann

  committed
  20127ab

  Copy full SHA for 20127ab

• remove original data files

  pitter3

  committed
  76dbc12

  Copy full SHA for 76dbc12

• Add a robust test for returnFilteredTag function. Remove an unnecessary test

  pitter3

  committed
  484767e

  Copy full SHA for 484767e

• change wording of an it statement

  pitter3

  committed
  1e8949d

  Copy full SHA for 1e8949d

• Bug in scripts.js

  joh-ann

  committed
  dbf3706

  Copy full SHA for dbf3706

• Clean up domUpdates

  joh-ann

  committed
  bf6ea92

  Copy full SHA for bf6ea92

• Move Promise.all to scripts

  joh-ann

  committed
  cd253e3

  Copy full SHA for cd253e3

• Replace getRandomUser/setCurrentUser with createRandomUser

  joh-ann

  committed
  e248223

  Copy full SHA for e248223

• Add a robust test for the returnFilteredListName function

  pitter3

  committed
  6b1c50c

  Copy full SHA for 6b1c50c

• Add a robust test for the returnIngredientNames function

  pitter3

  committed
  72a0645

  Copy full SHA for 72a0645

• Add a robust test for the returnRecipeCost function

  pitter3

  committed
  5c95ee6

  Copy full SHA for 5c95ee6

• Add images

  joh-ann

  committed
  f81abf2

  Copy full SHA for f81abf2

• Add a robust test for returnRecipeDirections function

  pitter3

  committed
  ca8e081

  Copy full SHA for ca8e081

• Display tag button images

  joh-ann

  committed
  fbf4f2c

  Copy full SHA for fbf4f2c

• Add new font api

  joh-ann

  committed
  8097a33

  Copy full SHA for 8097a33

• Finalize recipe tests

  pitter3

  committed
  7baf48b

  Copy full SHA for 7baf48b

• Update input styling

  joh-ann

  committed
  d1bca15

  Copy full SHA for d1bca15

• Add input hover styling

  joh-ann

  committed
  56d2ac5

  Copy full SHA for 56d2ac5

• Update recipe card styling

  joh-ann

  committed
  c0826b9

  Copy full SHA for c0826b9

• Change 'View Saved' to 'View Saved Recipes'

  joh-ann

  committed
  a008467

  Copy full SHA for a008467

• Add height to recipe card

  joh-ann

  committed
  63435e3

  Copy full SHA for 63435e3

• Update modal styling

  joh-ann

  committed
  23c8adf

  Copy full SHA for 23c8adf

• Update recipe recipe card styling

  joh-ann

  committed
  0138ce2

  Copy full SHA for 0138ce2

• Update button styling

  joh-ann

  committed
  5d3c105

  Copy full SHA for 5d3c105

• Add box shadow to recipe card

  joh-ann

  committed
  6d352b7

  Copy full SHA for 6d352b7

• Add box shadow to modal

  joh-ann

  committed
  cf54f28

  Copy full SHA for cf54f28

• Update close button hover styling

  joh-ann

  committed
  94ba9da

  Copy full SHA for 94ba9da

• Merge pull request #31 from joh-ann/feat/api

  Show description for b594e23
  nicolerue

  authored
  b594e23

  Copy full SHA for b594e23

• Merge branch 'main' into update-tests

  joh-ann

  authored
  2507361

  Copy full SHA for 2507361

• Merge pull request #32 from joh-ann/update-tests

  Show description for fe0acc8
  joh-ann

  authored
  fe0acc8

  Copy full SHA for fe0acc8

• Add scripts.js

  joh-ann

  committed
  784956e

  Copy full SHA for 784956e

• Add functions.js

  joh-ann

  committed
  ec59637

  Copy full SHA for ec59637

• Add domUpdates.js

  joh-ann

  committed
  f5c32bd

  Copy full SHA for f5c32bd

• Add recipe-test.js

  joh-ann

  committed
  06566b2

  Copy full SHA for 06566b2

• Fix document error

  joh-ann

  committed
  94432b9

  Copy full SHA for 94432b9

• Merge branch 'main' of github.com:joh-ann/whats-cookin into css-style

  joh-ann

  committed
  7de568c

  Copy full SHA for 7de568c

• Merge pull request #33 from joh-ann/css-style

  Show description for 4168d75
  pitter3

  authored
  4168d75

  Copy full SHA for 4168d75

• Move createRandomUser to scripts

  joh-ann

  committed
  01fc00c

  Copy full SHA for 01fc00c

• Merge pull request #36 from joh-ann/bug/testing

  Show description for 28e2f22
  nicolerue

  authored
  28e2f22

  Copy full SHA for 28e2f22

• changes

  nicolerue

  committed
  a8e0ae9

  Copy full SHA for a8e0ae9

• add some css and clean up some commented out lines of code

  nicolerue

  committed
  fa75b9b

  Copy full SHA for fa75b9b

Commits on Aug 31, 2023

• Merge pull request #37 from joh-ann/update-css-clean-up-code

  Show description for eb80eac
  joh-ann

  authored
  eb80eac

  Copy full SHA for eb80eac

Commits on Sep 1, 2023

• added padding-top to recipes class

  alvarotorrestx

  committed
  6efd14f

  Copy full SHA for 6efd14f

• Merge pull request #41 from alvarotorrestx/recipes-cut-off-top

  Show description for 6404e7b
  pitter3

  authored
  6404e7b

  Copy full SHA for 6404e7b

Commits on Sep 3, 2023

• added padding to title-recipe class

  alvarotorrestx

  committed
  441bb1b

  Copy full SHA for 441bb1b

• fixed whitespace bug with tags

  alvarotorrestx

  committed
  9ef4412

  Copy full SHA for 9ef4412

Commits on Sep 4, 2023

• remove code from promise

  nicolerue

  committed
  53b0eee

  Copy full SHA for 53b0eee

• Merge pull request #47 from joh-ann/wip/remove-code-from-process

  Show description for 6fdfec2
  pitter3

  authored
  6fdfec2

  Copy full SHA for 6fdfec2

• Merge branch 'tag-whitespace-bug-fix' of github.com:alvarotorrestx/whats-cookin

  joh-ann

  committed
  f0b6e5c

  Copy full SHA for f0b6e5c

• Clean up html

  joh-ann

  committed
  793dbfd

  Copy full SHA for 793dbfd

• Merge pull request #48 from joh-ann/fix/clean-up-html

  Show description for ee3bf4c
  pitter3

  authored
  ee3bf4c

  Copy full SHA for ee3bf4c

• Add text to the README file

  pitter3

  committed
  0b3677f

  Copy full SHA for 0b3677f

• Merge pull request #51 from joh-ann/readme

  Show description for 7cc306d
  joh-ann

  authored
  7cc306d

  Copy full SHA for 7cc306d

• Update README.md

  joh-ann

  authored
  2f86ce7

  Copy full SHA for 2f86ce7

• Update README.md

  joh-ann

  authored
  6848d3f

  Copy full SHA for 6848d3f

• Test deployment

  joh-ann

  committed
  898e17f

  Copy full SHA for 898e17f

• Test deployment

  joh-ann

  committed
  4c9b078

  Copy full SHA for 4c9b078

• Merge pull request #52 from joh-ann/feat/gh-pages

  Show description for 52c6c9b
  joh-ann

  authored
  52c6c9b

  Copy full SHA for 52c6c9b

• Add homepage to package.json

  joh-ann

  committed
  3384a59

  Copy full SHA for 3384a59

• Merge pull request #53 from joh-ann/feat/gh-pages

  Show description for 5b5934b
  joh-ann

  authored
  5b5934b

  Copy full SHA for 5b5934b

Commits on Sep 5, 2023

• Add images to gh-pages

  joh-ann

  committed
  d6b86c9

  Copy full SHA for d6b86c9

• Merge pull request #54 from joh-ann/feat/gh-pages

  Show description for 75a43b4
  joh-ann

  authored
  75a43b4

  Copy full SHA for 75a43b4

• Update README.md

  joh-ann

  authored
  f7f0090

  Copy full SHA for f7f0090

• Move images folder to root

  joh-ann

  committed
  0233b78

  Copy full SHA for 0233b78

• Merge pull request #55 from joh-ann/feat/gh-pages

  Show description for 9844efe
  joh-ann

  authored
  9844efe

  Copy full SHA for 9844efe

• Add images back to dist directory

  joh-ann

  committed
  e3e1dd6

  Copy full SHA for e3e1dd6

• Merge pull request #56 from joh-ann/feat/gh-pages

  Show description for cf598af
  joh-ann

  authored
  cf598af

  Copy full SHA for cf598af

• Update README.md

  joh-ann

  authored
  2693e44

  Copy full SHA for 2693e44

• Updated Webpack configuration for image paths

  joh-ann

  committed
  232e334

  Copy full SHA for 232e334

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

  joh-ann

  committed
  1c5c404

  Copy full SHA for 1c5c404

• Updates

  joh-ann

  committed
  d73c49c

  Copy full SHA for d73c49c

• Updates

  joh-ann

  committed
  9a65240

  Copy full SHA for 9a65240

• Updates

  joh-ann

  committed
  46283af

  Copy full SHA for 46283af

• Update tag image path

  joh-ann

  committed
  f08d670

  Copy full SHA for f08d670

• Updates

  joh-ann

  committed
  b6297c6

  Copy full SHA for b6297c6

• Update README.md

  joh-ann

  authored
  e50b064

  Copy full SHA for e50b064

• Update README.md

  joh-ann

  authored
  e859852

  Copy full SHA for e859852

Commits on Sep 12, 2023

• refactor to a reduce iterator, and refactor the recipe display event listener, extracting the function inside

  nicolerue

  committed
  aa05487

  Copy full SHA for aa05487

• remove createFunction and its export

  pitter3

  committed
  6bf9ac4

  Copy full SHA for 6bf9ac4

• change parameter names for returnFilteredTag function

  pitter3

  committed
  a8a1a56

  Copy full SHA for a8a1a56

• change parameter names for returnRecipeCost function

  pitter3

  committed
  60a8371

  Copy full SHA for 60a8371

• Update input eventListener to listen for a keyup instead of keydown

  joh-ann

  committed
  3284098

  Copy full SHA for 3284098

• change parameter names of returnRecipeDirections function

  pitter3

  committed
  246565a

  Copy full SHA for 246565a

• change parameter name returnFilteredListName function

  pitter3

  committed
  446040d

  Copy full SHA for 446040d

• change parameter names of returnRecipeTitle

  pitter3

  committed
  bf8de95

  Copy full SHA for bf8de95

• change parameter names of returnRecipeTags function

  pitter3

  committed
  271bdfc

  Copy full SHA for 271bdfc

• change parameters of returnRecipeImgURL function

  pitter3

  committed
  fc2066f

  Copy full SHA for fc2066f

• change parameter names for returnListOfUniqueTags function

  pitter3

  committed
  82683cb

  Copy full SHA for 82683cb

• change parameter names of returnFilteredRecipeByTagID function

  pitter3

  committed
  b707026

  Copy full SHA for b707026

• change parameter names for DOM functions

  pitter3

  committed
  94b29a8

  Copy full SHA for 94b29a8

• Highlight selected tag button

  joh-ann

  committed
  e631d40

  Copy full SHA for e631d40

• change parameter name of createRandomUser

  pitter3

  committed
  322436c

  Copy full SHA for 322436c

• Merge branch 'main' into test-feedback-update

  pitter3

  committed
  0f3df91

  Copy full SHA for 0f3df91

• Merge pull request #66 from joh-ann/test-feedback-update

  Show description for 7bd4e51
  nicolerue

  authored
  7bd4e51

  Copy full SHA for 7bd4e51

• Merge branch 'main' of github.com:joh-ann/whats-cookin into wip/refactor-event-listeners

  nicolerue

  committed
  c630bc2

  Copy full SHA for c630bc2

• Merge pull request #67 from joh-ann/wip/refactor-event-listeners

  Show description for d006273
  joh-ann

  authored
  d006273

  Copy full SHA for d006273

• Merge branch 'main' of github.com:joh-ann/whats-cookin into bug/search-input

  joh-ann

  committed
  f4b17b9

  Copy full SHA for f4b17b9

• Merge pull request #68 from joh-ann/bug/search-input

  Show description for bef9ebf
  pitter3

  authored
  bef9ebf

  Copy full SHA for bef9ebf

• fixed a bug caused by a merge conflict on returnRecipeCost function

  pitter3

  committed
  9a16bbd

  Copy full SHA for 9a16bbd