From b42971703fc7f41459edc2cf4fac71adbca2519c Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Wed, 28 Jan 2026 18:17:31 -0600 Subject: [PATCH] All steps basically working, much more todo. --- .../recipe-page-content.html | 19 ++- .../recipe-page-content.ts | 4 +- .../recipe-upload-page.html | 4 +- .../recipe-upload-page/recipe-upload-page.ts | 145 ++++++------------ .../enter-recipe-data/EnterRecipeDataEvent.ts | 10 ++ .../enter-recipe-data/enter-recipe-data.html | 3 +- .../enter-recipe-data/enter-recipe-data.ts | 20 ++- .../steps/review/review.css | 0 .../steps/review/review.html | 9 ++ .../steps/review/review.spec.ts | 23 +++ .../recipe-upload-page/steps/review/review.ts | 22 +++ .../shared/client-models/RecipeUploadStep.ts | 1 + .../recipe-card/recipe-card.html | 7 +- .../recipe-card/recipe-card.ts | 4 +- src/app/shared/models/Recipe.model.ts | 2 +- src/app/shared/services/ImageService.ts | 20 ++- src/app/shared/services/RecipeDraftService.ts | 46 ++++++ 17 files changed, 212 insertions(+), 127 deletions(-) create mode 100644 src/app/pages/recipe-upload-page/steps/enter-recipe-data/EnterRecipeDataEvent.ts create mode 100644 src/app/pages/recipe-upload-page/steps/review/review.css create mode 100644 src/app/pages/recipe-upload-page/steps/review/review.html create mode 100644 src/app/pages/recipe-upload-page/steps/review/review.spec.ts create mode 100644 src/app/pages/recipe-upload-page/steps/review/review.ts diff --git a/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.html b/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.html index 339a0f9..87a0c83 100644 --- a/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.html +++ b/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.html @@ -31,13 +31,18 @@ @if (mainImageUrl.isSuccess()) { - + @let maybeMainImageUrl = mainImageUrl.data(); + @if (!!maybeMainImageUrl) { + + } @else { +

!! Placeholder todo !!

+ } }
diff --git a/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts b/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts index 9687070..fdbd9f3 100644 --- a/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts +++ b/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts @@ -27,8 +27,8 @@ export class RecipePageContent { protected readonly mainImageUrl = injectQuery(() => { const recipe = this.recipeView().recipe; return { - queryKey: ['images', recipe.mainImage.owner.username, recipe.mainImage.filename], - queryFn: () => this.imageService.getImage(recipe.mainImage.url), + queryKey: ['recipe-main-images', recipe.owner.username, recipe.slug], + queryFn: () => this.imageService.getImage(recipe.mainImage?.url) }; }); diff --git a/src/app/pages/recipe-upload-page/recipe-upload-page.html b/src/app/pages/recipe-upload-page/recipe-upload-page.html index 86474a9..37ce283 100644 --- a/src/app/pages/recipe-upload-page/recipe-upload-page.html +++ b/src/app/pages/recipe-upload-page/recipe-upload-page.html @@ -16,7 +16,9 @@ } @else if (displayStep() === RecipeUploadStep.INFER) { } @else if (displayStep() === RecipeUploadStep.ENTER_DATA) { - + + } @else if (displayStep() === RecipeUploadStep.REVIEW) { + }