From 38e5e3686d4ff4f28612c385593714280d21ac3b Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 29 Feb 2024 04:33:53 +0000 Subject: [PATCH] Moving items - These are not "tables" per-se --- .../components/{images => details}/DetailsImage.tsx | 2 +- .../src/{tables => components/details}/ItemDetails.tsx | 9 +++------ src/frontend/src/pages/part/PartDetail.tsx | 10 +++++----- 3 files changed, 9 insertions(+), 12 deletions(-) rename src/frontend/src/components/{images => details}/DetailsImage.tsx (99%) rename src/frontend/src/{tables => components/details}/ItemDetails.tsx (91%) diff --git a/src/frontend/src/components/images/DetailsImage.tsx b/src/frontend/src/components/details/DetailsImage.tsx similarity index 99% rename from src/frontend/src/components/images/DetailsImage.tsx rename to src/frontend/src/components/details/DetailsImage.tsx index 929af89c03..7bd6f62ff7 100644 --- a/src/frontend/src/components/images/DetailsImage.tsx +++ b/src/frontend/src/components/details/DetailsImage.tsx @@ -22,8 +22,8 @@ import { InvenTreeIcon } from '../../functions/icons'; import { useUserState } from '../../states/UserState'; import { PartThumbTable } from '../../tables/part/PartThumbTable'; import { ActionButton } from '../buttons/ActionButton'; +import { ApiImage } from '../images/ApiImage'; import { StylishText } from '../items/StylishText'; -import { ApiImage } from './ApiImage'; /** * Props for detail image diff --git a/src/frontend/src/tables/ItemDetails.tsx b/src/frontend/src/components/details/ItemDetails.tsx similarity index 91% rename from src/frontend/src/tables/ItemDetails.tsx rename to src/frontend/src/components/details/ItemDetails.tsx index 1ffc49473f..d674cc7bcf 100644 --- a/src/frontend/src/tables/ItemDetails.tsx +++ b/src/frontend/src/components/details/ItemDetails.tsx @@ -1,11 +1,8 @@ import { Grid, Group, Paper, SimpleGrid } from '@mantine/core'; -import { - DetailImageButtonProps, - DetailsImage -} from '../components/images/DetailsImage'; -import { UserRoles } from '../enums/Roles'; -import { DetailsField, DetailsTable } from './Details'; +import { UserRoles } from '../../enums/Roles'; +import { DetailsField, DetailsTable } from '../../tables/Details'; +import { DetailImageButtonProps, DetailsImage } from './DetailsImage'; /** * Type for defining field arrays diff --git a/src/frontend/src/pages/part/PartDetail.tsx b/src/frontend/src/pages/part/PartDetail.tsx index 196425b335..7d4ce146d9 100644 --- a/src/frontend/src/pages/part/PartDetail.tsx +++ b/src/frontend/src/pages/part/PartDetail.tsx @@ -28,6 +28,11 @@ import { useMemo, useState } from 'react'; import { useParams } from 'react-router-dom'; import { api } from '../../App'; +import { + DetailsImageType, + ItemDetailFields, + ItemDetails +} from '../../components/details/ItemDetails'; import { ActionDropdown, BarcodeActionDropdown, @@ -52,11 +57,6 @@ import { useInstance } from '../../hooks/UseInstance'; import { apiUrl } from '../../states/ApiState'; import { useUserState } from '../../states/UserState'; import { DetailsField } from '../../tables/Details'; -import { - DetailsImageType, - ItemDetailFields, - ItemDetails -} from '../../tables/ItemDetails'; import { BomTable } from '../../tables/bom/BomTable'; import { UsedInTable } from '../../tables/bom/UsedInTable'; import { BuildOrderTable } from '../../tables/build/BuildOrderTable';