diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx index 3556c57a34..3bc2f51229 100644 --- a/web/apps/photos/src/pages/shared-albums.tsx +++ b/web/apps/photos/src/pages/shared-albums.tsx @@ -5,9 +5,9 @@ import { NavbarBase, SelectionBar } from "@/base/components/Navbar"; import { sharedCryptoWorker } from "@/base/crypto"; import { useIsSmallWidth, useIsTouchscreen } from "@/base/hooks"; import log from "@/base/log"; +import { updateShouldDisableCFUploadProxy } from "@/gallery/upload"; import type { Collection } from "@/media/collection"; import { type EnteFile, mergeMetadata } from "@/media/file"; -import { updateShouldDisableCFUploadProxy } from "@/gallery/upload"; import { GalleryItemsHeaderAdapter, GalleryItemsSummary, diff --git a/web/apps/photos/src/services/upload/uploadManager.ts b/web/apps/photos/src/services/upload/uploadManager.ts index 2171d079a9..c3989ee91f 100644 --- a/web/apps/photos/src/services/upload/uploadManager.ts +++ b/web/apps/photos/src/services/upload/uploadManager.ts @@ -4,11 +4,11 @@ import { lowercaseExtension, nameAndExtension } from "@/base/file"; import log from "@/base/log"; import type { Electron } from "@/base/types/ipc"; import { ComlinkWorker } from "@/base/worker/comlink-worker"; +import { shouldDisableCFUploadProxy } from "@/gallery/upload"; import type { Collection } from "@/media/collection"; import { EncryptedEnteFile, EnteFile } from "@/media/file"; import { FileType } from "@/media/file-type"; import { potentialFileTypeFromExtension } from "@/media/live-photo"; -import { shouldDisableCFUploadProxy } from "@/gallery/upload"; import { getLocalFiles } from "@/new/photos/services/files"; import { indexNewUpload } from "@/new/photos/services/ml"; import type { UploadItem } from "@/new/photos/services/upload/types"; diff --git a/web/packages/gallery/tsconfig.json b/web/packages/gallery/tsconfig.json index b39c0995b0..b2a1203623 100644 --- a/web/packages/gallery/tsconfig.json +++ b/web/packages/gallery/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@/build-config/tsconfig-next.json", - "include": ["."] + "include": [".", "../../packages/base/global-electron.d.ts"] } diff --git a/web/packages/shared/components/Container.tsx b/web/packages/shared/components/Container.tsx index 3472e2c5b4..7852439cb4 100644 --- a/web/packages/shared/components/Container.tsx +++ b/web/packages/shared/components/Container.tsx @@ -32,7 +32,6 @@ export const FluidContainer = styled(FlexWrapper)` flex: 1; `; - export const HorizontalFlex = styled(Box)({ display: "flex", });