From 8e10c8bec6e00aff65f056a1d3d4b5de44668bd6 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Wed, 10 Jul 2024 11:33:07 +0530 Subject: [PATCH] Move --- web/apps/accounts/src/pages/passkeys/index.tsx | 2 +- .../CollectionShare/emailShare/AddParticipant.tsx | 2 +- .../CollectionShare/emailShare/ManageEmailShare.tsx | 2 +- .../CollectionShare/emailShare/ManageParticipant.tsx | 2 +- .../components/Collections/CollectionShare/index.tsx | 2 +- .../CollectionShare/publicShare/manage/deviceLimit.tsx | 2 +- .../CollectionShare/publicShare/manage/index.tsx | 2 +- .../CollectionShare/publicShare/manage/linkExpiry.tsx | 2 +- .../src/components/PhotoViewer/FileInfo/index.tsx | 2 +- .../PhotoViewer/ImageEditorOverlay/index.tsx | 2 +- .../photos/src/components/Sidebar/AdvancedSettings.tsx | 2 +- web/apps/photos/src/components/Sidebar/MapSetting.tsx | 2 +- web/apps/photos/src/components/Sidebar/Preferences.tsx | 2 +- web/apps/photos/src/components/Sidebar/index.tsx | 2 +- web/apps/photos/src/components/ml/MLSearchSettings.tsx | 2 +- .../new/shared}/components/EnteDrawer.tsx | 0 web/packages/shared/components/EnteDrawer.tsx | 10 ---------- 17 files changed, 15 insertions(+), 25 deletions(-) rename web/{apps/photos/src => packages/new/shared}/components/EnteDrawer.tsx (100%) delete mode 100644 web/packages/shared/components/EnteDrawer.tsx diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx index 5e91654559..1ca210d5f6 100644 --- a/web/apps/accounts/src/pages/passkeys/index.tsx +++ b/web/apps/accounts/src/pages/passkeys/index.tsx @@ -1,3 +1,4 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; @@ -5,7 +6,6 @@ import { ensure } from "@/utils/ensure"; import { CenteredFlex } from "@ente/shared/components/Container"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; import EnteButton from "@ente/shared/components/EnteButton"; -import { EnteDrawer } from "@ente/shared/components/EnteDrawer"; import FormPaper from "@ente/shared/components/Form/FormPaper"; import InfoItem from "@ente/shared/components/Info/InfoItem"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx index 9edb18b0de..5d833642df 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx @@ -1,6 +1,6 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { DialogProps, Stack } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { COLLECTION_ROLE, Collection } from "types/collection"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx index 8e15765a5a..972b11019e 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx @@ -1,3 +1,4 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup, @@ -11,7 +12,6 @@ import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import ModeEditIcon from "@mui/icons-material/ModeEdit"; import Photo from "@mui/icons-material/Photo"; import { DialogProps, Stack } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import Avatar from "components/pages/gallery/Avatar"; import { t } from "i18next"; import { AppContext } from "pages/_app"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx index ca233755d4..fd8421ed5d 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx @@ -1,3 +1,4 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; @@ -7,7 +8,6 @@ import DoneIcon from "@mui/icons-material/Done"; import ModeEditIcon from "@mui/icons-material/ModeEdit"; import PhotoIcon from "@mui/icons-material/Photo"; import { DialogProps, Stack, Typography } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { AppContext } from "pages/_app"; import { GalleryContext } from "pages/gallery"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx index 7653877c9b..0e675fcafa 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx @@ -1,6 +1,6 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { DialogProps, Stack } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { CollectionSummaryType } from "constants/collection"; import { t } from "i18next"; import { Collection, CollectionSummary } from "types/collection"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx index 7b3950edb8..4090b08ec1 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx @@ -1,9 +1,9 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import ChevronRight from "@mui/icons-material/ChevronRight"; import { DialogProps, Stack } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { useMemo, useState } from "react"; import { Collection, PublicURL, UpdatePublicURL } from "types/collection"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx index d072d5b4cd..5cb996e86f 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx @@ -1,10 +1,10 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import ContentCopyIcon from "@mui/icons-material/ContentCopy"; import RemoveCircleOutline from "@mui/icons-material/RemoveCircleOutline"; import { DialogProps, Stack, Typography } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { GalleryContext } from "pages/gallery"; import { useContext, useState } from "react"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx index 2902055b9e..6cafd68c3b 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx @@ -1,10 +1,10 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import { formatDateTime } from "@ente/shared/time/format"; import ChevronRight from "@mui/icons-material/ChevronRight"; import { DialogProps, Stack } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { useMemo, useState } from "react"; import { Collection, PublicURL, UpdatePublicURL } from "types/collection"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx index 0f1869e28e..d486efb990 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx @@ -1,6 +1,7 @@ import { UnidentifiedFaces } from "@/new/photos/components/PeopleList"; import { isMLEnabled } from "@/new/photos/services/ml"; import { EnteFile } from "@/new/photos/types/file"; +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { Titlebar } from "@/new/shared/components/Titlebar"; import CopyButton from "@ente/shared/components/CodeBlock/CopyButton"; import { FlexWrapper } from "@ente/shared/components/Container"; @@ -13,7 +14,6 @@ import LocationOnOutlined from "@mui/icons-material/LocationOnOutlined"; import TextSnippetOutlined from "@mui/icons-material/TextSnippetOutlined"; import { Box, DialogProps, Link, Stack, styled } from "@mui/material"; import { Chip } from "components/Chip"; -import { EnteDrawer } from "components/EnteDrawer"; import LinkButton from "components/pages/gallery/LinkButton"; import { t } from "i18next"; import { AppContext } from "pages/_app"; diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx index 1bc3f3ad5c..94002c664f 100644 --- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx @@ -1,5 +1,6 @@ import downloadManager from "@/new/photos/services/download"; import { EnteFile } from "@/new/photos/types/file"; +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemDivider, MenuItemGroup, @@ -31,7 +32,6 @@ import { Tabs, Typography, } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { CORNER_THRESHOLD, FILTER_DEFAULT_VALUES } from "constants/photoEditor"; import { t } from "i18next"; import { AppContext } from "pages/_app"; diff --git a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx index 6f270670d2..c3c9134aa8 100644 --- a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx +++ b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx @@ -1,10 +1,10 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import ChevronRight from "@mui/icons-material/ChevronRight"; import ScienceIcon from "@mui/icons-material/Science"; import { Box, DialogProps, Stack } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { MLSearchSettings } from "components/ml/MLSearchSettings"; import { t } from "i18next"; import isElectron from "is-electron"; diff --git a/web/apps/photos/src/components/Sidebar/MapSetting.tsx b/web/apps/photos/src/components/Sidebar/MapSetting.tsx index 373243612f..60d71dca66 100644 --- a/web/apps/photos/src/components/Sidebar/MapSetting.tsx +++ b/web/apps/photos/src/components/Sidebar/MapSetting.tsx @@ -1,3 +1,4 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; @@ -10,7 +11,6 @@ import { Stack, Typography, } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { AppContext } from "pages/_app"; import { useContext, useEffect, useState } from "react"; diff --git a/web/apps/photos/src/components/Sidebar/Preferences.tsx b/web/apps/photos/src/components/Sidebar/Preferences.tsx index e8cb67de21..ac6e9ecb57 100644 --- a/web/apps/photos/src/components/Sidebar/Preferences.tsx +++ b/web/apps/photos/src/components/Sidebar/Preferences.tsx @@ -1,3 +1,4 @@ +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { Titlebar } from "@/new/shared/components/Titlebar"; import { getLocaleInUse, @@ -9,7 +10,6 @@ import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import ChevronRight from "@mui/icons-material/ChevronRight"; import { Box, DialogProps, Stack } from "@mui/material"; import DropdownInput from "components/DropdownInput"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { useState } from "react"; import AdvancedSettings from "./AdvancedSettings"; diff --git a/web/apps/photos/src/components/Sidebar/index.tsx b/web/apps/photos/src/components/Sidebar/index.tsx index 1dedaf6a79..3d3f9f964a 100644 --- a/web/apps/photos/src/components/Sidebar/index.tsx +++ b/web/apps/photos/src/components/Sidebar/index.tsx @@ -1,4 +1,5 @@ import { openAccountsManagePasskeysPage } from "@/accounts/services/passkey"; +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import log from "@/next/log"; import { savedLogs } from "@/next/log-web"; import { customAPIHost } from "@/next/origins"; @@ -34,7 +35,6 @@ import { } from "@mui/material"; import Typography from "@mui/material/Typography"; import DeleteAccountModal from "components/DeleteAccountModal"; -import { EnteDrawer } from "components/EnteDrawer"; import TwoFactorModal from "components/TwoFactor/Modal"; import { WatchFolder } from "components/WatchFolder"; import LinkButton from "components/pages/gallery/LinkButton"; diff --git a/web/apps/photos/src/components/ml/MLSearchSettings.tsx b/web/apps/photos/src/components/ml/MLSearchSettings.tsx index bb057a1dd3..4f7b251bc3 100644 --- a/web/apps/photos/src/components/ml/MLSearchSettings.tsx +++ b/web/apps/photos/src/components/ml/MLSearchSettings.tsx @@ -4,6 +4,7 @@ import { enableML, isMLEnabled, } from "@/new/photos/services/ml"; +import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; @@ -19,7 +20,6 @@ import { Stack, Typography, } from "@mui/material"; -import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; import { AppContext } from "pages/_app"; import { useContext, useEffect, useState } from "react"; diff --git a/web/apps/photos/src/components/EnteDrawer.tsx b/web/packages/new/shared/components/EnteDrawer.tsx similarity index 100% rename from web/apps/photos/src/components/EnteDrawer.tsx rename to web/packages/new/shared/components/EnteDrawer.tsx diff --git a/web/packages/shared/components/EnteDrawer.tsx b/web/packages/shared/components/EnteDrawer.tsx deleted file mode 100644 index e6fc35bb15..0000000000 --- a/web/packages/shared/components/EnteDrawer.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { Drawer, styled } from "@mui/material"; - -export const EnteDrawer = styled(Drawer)(({ theme }) => ({ - "& .MuiPaper-root": { - maxWidth: "375px", - width: "100%", - scrollbarWidth: "thin", - padding: theme.spacing(1), - }, -}));