diff --git a/web/apps/photos/src/components/Collections/AllCollections/content.tsx b/web/apps/photos/src/components/Collections/AllCollections/content.tsx index d2a34aed6f..27a7bc733c 100644 --- a/web/apps/photos/src/components/Collections/AllCollections/content.tsx +++ b/web/apps/photos/src/components/Collections/AllCollections/content.tsx @@ -3,7 +3,7 @@ import { ItemCard, LargeTileTextOverlay, } from "@/new/photos/components/ItemCards"; -import type { CollectionSummary } from "@/new/photos/types/collection"; +import type { CollectionSummary } from "@/new/photos/services/collection/ui"; import { FlexWrapper } from "@ente/shared/components/Container"; import useWindowSize from "@ente/shared/hooks/useWindowSize"; import { DialogContent, Typography } from "@mui/material"; diff --git a/web/apps/photos/src/components/Collections/AllCollections/index.tsx b/web/apps/photos/src/components/Collections/AllCollections/index.tsx index 688452d77d..509410bd87 100644 --- a/web/apps/photos/src/components/Collections/AllCollections/index.tsx +++ b/web/apps/photos/src/components/Collections/AllCollections/index.tsx @@ -1,8 +1,8 @@ import { CollectionsSortOptions } from "@/new/photos/components/CollectionsSortOptions"; import { FilledIconButton } from "@/new/photos/components/mui"; import { SlideUpTransition } from "@/new/photos/components/mui/SlideUpTransition"; -import type { CollectionSummary } from "@/new/photos/types/collection"; -import { CollectionsSortBy } from "@/new/photos/types/collection"; +import type { CollectionSummary } from "@/new/photos/services/collection/ui"; +import { CollectionsSortBy } from "@/new/photos/services/collection/ui"; import { FlexWrapper, FluidContainer } from "@ente/shared/components/Container"; import Close from "@mui/icons-material/Close"; import { diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx index 43aa939f10..2ea91ca6aa 100644 --- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx +++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx @@ -10,7 +10,7 @@ import { SpaceBetweenFlex } from "@/new/photos/components/mui"; import type { CollectionSummary, CollectionSummaryType, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; import { HorizontalFlex } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; import OverflowMenu, { diff --git a/web/apps/photos/src/components/Collections/CollectionSelector.tsx b/web/apps/photos/src/components/Collections/CollectionSelector.tsx index f4e39b63dc..0c049a77e4 100644 --- a/web/apps/photos/src/components/Collections/CollectionSelector.tsx +++ b/web/apps/photos/src/components/Collections/CollectionSelector.tsx @@ -9,7 +9,7 @@ import { CollectionSummaryOrder, type CollectionSummaries, type CollectionSummary, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; import { FlexWrapper } from "@ente/shared/components/Container"; import DialogTitleWithCloseButton from "@ente/shared/components/DialogBox/TitleWithCloseButton"; import { diff --git a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx index 2c66e90fa6..5fda2e00c8 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx @@ -1,7 +1,7 @@ import { EnteDrawer } from "@/base/components/EnteDrawer"; import { Titlebar } from "@/base/components/Titlebar"; import type { Collection } from "@/media/collection"; -import type { CollectionSummary } from "@/new/photos/types/collection"; +import type { CollectionSummary } from "@/new/photos/services/collection/ui"; import { DialogProps, Stack } from "@mui/material"; import { t } from "i18next"; import EmailShare from "./emailShare"; diff --git a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx index 3fe4db7fed..61529626ce 100644 --- a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx +++ b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx @@ -8,7 +8,7 @@ import { collectionsSortBy, type CollectionsSortBy, type CollectionSummaries, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; import { includes } from "@/utils/type-guards"; import { getData, diff --git a/web/apps/photos/src/components/Sidebar/index.tsx b/web/apps/photos/src/components/Sidebar/index.tsx index 259c29852f..2e911e1615 100644 --- a/web/apps/photos/src/components/Sidebar/index.tsx +++ b/web/apps/photos/src/components/Sidebar/index.tsx @@ -4,7 +4,7 @@ import { EnteDrawer } from "@/base/components/EnteDrawer"; import log from "@/base/log"; import { savedLogs } from "@/base/log-web"; import { customAPIHost } from "@/base/origins"; -import type { CollectionSummaries } from "@/new/photos/types/collection"; +import type { CollectionSummaries } from "@/new/photos/services/collection/ui"; import { initiateEmail, openURL } from "@/new/photos/utils/web"; import { SpaceBetweenFlex } from "@ente/shared/components/Container"; import { EnteLogo } from "@ente/shared/components/EnteLogo"; diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx index a0aa72b92b..8c2afde46c 100644 --- a/web/apps/photos/src/pages/gallery.tsx +++ b/web/apps/photos/src/pages/gallery.tsx @@ -15,6 +15,7 @@ import { } from "@/new/photos/components/SearchBar"; import { WhatsNew } from "@/new/photos/components/WhatsNew"; import { shouldShowWhatsNew } from "@/new/photos/services/changelog"; +import type { CollectionSummaries } from "@/new/photos/services/collection/ui"; import downloadManager from "@/new/photos/services/download"; import { getLocalFiles, @@ -28,7 +29,6 @@ import { setSearchCollectionsAndFiles, } from "@/new/photos/services/search"; import type { SearchOption } from "@/new/photos/services/search/types"; -import type { CollectionSummaries } from "@/new/photos/types/collection"; import { EnteFile } from "@/new/photos/types/file"; import { mergeMetadata } from "@/new/photos/utils/file"; import { ensure } from "@/utils/ensure"; diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts index 74198d6191..d89801435e 100644 --- a/web/apps/photos/src/services/collectionService.ts +++ b/web/apps/photos/src/services/collectionService.ts @@ -19,16 +19,16 @@ import { UpdatePublicURL, } from "@/media/collection"; import { ItemVisibility } from "@/media/file-metadata"; -import { getLocalFiles, sortFiles } from "@/new/photos/services/files"; import type { CollectionSummaries, CollectionSummary, CollectionSummaryType, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; import { CollectionSummaryOrder, CollectionsSortBy, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; +import { getLocalFiles, sortFiles } from "@/new/photos/services/files"; import { EnteFile } from "@/new/photos/types/file"; import { EncryptedMagicMetadata, diff --git a/web/apps/photos/src/utils/collection.ts b/web/apps/photos/src/utils/collection.ts index 1127b52062..f06457a670 100644 --- a/web/apps/photos/src/utils/collection.ts +++ b/web/apps/photos/src/utils/collection.ts @@ -8,11 +8,11 @@ import { CollectionType, } from "@/media/collection"; import { ItemVisibility } from "@/media/file-metadata"; -import { getAllLocalFiles, getLocalFiles } from "@/new/photos/services/files"; import type { CollectionSummaries, CollectionSummaryType, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; +import { getAllLocalFiles, getLocalFiles } from "@/new/photos/services/files"; import { EnteFile } from "@/new/photos/types/file"; import { SUB_TYPE } from "@/new/photos/types/magicMetadata"; import { safeDirectoryName } from "@/new/photos/utils/native-fs"; diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts index dd3c4e3163..19ebcf4c75 100644 --- a/web/apps/photos/src/utils/file/index.ts +++ b/web/apps/photos/src/utils/file/index.ts @@ -113,7 +113,6 @@ export function getSelectedFiles( return files.filter((file) => selectedFilesIDs.has(file.id)); } - export async function decryptFile( file: EncryptedEnteFile, collectionKey: string, diff --git a/web/packages/new/photos/components/CollectionsSortOptions.tsx b/web/packages/new/photos/components/CollectionsSortOptions.tsx index 89c239313a..d69d43a28f 100644 --- a/web/packages/new/photos/components/CollectionsSortOptions.tsx +++ b/web/packages/new/photos/components/CollectionsSortOptions.tsx @@ -1,4 +1,4 @@ -import type { CollectionsSortBy } from "@/new/photos/types/collection"; +import type { CollectionsSortBy } from "@/new/photos/services/collection/ui"; import OverflowMenu from "@ente/shared/components/OverflowMenu/menu"; import { OverflowMenuOption } from "@ente/shared/components/OverflowMenu/option"; import TickIcon from "@mui/icons-material/Done"; diff --git a/web/packages/new/photos/components/Gallery/BarImpl.tsx b/web/packages/new/photos/components/Gallery/BarImpl.tsx index 962051dd94..1c1ef216e8 100644 --- a/web/packages/new/photos/components/Gallery/BarImpl.tsx +++ b/web/packages/new/photos/components/Gallery/BarImpl.tsx @@ -11,12 +11,12 @@ import { MIN_COLUMNS, } from "@/new/photos/components/PhotoList"; import { UnstyledButton } from "@/new/photos/components/UnstyledButton"; -import type { Person } from "@/new/photos/services/ml/people"; import type { CollectionSummary, CollectionSummaryType, CollectionsSortBy, -} from "@/new/photos/types/collection"; +} from "@/new/photos/services/collection/ui"; +import type { Person } from "@/new/photos/services/ml/people"; import { ensure } from "@/utils/ensure"; import { Overlay } from "@ente/shared/components/Container"; import ArchiveIcon from "@mui/icons-material/Archive"; diff --git a/web/packages/new/photos/types/collection.ts b/web/packages/new/photos/services/collection/ui.ts similarity index 100% rename from web/packages/new/photos/types/collection.ts rename to web/packages/new/photos/services/collection/ui.ts