Code

feat: Structured Yields#4489

Code

Merged

michael-genson merged 63 commits intomealie-recipes:mealie-nextmealie-recipes/mealie:mealie-nextfrom michael-genson:feat/structured-yieldsmichael-genson/mealie:feat/structured-yieldsCopy head branch name to clipboardNov 20, 2024

+1,017-550

Commits

Commits on Oct 23, 2024

• added column for recipe yield qty

  michael-genson

  committed
  9e2bd29

  Copy full SHA for 9e2bd29

Commits on Oct 31, 2024

• Merge remote-tracking branch 'upstream/mealie-next' into feat/structured-yields

  michael-genson

  committed
  089b3fb

  Copy full SHA for 089b3fb

• updated yield cleaning on recipe import

  michael-genson

  committed
  6a43774

  Copy full SHA for 6a43774

• parse all recipe yields on migration

  michael-genson

  committed
  bee731c

  Copy full SHA for bee731c

• added yield qty to schema

  michael-genson

  committed
  14d61b2

  Copy full SHA for 14d61b2

• dev:generate

  michael-genson

  committed
  9df445b

  Copy full SHA for 9df445b

• updated data tables

  michael-genson

  committed
  b9c6ab6

  Copy full SHA for b9c6ab6

• updated spa meta

  michael-genson

  committed
  f5e3ffc

  Copy full SHA for f5e3ffc

• updated tandoor migration

  michael-genson

  committed
  08d9891

  Copy full SHA for 08d9891

• Added new yield composable

  michael-genson

  committed
  26b4d29

  Copy full SHA for 26b4d29

• replaced print view yield

  michael-genson

  committed
  da160f5

  Copy full SHA for da160f5

• replace print view yield

  michael-genson

  committed
  9942b7b

  Copy full SHA for 9942b7b

• round output

  michael-genson

  committed
  4e3eca6

  Copy full SHA for 4e3eca6

• simplify prop

  michael-genson

  committed
  f976571

  Copy full SHA for f976571

• replace scale editor logic

  michael-genson

  committed
  09a1b86

  Copy full SHA for 09a1b86

• add yield qty to recipe editor

  michael-genson

  committed
  1fee77c

  Copy full SHA for 1fee77c

• fix edge cases when yield is 0 or invalid

  michael-genson

  committed
  8eaddba

  Copy full SHA for 8eaddba

Commits on Nov 1, 2024

• fix sanitization

  michael-genson

  committed
  4025134

  Copy full SHA for 4025134

• add frontend tests

  michael-genson

  committed
  f390ed8

  Copy full SHA for f390ed8

• remove unused yield extract

  michael-genson

  committed
  1ca4b2c

  Copy full SHA for 1ca4b2c

• catch zero div errors

  michael-genson

  committed
  ae614ca

  Copy full SHA for ae614ca

• fix mixed vulgar fractions

  michael-genson

  committed
  7d011a2

  Copy full SHA for 7d011a2

• add/update yield cleaner tests

  michael-genson

  committed
  8f45ca8

  Copy full SHA for 8f45ca8

• fix brute parser

  michael-genson

  committed
  a7c43f6

  Copy full SHA for a7c43f6

• lint

  michael-genson

  committed
  791a2c8

  Copy full SHA for 791a2c8

• removed old yield set

  michael-genson

  committed
  9c90736

  Copy full SHA for 9c90736

• restore brute force parser code because I broke it

  michael-genson

  committed
  5db9922

  Copy full SHA for 5db9922

• Merge branch 'mealie-next' into feat/structured-yields

  michael-genson

  authored
  38d0e8d

  Copy full SHA for 38d0e8d

Commits on Nov 8, 2024

• added recipe servings to recipe model

  michael-genson

  committed
  5279e3a

  Copy full SHA for 5279e3a

• updated cleaner

  michael-genson

  committed
  b265eac

  Copy full SHA for b265eac

• updated tests

  michael-genson

  committed
  4f58443

  Copy full SHA for 4f58443

• added servings to models

  michael-genson

  committed
  a3e863c

  Copy full SHA for a3e863c

• updated data tables

  michael-genson

  committed
  7b025cb

  Copy full SHA for 7b025cb

• added servings to editor

  michael-genson

  committed
  6e475b8

  Copy full SHA for 6e475b8

• added servings to recipe page

  michael-genson

  committed
  69b0d9a

  Copy full SHA for 69b0d9a

• changed scale to use servings rather than yield

  michael-genson

  committed
  252352e

  Copy full SHA for 252352e

• refactor yield to generic amount

  michael-genson

  committed
  4bd4d85

  Copy full SHA for 4bd4d85

• fix tests

  michael-genson

  committed
  a4d99ad

  Copy full SHA for a4d99ad

• disable scale if empty

  michael-genson

  committed
  9c86bb2

  Copy full SHA for 9c86bb2

• sanitize yield html

  michael-genson

  committed
  9ccb44c

  Copy full SHA for 9ccb44c

• sanitize yield html

  michael-genson

  committed
  fc174e4

  Copy full SHA for fc174e4

• oops, that wasn't supposed to be there

  michael-genson

  committed
  7ed026b

  Copy full SHA for 7ed026b

• Merge branch 'feat/structured-yields' of https://github.com/michael-genson/mealie into feat/structured-yields

  michael-genson

  committed
  ad1e87b

  Copy full SHA for ad1e87b

Commits on Nov 13, 2024

• Merge remote-tracking branch 'upstream/mealie-next' into feat/structured-yields

  michael-genson

  committed
  7594e92

  Copy full SHA for 7594e92

Commits on Nov 16, 2024

• refactor recipe page parts/landscape logic

  michael-genson

  committed
  1c56e0f

  Copy full SHA for 1c56e0f

• shuffle around info and move yield to info

  michael-genson

  committed
  8699a74

  Copy full SHA for 8699a74

• fallback to yield qty or 1 when scaling

  michael-genson

  committed
  9defb0e

  Copy full SHA for 9defb0e

• allow 0 yield qty

  michael-genson

  committed
  e144239

  Copy full SHA for e144239

• fix landscape mode

  michael-genson

  committed
  1cb240b

  Copy full SHA for 1cb240b

• remove rating from scale

  michael-genson

  committed
  35e3dfe

  Copy full SHA for 35e3dfe

• lint

  michael-genson

  committed
  298c738

  Copy full SHA for 298c738

• more lint

  michael-genson

  committed
  179294a

  Copy full SHA for 179294a

• Merge branch 'mealie-next' into feat/structured-yields

  michael-genson

  authored
  b30dffb

  Copy full SHA for b30dffb

Commits on Nov 18, 2024

• restored image and other info to edit page

  michael-genson

  committed
  33c8efe

  Copy full SHA for 33c8efe

• adjust recipe timer layout

  michael-genson

  committed
  5827485

  Copy full SHA for 5827485

• fixed missing recipe prop

  michael-genson

  committed
  a126001

  Copy full SHA for a126001

• restore scale for yield

  michael-genson

  committed
  4987932

  Copy full SHA for 4987932

• added edit icon to servings

  michael-genson

  committed
  a927d51

  Copy full SHA for a927d51

• match print view to info card

  michael-genson

  committed
  633a79f

  Copy full SHA for 633a79f

• lint

  michael-genson

  committed
  9e93e10

  Copy full SHA for 9e93e10

• Merge branch 'mealie-next' into feat/structured-yields

  michael-genson

  authored
  b91b1ce

  Copy full SHA for b91b1ce

Commits on Nov 20, 2024

• Merge branch 'mealie-next' into feat/structured-yields

  Kuchenpirat

  authored
  1069fae

  Copy full SHA for 1069fae

• Update frontend/components/Domain/Recipe/RecipeScaleEditButton.vue

  Show description for 1670e71
  

  michael-genson

  and

  Kuchenpirat

  authored
  1670e71

  Copy full SHA for 1670e71