From e215ceef6c0b4f7916e291b0e82cd7d1cca41267 Mon Sep 17 00:00:00 2001 From: MiracleHorizon Date: Fri, 24 May 2024 17:42:27 +0300 Subject: [PATCH] refactor(frontend): improve components directory mapping and file names --- apps/frontend/src/__setup__/test-aliases.ts | 4 - .../CompareSlider}/CompareSlider.module.css | 0 .../CompareSlider}/CompareSlider.tsx | 0 .../DragHandle}/DragHandle.module.css | 0 .../CompareSlider/DragHandle}/DragHandle.tsx | 0 .../CompareSlider/DragHandle/index.ts | 1 + .../GallerySlide/CompareSlider/index.ts | 1 + .../GallerySlide.module.css | 0 .../{ => GallerySlide}/GallerySlide.tsx | 0 .../GallerySlideAside.module.css | 0 .../GallerySlideAside}/GallerySlideAside.tsx | 2 +- .../GallerySlide/GallerySlideAside/index.ts | 1 + .../GallerySlideInfo.module.css | 0 .../GallerySlideInfo}/GallerySlideInfo.tsx | 0 .../GallerySlide/GallerySlideInfo/index.ts | 1 + .../GallerySlidePopover.module.css | 0 .../GallerySlidePopover.tsx | 2 +- .../GallerySlide/GallerySlidePopover/index.ts | 1 + .../GallerySlideSkeleton.module.css | 0 .../GallerySlideSkeleton.tsx | 0 .../GallerySlideSkeleton/index.ts | 1 + .../gallery/components/GallerySlide/index.ts | 1 + apps/frontend/src/app/gallery/layout.tsx | 4 +- apps/frontend/src/app/gallery/page.tsx | 2 +- apps/frontend/src/app/layout.tsx | 3 +- .../ButtonGithub.tsx | 0 .../components/CheckboxDominantBackground.tsx | 2 +- .../ImageUploaderLoading.module.css | 0 .../ImageUploaderLoading.tsx | 0 .../ImageUploaderLoading/index.ts | 1 + .../default => components/Layout}/Layout.tsx | 0 .../LayoutDrawer/LayoutDrawer.module.css} | 0 .../Layout/LayoutDrawer/LayoutDrawer.tsx} | 6 +- .../components/Layout/LayoutDrawer/index.ts | 1 + .../LayoutHeader/LayoutHeader.module.css | 0 .../Layout}/LayoutHeader/LayoutHeader.tsx | 12 +-- .../Layout}/LayoutHeader/index.ts | 0 .../default => components/Layout}/index.ts | 0 .../NumberInput/NumberInput.test.tsx | 2 +- .../components/NumberInput/NumberInput.tsx | 2 +- .../{NumberInput.types.ts => types.ts} | 0 .../src/components/alerts/ConfirmAlert.tsx | 6 +- .../alerts/ConfirmSettingsResetAlert.tsx | 2 +- .../components/alerts/FileValidationAlert.tsx | 6 +- .../components/alerts/RequestErrorAlert.tsx | 6 +- .../NavigationDesktop.module.css | 0 .../NavigationDesktop}/NavigationDesktop.tsx | 2 +- .../NavigationItem/NavigationItem.module.css | 0 .../NavigationItem/NavigationItem.tsx | 2 +- .../NavigationItem/index.ts | 0 .../navigation/NavigationDesktop/index.ts | 1 + .../NavigationMobile.module.css | 3 + .../NavigationMobile/NavigationMobile.tsx | 30 ++++++ .../NavigationMobileItem.module.css} | 8 +- .../NavigationMobileItem.tsx | 32 +++++++ .../NavigationMobileItem/index.ts | 1 + .../navigation/NavigationMobile/index.ts | 2 + .../navigation/data.tsx | 0 .../navigation/types.ts | 0 .../Checkbox.module.css} | 0 .../Checkbox.test.tsx} | 0 .../checkbox.tsx => Checkbox/Checkbox.tsx} | 2 +- .../CheckboxSkeleton.tsx} | 0 .../src/design-system/Checkbox/index.ts | 1 + .../Select.module.css} | 0 .../{select/select.tsx => Select/Select.tsx} | 2 +- .../design-system/{select => Select}/index.ts | 2 +- .../design-system/{select => Select}/types.ts | 0 .../Slider.module.css} | 0 .../{slider/slider.tsx => Slider/Slider.tsx} | 4 +- .../SliderHeader/SliderHeader.module.css} | 0 .../SliderHeader/SliderHeader.tsx} | 6 +- .../SliderHeader/SliderPopover.tsx} | 0 .../Slider/SliderHeader/index.ts | 1 + .../SliderSkeleton.tsx} | 0 .../src/design-system/Slider/index.ts | 1 + .../design-system/{slider => Slider}/types.ts | 0 .../design-system/{slider => Slider}/utils.ts | 0 .../Switch.test.tsx} | 0 .../{switch/switch.tsx => Switch/Switch.tsx} | 0 .../src/design-system/Switch/index.ts | 1 + .../src/design-system/checkbox/index.ts | 1 - .../src/design-system/slider/index.ts | 1 - .../src/design-system/switch/index.ts | 1 - .../navigation/NavigationMobile.tsx | 58 ----------- .../src/lib/ui/ColorPicker/ColorPicker.tsx | 35 ------- .../ColorPickerContent.module.css | 19 ---- .../ColorPickerContent/ColorPickerContent.tsx | 55 ----------- .../ColorPickerSwatches.module.css | 8 -- .../ColorPickerSwatches.tsx | 48 ---------- .../ColorPickerSwatches/index.ts | 1 - .../HexColorInput/ColorInput.tsx | 96 ------------------- .../HexColorInput/HexColorInput.tsx | 37 ------- .../ColorPickerContent/HexColorInput/index.ts | 1 - .../ColorPicker/ColorPickerContent/index.ts | 1 - .../ui/ColorPicker/ColorPickerSkeleton.tsx | 13 --- .../ColorPickerTrigger.module.css | 14 --- .../ColorPickerTrigger/ColorPickerTrigger.tsx | 39 -------- .../ColorPicker/ColorPickerTrigger/index.ts | 1 - apps/frontend/src/lib/ui/ColorPicker/index.ts | 1 - .../DrawerCloseLine.module.css | 0 .../{ => DrawerCloseLine}/DrawerCloseLine.tsx | 0 .../lib/ui/Drawer/DrawerCloseLine/index.ts | 1 + ...thExclamation.tsx => ExclamationTitle.tsx} | 2 +- .../__tests__/TitleWithExclamation.test.tsx | 6 +- .../AppFooterContent/AppFooterContent.tsx | 35 ++++--- .../ButtonRequest.module.css | 0 .../{ => ButtonRequest}/ButtonRequest.tsx | 2 +- .../ButtonRequest}/CheckboxKeepChanges.tsx | 2 +- .../AppFooterContent/ButtonRequest/index.ts | 1 + .../{ => buttons}/ButtonConvert.tsx | 2 +- .../{ => buttons}/ButtonDownload.tsx | 0 .../{ => buttons}/ButtonMetadata.tsx | 2 +- .../{ => buttons}/ButtonResize.tsx | 2 +- .../UploadedFile/UploadedFileLightbox.tsx | 1 + .../TabConvert/Options/Basic/BasicOptions.tsx | 6 +- .../Basic/{ => switches}/SwitchFlip.tsx | 2 +- .../Basic/{ => switches}/SwitchFlop.tsx | 2 +- .../Basic/{ => switches}/SwitchGrayscale.tsx | 2 +- .../TabConvert/Options/Blur/Blur.tsx | 2 +- .../Options/Blur/BlurSigma/BlurSigma.tsx | 2 +- .../{ => BlurSigmaHeader}/BlurSigmaHeader.tsx | 0 .../ButtonRemoveBlurSigma.tsx | 0 .../ButtonResetBlurSigma.tsx | 0 .../Blur/BlurSigma/BlurSigmaHeader/index.ts | 1 + .../Blur/BlurSigma/BlurSigmaSkeleton.tsx | 2 +- .../TabConvert/Options/Gamma/Gamma.tsx | 2 +- .../Gamma/{ => GammaContent}/GammaContent.tsx | 0 .../GammaContentSkeleton.tsx | 2 +- .../GammaHeader}/ButtonRemoveGamma.tsx | 0 .../GammaHeader}/ButtonResetGamma.tsx | 0 .../GammaHeader}/GammaHeader.tsx | 0 .../Gamma/GammaContent/GammaHeader/index.ts | 1 + .../Gamma/{ => GammaContent}/SliderGamma.tsx | 2 +- .../Options/Gamma/GammaContent/index.ts | 1 + .../TabConvert/Options/Modulate/Modulate.tsx | 2 +- .../{ => ModulateContent}/ModulateContent.tsx | 0 .../ModulateContentSkeleton.tsx | 2 +- .../ModulateHeader}/ButtonRemoveModulate.tsx | 0 .../ModulateHeader}/ButtonResetModulate.tsx | 0 .../ModulateHeader}/ModulateHeader.tsx | 0 .../ModulateContent/ModulateHeader/index.ts | 1 + .../{ => ModulateContent}/ModulateList.tsx | 17 ++-- .../Options/Modulate/ModulateContent/index.ts | 1 + .../sliders/SliderBrightness.tsx | 5 +- .../sliders/SliderHue.module.css | 0 .../sliders/SliderHue.tsx | 2 +- .../sliders/SliderLightness.tsx | 2 +- .../sliders/SliderSaturation.tsx | 2 +- .../TabConvert/Options/Negate/Negate.tsx | 4 +- .../Negate/{ => switches}/SwitchNegate.tsx | 2 +- .../{ => switches}/SwitchNegateAlpha.tsx | 2 +- .../Options/Normalise/Normalise.tsx | 2 +- .../NormaliseContent.tsx | 0 .../NormaliseContentSkeleton.tsx | 2 +- .../ButtonRemoveNormalise.tsx | 0 .../NormaliseHeader}/ButtonResetNormalise.tsx | 0 .../NormaliseHeader}/NormaliseHeader.tsx | 0 .../NormaliseContent/NormaliseHeader/index.ts | 1 + .../SliderNormalise.tsx | 2 +- .../Normalise/NormaliseContent/index.ts | 1 + .../OutputFormat/SelectOutputFormat.tsx | 2 +- .../TabConvert/Options/Rotate/Rotate.tsx | 2 +- .../RotateContentSkeleton.tsx | 4 +- .../{ => RotateHeader}/ButtonRemoveRotate.tsx | 0 .../{ => RotateHeader}/ButtonResetRotate.tsx | 0 .../{ => RotateHeader}/RotateHeader.tsx | 0 .../RotateContent/RotateHeader/index.ts | 1 + .../RotateContent/SliderRotateAngle.tsx | 2 +- .../TabConvert/Options/Tint/Tint.tsx | 2 +- .../Tint/{ => TintContent}/TintContent.tsx | 0 .../{ => TintContent}/TintContentSkeleton.tsx | 0 .../TintHeader}/ButtonRemoveTint.tsx | 0 .../TintHeader}/ButtonResetTint.tsx | 0 .../TintHeader}/TintHeader.tsx | 0 .../Tint/TintContent/TintHeader/index.ts | 1 + .../Options/Tint/TintContent/index.ts | 1 + .../TabMetadata/MetadataCheckboxGroup.tsx | 2 +- .../MetadataForm.module.css | 0 .../{ => MetadataForm}/MetadataForm.tsx | 0 .../MetadataFormField.module.css | 0 .../MetadataFormField}/MetadataFormField.tsx | 0 .../MetadataForm/MetadataFormField/index.ts | 1 + .../TabMetadata/MetadataForm/index.ts | 2 + .../TabMetadata/TabMetadataContent.tsx | 4 +- .../TabMetadata/{ => forms}/ifd0-form.tsx | 3 +- .../TabMetadata/{ => forms}/ifd2-form.tsx | 4 +- .../SortableSectionButton.module.css | 0 .../SortableSectionButton.tsx | 0 .../SortableSectionButton/index.ts | 1 + .../ExtendDirectionFormAxis.tsx | 2 +- .../ExtendDirectionFormNumber.tsx | 2 +- .../ExtendDirectionFormSeparated.tsx | 2 +- .../ExtendWith/SelectExtendWith.tsx | 2 +- .../ResizeCheckboxes/CheckboxEnlargement.tsx | 2 +- .../ResizeCheckboxes/CheckboxFastShrink.tsx | 2 +- .../ResizeCheckboxes/CheckboxReduction.tsx | 2 +- .../SelectResizeFit/SelectResizeFit.tsx | 2 +- .../ResizeSelectList/SelectResizeKernel.tsx | 2 +- .../ResizeSelectList/SelectResizePosition.tsx | 2 +- .../sections/resize/ResizeSizesForm.tsx | 2 +- .../{ => TrimContent}/CheckboxTrimLineArt.tsx | 2 +- .../TrimBackground/TrimBackground.tsx | 2 +- .../TrimBackgroundInfoPopover.tsx | 0 .../TrimBackground/TrimBackgroundPicker.tsx | 0 .../{ => TrimContent}/TrimBackground/index.ts | 0 .../sections/trim/TrimContent/TrimContent.tsx | 15 +++ .../{ => TrimContent}/TrimThresholdInput.tsx | 2 +- .../sections/trim/TrimContent/index.ts | 1 + .../TabResize/sections/trim/TrimSection.tsx | 12 +-- apps/frontend/tsconfig.json | 3 - 211 files changed, 251 insertions(+), 574 deletions(-) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/CompareSlider}/CompareSlider.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/CompareSlider}/CompareSlider.tsx (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/CompareSlider/DragHandle}/DragHandle.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/CompareSlider/DragHandle}/DragHandle.tsx (100%) create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/index.ts create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/index.ts rename apps/frontend/src/app/gallery/components/{ => GallerySlide}/GallerySlide.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide}/GallerySlide.tsx (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlideAside}/GallerySlideAside.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlideAside}/GallerySlideAside.tsx (89%) create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/index.ts rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlideInfo}/GallerySlideInfo.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlideInfo}/GallerySlideInfo.tsx (100%) create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/index.ts rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlidePopover}/GallerySlidePopover.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlidePopover}/GallerySlidePopover.tsx (94%) create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/index.ts rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlideSkeleton}/GallerySlideSkeleton.module.css (100%) rename apps/frontend/src/app/gallery/components/{ => GallerySlide/GallerySlideSkeleton}/GallerySlideSkeleton.tsx (100%) create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/index.ts create mode 100644 apps/frontend/src/app/gallery/components/GallerySlide/index.ts rename apps/frontend/src/{layouts/default/LayoutHeader => components}/ButtonGithub.tsx (100%) rename apps/frontend/src/components/ImageUploader/{ => ImageUploaderLoading}/ImageUploaderLoading.module.css (100%) rename apps/frontend/src/components/ImageUploader/{ => ImageUploaderLoading}/ImageUploaderLoading.tsx (100%) create mode 100644 apps/frontend/src/components/ImageUploader/ImageUploaderLoading/index.ts rename apps/frontend/src/{layouts/default => components/Layout}/Layout.tsx (100%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation/NavigationDrawer.module.css => components/Layout/LayoutDrawer/LayoutDrawer.module.css} (100%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation/NavigationDrawer.tsx => components/Layout/LayoutDrawer/LayoutDrawer.tsx} (89%) create mode 100644 apps/frontend/src/components/Layout/LayoutDrawer/index.ts rename apps/frontend/src/{layouts/default => components/Layout}/LayoutHeader/LayoutHeader.module.css (100%) rename apps/frontend/src/{layouts/default => components/Layout}/LayoutHeader/LayoutHeader.tsx (84%) rename apps/frontend/src/{layouts/default => components/Layout}/LayoutHeader/index.ts (100%) rename apps/frontend/src/{layouts/default => components/Layout}/index.ts (100%) rename apps/frontend/src/components/NumberInput/{NumberInput.types.ts => types.ts} (100%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation => components/navigation/NavigationDesktop}/NavigationDesktop.module.css (100%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation => components/navigation/NavigationDesktop}/NavigationDesktop.tsx (92%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation => components/navigation/NavigationDesktop}/NavigationItem/NavigationItem.module.css (100%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation => components/navigation/NavigationDesktop}/NavigationItem/NavigationItem.tsx (94%) rename apps/frontend/src/{layouts/default/LayoutHeader/navigation => components/navigation/NavigationDesktop}/NavigationItem/index.ts (100%) create mode 100644 apps/frontend/src/components/navigation/NavigationDesktop/index.ts create mode 100644 apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.module.css create mode 100644 apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.tsx rename apps/frontend/src/{layouts/default/LayoutHeader/navigation/NavigationMobile.module.css => components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.module.css} (90%) create mode 100644 apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.tsx create mode 100644 apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/index.ts create mode 100644 apps/frontend/src/components/navigation/NavigationMobile/index.ts rename apps/frontend/src/{layouts/default/LayoutHeader => components}/navigation/data.tsx (100%) rename apps/frontend/src/{layouts/default/LayoutHeader => components}/navigation/types.ts (100%) rename apps/frontend/src/design-system/{checkbox/checkbox.module.css => Checkbox/Checkbox.module.css} (100%) rename apps/frontend/src/design-system/{checkbox/checkbox.test.tsx => Checkbox/Checkbox.test.tsx} (100%) rename apps/frontend/src/design-system/{checkbox/checkbox.tsx => Checkbox/Checkbox.tsx} (95%) rename apps/frontend/src/design-system/{checkbox/checkbox-skeleton.tsx => Checkbox/CheckboxSkeleton.tsx} (100%) create mode 100644 apps/frontend/src/design-system/Checkbox/index.ts rename apps/frontend/src/design-system/{select/select.module.css => Select/Select.module.css} (100%) rename apps/frontend/src/design-system/{select/select.tsx => Select/Select.tsx} (97%) rename apps/frontend/src/design-system/{select => Select}/index.ts (55%) rename apps/frontend/src/design-system/{select => Select}/types.ts (100%) rename apps/frontend/src/design-system/{slider/slider.module.css => Slider/Slider.module.css} (100%) rename apps/frontend/src/design-system/{slider/slider.tsx => Slider/Slider.tsx} (96%) rename apps/frontend/src/design-system/{slider/slider-header.module.css => Slider/SliderHeader/SliderHeader.module.css} (100%) rename apps/frontend/src/design-system/{slider/slider-header.tsx => Slider/SliderHeader/SliderHeader.tsx} (80%) rename apps/frontend/src/design-system/{slider/slider-popover.tsx => Slider/SliderHeader/SliderPopover.tsx} (100%) create mode 100644 apps/frontend/src/design-system/Slider/SliderHeader/index.ts rename apps/frontend/src/design-system/{slider/slider-skeleton.tsx => Slider/SliderSkeleton.tsx} (100%) create mode 100644 apps/frontend/src/design-system/Slider/index.ts rename apps/frontend/src/design-system/{slider => Slider}/types.ts (100%) rename apps/frontend/src/design-system/{slider => Slider}/utils.ts (100%) rename apps/frontend/src/design-system/{switch/switch.test.tsx => Switch/Switch.test.tsx} (100%) rename apps/frontend/src/design-system/{switch/switch.tsx => Switch/Switch.tsx} (100%) create mode 100644 apps/frontend/src/design-system/Switch/index.ts delete mode 100644 apps/frontend/src/design-system/checkbox/index.ts delete mode 100644 apps/frontend/src/design-system/slider/index.ts delete mode 100644 apps/frontend/src/design-system/switch/index.ts delete mode 100644 apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPicker.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.module.css delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.module.css delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/index.ts delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/ColorInput.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/HexColorInput.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/index.ts delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/index.ts delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerSkeleton.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.module.css delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.tsx delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/index.ts delete mode 100644 apps/frontend/src/lib/ui/ColorPicker/index.ts rename apps/frontend/src/lib/ui/Drawer/{ => DrawerCloseLine}/DrawerCloseLine.module.css (100%) rename apps/frontend/src/lib/ui/Drawer/{ => DrawerCloseLine}/DrawerCloseLine.tsx (100%) create mode 100644 apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/index.ts rename apps/frontend/src/lib/ui/{TitleWithExclamation.tsx => ExclamationTitle.tsx} (90%) rename apps/frontend/src/widgets/AppFooter/AppFooterContent/{ => ButtonRequest}/ButtonRequest.module.css (100%) rename apps/frontend/src/widgets/AppFooter/AppFooterContent/{ => ButtonRequest}/ButtonRequest.tsx (96%) rename apps/frontend/src/{components => widgets/AppFooter/AppFooterContent/ButtonRequest}/CheckboxKeepChanges.tsx (87%) create mode 100644 apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/index.ts rename apps/frontend/src/widgets/AppFooter/AppFooterContent/{ => buttons}/ButtonConvert.tsx (96%) rename apps/frontend/src/widgets/AppFooter/AppFooterContent/{ => buttons}/ButtonDownload.tsx (100%) rename apps/frontend/src/widgets/AppFooter/AppFooterContent/{ => buttons}/ButtonMetadata.tsx (96%) rename apps/frontend/src/widgets/AppFooter/AppFooterContent/{ => buttons}/ButtonResize.tsx (96%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/{ => switches}/SwitchFlip.tsx (89%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/{ => switches}/SwitchFlop.tsx (89%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/{ => switches}/SwitchGrayscale.tsx (90%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/{ => BlurSigmaHeader}/BlurSigmaHeader.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/{ => BlurSigmaHeader}/ButtonRemoveBlurSigma.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/{ => BlurSigmaHeader}/ButtonResetBlurSigma.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/{ => GammaContent}/GammaContent.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/{ => GammaContent}/GammaContentSkeleton.tsx (81%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/{ => GammaContent/GammaHeader}/ButtonRemoveGamma.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/{ => GammaContent/GammaHeader}/ButtonResetGamma.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/{ => GammaContent/GammaHeader}/GammaHeader.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/{ => GammaContent}/SliderGamma.tsx (92%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/ModulateContent.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/ModulateContentSkeleton.tsx (88%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent/ModulateHeader}/ButtonRemoveModulate.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent/ModulateHeader}/ButtonResetModulate.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent/ModulateHeader}/ModulateHeader.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/ModulateList.tsx (68%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/sliders/SliderBrightness.tsx (93%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/sliders/SliderHue.module.css (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/sliders/SliderHue.tsx (95%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/sliders/SliderLightness.tsx (93%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/{ => ModulateContent}/sliders/SliderSaturation.tsx (94%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/{ => switches}/SwitchNegate.tsx (88%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/{ => switches}/SwitchNegateAlpha.tsx (91%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/{ => NormaliseContent}/NormaliseContent.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/{ => NormaliseContent}/NormaliseContentSkeleton.tsx (82%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/{ => NormaliseContent/NormaliseHeader}/ButtonRemoveNormalise.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/{ => NormaliseContent/NormaliseHeader}/ButtonResetNormalise.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/{ => NormaliseContent/NormaliseHeader}/NormaliseHeader.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/{ => NormaliseContent}/SliderNormalise.tsx (95%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/{ => RotateContent}/RotateContentSkeleton.tsx (75%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/{ => RotateHeader}/ButtonRemoveRotate.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/{ => RotateHeader}/ButtonResetRotate.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/{ => RotateHeader}/RotateHeader.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/{ => TintContent}/TintContent.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/{ => TintContent}/TintContentSkeleton.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/{ => TintContent/TintHeader}/ButtonRemoveTint.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/{ => TintContent/TintHeader}/ButtonResetTint.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/{ => TintContent/TintHeader}/TintHeader.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/index.ts create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabMetadata/{ => MetadataForm}/MetadataForm.module.css (100%) rename apps/frontend/src/widgets/SettingsPanel/TabMetadata/{ => MetadataForm}/MetadataForm.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabMetadata/{ => MetadataForm/MetadataFormField}/MetadataFormField.module.css (100%) rename apps/frontend/src/widgets/SettingsPanel/TabMetadata/{ => MetadataForm/MetadataFormField}/MetadataFormField.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/index.ts create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabMetadata/{ => forms}/ifd0-form.tsx (97%) rename apps/frontend/src/widgets/SettingsPanel/TabMetadata/{ => forms}/ifd2-form.tsx (95%) rename apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/{ => SortableSectionButton}/SortableSectionButton.module.css (100%) rename apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/{ => SortableSectionButton}/SortableSectionButton.tsx (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/index.ts rename apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/{ => TrimContent}/CheckboxTrimLineArt.tsx (87%) rename apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/{ => TrimContent}/TrimBackground/TrimBackground.tsx (94%) rename apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/{ => TrimContent}/TrimBackground/TrimBackgroundInfoPopover.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/{ => TrimContent}/TrimBackground/TrimBackgroundPicker.tsx (100%) rename apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/{ => TrimContent}/TrimBackground/index.ts (100%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimContent.tsx rename apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/{ => TrimContent}/TrimThresholdInput.tsx (91%) create mode 100644 apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/index.ts diff --git a/apps/frontend/src/__setup__/test-aliases.ts b/apps/frontend/src/__setup__/test-aliases.ts index 05d5a136..ebf48a6e 100644 --- a/apps/frontend/src/__setup__/test-aliases.ts +++ b/apps/frontend/src/__setup__/test-aliases.ts @@ -23,10 +23,6 @@ const aliases: Alias[] = [ replacementPath: './src/site' }, /* Components */ - { - find: '@layouts', - replacementPath: './src/layouts' - }, { find: '@widgets', replacementPath: './src/widgets' diff --git a/apps/frontend/src/app/gallery/components/CompareSlider.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/CompareSlider.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/CompareSlider.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/CompareSlider.module.css diff --git a/apps/frontend/src/app/gallery/components/CompareSlider.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/CompareSlider.tsx similarity index 100% rename from apps/frontend/src/app/gallery/components/CompareSlider.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/CompareSlider.tsx diff --git a/apps/frontend/src/app/gallery/components/DragHandle.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/DragHandle.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/DragHandle.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/DragHandle.module.css diff --git a/apps/frontend/src/app/gallery/components/DragHandle.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/DragHandle.tsx similarity index 100% rename from apps/frontend/src/app/gallery/components/DragHandle.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/DragHandle.tsx diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/index.ts new file mode 100644 index 00000000..3cf4d671 --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/DragHandle/index.ts @@ -0,0 +1 @@ +export { DragHandle } from './DragHandle' diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/index.ts new file mode 100644 index 00000000..eb89c0f4 --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/CompareSlider/index.ts @@ -0,0 +1 @@ +export { CompareSlider } from './CompareSlider' diff --git a/apps/frontend/src/app/gallery/components/GallerySlide.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlide.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlide.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlide.module.css diff --git a/apps/frontend/src/app/gallery/components/GallerySlide.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlide.tsx similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlide.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlide.tsx diff --git a/apps/frontend/src/app/gallery/components/GallerySlideAside.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/GallerySlideAside.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlideAside.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/GallerySlideAside.module.css diff --git a/apps/frontend/src/app/gallery/components/GallerySlideAside.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/GallerySlideAside.tsx similarity index 89% rename from apps/frontend/src/app/gallery/components/GallerySlideAside.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/GallerySlideAside.tsx index 53f14bb4..2095d997 100644 --- a/apps/frontend/src/app/gallery/components/GallerySlideAside.tsx +++ b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/GallerySlideAside.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' import type { ComponentPropsWithoutRef, FC } from 'react' -import { GallerySlideInfo } from './GallerySlideInfo' +import { GallerySlideInfo } from '../GallerySlideInfo' import styles from './GallerySlideAside.module.css' export const GallerySlideAside: FC = props => ( diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/index.ts new file mode 100644 index 00000000..bbbe6131 --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideAside/index.ts @@ -0,0 +1 @@ +export { GallerySlideAside } from './GallerySlideAside' diff --git a/apps/frontend/src/app/gallery/components/GallerySlideInfo.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/GallerySlideInfo.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlideInfo.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/GallerySlideInfo.module.css diff --git a/apps/frontend/src/app/gallery/components/GallerySlideInfo.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/GallerySlideInfo.tsx similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlideInfo.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/GallerySlideInfo.tsx diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/index.ts new file mode 100644 index 00000000..d1274fdd --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideInfo/index.ts @@ -0,0 +1 @@ +export { GallerySlideInfo } from './GallerySlideInfo' diff --git a/apps/frontend/src/app/gallery/components/GallerySlidePopover.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/GallerySlidePopover.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlidePopover.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/GallerySlidePopover.module.css diff --git a/apps/frontend/src/app/gallery/components/GallerySlidePopover.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/GallerySlidePopover.tsx similarity index 94% rename from apps/frontend/src/app/gallery/components/GallerySlidePopover.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/GallerySlidePopover.tsx index 53a449ee..dd5fa698 100644 --- a/apps/frontend/src/app/gallery/components/GallerySlidePopover.tsx +++ b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/GallerySlidePopover.tsx @@ -3,7 +3,7 @@ import type { ComponentPropsWithoutRef, FC } from 'react' import { DotsHorizontalIcon } from '@scissors/react-icons/DotsHorizontalIcon' -import { GallerySlideInfo } from './GallerySlideInfo' +import { GallerySlideInfo } from '../GallerySlideInfo' import styles from './GallerySlidePopover.module.css' const GallerySlidePopoverTrigger = () => ( diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/index.ts new file mode 100644 index 00000000..5a499509 --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlidePopover/index.ts @@ -0,0 +1 @@ +export { GallerySlidePopover } from './GallerySlidePopover' diff --git a/apps/frontend/src/app/gallery/components/GallerySlideSkeleton.module.css b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/GallerySlideSkeleton.module.css similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlideSkeleton.module.css rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/GallerySlideSkeleton.module.css diff --git a/apps/frontend/src/app/gallery/components/GallerySlideSkeleton.tsx b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/GallerySlideSkeleton.tsx similarity index 100% rename from apps/frontend/src/app/gallery/components/GallerySlideSkeleton.tsx rename to apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/GallerySlideSkeleton.tsx diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/index.ts new file mode 100644 index 00000000..5858d5bc --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/GallerySlideSkeleton/index.ts @@ -0,0 +1 @@ +export * from './GallerySlideSkeleton' diff --git a/apps/frontend/src/app/gallery/components/GallerySlide/index.ts b/apps/frontend/src/app/gallery/components/GallerySlide/index.ts new file mode 100644 index 00000000..612c13c6 --- /dev/null +++ b/apps/frontend/src/app/gallery/components/GallerySlide/index.ts @@ -0,0 +1 @@ +export { default } from './GallerySlide' diff --git a/apps/frontend/src/app/gallery/layout.tsx b/apps/frontend/src/app/gallery/layout.tsx index 430b9f12..c1db8626 100644 --- a/apps/frontend/src/app/gallery/layout.tsx +++ b/apps/frontend/src/app/gallery/layout.tsx @@ -1,10 +1,10 @@ -import type { FC, PropsWithChildren } from 'react' +import type { PropsWithChildren } from 'react' import type { Metadata } from 'next' export const metadata: Metadata = { title: 'Gallery' } -const GalleryLayout: FC = ({ children }) => children +const GalleryLayout = ({ children }: PropsWithChildren) => children export default GalleryLayout diff --git a/apps/frontend/src/app/gallery/page.tsx b/apps/frontend/src/app/gallery/page.tsx index 33bd6065..f6eacb62 100644 --- a/apps/frontend/src/app/gallery/page.tsx +++ b/apps/frontend/src/app/gallery/page.tsx @@ -1,7 +1,7 @@ import dynamic from 'next/dynamic' import { Flex, ScrollArea } from '@radix-ui/themes' -import { GallerySlideSkeleton } from './components/GallerySlideSkeleton' +import { GallerySlideSkeleton } from './components/GallerySlide/GallerySlideSkeleton' import { slides } from './slides' import styles from './page.module.css' diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx index 9fae233e..2954c31f 100644 --- a/apps/frontend/src/app/layout.tsx +++ b/apps/frontend/src/app/layout.tsx @@ -5,9 +5,8 @@ import { Theme } from '@radix-ui/themes' import { ThemeProvider } from 'next-themes' import type { Metadata } from 'next' import type { PropsWithChildren } from 'react' -import 'yet-another-react-lightbox/styles.css' -import { Layout } from '@layouts/default' +import { Layout } from '@components/Layout' import { pathForSocial, SITE_DESCRIPTION, diff --git a/apps/frontend/src/layouts/default/LayoutHeader/ButtonGithub.tsx b/apps/frontend/src/components/ButtonGithub.tsx similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/ButtonGithub.tsx rename to apps/frontend/src/components/ButtonGithub.tsx diff --git a/apps/frontend/src/components/CheckboxDominantBackground.tsx b/apps/frontend/src/components/CheckboxDominantBackground.tsx index 638bbc4b..d842ad3e 100644 --- a/apps/frontend/src/components/CheckboxDominantBackground.tsx +++ b/apps/frontend/src/components/CheckboxDominantBackground.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react' -import { Checkbox, type Props as CheckboxProps } from '@design-system/checkbox' +import { Checkbox, type Props as CheckboxProps } from '@design-system/Checkbox' export const CheckboxDominantBackground: FC> = props => ( diff --git a/apps/frontend/src/components/ImageUploader/ImageUploaderLoading.module.css b/apps/frontend/src/components/ImageUploader/ImageUploaderLoading/ImageUploaderLoading.module.css similarity index 100% rename from apps/frontend/src/components/ImageUploader/ImageUploaderLoading.module.css rename to apps/frontend/src/components/ImageUploader/ImageUploaderLoading/ImageUploaderLoading.module.css diff --git a/apps/frontend/src/components/ImageUploader/ImageUploaderLoading.tsx b/apps/frontend/src/components/ImageUploader/ImageUploaderLoading/ImageUploaderLoading.tsx similarity index 100% rename from apps/frontend/src/components/ImageUploader/ImageUploaderLoading.tsx rename to apps/frontend/src/components/ImageUploader/ImageUploaderLoading/ImageUploaderLoading.tsx diff --git a/apps/frontend/src/components/ImageUploader/ImageUploaderLoading/index.ts b/apps/frontend/src/components/ImageUploader/ImageUploaderLoading/index.ts new file mode 100644 index 00000000..14f00788 --- /dev/null +++ b/apps/frontend/src/components/ImageUploader/ImageUploaderLoading/index.ts @@ -0,0 +1 @@ +export { ImageUploaderLoading } from './ImageUploaderLoading' diff --git a/apps/frontend/src/layouts/default/Layout.tsx b/apps/frontend/src/components/Layout/Layout.tsx similarity index 100% rename from apps/frontend/src/layouts/default/Layout.tsx rename to apps/frontend/src/components/Layout/Layout.tsx diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDrawer.module.css b/apps/frontend/src/components/Layout/LayoutDrawer/LayoutDrawer.module.css similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDrawer.module.css rename to apps/frontend/src/components/Layout/LayoutDrawer/LayoutDrawer.module.css diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDrawer.tsx b/apps/frontend/src/components/Layout/LayoutDrawer/LayoutDrawer.tsx similarity index 89% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDrawer.tsx rename to apps/frontend/src/components/Layout/LayoutDrawer/LayoutDrawer.tsx index cf2b3d4d..cf433f29 100644 --- a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDrawer.tsx +++ b/apps/frontend/src/components/Layout/LayoutDrawer/LayoutDrawer.tsx @@ -8,12 +8,12 @@ import { GithubLogoIcon } from '@scissors/react-icons/GithubLogoIcon' import { HamburgerMenuIcon } from '@scissors/react-icons/HamburgerMenuIcon' import { Drawer } from '@ui/Drawer' -import { NavigationMobile, NavigationMobileItem } from './NavigationMobile' +import { NavigationMobile, NavigationMobileItem } from '@components/navigation/NavigationMobile' import { useEscapeAction } from '@hooks/useEscapeAction' import { GITHUB_REPO_PATH } from '@site/config' -import styles from './NavigationDrawer.module.css' +import styles from './LayoutDrawer.module.css' -export default function NavigationDrawer() { +export default function LayoutDrawer() { const [isOpen, setIsOpen] = useState(false) const pathname = usePathname() diff --git a/apps/frontend/src/components/Layout/LayoutDrawer/index.ts b/apps/frontend/src/components/Layout/LayoutDrawer/index.ts new file mode 100644 index 00000000..ab495680 --- /dev/null +++ b/apps/frontend/src/components/Layout/LayoutDrawer/index.ts @@ -0,0 +1 @@ +export { default } from './LayoutDrawer' diff --git a/apps/frontend/src/layouts/default/LayoutHeader/LayoutHeader.module.css b/apps/frontend/src/components/Layout/LayoutHeader/LayoutHeader.module.css similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/LayoutHeader.module.css rename to apps/frontend/src/components/Layout/LayoutHeader/LayoutHeader.module.css diff --git a/apps/frontend/src/layouts/default/LayoutHeader/LayoutHeader.tsx b/apps/frontend/src/components/Layout/LayoutHeader/LayoutHeader.tsx similarity index 84% rename from apps/frontend/src/layouts/default/LayoutHeader/LayoutHeader.tsx rename to apps/frontend/src/components/Layout/LayoutHeader/LayoutHeader.tsx index 6de32a7a..ddc461f7 100644 --- a/apps/frontend/src/layouts/default/LayoutHeader/LayoutHeader.tsx +++ b/apps/frontend/src/components/Layout/LayoutHeader/LayoutHeader.tsx @@ -2,19 +2,19 @@ import dynamic from 'next/dynamic' import { Flex } from '@radix-ui/themes' import { AppLogo } from '@ui/AppLogo' -import { ButtonGithub } from './ButtonGithub' -import { NavigationDesktop } from './navigation/NavigationDesktop' +import { ButtonGithub } from '@components/ButtonGithub' +import { NavigationDesktop } from '@components/navigation/NavigationDesktop' import { ThemeColorMenu } from '@components/theme/ThemeColorMenu' import { IconButtonGhostSkeleton } from '@ui/skeletons/IconButtonGhostSkeleton' import styles from './LayoutHeader.module.css' +const LayoutDrawer = dynamic(() => import('../LayoutDrawer'), { + ssr: false +}) const AppearancePopover = dynamic(() => import('@components/AppearancePopover'), { ssr: false, loading: () => }) -const NavigationDrawer = dynamic(() => import('./navigation/NavigationDrawer'), { - ssr: false -}) const ButtonToggleTheme = dynamic(() => import('@components/theme/ButtonToggleTheme'), { ssr: false, loading: () => @@ -40,7 +40,7 @@ export const LayoutHeader = () => ( - + ) diff --git a/apps/frontend/src/layouts/default/LayoutHeader/index.ts b/apps/frontend/src/components/Layout/LayoutHeader/index.ts similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/index.ts rename to apps/frontend/src/components/Layout/LayoutHeader/index.ts diff --git a/apps/frontend/src/layouts/default/index.ts b/apps/frontend/src/components/Layout/index.ts similarity index 100% rename from apps/frontend/src/layouts/default/index.ts rename to apps/frontend/src/components/Layout/index.ts diff --git a/apps/frontend/src/components/NumberInput/NumberInput.test.tsx b/apps/frontend/src/components/NumberInput/NumberInput.test.tsx index 854df6dc..66125618 100644 --- a/apps/frontend/src/components/NumberInput/NumberInput.test.tsx +++ b/apps/frontend/src/components/NumberInput/NumberInput.test.tsx @@ -4,7 +4,7 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { fieldTestId, labelTestId, NumberInput, slotTestId } from './NumberInput' import { NOT_ALLOWED_KEYS } from './utils' -import type { Props } from './NumberInput.types' +import type { Props } from './types' describe('@components/NumberInput - rendering', () => { afterEach(() => { diff --git a/apps/frontend/src/components/NumberInput/NumberInput.tsx b/apps/frontend/src/components/NumberInput/NumberInput.tsx index c04aacec..6d0f7446 100644 --- a/apps/frontend/src/components/NumberInput/NumberInput.tsx +++ b/apps/frontend/src/components/NumberInput/NumberInput.tsx @@ -6,7 +6,7 @@ import { clsx } from 'clsx' import { NOT_ALLOWED_KEYS, parseValue } from './utils' import { useEscapeBlur } from '@hooks/useEscapeBlur' -import type { LabelProps, Props } from './NumberInput.types' +import type { LabelProps, Props } from './types' import styles from './NumberInput.module.css' export const labelTestId = 'number-input-label' diff --git a/apps/frontend/src/components/NumberInput/NumberInput.types.ts b/apps/frontend/src/components/NumberInput/types.ts similarity index 100% rename from apps/frontend/src/components/NumberInput/NumberInput.types.ts rename to apps/frontend/src/components/NumberInput/types.ts diff --git a/apps/frontend/src/components/alerts/ConfirmAlert.tsx b/apps/frontend/src/components/alerts/ConfirmAlert.tsx index 20b636fb..8203d7d2 100644 --- a/apps/frontend/src/components/alerts/ConfirmAlert.tsx +++ b/apps/frontend/src/components/alerts/ConfirmAlert.tsx @@ -3,7 +3,7 @@ import { AlertDialog, Button, Flex } from '@radix-ui/themes' import type { FC, PropsWithChildren } from 'react' -import { TitleWithExclamation } from '@ui/TitleWithExclamation' +import { ExclamationTitle } from '@ui/ExclamationTitle' export const ConfirmAlert: FC = ({ children, @@ -24,9 +24,9 @@ export const ConfirmAlert: FC = ({ {withTitleExclamation ? ( - + {title} - + ) : ( {title} )} diff --git a/apps/frontend/src/components/alerts/ConfirmSettingsResetAlert.tsx b/apps/frontend/src/components/alerts/ConfirmSettingsResetAlert.tsx index d937589d..3761aca0 100644 --- a/apps/frontend/src/components/alerts/ConfirmSettingsResetAlert.tsx +++ b/apps/frontend/src/components/alerts/ConfirmSettingsResetAlert.tsx @@ -3,7 +3,7 @@ import { type ComponentPropsWithoutRef, type FC, type PropsWithChildren, useState } from 'react' import { AlertDialog, Button, Flex } from '@radix-ui/themes' -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' const contentActionsProps = { gap: { diff --git a/apps/frontend/src/components/alerts/FileValidationAlert.tsx b/apps/frontend/src/components/alerts/FileValidationAlert.tsx index c7265858..af87ca42 100644 --- a/apps/frontend/src/components/alerts/FileValidationAlert.tsx +++ b/apps/frontend/src/components/alerts/FileValidationAlert.tsx @@ -3,7 +3,7 @@ import { AlertDialog, Button, Flex } from '@radix-ui/themes' import type { ComponentPropsWithoutRef, FC, ReactNode } from 'react' -import { TitleWithExclamation } from '@ui/TitleWithExclamation' +import { ExclamationTitle } from '@ui/ExclamationTitle' export const FileValidationAlert: FC = ({ open, @@ -14,9 +14,9 @@ export const FileValidationAlert: FC = ({ }) => ( - + {title} - + {description} diff --git a/apps/frontend/src/components/alerts/RequestErrorAlert.tsx b/apps/frontend/src/components/alerts/RequestErrorAlert.tsx index 5aa48a54..88abcee2 100644 --- a/apps/frontend/src/components/alerts/RequestErrorAlert.tsx +++ b/apps/frontend/src/components/alerts/RequestErrorAlert.tsx @@ -2,7 +2,7 @@ import { AlertDialog, Button, Flex } from '@radix-ui/themes' -import { TitleWithExclamation } from '@ui/TitleWithExclamation' +import { ExclamationTitle } from '@ui/ExclamationTitle' import { handleRequestError } from '@api/helpers/handleRequestError' export function RequestErrorAlert({ open, error, reset, retry }: Props) { @@ -12,11 +12,11 @@ export function RequestErrorAlert({ open, error, reset, retry }: Props) { return ( - + {isMessageEmpty ? 'Something went wrong' : 'Error'} - + {isMessageEmpty ? 'Please try again later' : message} diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDesktop.module.css b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationDesktop.module.css similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDesktop.module.css rename to apps/frontend/src/components/navigation/NavigationDesktop/NavigationDesktop.module.css diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDesktop.tsx b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationDesktop.tsx similarity index 92% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDesktop.tsx rename to apps/frontend/src/components/navigation/NavigationDesktop/NavigationDesktop.tsx index 61887202..1d72ff06 100644 --- a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationDesktop.tsx +++ b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationDesktop.tsx @@ -3,7 +3,7 @@ import type { MarginProps } from '@radix-ui/themes/props' import type { FC } from 'react' import { NavigationItem } from './NavigationItem' -import { navigationItems } from './data' +import { navigationItems } from '../data' import styles from './NavigationDesktop.module.css' export const NavigationDesktop: FC = props => ( diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/NavigationItem.module.css b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/NavigationItem.module.css similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/NavigationItem.module.css rename to apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/NavigationItem.module.css diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/NavigationItem.tsx b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/NavigationItem.tsx similarity index 94% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/NavigationItem.tsx rename to apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/NavigationItem.tsx index 117a405b..241e2da6 100644 --- a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/NavigationItem.tsx +++ b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/NavigationItem.tsx @@ -5,7 +5,7 @@ import { Flex, IconButton, Link as RadixLink, Text, Tooltip } from '@radix-ui/th import { clsx } from 'clsx' import { useSelectedPath } from '@hooks/useSelectedPath' -import type { NavigationItemModel } from '../types' +import type { NavigationItemModel } from '@components/navigation/types' import styles from './NavigationItem.module.css' export function NavigationItem({ diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/index.ts b/apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/index.ts similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationItem/index.ts rename to apps/frontend/src/components/navigation/NavigationDesktop/NavigationItem/index.ts diff --git a/apps/frontend/src/components/navigation/NavigationDesktop/index.ts b/apps/frontend/src/components/navigation/NavigationDesktop/index.ts new file mode 100644 index 00000000..5a4ea60c --- /dev/null +++ b/apps/frontend/src/components/navigation/NavigationDesktop/index.ts @@ -0,0 +1 @@ +export { NavigationDesktop } from './NavigationDesktop' diff --git a/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.module.css b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.module.css new file mode 100644 index 00000000..3d6168b1 --- /dev/null +++ b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.module.css @@ -0,0 +1,3 @@ +.root { + row-gap: 2px; +} diff --git a/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.tsx b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.tsx new file mode 100644 index 00000000..a9aa17a1 --- /dev/null +++ b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobile.tsx @@ -0,0 +1,30 @@ +'use client' + +import { Flex } from '@radix-ui/themes' + +import { NavigationMobileItem } from './NavigationMobileItem' +import { PATH_ROOT } from '@site/paths' +import { navigationItems } from '../data' +import type { NavigationItemModel } from '../types' +import styles from './NavigationMobile.module.css' + +const items: NavigationItemModel[] = [ + { + label: 'Homepage', + href: PATH_ROOT + }, + ...navigationItems.map(item => ({ + ...item, + icon: undefined + })) +] + +export const NavigationMobile = () => ( + + + +) diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.module.css b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.module.css similarity index 90% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.module.css rename to apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.module.css index da7ccc62..9a801713 100644 --- a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.module.css +++ b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.module.css @@ -1,8 +1,4 @@ .root { - row-gap: 2px; -} - -.item { display: flex; align-items: center; justify-content: flex-start; @@ -18,7 +14,7 @@ text-decoration: none; } -.item:focus-visible { +.root:focus-visible { box-shadow: inset 0 0 0 1px var(--accent-8), 0 0 0 1px var(--accent-8); @@ -29,7 +25,7 @@ } @media (hover: hover) { - .item:hover { + .root:hover { background-color: var(--accent-a4); } diff --git a/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.tsx b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.tsx new file mode 100644 index 00000000..58af04fc --- /dev/null +++ b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/NavigationMobileItem.tsx @@ -0,0 +1,32 @@ +import Link from 'next/link' +import { Text, Link as RadixLink } from '@radix-ui/themes' +import { clsx } from 'clsx' + +import { useSelectedPath } from '@hooks/useSelectedPath' +import type { NavigationItemModel } from '@components/navigation/types' +import styles from './NavigationMobileItem.module.css' + +export const NavigationMobileItem = ({ + href, + label, + icon, + // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars + tooltipContent: _, + ...attributes +}: NavigationItemModel) => { + const isSelected = useSelectedPath(href) + + return ( + + + {icon} {label} + + + ) +} diff --git a/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/index.ts b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/index.ts new file mode 100644 index 00000000..a3be2d62 --- /dev/null +++ b/apps/frontend/src/components/navigation/NavigationMobile/NavigationMobileItem/index.ts @@ -0,0 +1 @@ +export { NavigationMobileItem } from './NavigationMobileItem' diff --git a/apps/frontend/src/components/navigation/NavigationMobile/index.ts b/apps/frontend/src/components/navigation/NavigationMobile/index.ts new file mode 100644 index 00000000..3488e183 --- /dev/null +++ b/apps/frontend/src/components/navigation/NavigationMobile/index.ts @@ -0,0 +1,2 @@ +export { NavigationMobile } from './NavigationMobile' +export { NavigationMobileItem } from './NavigationMobileItem' diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/data.tsx b/apps/frontend/src/components/navigation/data.tsx similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/data.tsx rename to apps/frontend/src/components/navigation/data.tsx diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/types.ts b/apps/frontend/src/components/navigation/types.ts similarity index 100% rename from apps/frontend/src/layouts/default/LayoutHeader/navigation/types.ts rename to apps/frontend/src/components/navigation/types.ts diff --git a/apps/frontend/src/design-system/checkbox/checkbox.module.css b/apps/frontend/src/design-system/Checkbox/Checkbox.module.css similarity index 100% rename from apps/frontend/src/design-system/checkbox/checkbox.module.css rename to apps/frontend/src/design-system/Checkbox/Checkbox.module.css diff --git a/apps/frontend/src/design-system/checkbox/checkbox.test.tsx b/apps/frontend/src/design-system/Checkbox/Checkbox.test.tsx similarity index 100% rename from apps/frontend/src/design-system/checkbox/checkbox.test.tsx rename to apps/frontend/src/design-system/Checkbox/Checkbox.test.tsx diff --git a/apps/frontend/src/design-system/checkbox/checkbox.tsx b/apps/frontend/src/design-system/Checkbox/Checkbox.tsx similarity index 95% rename from apps/frontend/src/design-system/checkbox/checkbox.tsx rename to apps/frontend/src/design-system/Checkbox/Checkbox.tsx index ef9bc9e6..de8c7cb1 100644 --- a/apps/frontend/src/design-system/checkbox/checkbox.tsx +++ b/apps/frontend/src/design-system/Checkbox/Checkbox.tsx @@ -4,7 +4,7 @@ import { type FC, memo, useId } from 'react' import { Checkbox as RadixCheckbox, Flex, Text } from '@radix-ui/themes' import { clsx } from 'clsx' -import styles from './checkbox.module.css' +import styles from './Checkbox.module.css' export const rootTestId = 'checkbox-root' diff --git a/apps/frontend/src/design-system/checkbox/checkbox-skeleton.tsx b/apps/frontend/src/design-system/Checkbox/CheckboxSkeleton.tsx similarity index 100% rename from apps/frontend/src/design-system/checkbox/checkbox-skeleton.tsx rename to apps/frontend/src/design-system/Checkbox/CheckboxSkeleton.tsx diff --git a/apps/frontend/src/design-system/Checkbox/index.ts b/apps/frontend/src/design-system/Checkbox/index.ts new file mode 100644 index 00000000..bc9bc8b4 --- /dev/null +++ b/apps/frontend/src/design-system/Checkbox/index.ts @@ -0,0 +1 @@ +export { Checkbox, type Props, rootTestId } from './Checkbox' diff --git a/apps/frontend/src/design-system/select/select.module.css b/apps/frontend/src/design-system/Select/Select.module.css similarity index 100% rename from apps/frontend/src/design-system/select/select.module.css rename to apps/frontend/src/design-system/Select/Select.module.css diff --git a/apps/frontend/src/design-system/select/select.tsx b/apps/frontend/src/design-system/Select/Select.tsx similarity index 97% rename from apps/frontend/src/design-system/select/select.tsx rename to apps/frontend/src/design-system/Select/Select.tsx index 40b67b87..60b1cda4 100644 --- a/apps/frontend/src/design-system/select/select.tsx +++ b/apps/frontend/src/design-system/Select/Select.tsx @@ -6,7 +6,7 @@ import { clsx } from 'clsx' import capitalize from 'lodash.capitalize' import type { Props } from './types' -import styles from './select.module.css' +import styles from './Select.module.css' export function Select({ data, diff --git a/apps/frontend/src/design-system/select/index.ts b/apps/frontend/src/design-system/Select/index.ts similarity index 55% rename from apps/frontend/src/design-system/select/index.ts rename to apps/frontend/src/design-system/Select/index.ts index 2575555e..f6235163 100644 --- a/apps/frontend/src/design-system/select/index.ts +++ b/apps/frontend/src/design-system/Select/index.ts @@ -1,2 +1,2 @@ -export { Select } from './select' +export { Select } from './Select' export type { SelectData } from './types' diff --git a/apps/frontend/src/design-system/select/types.ts b/apps/frontend/src/design-system/Select/types.ts similarity index 100% rename from apps/frontend/src/design-system/select/types.ts rename to apps/frontend/src/design-system/Select/types.ts diff --git a/apps/frontend/src/design-system/slider/slider.module.css b/apps/frontend/src/design-system/Slider/Slider.module.css similarity index 100% rename from apps/frontend/src/design-system/slider/slider.module.css rename to apps/frontend/src/design-system/Slider/Slider.module.css diff --git a/apps/frontend/src/design-system/slider/slider.tsx b/apps/frontend/src/design-system/Slider/Slider.tsx similarity index 96% rename from apps/frontend/src/design-system/slider/slider.tsx rename to apps/frontend/src/design-system/Slider/Slider.tsx index d70a1c4c..bba76538 100644 --- a/apps/frontend/src/design-system/slider/slider.tsx +++ b/apps/frontend/src/design-system/Slider/Slider.tsx @@ -4,8 +4,8 @@ import { useCallback } from 'react' import { Flex, Slider as RadixSlider, Text } from '@radix-ui/themes' import { clsx } from 'clsx' -import { NumberInput } from 'src/components/NumberInput' -import { SliderHeader } from './slider-header' +import { NumberInput } from '@components/NumberInput' +import { SliderHeader } from './SliderHeader' import { getSliderTitleValue, getSliderValue } from './utils' import type { Props } from './types' import styles from './slider.module.css' diff --git a/apps/frontend/src/design-system/slider/slider-header.module.css b/apps/frontend/src/design-system/Slider/SliderHeader/SliderHeader.module.css similarity index 100% rename from apps/frontend/src/design-system/slider/slider-header.module.css rename to apps/frontend/src/design-system/Slider/SliderHeader/SliderHeader.module.css diff --git a/apps/frontend/src/design-system/slider/slider-header.tsx b/apps/frontend/src/design-system/Slider/SliderHeader/SliderHeader.tsx similarity index 80% rename from apps/frontend/src/design-system/slider/slider-header.tsx rename to apps/frontend/src/design-system/Slider/SliderHeader/SliderHeader.tsx index 6558a238..1f6f879d 100644 --- a/apps/frontend/src/design-system/slider/slider-header.tsx +++ b/apps/frontend/src/design-system/Slider/SliderHeader/SliderHeader.tsx @@ -2,10 +2,10 @@ import dynamic from 'next/dynamic' import { Flex, Heading, Separator } from '@radix-ui/themes' import type { FC } from 'react' -import type { Props as SliderProps } from './types' -import styles from './slider-header.module.css' +import type { Props as SliderProps } from '../types' +import styles from './SliderHeader.module.css' -const SliderPopover = dynamic(() => import('./slider-popover').then(mod => mod.SliderPopover), { +const SliderPopover = dynamic(() => import('./SliderPopover').then(mod => mod.SliderPopover), { ssr: false }) diff --git a/apps/frontend/src/design-system/slider/slider-popover.tsx b/apps/frontend/src/design-system/Slider/SliderHeader/SliderPopover.tsx similarity index 100% rename from apps/frontend/src/design-system/slider/slider-popover.tsx rename to apps/frontend/src/design-system/Slider/SliderHeader/SliderPopover.tsx diff --git a/apps/frontend/src/design-system/Slider/SliderHeader/index.ts b/apps/frontend/src/design-system/Slider/SliderHeader/index.ts new file mode 100644 index 00000000..5ed977ff --- /dev/null +++ b/apps/frontend/src/design-system/Slider/SliderHeader/index.ts @@ -0,0 +1 @@ +export { SliderHeader } from './SliderHeader' diff --git a/apps/frontend/src/design-system/slider/slider-skeleton.tsx b/apps/frontend/src/design-system/Slider/SliderSkeleton.tsx similarity index 100% rename from apps/frontend/src/design-system/slider/slider-skeleton.tsx rename to apps/frontend/src/design-system/Slider/SliderSkeleton.tsx diff --git a/apps/frontend/src/design-system/Slider/index.ts b/apps/frontend/src/design-system/Slider/index.ts new file mode 100644 index 00000000..6d43da3c --- /dev/null +++ b/apps/frontend/src/design-system/Slider/index.ts @@ -0,0 +1 @@ +export { Slider } from './Slider' diff --git a/apps/frontend/src/design-system/slider/types.ts b/apps/frontend/src/design-system/Slider/types.ts similarity index 100% rename from apps/frontend/src/design-system/slider/types.ts rename to apps/frontend/src/design-system/Slider/types.ts diff --git a/apps/frontend/src/design-system/slider/utils.ts b/apps/frontend/src/design-system/Slider/utils.ts similarity index 100% rename from apps/frontend/src/design-system/slider/utils.ts rename to apps/frontend/src/design-system/Slider/utils.ts diff --git a/apps/frontend/src/design-system/switch/switch.test.tsx b/apps/frontend/src/design-system/Switch/Switch.test.tsx similarity index 100% rename from apps/frontend/src/design-system/switch/switch.test.tsx rename to apps/frontend/src/design-system/Switch/Switch.test.tsx diff --git a/apps/frontend/src/design-system/switch/switch.tsx b/apps/frontend/src/design-system/Switch/Switch.tsx similarity index 100% rename from apps/frontend/src/design-system/switch/switch.tsx rename to apps/frontend/src/design-system/Switch/Switch.tsx diff --git a/apps/frontend/src/design-system/Switch/index.ts b/apps/frontend/src/design-system/Switch/index.ts new file mode 100644 index 00000000..dd5775ab --- /dev/null +++ b/apps/frontend/src/design-system/Switch/index.ts @@ -0,0 +1 @@ +export { Switch } from './Switch' diff --git a/apps/frontend/src/design-system/checkbox/index.ts b/apps/frontend/src/design-system/checkbox/index.ts deleted file mode 100644 index 455b271b..00000000 --- a/apps/frontend/src/design-system/checkbox/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { Checkbox, type Props, rootTestId } from './checkbox' diff --git a/apps/frontend/src/design-system/slider/index.ts b/apps/frontend/src/design-system/slider/index.ts deleted file mode 100644 index f9940a9e..00000000 --- a/apps/frontend/src/design-system/slider/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { Slider } from './slider' diff --git a/apps/frontend/src/design-system/switch/index.ts b/apps/frontend/src/design-system/switch/index.ts deleted file mode 100644 index efcd29b1..00000000 --- a/apps/frontend/src/design-system/switch/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { Switch } from './switch' diff --git a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.tsx b/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.tsx deleted file mode 100644 index 8a1b1452..00000000 --- a/apps/frontend/src/layouts/default/LayoutHeader/navigation/NavigationMobile.tsx +++ /dev/null @@ -1,58 +0,0 @@ -'use client' - -import Link from 'next/link' -import { Flex, Text, Link as RadixLink } from '@radix-ui/themes' -import { clsx } from 'clsx' -import type { FC } from 'react' - -import { navigationItems } from './data' -import { useSelectedPath } from '@hooks/useSelectedPath' -import { PATH_ROOT } from '@site/paths' -import type { NavigationItemModel } from './types' -import styles from './NavigationMobile.module.css' - -const items: NavigationItemModel[] = [ - { - label: 'Homepage', - href: PATH_ROOT - }, - ...navigationItems.map(item => ({ - ...item, - icon: undefined - })) -] - -export const NavigationMobile = () => ( - - - -) - -export const NavigationMobileItem: FC = ({ - href, - label, - icon, - // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars - tooltipContent: _, - ...attributes -}) => { - const isSelected = useSelectedPath(href) - - return ( - - - {icon} {label} - - - ) -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPicker.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPicker.tsx deleted file mode 100644 index 9269cf5c..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPicker.tsx +++ /dev/null @@ -1,35 +0,0 @@ -'use client' - -import { Popover } from '@radix-ui/themes' -import type { FC } from 'react' - -import { ColorPickerTrigger } from './ColorPickerTrigger' -import { ColorPickerContent } from './ColorPickerContent' -import type { TextSize } from '@lib/theme' - -export const ColorPicker: FC = ({ - color, - setColor, - triggerLabel, - triggerLabelSize = '3', - disabled -}) => ( - - - - -) - -/* eslint no-unused-vars: 0 */ -interface Props { - color: string - setColor: (color: string) => void - triggerLabel?: string - triggerLabelSize?: TextSize - disabled?: boolean -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.module.css b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.module.css deleted file mode 100644 index 9f0fe61e..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.module.css +++ /dev/null @@ -1,19 +0,0 @@ -.root :global(.react-colorful__saturation-pointer) { - width: 20px; - height: 20px; -} - -.root :global(.react-colorful__hue-pointer), -.root :global(.react-colorful__alpha-pointer) { - width: 9px; - border-radius: 4px; - border-width: 1px; -} - -.root :global(.react-colorful__interactive:focus .react-colorful__pointer) { - transform: translate3d(-50%, -50%, 0) scale(1); -} - -.reactColorfulColorPicker { - width: 100% !important; -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.tsx deleted file mode 100644 index 0691d0d5..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerContent.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import { useCallback } from 'react' -import { Flex, Popover } from '@radix-ui/themes' -import { HexColorPicker } from 'react-colorful' - -import { ButtonClipboardCopy } from '@ui/ButtonClipboardCopy' -import { ButtonRandomize } from '@ui/ButtonRandomize' -import { EyeDropper } from '@ui/EyeDropper' -import { HexColorInput } from './HexColorInput' -import { ColorPickerSwatches } from './ColorPickerSwatches' -import { useEyeDropper } from '@hooks/useEyeDropper' -import { getRandomHexColor } from '@lib/helpers/colors' -import styles from './ColorPickerContent.module.css' - -export function ColorPickerContent({ color, setColor }: Props) { - const { isSupported: isEyeDropperSupported } = useEyeDropper() - - const handleValueChange = useCallback((color: string) => setColor(color), [setColor]) - const handleInputValueChange = useCallback( - (color: string) => setColor(!color.startsWith('#') ? `#${color}` : color), - [setColor] - ) - const handleRandomize = () => setColor(getRandomHexColor()) - - return ( - - - - - - - - {isEyeDropperSupported && } - - - - - - - - ) -} - -/* eslint no-unused-vars: 0 */ -interface Props { - color: string - setColor: (color: string) => void -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.module.css b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.module.css deleted file mode 100644 index 5e9d6d60..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.module.css +++ /dev/null @@ -1,8 +0,0 @@ -.swatch { - --size: 22px; - - cursor: pointer; - width: var(--size); - height: var(--size); - border-radius: 4px; -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.tsx deleted file mode 100644 index 262107b6..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/ColorPickerSwatches.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { Grid } from '@radix-ui/themes' -import type { FC } from 'react' - -import { ColorSwatch } from '@ui/ColorSwatch' -import styles from './ColorPickerSwatches.module.css' - -const colors = [ - '#2e2e2e', - '#868e96', - '#fa5252', - '#e64980', - '#be4bdb', - '#7950f2', - '#4c6ef5', - '#228be6', - '#15aabf', - '#12b886', - '#40c057', - '#82c91e', - '#fab005', - '#fd7e14' -] - -const rows = 2 -const columns = Math.floor(colors.length / rows).toString() - -export const ColorPickerSwatches: FC = ({ setColor }) => ( - - {colors.map(color => ( - - ))} - -) - -/* eslint no-unused-vars: 0 */ -interface Props { - setColor: (color: string) => void -} - -function ColorPickerSwatch({ color, setColor }: SwatchProps) { - const handleClick = () => setColor(color) - - return -} - -interface SwatchProps extends Props { - color: string -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/index.ts b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/index.ts deleted file mode 100644 index 1aef6c98..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/ColorPickerSwatches/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ColorPickerSwatches } from './ColorPickerSwatches' diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/ColorInput.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/ColorInput.tsx deleted file mode 100644 index e28cf67b..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/ColorInput.tsx +++ /dev/null @@ -1,96 +0,0 @@ -/** - * NOTE: Merged radix-ui/TextField.Root with react-colorful/HexColorInput; - *
- * ColorInput; - *
- * HexColorInput; - */ - -import { - type ChangeEvent, - type FocusEvent, - type InputHTMLAttributes, - useCallback, - useEffect, - useRef, - useState -} from 'react' -import { TextField } from '@radix-ui/themes' -import type { Responsive } from '@radix-ui/themes/props' - -export function useEventCallback(handler?: (value: T) => void): (value: T) => void { - const callbackRef = useRef(handler) - - const callback = useRef((value: T) => { - if (!callbackRef.current) return - - callbackRef.current(value) - }) - - callbackRef.current = handler - - return callback.current -} - -// TODO: UPDATE PROPS -export function ColorInput({ color, onChange, onBlur, validate, escape, ...inputProps }: Props) { - const [value, setValue] = useState(() => escape(color)) - - const onChangeCallback = useEventCallback(onChange) - const onBlurCallback = useEventCallback>(onBlur) - - const handleChange = useCallback( - (ev: ChangeEvent) => { - const inputValue = escape(ev.target.value) - - setValue(inputValue) - - if (validate(inputValue)) { - onChangeCallback(inputValue) - } - }, - [escape, validate, onChangeCallback] - ) - - const handleBlur = useCallback( - (ev: FocusEvent) => { - if (!validate(ev.target.value)) { - setValue(escape(color)) - } - - onBlurCallback(ev) - }, - [color, escape, validate, onBlurCallback] - ) - - useEffect(() => setValue(escape(color)), [color, escape]) - - return ( - - ) -} - -type ColorInputHTMLAttributes = Omit< - InputHTMLAttributes, - 'onChange' | 'value' | 'size' | 'defaultValue' | 'type' -> - -/* eslint no-unused-vars: 0 */ -interface ColorInputBaseProps extends ColorInputHTMLAttributes { - color: string - onChange: (color: string) => void - size?: Responsive<'1' | '2' | '3'> - variant?: 'classic' | 'surface' | 'soft' -} - -interface Props extends ColorInputBaseProps { - escape: (value: string) => string - validate: (value: string) => boolean -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/HexColorInput.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/HexColorInput.tsx deleted file mode 100644 index 402759e4..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/HexColorInput.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import type { CSSProperties } from 'react' - -import { ColorInput } from './ColorInput' -import type { TextFieldProps } from '@lib/theme' - -export const validHex = (value: string, alpha?: boolean): boolean => { - const matcher = /^#?([0-9A-F]{3,8})$/i - const match = matcher.exec(value) - const length = match ? match[1].length : 0 - - return length === 3 || length === 6 || (!!alpha && length === 4) || (!!alpha && length === 8) -} - -const style: CSSProperties = { - flex: '1 1 auto' -} as const - -export function HexColorInput(props: Props) { - const escape = (value: string) => value.replace(/([^0-9A-F]+)/gi, '').substring(0, 6) - const validate = (value: string) => validHex(value, false) - - return ( - - ) -} - -/* eslint no-unused-vars: 0 */ -interface Props extends Omit { - color: string - onChange: (color: string) => void -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/index.ts b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/index.ts deleted file mode 100644 index 3b22b830..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/HexColorInput/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { HexColorInput } from './HexColorInput' diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/index.ts b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/index.ts deleted file mode 100644 index 71587334..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerContent/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ColorPickerContent } from './ColorPickerContent' diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerSkeleton.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerSkeleton.tsx deleted file mode 100644 index bce1bbb1..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerSkeleton.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { Flex, Skeleton } from '@radix-ui/themes' -import type { FC } from 'react' - -export const ColorPickerSkeleton: FC = ({ withLabel = true }) => ( - - {withLabel && } - - -) - -interface Props { - withLabel?: boolean -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.module.css b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.module.css deleted file mode 100644 index 0c5673e7..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.module.css +++ /dev/null @@ -1,14 +0,0 @@ -.root { - width: max-content; -} - -.button { - width: max-content; - font-weight: 500; - color: var(--gray-12); -} - -.disabled { - pointer-events: none; - opacity: 0.6; -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.tsx b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.tsx deleted file mode 100644 index 3728d539..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/ColorPickerTrigger.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { clsx } from 'clsx' -import { Button, Flex, Popover, Text } from '@radix-ui/themes' -import type { FC } from 'react' - -import { ColorSwatch } from '@ui/ColorSwatch' -import type { TextSize } from '@lib/theme' -import { geistMono } from '@app/fonts' -import styles from './ColorPickerTrigger.module.css' - -export const ColorPickerTrigger: FC = ({ color, label, labelSize, disabled }) => ( - - - {label && {label}} - - - - -) - -// TODO: Props limitations -interface Props { - color: string - label?: string - labelSize?: TextSize - disabled?: boolean -} diff --git a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/index.ts b/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/index.ts deleted file mode 100644 index c74c4067..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/ColorPickerTrigger/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ColorPickerTrigger } from './ColorPickerTrigger' diff --git a/apps/frontend/src/lib/ui/ColorPicker/index.ts b/apps/frontend/src/lib/ui/ColorPicker/index.ts deleted file mode 100644 index 03af600a..00000000 --- a/apps/frontend/src/lib/ui/ColorPicker/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ColorPicker } from './ColorPicker' diff --git a/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine.module.css b/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/DrawerCloseLine.module.css similarity index 100% rename from apps/frontend/src/lib/ui/Drawer/DrawerCloseLine.module.css rename to apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/DrawerCloseLine.module.css diff --git a/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine.tsx b/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/DrawerCloseLine.tsx similarity index 100% rename from apps/frontend/src/lib/ui/Drawer/DrawerCloseLine.tsx rename to apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/DrawerCloseLine.tsx diff --git a/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/index.ts b/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/index.ts new file mode 100644 index 00000000..3fe66ff2 --- /dev/null +++ b/apps/frontend/src/lib/ui/Drawer/DrawerCloseLine/index.ts @@ -0,0 +1 @@ +export { DrawerCloseLine } from './DrawerCloseLine' diff --git a/apps/frontend/src/lib/ui/TitleWithExclamation.tsx b/apps/frontend/src/lib/ui/ExclamationTitle.tsx similarity index 90% rename from apps/frontend/src/lib/ui/TitleWithExclamation.tsx rename to apps/frontend/src/lib/ui/ExclamationTitle.tsx index 2beae845..68af657c 100644 --- a/apps/frontend/src/lib/ui/TitleWithExclamation.tsx +++ b/apps/frontend/src/lib/ui/ExclamationTitle.tsx @@ -12,7 +12,7 @@ const iconStyle: CSSProperties = { marginRight: getRadixSpaceVar(2) } as const -export const TitleWithExclamation: FC = ({ children, ...props }) => ( +export const ExclamationTitle: FC = ({ children, ...props }) => ( {children} diff --git a/apps/frontend/src/lib/ui/__tests__/TitleWithExclamation.test.tsx b/apps/frontend/src/lib/ui/__tests__/TitleWithExclamation.test.tsx index a12f119b..a85f8ea7 100644 --- a/apps/frontend/src/lib/ui/__tests__/TitleWithExclamation.test.tsx +++ b/apps/frontend/src/lib/ui/__tests__/TitleWithExclamation.test.tsx @@ -2,10 +2,10 @@ import { cleanup, render } from '@testing-library/react' -import { type Props, testId, TitleWithExclamation } from '@ui/TitleWithExclamation' +import { type Props, testId, ExclamationTitle } from '../ExclamationTitle' import { getRadixSpaceVar } from '@lib/theme' -describe('@ui/TitleWithExclamation', () => { +describe('@ui/ExclamationTitle', () => { const testLabel = 'Lorem ipsum dolor sit amet.' const testTag = 'H1' const testJSX =

{testLabel}

@@ -23,7 +23,7 @@ describe('@ui/TitleWithExclamation', () => { } as Props const { getByTestId, getByText, container } = render( - {testJSX} + {testJSX} ) const rootElement = getByTestId(testId) diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/AppFooterContent.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/AppFooterContent.tsx index b0fe3a1a..6ba3e51d 100644 --- a/apps/frontend/src/widgets/AppFooter/AppFooterContent/AppFooterContent.tsx +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/AppFooterContent.tsx @@ -6,22 +6,31 @@ import { Flex, Separator } from '@radix-ui/themes' import { ButtonDownloadSkeleton, ButtonRequestSkeleton } from '../AppFooterContentSkeleton' import { TOOLBAR_TAB, useTabsStore } from '@stores/tabs' -const ButtonDownload = dynamic(() => import('./ButtonDownload').then(mod => mod.ButtonDownload), { - ssr: false, - loading: () => -}) -const ButtonConvert = dynamic(() => import('./ButtonConvert').then(mod => mod.ButtonConvert), { - ssr: false, - loading: () => -}) -const ButtonResize = dynamic(() => import('./ButtonResize').then(mod => mod.ButtonResize), { - ssr: false, - loading: () => -}) -const ButtonMetadata = dynamic(() => import('./ButtonMetadata').then(mod => mod.ButtonMetadata), { +const ButtonDownload = dynamic( + () => import('./buttons/ButtonDownload').then(mod => mod.ButtonDownload), + { + ssr: false, + loading: () => + } +) +const ButtonConvert = dynamic( + () => import('./buttons/ButtonConvert').then(mod => mod.ButtonConvert), + { + ssr: false, + loading: () => + } +) +const ButtonResize = dynamic(() => import('./buttons/ButtonResize').then(mod => mod.ButtonResize), { ssr: false, loading: () => }) +const ButtonMetadata = dynamic( + () => import('./buttons/ButtonMetadata').then(mod => mod.ButtonMetadata), + { + ssr: false, + loading: () => + } +) export default function AppFooterContent() { const selectedTab = useTabsStore(state => state.selectedTab) diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest.module.css b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/ButtonRequest.module.css similarity index 100% rename from apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest.module.css rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/ButtonRequest.module.css diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/ButtonRequest.tsx similarity index 96% rename from apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest.tsx rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/ButtonRequest.tsx index 1751de12..3a3616a6 100644 --- a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest.tsx +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/ButtonRequest.tsx @@ -3,7 +3,7 @@ import { type FC, memo } from 'react' import { Button, IconButton, DropdownMenu, Flex, Spinner } from '@radix-ui/themes' import { clsx } from 'clsx' -import { CheckboxKeepChanges } from '@components/CheckboxKeepChanges' +import { CheckboxKeepChanges } from './CheckboxKeepChanges' import { useOutputStore } from '@stores/output' import { TOUR_STEP } from '@lib/tour' import styles from './ButtonRequest.module.css' diff --git a/apps/frontend/src/components/CheckboxKeepChanges.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/CheckboxKeepChanges.tsx similarity index 87% rename from apps/frontend/src/components/CheckboxKeepChanges.tsx rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/CheckboxKeepChanges.tsx index 1bcfa537..17faba5b 100644 --- a/apps/frontend/src/components/CheckboxKeepChanges.tsx +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/CheckboxKeepChanges.tsx @@ -1,4 +1,4 @@ -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { useOutputStore } from '@stores/output' export const CheckboxKeepChanges = () => { diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/index.ts b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/index.ts new file mode 100644 index 00000000..bd2be3f6 --- /dev/null +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonRequest/index.ts @@ -0,0 +1 @@ +export { ButtonRequest } from './ButtonRequest' diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonConvert.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonConvert.tsx similarity index 96% rename from apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonConvert.tsx rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonConvert.tsx index 3b7e2f91..a3a3ca39 100644 --- a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonConvert.tsx +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonConvert.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { ButtonRequest } from './ButtonRequest' +import { ButtonRequest } from '../ButtonRequest' import { useConvertMutation } from '@api/convert-image' import { useConvertSettings } from '@stores/hooks/useConvertSettings' import { useOutputStore } from '@stores/output' diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonDownload.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonDownload.tsx similarity index 100% rename from apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonDownload.tsx rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonDownload.tsx diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonMetadata.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonMetadata.tsx similarity index 96% rename from apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonMetadata.tsx rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonMetadata.tsx index 663c9c13..ecc6d9a0 100644 --- a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonMetadata.tsx +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonMetadata.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { ButtonRequest } from './ButtonRequest' +import { ButtonRequest } from '../ButtonRequest' import { useOutputStore } from '@stores/output' import { useRequestStore } from '@stores/request' import { useMetadataStore } from '@stores/metadata' diff --git a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonResize.tsx b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonResize.tsx similarity index 96% rename from apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonResize.tsx rename to apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonResize.tsx index c0fdd70e..372b605f 100644 --- a/apps/frontend/src/widgets/AppFooter/AppFooterContent/ButtonResize.tsx +++ b/apps/frontend/src/widgets/AppFooter/AppFooterContent/buttons/ButtonResize.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { ButtonRequest } from './ButtonRequest' +import { ButtonRequest } from '../ButtonRequest' import { useResizeMutation } from '@api/resize-image' import { useResizeSettings } from '@stores/hooks/useResizeSettings' import { useOutputStore } from '@stores/output' diff --git a/apps/frontend/src/widgets/Preview/UploadedFile/UploadedFileLightbox.tsx b/apps/frontend/src/widgets/Preview/UploadedFile/UploadedFileLightbox.tsx index c2910660..2a3fecfd 100644 --- a/apps/frontend/src/widgets/Preview/UploadedFile/UploadedFileLightbox.tsx +++ b/apps/frontend/src/widgets/Preview/UploadedFile/UploadedFileLightbox.tsx @@ -7,6 +7,7 @@ import Lightbox, { import Zoom from 'yet-another-react-lightbox/plugins/zoom' import Download from 'yet-another-react-lightbox/plugins/download' import Fullscreen from 'yet-another-react-lightbox/plugins/fullscreen' +import 'yet-another-react-lightbox/styles.css' import { Cross1Icon } from '@scissors/react-icons/Cross1Icon' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/BasicOptions.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/BasicOptions.tsx index 67c9bd07..acb79f45 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/BasicOptions.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/BasicOptions.tsx @@ -1,8 +1,8 @@ import { Flex } from '@radix-ui/themes' -import { SwitchFlip } from './SwitchFlip' -import { SwitchFlop } from './SwitchFlop' -import { SwitchGrayscale } from './SwitchGrayscale' +import { SwitchFlip } from './switches/SwitchFlip' +import { SwitchFlop } from './switches/SwitchFlop' +import { SwitchGrayscale } from './switches/SwitchGrayscale' import type { FlexDirection } from '@lib/theme' const direction: FlexDirection = { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchFlip.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchFlip.tsx similarity index 89% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchFlip.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchFlip.tsx index 197702f2..101b04ff 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchFlip.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchFlip.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Switch } from '@design-system/switch' +import { Switch } from '@design-system/Switch' import { useConvertStore } from '@stores/convert' export function SwitchFlip() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchFlop.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchFlop.tsx similarity index 89% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchFlop.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchFlop.tsx index a4004ada..2cb10b8a 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchFlop.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchFlop.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Switch } from '@design-system/switch' +import { Switch } from '@design-system/Switch' import { useConvertStore } from '@stores/convert' export function SwitchFlop() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchGrayscale.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchGrayscale.tsx similarity index 90% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchGrayscale.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchGrayscale.tsx index 34c9e73c..911da94b 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/SwitchGrayscale.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Basic/switches/SwitchGrayscale.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Switch } from '@design-system/switch' +import { Switch } from '@design-system/Switch' import { useConvertStore } from '@stores/convert' export function SwitchGrayscale() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/Blur.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/Blur.tsx index da4ae18d..e521e8c5 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/Blur.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/Blur.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { useMemo } from 'react' import { Flex } from '@radix-ui/themes' -import { Switch } from '@design-system/switch' +import { Switch } from '@design-system/Switch' import { BlurSigmaSkeleton } from './BlurSigma/BlurSigmaSkeleton' import { ButtonAddBlurSigma } from './BlurSigma/ButtonAddBlurSigma' import { useBlurStore } from '@stores/blur' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigma.tsx index dd8e8e49..88151177 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigma.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigma.tsx @@ -2,7 +2,7 @@ import { Flex } from '@radix-ui/themes' import { BLUR_SIGMA_STEP, MAX_BLUR_SIGMA, MIN_BLUR_SIGMA } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { BlurSigmaHeader } from './BlurSigmaHeader' import { useBlurStore } from '@stores/blur' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/BlurSigmaHeader.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/BlurSigmaHeader.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/ButtonRemoveBlurSigma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/ButtonRemoveBlurSigma.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/ButtonRemoveBlurSigma.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/ButtonRemoveBlurSigma.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/ButtonResetBlurSigma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/ButtonResetBlurSigma.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/ButtonResetBlurSigma.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/ButtonResetBlurSigma.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/index.ts new file mode 100644 index 00000000..328a2ced --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaHeader/index.ts @@ -0,0 +1 @@ +export { BlurSigmaHeader } from './BlurSigmaHeader' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaSkeleton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaSkeleton.tsx index cf4ecb77..893014d4 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaSkeleton.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Blur/BlurSigma/BlurSigmaSkeleton.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' import { OptionSectionHeaderSkeleton } from '@widgets/SettingsPanel/OptionSectionHeader/OptionSectionHeaderSkeleton' -import { SliderSkeleton } from '@design-system/slider/slider-skeleton' +import { SliderSkeleton } from '@design-system/Slider/SliderSkeleton' export const BlurSigmaSkeleton = () => ( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/Gamma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/Gamma.tsx index 7ebebabd..83c1be52 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/Gamma.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/Gamma.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { Flex } from '@radix-ui/themes' import { ButtonAddGamma } from './ButtonAddGamma' -import { GammaContentSkeleton } from './GammaContentSkeleton' +import { GammaContentSkeleton } from './GammaContent/GammaContentSkeleton' import { useGammaStore } from '@stores/gamma' const GammaContent = dynamic(() => import('./GammaContent').then(mod => mod.GammaContent), { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaContent.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaContent.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContentSkeleton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaContentSkeleton.tsx similarity index 81% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContentSkeleton.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaContentSkeleton.tsx index 7ae21d43..11d1bb50 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContentSkeleton.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaContentSkeleton.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' import { OptionSectionHeaderSkeleton } from '@widgets/SettingsPanel/OptionSectionHeader/OptionSectionHeaderSkeleton' -import { SliderSkeleton } from '@design-system/slider/slider-skeleton' +import { SliderSkeleton } from '@design-system/Slider/SliderSkeleton' export const GammaContentSkeleton = () => ( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/ButtonRemoveGamma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/ButtonRemoveGamma.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/ButtonRemoveGamma.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/ButtonRemoveGamma.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/ButtonResetGamma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/ButtonResetGamma.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/ButtonResetGamma.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/ButtonResetGamma.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaHeader.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/GammaHeader.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaHeader.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/GammaHeader.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/index.ts new file mode 100644 index 00000000..1ba3d441 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/GammaHeader/index.ts @@ -0,0 +1 @@ +export { GammaHeader } from './GammaHeader' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/SliderGamma.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/SliderGamma.tsx similarity index 92% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/SliderGamma.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/SliderGamma.tsx index ffcc513d..a09d7b6d 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/SliderGamma.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/SliderGamma.tsx @@ -1,6 +1,6 @@ import { GAMMA_STEP, MAX_GAMMA, MIN_GAMMA } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { useGammaStore } from '@stores/gamma' export function SliderGamma() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/index.ts new file mode 100644 index 00000000..d0207b6e --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Gamma/GammaContent/index.ts @@ -0,0 +1 @@ +export { GammaContent } from './GammaContent' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/Modulate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/Modulate.tsx index e85947eb..bf15a3a3 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/Modulate.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/Modulate.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { Flex } from '@radix-ui/themes' import { ButtonAddModulate } from './ButtonAddModulate' -import { ModulateContentSkeleton } from './ModulateContentSkeleton' +import { ModulateContentSkeleton } from './ModulateContent/ModulateContentSkeleton' import { useModulateStore } from '@stores/modulate' const ModulateContent = dynamic( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateContent.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateContent.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContentSkeleton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateContentSkeleton.tsx similarity index 88% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContentSkeleton.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateContentSkeleton.tsx index 40b4a54a..a3a22ff3 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContentSkeleton.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateContentSkeleton.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' import { OptionSectionHeaderSkeleton } from '@widgets/SettingsPanel/OptionSectionHeader/OptionSectionHeaderSkeleton' -import { SliderSkeleton } from '@design-system/slider/slider-skeleton' +import { SliderSkeleton } from '@design-system/Slider/SliderSkeleton' export const ModulateContentSkeleton = () => ( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ButtonRemoveModulate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/ButtonRemoveModulate.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ButtonRemoveModulate.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/ButtonRemoveModulate.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ButtonResetModulate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/ButtonResetModulate.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ButtonResetModulate.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/ButtonResetModulate.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateHeader.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/ModulateHeader.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateHeader.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/ModulateHeader.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/index.ts new file mode 100644 index 00000000..64b97077 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateHeader/index.ts @@ -0,0 +1 @@ +export { ModulateHeader } from './ModulateHeader' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateList.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateList.tsx similarity index 68% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateList.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateList.tsx index 1c52d963..fc7d793c 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateList.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/ModulateList.tsx @@ -13,10 +13,13 @@ const options = [ { key: 'hue', Component: SliderHue } ] as const -export const ModulateList = () => - options.map(({ key, Component }, index) => ( - - - {index < options.length - 1 && } - - )) +export const ModulateList = () => ( + <> + {options.map(({ key, Component }, index) => ( + + + {index < options.length - 1 && } + + ))} + +) diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/index.ts new file mode 100644 index 00000000..53e25cdb --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/index.ts @@ -0,0 +1 @@ +export { ModulateContent } from './ModulateContent' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderBrightness.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderBrightness.tsx similarity index 93% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderBrightness.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderBrightness.tsx index e476dcc7..733b0083 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderBrightness.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderBrightness.tsx @@ -1,7 +1,8 @@ -import { Slider } from '@design-system/slider' -import { useModulateStore } from '@stores/modulate' import { BRIGHTNESS_STEP, MAX_BRIGHTNESS, MIN_BRIGHTNESS } from '@scissors/sharp' +import { Slider } from '@design-system/Slider' +import { useModulateStore } from '@stores/modulate' + export function SliderBrightness() { const brightness = useModulateStore(state => state.brightness) diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderHue.module.css b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderHue.module.css similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderHue.module.css rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderHue.module.css diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderHue.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderHue.tsx similarity index 95% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderHue.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderHue.tsx index 508b22c4..9b909ba2 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderHue.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderHue.tsx @@ -2,7 +2,7 @@ import type { CSSProperties } from 'react' import { MAX_HUE, MIN_HUE } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { useModulateStore } from '@stores/modulate' import { useConvertStore } from '@stores/convert' import styles from './SliderHue.module.css' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderLightness.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderLightness.tsx similarity index 93% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderLightness.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderLightness.tsx index 429a9cce..6225ae61 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderLightness.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderLightness.tsx @@ -1,6 +1,6 @@ import { MAX_LIGHTNESS, MIN_LIGHTNESS } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { useModulateStore } from '@stores/modulate' export function SliderLightness() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderSaturation.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderSaturation.tsx similarity index 94% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderSaturation.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderSaturation.tsx index b2eac091..6faf8ab4 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/sliders/SliderSaturation.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Modulate/ModulateContent/sliders/SliderSaturation.tsx @@ -1,6 +1,6 @@ import { MAX_SATURATION, MIN_SATURATION, SATURATION_STEP } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { useModulateStore } from '@stores/modulate' export function SliderSaturation() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/Negate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/Negate.tsx index 9729caa1..d1f17b40 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/Negate.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/Negate.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' -import { SwitchNegate } from './SwitchNegate' -import { SwitchNegateAlpha } from './SwitchNegateAlpha' +import { SwitchNegate } from './switches/SwitchNegate' +import { SwitchNegateAlpha } from './switches/SwitchNegateAlpha' import type { FlexDirection } from '@lib/theme' const direction: FlexDirection = { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/SwitchNegate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/switches/SwitchNegate.tsx similarity index 88% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/SwitchNegate.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/switches/SwitchNegate.tsx index f823cae9..faf73a49 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/SwitchNegate.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/switches/SwitchNegate.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Switch } from '@design-system/switch' +import { Switch } from '@design-system/Switch' import { useNegateStore } from '@stores/negate' export function SwitchNegate() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/SwitchNegateAlpha.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/switches/SwitchNegateAlpha.tsx similarity index 91% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/SwitchNegateAlpha.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/switches/SwitchNegateAlpha.tsx index 11bf0bda..b34ec358 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/SwitchNegateAlpha.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Negate/switches/SwitchNegateAlpha.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Switch } from '@design-system/switch' +import { Switch } from '@design-system/Switch' import { useNegateStore } from '@stores/negate' export function SwitchNegateAlpha() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/Normalise.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/Normalise.tsx index 8ed1b8d2..1d499879 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/Normalise.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/Normalise.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { Flex } from '@radix-ui/themes' import { ButtonAddNormalise } from './ButtonAddNormalise' -import { NormaliseContentSkeleton } from './NormaliseContentSkeleton' +import { NormaliseContentSkeleton } from './NormaliseContent/NormaliseContentSkeleton' import { useNormaliseStore } from '@stores/normalise' const NormaliseContent = dynamic( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseContent.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseContent.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContentSkeleton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseContentSkeleton.tsx similarity index 82% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContentSkeleton.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseContentSkeleton.tsx index e2dd306b..b2c8f99a 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContentSkeleton.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseContentSkeleton.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' import { OptionSectionHeaderSkeleton } from '@widgets/SettingsPanel/OptionSectionHeader/OptionSectionHeaderSkeleton' -import { SliderSkeleton } from '@design-system/slider/slider-skeleton' +import { SliderSkeleton } from '@design-system/Slider/SliderSkeleton' export const NormaliseContentSkeleton = () => ( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/ButtonRemoveNormalise.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/ButtonRemoveNormalise.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/ButtonRemoveNormalise.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/ButtonRemoveNormalise.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/ButtonResetNormalise.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/ButtonResetNormalise.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/ButtonResetNormalise.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/ButtonResetNormalise.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseHeader.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/NormaliseHeader.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseHeader.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/NormaliseHeader.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/index.ts new file mode 100644 index 00000000..15b3a349 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/NormaliseHeader/index.ts @@ -0,0 +1 @@ +export { NormaliseHeader } from './NormaliseHeader' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/SliderNormalise.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/SliderNormalise.tsx similarity index 95% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/SliderNormalise.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/SliderNormalise.tsx index 43893e44..f5e04017 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/SliderNormalise.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/SliderNormalise.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { MAX_NORMALISE, MIN_NORMALISE } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { useNormaliseStore } from '@stores/normalise' export function SliderNormalise() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/index.ts new file mode 100644 index 00000000..df402034 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Normalise/NormaliseContent/index.ts @@ -0,0 +1 @@ +export { NormaliseContent } from './NormaliseContent' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/OutputFormat/SelectOutputFormat.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/OutputFormat/SelectOutputFormat.tsx index 74fe5db7..c41ec10d 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/OutputFormat/SelectOutputFormat.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/OutputFormat/SelectOutputFormat.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { IMAGE_FILE_FORMAT, type ImageFileFormat } from '@scissors/sharp' -import { Select, type SelectData } from '@design-system/select' +import { Select, type SelectData } from '@design-system/Select' import { useOutputStore } from '@stores/output' const data: SelectData = [ diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/Rotate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/Rotate.tsx index e20c58c5..9d3b05c0 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/Rotate.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/Rotate.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { Flex } from '@radix-ui/themes' import { ButtonAddRotate } from './ButtonAddRotate' -import { RotateContentSkeleton } from './RotateContentSkeleton' +import { RotateContentSkeleton } from './RotateContent/RotateContentSkeleton' import { useRotateStore } from '@stores/rotate' const RotateContent = dynamic(() => import('./RotateContent').then(mod => mod.RotateContent), { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContentSkeleton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateContentSkeleton.tsx similarity index 75% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContentSkeleton.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateContentSkeleton.tsx index 3cf27a4e..d9e09858 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContentSkeleton.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateContentSkeleton.tsx @@ -1,8 +1,8 @@ import { Flex } from '@radix-ui/themes' import { OptionSectionHeaderSkeleton } from '@widgets/SettingsPanel/OptionSectionHeader/OptionSectionHeaderSkeleton' -import { SliderSkeleton } from '@design-system/slider/slider-skeleton' -import { CheckboxSkeleton } from '@design-system/checkbox/checkbox-skeleton' +import { SliderSkeleton } from '@design-system/Slider/SliderSkeleton' +import { CheckboxSkeleton } from '@design-system/Checkbox/CheckboxSkeleton' import { ColorFieldSkeleton } from '@ui/ColorField/ColorFieldSkeleton' export const RotateContentSkeleton = () => ( diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/ButtonRemoveRotate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/ButtonRemoveRotate.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/ButtonRemoveRotate.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/ButtonRemoveRotate.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/ButtonResetRotate.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/ButtonResetRotate.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/ButtonResetRotate.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/ButtonResetRotate.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/RotateHeader.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/RotateHeader.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/index.ts new file mode 100644 index 00000000..ad9ec51d --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/RotateHeader/index.ts @@ -0,0 +1 @@ +export { RotateHeader } from './RotateHeader' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/SliderRotateAngle.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/SliderRotateAngle.tsx index 61fb6d0b..d5be9002 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/SliderRotateAngle.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Rotate/RotateContent/SliderRotateAngle.tsx @@ -1,6 +1,6 @@ import { DEFAULT_ROTATE_ANGLE, MAX_ROTATE_ANGLE, MIN_ROTATE_ANGLE } from '@scissors/sharp' -import { Slider } from '@design-system/slider' +import { Slider } from '@design-system/Slider' import { useRotateStore } from '@stores/rotate' export function SliderRotateAngle() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/Tint.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/Tint.tsx index ef163995..970e502b 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/Tint.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/Tint.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { Flex } from '@radix-ui/themes' import { ButtonAddTint } from './ButtonAddTint' -import { TintContentSkeleton } from './TintContentSkeleton' +import { TintContentSkeleton } from './TintContent/TintContentSkeleton' import { useTintStore } from '@stores/tint' const TintContent = dynamic(() => import('./TintContent').then(mod => mod.TintContent), { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintContent.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintContent.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContentSkeleton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintContentSkeleton.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContentSkeleton.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintContentSkeleton.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/ButtonRemoveTint.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/ButtonRemoveTint.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/ButtonRemoveTint.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/ButtonRemoveTint.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/ButtonResetTint.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/ButtonResetTint.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/ButtonResetTint.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/ButtonResetTint.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintHeader.tsx b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/TintHeader.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintHeader.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/TintHeader.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/index.ts new file mode 100644 index 00000000..29e9c61b --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/TintHeader/index.ts @@ -0,0 +1 @@ +export { TintHeader } from './TintHeader' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/index.ts new file mode 100644 index 00000000..02106aa7 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabConvert/Options/Tint/TintContent/index.ts @@ -0,0 +1 @@ +export { TintContent } from './TintContent' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataCheckboxGroup.tsx b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataCheckboxGroup.tsx index f663e466..06943264 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataCheckboxGroup.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataCheckboxGroup.tsx @@ -1,6 +1,6 @@ import { Flex } from '@radix-ui/themes' -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { useMetadataStore } from '@stores/metadata' export function MetadataCheckboxGroup({ hasExif, hasICC }: Props) { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm.module.css b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataForm.module.css similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm.module.css rename to apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataForm.module.css diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm.tsx b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataForm.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataForm.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataFormField.module.css b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/MetadataFormField.module.css similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataFormField.module.css rename to apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/MetadataFormField.module.css diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataFormField.tsx b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/MetadataFormField.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataFormField.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/MetadataFormField.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/index.ts new file mode 100644 index 00000000..e6062692 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/MetadataFormField/index.ts @@ -0,0 +1 @@ +export { MetadataFormField } from './MetadataFormField' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/index.ts new file mode 100644 index 00000000..ad532539 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/MetadataForm/index.ts @@ -0,0 +1,2 @@ +export { MetadataForm } from './MetadataForm' +export { MetadataFormField } from './MetadataFormField' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/TabMetadataContent.tsx b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/TabMetadataContent.tsx index b3beac99..fb8f7fbd 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/TabMetadataContent.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/TabMetadataContent.tsx @@ -4,8 +4,8 @@ import { Flex, Separator } from '@radix-ui/themes' import { IMAGE_FILE_FORMAT } from '@scissors/sharp' -import { Ifd0OptionsForm } from './ifd0-form' -import { Ifd2OptionsForm } from './ifd2-form' +import { Ifd0OptionsForm } from './forms/ifd0-form' +import { Ifd2OptionsForm } from './forms/ifd2-form' import { MetadataCheckboxGroup } from './MetadataCheckboxGroup' import { CalloutDefault } from '@ui/CalloutDefault' import { useOutputStore } from '@stores/output' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/ifd0-form.tsx b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/forms/ifd0-form.tsx similarity index 97% rename from apps/frontend/src/widgets/SettingsPanel/TabMetadata/ifd0-form.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabMetadata/forms/ifd0-form.tsx index b4b37fdb..0c27b23a 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/ifd0-form.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/forms/ifd0-form.tsx @@ -4,8 +4,7 @@ import type { ChangeEvent } from 'react' import { DatePicker } from '@ui/DatePicker' import { ButtonReset } from '@ui/ButtonReset' -import { MetadataForm } from './MetadataForm' -import { MetadataFormField } from './MetadataFormField' +import { MetadataForm, MetadataFormField } from '../MetadataForm' import { useMetadataStore } from '@stores/metadata' export function Ifd0OptionsForm() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/ifd2-form.tsx b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/forms/ifd2-form.tsx similarity index 95% rename from apps/frontend/src/widgets/SettingsPanel/TabMetadata/ifd2-form.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabMetadata/forms/ifd2-form.tsx index 164d309f..1459dcea 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabMetadata/ifd2-form.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabMetadata/forms/ifd2-form.tsx @@ -1,10 +1,10 @@ import { useForm } from 'react-hook-form' import { useCallback, useMemo } from 'react' + import { DEFAULT_IFD2_OPTIONS, type IFD2Options } from '@scissors/sharp' import { ButtonReset } from '@ui/ButtonReset' -import { MetadataForm } from './MetadataForm' -import { MetadataFormField } from './MetadataFormField' +import { MetadataForm, MetadataFormField } from '../MetadataForm' import { useMetadataStore } from '@stores/metadata' const fieldList: { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton.module.css b/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/SortableSectionButton.module.css similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton.module.css rename to apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/SortableSectionButton.module.css diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/SortableSectionButton.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/SortableSectionButton.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/index.ts new file mode 100644 index 00000000..424647fb --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/SortableSection/SortableSectionButton/index.ts @@ -0,0 +1 @@ +export { SortableSectionButton } from './SortableSectionButton' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormAxis.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormAxis.tsx index 22f8fd41..ba28d549 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormAxis.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormAxis.tsx @@ -1,7 +1,7 @@ import { RowSpacingIcon } from '@scissors/react-icons/RowSpacingIcon' import { ColumnSpacingIcon } from '@scissors/react-icons/ColumnSpacingIcon' -import { NumberInput } from 'src/components/NumberInput' +import { NumberInput } from '@components/NumberInput' import { useExtendStore } from '@stores/extend' import { DEFAULT_EXTEND_INPUT_PROPS } from './constants' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormNumber.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormNumber.tsx index 0af02f6f..29af7649 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormNumber.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormNumber.tsx @@ -1,6 +1,6 @@ import { MoveIcon } from '@scissors/react-icons/MoveIcon' -import { NumberInput } from 'src/components/NumberInput' +import { NumberInput } from '@components/NumberInput' import { DEFAULT_EXTEND_INPUT_PROPS } from './constants' import { useExtendStore } from '@stores/extend' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormSeparated.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormSeparated.tsx index 48a72ff4..8645b5f2 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormSeparated.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendDirectionForm/ExtendDirectionFormSeparated.tsx @@ -3,7 +3,7 @@ import { ArrowDownIcon } from '@scissors/react-icons/ArrowDownIcon' import { ArrowLeftIcon } from '@scissors/react-icons/ArrowLeftIcon' import { ArrowRightIcon } from '@scissors/react-icons/ArrowRightIcon' -import { NumberInput } from 'src/components/NumberInput' +import { NumberInput } from '@components/NumberInput' import { DEFAULT_EXTEND_INPUT_PROPS } from './constants' import { useExtendStore } from '@stores/extend' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendExtra/ExtendWith/SelectExtendWith.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendExtra/ExtendWith/SelectExtendWith.tsx index 91c18fe5..5a284975 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendExtra/ExtendWith/SelectExtendWith.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/extend/ExtendExtra/ExtendWith/SelectExtendWith.tsx @@ -7,7 +7,7 @@ import { IMAGE_FILE_FORMAT } from '@scissors/sharp' -import { Select, type SelectData } from '@design-system/select' +import { Select, type SelectData } from '@design-system/Select' import { useExtendStore } from '@stores/extend' import { useOutputStore } from '@stores/output' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxEnlargement.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxEnlargement.tsx index 0404210a..f230b5a7 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxEnlargement.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxEnlargement.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { useResizeStore } from '@stores/resize' export function CheckboxEnlargement() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxFastShrink.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxFastShrink.tsx index d6b2a794..3f0530c4 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxFastShrink.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxFastShrink.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { IMAGE_FILE_FORMAT } from '@scissors/sharp' -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { useResizeStore } from '@stores/resize' import { useOutputStore } from '@stores/output' import { cropImageFileType } from '@helpers/file/cropImageFileType' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxReduction.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxReduction.tsx index e903ed82..b477112d 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxReduction.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeCheckboxes/CheckboxReduction.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { useResizeStore } from '@stores/resize' export function CheckboxReduction() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeFit/SelectResizeFit.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeFit/SelectResizeFit.tsx index a373cd86..712d55cd 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeFit/SelectResizeFit.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeFit/SelectResizeFit.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { DEFAULT_RESIZE_FIT, RESIZE_FIT, type ResizeFit } from '@scissors/sharp' -import { Select, type SelectData } from '@design-system/select' +import { Select, type SelectData } from '@design-system/Select' import { ResizeFitExamplesPopover } from './ResizeFitExamplesPopover' import { useResizeStore } from '@stores/resize' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeKernel.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeKernel.tsx index b1f7a00e..c060e89e 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeKernel.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizeKernel.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { DEFAULT_RESIZE_KERNEL, RESIZE_KERNEL, type ResizeKernel } from '@scissors/sharp' -import { Select, type SelectData } from '@design-system/select' +import { Select, type SelectData } from '@design-system/Select' import { useResizeStore } from '@stores/resize' const data: SelectData = [ diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizePosition.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizePosition.tsx index eadf75c2..5992d414 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizePosition.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeExtra/ResizeSelectList/SelectResizePosition.tsx @@ -7,7 +7,7 @@ import { type ResizePosition } from '@scissors/sharp' -import { Select, type SelectData } from '@design-system/select' +import { Select, type SelectData } from '@design-system/Select' import { useResizeStore } from '@stores/resize' const data: SelectData = [ diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeSizesForm.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeSizesForm.tsx index a8a1bdb9..24a4cbc9 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeSizesForm.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/resize/ResizeSizesForm.tsx @@ -9,7 +9,7 @@ import { import { WidthIcon } from '@scissors/react-icons/WidthIcon' import { HeightIcon } from '@scissors/react-icons/HeightIcon' -import { NumberInput } from 'src/components/NumberInput' +import { NumberInput } from '@components/NumberInput' import { useResizeStore } from '@stores/resize' const defaultInputProps = { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/CheckboxTrimLineArt.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/CheckboxTrimLineArt.tsx similarity index 87% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/CheckboxTrimLineArt.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/CheckboxTrimLineArt.tsx index dfb0c697..56ace5d4 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/CheckboxTrimLineArt.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/CheckboxTrimLineArt.tsx @@ -1,4 +1,4 @@ -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { useTrimStore } from '@stores/trim' export function CheckboxTrimLineArt() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackground.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackground.tsx similarity index 94% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackground.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackground.tsx index 99b97791..daf8174a 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackground.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackground.tsx @@ -1,7 +1,7 @@ import { Flex } from '@radix-ui/themes' import { DEFAULT_TRIM_BACKGROUND } from '@scissors/sharp' -import { Checkbox } from '@design-system/checkbox' +import { Checkbox } from '@design-system/Checkbox' import { TrimBackgroundPicker } from './TrimBackgroundPicker' import { TrimBackgroundInfoPopover } from './TrimBackgroundInfoPopover' import { useTrimStore } from '@stores/trim' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackgroundInfoPopover.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackgroundInfoPopover.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackgroundInfoPopover.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackgroundInfoPopover.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackgroundPicker.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackgroundPicker.tsx similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/TrimBackgroundPicker.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/TrimBackgroundPicker.tsx diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/index.ts similarity index 100% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimBackground/index.ts rename to apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimBackground/index.ts diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimContent.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimContent.tsx new file mode 100644 index 00000000..9fdcc8e4 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimContent.tsx @@ -0,0 +1,15 @@ +import { Flex } from '@radix-ui/themes' + +import { TrimBackground } from './TrimBackground' +import { TrimThresholdInput } from './TrimThresholdInput' +import { CheckboxTrimLineArt } from './CheckboxTrimLineArt' + +export const TrimContent = () => ( + <> + + + + + + +) diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimThresholdInput.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimThresholdInput.tsx similarity index 91% rename from apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimThresholdInput.tsx rename to apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimThresholdInput.tsx index ee2af776..c530955c 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimThresholdInput.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/TrimThresholdInput.tsx @@ -1,6 +1,6 @@ import { DEFAULT_TRIM_THRESHOLD, MAX_TRIM_THRESHOLD, MIN_TRIM_THRESHOLD } from '@scissors/sharp' -import { NumberInput } from 'src/components/NumberInput' +import { NumberInput } from '@components/NumberInput' import { useTrimStore } from '@stores/trim' export function TrimThresholdInput() { diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/index.ts b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/index.ts new file mode 100644 index 00000000..f375bd69 --- /dev/null +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimContent/index.ts @@ -0,0 +1 @@ +export { TrimContent } from './TrimContent' diff --git a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimSection.tsx b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimSection.tsx index 944c66b2..645ebc22 100644 --- a/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimSection.tsx +++ b/apps/frontend/src/widgets/SettingsPanel/TabResize/sections/trim/TrimSection.tsx @@ -1,20 +1,12 @@ -import { Flex } from '@radix-ui/themes' - import { TrimHeader } from './TrimHeader' -import { TrimBackground } from './TrimBackground' -import { TrimThresholdInput } from './TrimThresholdInput' +import { TrimContent } from './TrimContent' import { TabResizeSection } from '../../TabResizeSection' -import { CheckboxTrimLineArt } from './CheckboxTrimLineArt' export const TrimSection = () => ( <> - - - - - + ) diff --git a/apps/frontend/tsconfig.json b/apps/frontend/tsconfig.json index 03e6c969..e12714ea 100644 --- a/apps/frontend/tsconfig.json +++ b/apps/frontend/tsconfig.json @@ -69,9 +69,6 @@ "@api/*": [ "./src/api/*" ], - "@layouts/*": [ - "./src/layouts/*" - ], "@widgets/*": [ "./src/widgets/*" ],