From 547a23e50a60c850556f145a72783f21c4703e55 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Mon, 16 Feb 2026 17:21:46 -0600 Subject: [PATCH] Move recipe edit components to proper location. --- .../edit-image-dialog/edit-image-dialog.css | 0 .../edit-image-dialog/edit-image-dialog.html | 0 .../edit-image-dialog/edit-image-dialog.spec.ts | 4 ++-- .../edit-image-dialog/edit-image-dialog.ts | 10 +++++----- .../recipe-edit-form}/image-select/image-select.css | 0 .../recipe-edit-form}/image-select/image-select.html | 0 .../image-select/image-select.spec.ts | 6 +++--- .../recipe-edit-form}/image-select/image-select.ts | 10 +++++----- .../image-upload-dialog/image-upload-dialog.css | 0 .../image-upload-dialog/image-upload-dialog.html | 0 .../image-upload-dialog/image-upload-dialog.spec.ts | 0 .../image-upload-dialog/image-upload-dialog.ts | 12 ++++++------ .../ingredient-dialog/ingredient-dialog.css | 0 .../ingredient-dialog/ingredient-dialog.html | 0 .../ingredient-dialog/ingredient-dialog.spec.ts | 0 .../ingredient-dialog/ingredient-dialog.ts | 4 ++-- 16 files changed, 23 insertions(+), 23 deletions(-) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/edit-image-dialog/edit-image-dialog.css (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/edit-image-dialog/edit-image-dialog.html (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/edit-image-dialog/edit-image-dialog.spec.ts (93%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/edit-image-dialog/edit-image-dialog.ts (88%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/image-select.css (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/image-select.html (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/image-select.spec.ts (82%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-select/image-select.ts (92%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-upload-dialog/image-upload-dialog.css (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-upload-dialog/image-upload-dialog.html (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-upload-dialog/image-upload-dialog.spec.ts (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/image-upload-dialog/image-upload-dialog.ts (84%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/ingredient-dialog/ingredient-dialog.css (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/ingredient-dialog/ingredient-dialog.html (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/ingredient-dialog/ingredient-dialog.spec.ts (100%) rename src/app/{pages/recipe-upload-page/steps/enter-recipe-data => shared/components/recipe-edit-form}/ingredient-dialog/ingredient-dialog.ts (88%) diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.css b/src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.css similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.css rename to src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.css diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.html b/src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.html similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.html rename to src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.html diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.spec.ts b/src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.spec.ts similarity index 93% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.spec.ts rename to src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.spec.ts index 1555aad..1a28b7c 100644 --- a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.spec.ts +++ b/src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.spec.ts @@ -3,8 +3,8 @@ import { By } from '@angular/platform-browser'; import { EditImageDialog } from './edit-image-dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Mocked } from 'vitest'; -import { ImageService } from '../../../../../../shared/services/ImageService'; -import { ImageView } from '../../../../../../shared/models/ImageView.model'; +import { ImageService } from '../../../../services/ImageService'; +import { ImageView } from '../../../../models/ImageView.model'; import { of } from 'rxjs'; describe('EditImageDialog', () => { diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.ts b/src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.ts similarity index 88% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.ts rename to src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.ts index 94adbea..c96c0e8 100644 --- a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/edit-image-dialog/edit-image-dialog.ts +++ b/src/app/shared/components/recipe-edit-form/image-select/edit-image-dialog/edit-image-dialog.ts @@ -1,13 +1,13 @@ import { Component, inject, OnInit, signal } from '@angular/core'; -import { DialogContainer } from '../../../../../../shared/components/dialog-container/dialog-container'; +import { DialogContainer } from '../../../dialog-container/dialog-container'; import { MatFormField, MatInput, MatLabel } from '@angular/material/input'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; -import { ImageView } from '../../../../../../shared/models/ImageView.model'; +import { ImageView } from '../../../../models/ImageView.model'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MatButton } from '@angular/material/button'; -import { ImageService } from '../../../../../../shared/services/ImageService'; -import { notNullOrUndefined } from '../../../../../../shared/util'; -import { Spinner } from '../../../../../../shared/components/spinner/spinner'; +import { ImageService } from '../../../../services/ImageService'; +import { notNullOrUndefined } from '../../../../util'; +import { Spinner } from '../../../spinner/spinner'; @Component({ selector: 'app-edit-image-dialog', diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.css b/src/app/shared/components/recipe-edit-form/image-select/image-select.css similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.css rename to src/app/shared/components/recipe-edit-form/image-select/image-select.css diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.html b/src/app/shared/components/recipe-edit-form/image-select/image-select.html similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.html rename to src/app/shared/components/recipe-edit-form/image-select/image-select.html diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.spec.ts b/src/app/shared/components/recipe-edit-form/image-select/image-select.spec.ts similarity index 82% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.spec.ts rename to src/app/shared/components/recipe-edit-form/image-select/image-select.spec.ts index e5cc93c..b0f0a2b 100644 --- a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.spec.ts +++ b/src/app/shared/components/recipe-edit-form/image-select/image-select.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ImageSelect } from './image-select'; import { Mocked } from 'vitest'; -import { ImageService } from '../../../../../shared/services/ImageService'; +import { ImageService } from '../../../services/ImageService'; import { of } from 'rxjs'; -import { SliceView, SliceViewMeta } from '../../../../../shared/models/SliceView.model'; -import { ImageViewWithBlobUrl } from '../../../../../shared/client-models/ImageViewWithBlobUrl'; +import { SliceView, SliceViewMeta } from '../../../models/SliceView.model'; +import { ImageViewWithBlobUrl } from '../../../client-models/ImageViewWithBlobUrl'; describe('ImageSelect', () => { let component: ImageSelect; diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.ts b/src/app/shared/components/recipe-edit-form/image-select/image-select.ts similarity index 92% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.ts rename to src/app/shared/components/recipe-edit-form/image-select/image-select.ts index 860af66..877fe9f 100644 --- a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-select/image-select.ts +++ b/src/app/shared/components/recipe-edit-form/image-select/image-select.ts @@ -1,8 +1,8 @@ import { Component, inject, input, OnInit, output, signal } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; -import { ImageService } from '../../../../../shared/services/ImageService'; -import { Spinner } from '../../../../../shared/components/spinner/spinner'; -import { ImageView } from '../../../../../shared/models/ImageView.model'; +import { ImageService } from '../../../services/ImageService'; +import { Spinner } from '../../spinner/spinner'; +import { ImageView } from '../../../models/ImageView.model'; import { MatCard, MatCardActions, MatCardContent, MatCardImage } from '@angular/material/card'; import { MatCheckbox } from '@angular/material/checkbox'; import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu'; @@ -11,8 +11,8 @@ import { faEllipsis } from '@fortawesome/free-solid-svg-icons'; import { MatButton } from '@angular/material/button'; import { MatDialog } from '@angular/material/dialog'; import { EditImageDialog } from './edit-image-dialog/edit-image-dialog'; -import { SliceView } from '../../../../../shared/models/SliceView.model'; -import { ImageViewWithBlobUrl } from '../../../../../shared/client-models/ImageViewWithBlobUrl'; +import { SliceView } from '../../../models/SliceView.model'; +import { ImageViewWithBlobUrl } from '../../../client-models/ImageViewWithBlobUrl'; @Component({ selector: 'app-image-select', diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.css b/src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.css similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.css rename to src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.css diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.html b/src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.html similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.html rename to src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.html diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.spec.ts b/src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.spec.ts similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.spec.ts rename to src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.spec.ts diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.ts b/src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.ts similarity index 84% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.ts rename to src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.ts index 124666c..3d1dfc7 100644 --- a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/image-upload-dialog/image-upload-dialog.ts +++ b/src/app/shared/components/recipe-edit-form/image-upload-dialog/image-upload-dialog.ts @@ -1,16 +1,16 @@ import { Component, computed, inject, signal } from '@angular/core'; -import { ImageService } from '../../../../../shared/services/ImageService'; -import { FileUpload } from '../../../../../shared/components/file-upload/file-upload'; +import { ImageService } from '../../../services/ImageService'; +import { FileUpload } from '../../file-upload/file-upload'; import { MatButton } from '@angular/material/button'; import { faFileImage } from '@fortawesome/free-solid-svg-icons'; -import { FileUploadEvent } from '../../../../../shared/components/file-upload/FileUploadEvent'; -import { Spinner } from '../../../../../shared/components/spinner/spinner'; +import { FileUploadEvent } from '../../file-upload/FileUploadEvent'; +import { Spinner } from '../../spinner/spinner'; import { MatError, MatFormField, MatInput, MatLabel } from '@angular/material/input'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { MatCheckbox } from '@angular/material/checkbox'; import { MatDialogRef } from '@angular/material/dialog'; -import { ImageDoesNotExistValidator } from '../../../../../shared/validators/image-does-not-exist-validator'; -import { DialogContainer } from '../../../../../shared/components/dialog-container/dialog-container'; +import { ImageDoesNotExistValidator } from '../../../validators/image-does-not-exist-validator'; +import { DialogContainer } from '../../dialog-container/dialog-container'; @Component({ selector: 'app-image-upload-dialog', diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.css b/src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.css similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.css rename to src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.css diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.html b/src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.html similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.html rename to src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.html diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.spec.ts b/src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.spec.ts similarity index 100% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.spec.ts rename to src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.spec.ts diff --git a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.ts b/src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.ts similarity index 88% rename from src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.ts rename to src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.ts index 87e8402..e8d0c67 100644 --- a/src/app/pages/recipe-upload-page/steps/enter-recipe-data/ingredient-dialog/ingredient-dialog.ts +++ b/src/app/shared/components/recipe-edit-form/ingredient-dialog/ingredient-dialog.ts @@ -1,10 +1,10 @@ import { Component, inject, OnInit } from '@angular/core'; -import { DialogContainer } from '../../../../../shared/components/dialog-container/dialog-container'; +import { DialogContainer } from '../../dialog-container/dialog-container'; import { MatFormField, MatInput, MatLabel } from '@angular/material/input'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { MatButton } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { IngredientDraftClientModel } from '../../../../../shared/client-models/IngredientDraftClientModel'; +import { IngredientDraftClientModel } from '../../../client-models/IngredientDraftClientModel'; @Component({ selector: 'app-ingredient-dialog',