diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index c514df101f..c2ed6d7c81 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -53,7 +53,7 @@ import { photosLogout } from "services/logout"; // import "photoswipe/dist/photoswipe.css"; // TODO(PS): Note, auto hide only works with the new CSS. -import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css"; +import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css"; import "styles/global.css"; diff --git a/web/packages/new/photos/components/.gitignore b/web/packages/gallery/components/viewer/.gitignore similarity index 100% rename from web/packages/new/photos/components/.gitignore rename to web/packages/gallery/components/viewer/.gitignore diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx similarity index 98% rename from web/packages/new/photos/components/FileViewer5.tsx rename to web/packages/gallery/components/viewer/FileViewer.tsx index 2e019202c5..9deedd9180 100644 --- a/web/packages/new/photos/components/FileViewer5.tsx +++ b/web/packages/gallery/components/viewer/FileViewer.tsx @@ -18,7 +18,7 @@ import { FileInfo } from "@/gallery/components/FileInfo"; import type { EnteFile } from "@/media/file.js"; import { Button, styled } from "@mui/material"; import { useCallback, useEffect, useRef, useState } from "react"; -import { FileViewerPhotoSwipe } from "./FileViewerPhotoSwipe"; +import { FileViewerPhotoSwipe } from "./photoswipe"; export interface FileViewerProps { /** diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/gallery/components/viewer/photoswipe.ts similarity index 99% rename from web/packages/new/photos/components/FileViewerPhotoSwipe.tsx rename to web/packages/gallery/components/viewer/photoswipe.ts index 5f50599274..f112e712de 100644 --- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx +++ b/web/packages/gallery/components/viewer/photoswipe.ts @@ -9,7 +9,7 @@ import { } from "@/gallery/services/download"; import type { EnteFile } from "@/media/file"; import { FileType } from "@/media/file-type"; -import type { FileViewerProps } from "./FileViewer5"; +import type { FileViewerProps } from "./FileViewer"; // import { renderToString } from "react-dom/server"; diff --git a/web/packages/new/photos/components/FileViewerComponents.tsx b/web/packages/new/photos/components/FileViewerComponents.tsx index 3835fae56a..120b3a4c2c 100644 --- a/web/packages/new/photos/components/FileViewerComponents.tsx +++ b/web/packages/new/photos/components/FileViewerComponents.tsx @@ -13,7 +13,9 @@ import { aboveFileViewerContentZ } from "./utils/z-index"; import dynamic from "next/dynamic"; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore -const FV5 = dynamic(() => import("./FileViewer5"), { ssr: false }); +const FV5 = dynamic(() => import("@/gallery/components/viewer/FileViewer"), { + ssr: false, +}); const FVD = () => <>; export const FileViewer: React.FC = (props) => {