From eb271088a40adc020ffd90db8554d3f53bbe5166 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Wed, 10 Jul 2024 11:02:01 +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 +- .../src/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/ExifData.tsx | 2 +- .../photos/src/components/PhotoViewer/FileInfo/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/ml/MLSearchSettings.tsx | 2 +- web/packages/new/shared/components/Titlebar.tsx | 9 +++++---- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx index e98cc3f167..5e91654559 100644 --- a/web/apps/accounts/src/pages/passkeys/index.tsx +++ b/web/apps/accounts/src/pages/passkeys/index.tsx @@ -1,5 +1,5 @@ import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; import { ensure } from "@/utils/ensure"; import { CenteredFlex } from "@ente/shared/components/Container"; 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 733406c968..9edb18b0de 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx @@ -1,4 +1,4 @@ -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import { DialogProps, Stack } from "@mui/material"; import { EnteDrawer } from "components/EnteDrawer"; import { t } from "i18next"; 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 807551b4fe..8e15765a5a 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx @@ -3,7 +3,7 @@ import { MenuItemGroup, MenuSectionTitle, } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import Add from "@mui/icons-material/Add"; import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings"; 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 022e1d9e4b..ca233755d4 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx @@ -1,5 +1,5 @@ import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import BlockIcon from "@mui/icons-material/Block"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx index f8ba77f510..7653877c9b 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx +++ b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx @@ -1,4 +1,4 @@ -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import { DialogProps, Stack } from "@mui/material"; import { EnteDrawer } from "components/EnteDrawer"; import { CollectionSummaryType } from "constants/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 7e4a91608b..7b3950edb8 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,5 +1,5 @@ import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +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"; 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 438e69eb03..d072d5b4cd 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,5 +1,5 @@ import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +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"; 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 6d808a4450..2902055b9e 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,5 +1,5 @@ import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +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"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx index 54db4e3849..d84aa106c3 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx @@ -1,4 +1,4 @@ -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import CopyButton from "@ente/shared/components/CodeBlock/CopyButton"; import { formatDateTimeFull } from "@ente/shared/time/format"; import { Box, Stack, styled, Typography } from "@mui/material"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx index 875041bf4b..0f1869e28e 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx @@ -1,7 +1,7 @@ import { UnidentifiedFaces } from "@/new/photos/components/PeopleList"; import { isMLEnabled } from "@/new/photos/services/ml"; import { EnteFile } from "@/new/photos/types/file"; -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import CopyButton from "@ente/shared/components/CodeBlock/CopyButton"; import { FlexWrapper } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; diff --git a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx index 6362ca9d12..6f270670d2 100644 --- a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx +++ b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx @@ -1,5 +1,5 @@ import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +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"; diff --git a/web/apps/photos/src/components/Sidebar/MapSetting.tsx b/web/apps/photos/src/components/Sidebar/MapSetting.tsx index 3b07087402..373243612f 100644 --- a/web/apps/photos/src/components/Sidebar/MapSetting.tsx +++ b/web/apps/photos/src/components/Sidebar/MapSetting.tsx @@ -1,5 +1,5 @@ import { MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import { diff --git a/web/apps/photos/src/components/Sidebar/Preferences.tsx b/web/apps/photos/src/components/Sidebar/Preferences.tsx index 9ca8c944e5..e8cb67de21 100644 --- a/web/apps/photos/src/components/Sidebar/Preferences.tsx +++ b/web/apps/photos/src/components/Sidebar/Preferences.tsx @@ -1,4 +1,4 @@ -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import { getLocaleInUse, setLocaleInUse, diff --git a/web/apps/photos/src/components/ml/MLSearchSettings.tsx b/web/apps/photos/src/components/ml/MLSearchSettings.tsx index d51a7609cf..bb057a1dd3 100644 --- a/web/apps/photos/src/components/ml/MLSearchSettings.tsx +++ b/web/apps/photos/src/components/ml/MLSearchSettings.tsx @@ -5,7 +5,7 @@ import { isMLEnabled, } from "@/new/photos/services/ml"; import { MenuItemGroup } from "@/new/shared/components/Menu"; -import Titlebar from "@/new/shared/components/Titlebar"; +import { Titlebar } from "@/new/shared/components/Titlebar"; import log from "@/next/log"; import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem"; import { diff --git a/web/packages/new/shared/components/Titlebar.tsx b/web/packages/new/shared/components/Titlebar.tsx index ed9089f4c2..e46fb92ce0 100644 --- a/web/packages/new/shared/components/Titlebar.tsx +++ b/web/packages/new/shared/components/Titlebar.tsx @@ -2,8 +2,9 @@ import { FlexWrapper } from "@ente/shared/components/Container"; import ArrowBack from "@mui/icons-material/ArrowBack"; import Close from "@mui/icons-material/Close"; import { Box, IconButton, Typography } from "@mui/material"; +import React from "react"; -interface Iprops { +interface TitlebarProps { title: string; caption?: string; onClose: () => void; @@ -12,14 +13,14 @@ interface Iprops { actionButton?: JSX.Element; } -export default function Titlebar({ +export const Titlebar: React.FC = ({ title, caption, onClose, backIsClose, actionButton, onRootClose, -}: Iprops): JSX.Element { +}) => { return ( <> ); -} +};