π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refractor(web):move-photos-specfic-component-from-pkgs
Aswin Asoke5b181d719df
diff --git a/web/apps/photos/src/components/Avatar.tsx b/web/apps/photos/src/components/Avatar.tsxindex b09ddbb49a..d77dbfd105 100644--- a/web/apps/photos/src/components/Avatar.tsx+++ b/web/apps/photos/src/components/Avatar.tsx@@ -1,13 +1,13 @@// TODO: Audit this file-import { styled } from "@mui/material";-import type { LocalUser } from "ente-accounts/services/user";-import { useResolvedContactAvatar } from "ente-contacts-web";-import type { EnteFile } from "ente-media/file";import {avatarBackgroundColor,avatarBackgroundColorPublicCollectedFile,avatarTextColor,-} from "ente-new/photos/services/avatar";+} from "@/services/avatar";+import { styled } from "@mui/material";+import type { LocalUser } from "ente-accounts/services/user";+import { useResolvedContactAvatar } from "ente-contacts-web";+import type { EnteFile } from "ente-media/file";import React, { useMemo } from "react";interface AvatarProps {diff --git a/web/packages/new/photos/components/CollectionMappingChoice.tsx b/web/apps/photos/src/components/CollectionMappingChoice.tsxsimilarity index 100%rename from web/packages/new/photos/components/CollectionMappingChoice.tsxrename to web/apps/photos/src/components/CollectionMappingChoice.tsxdiff --git a/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx b/web/apps/photos/src/components/Collections/AlbumCastDialog.tsxindex 20115039e9..37164bf3a2 100644--- a/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx+++ b/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx@@ -1,3 +1,9 @@+import {+ publishCastPayload,+ revokeAllCastTokens,+ unknownDeviceCodeErrorMessage,+} from "@/services/cast";+import { loadCast } from "@/utils/chromecast-sender";import { Link, Stack, Typography } from "@mui/material";import { TitledMiniDialog } from "ente-base/components/MiniDialog";import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";@@ -11,12 +17,6 @@ import { ut } from "ente-base/i18n";import log from "ente-base/log";import type { Collection } from "ente-media/collection";import { useSettingsSnapshot } from "ente-new/photos/components/utils/use-snapshot";-import {- publishCastPayload,- revokeAllCastTokens,- unknownDeviceCodeErrorMessage,-} from "ente-new/photos/services/cast";-import { loadCast } from "ente-new/photos/utils/chromecast-sender";import { t } from "i18next";import React, { useCallback, useEffect, useState } from "react";import { Trans } from "react-i18next";diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsxindex 5205d7a9a0..45616c0f82 100644--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx@@ -1,6 +1,8 @@// TODO: Audit this file/* eslint-disable @typescript-eslint/no-unnecessary-condition */import Avatar from "@/components/Avatar";+import { PublicLinkCreated } from "@/components/share/PublicLinkCreated";+import { avatarTextColor } from "@/services/avatar";import AddIcon from "@mui/icons-material/Add";import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";import BlockIcon from "@mui/icons-material/Block";@@ -59,9 +61,7 @@ import type {} from "ente-media/collection";import { CollectionSubType, type CollectionUser } from "ente-media/collection";import type { RemotePullOpts } from "ente-new/photos/components/gallery";-import { PublicLinkCreated } from "ente-new/photos/components/share/PublicLinkCreated";import { useSettingsSnapshot } from "ente-new/photos/components/utils/use-snapshot";-import { avatarTextColor } from "ente-new/photos/services/avatar";import {createPublicURL,deleteCollection,diff --git a/web/packages/new/photos/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsxsimilarity index 98%rename from web/packages/new/photos/components/DeleteAccount.tsxrename to web/apps/photos/src/components/DeleteAccount.tsxindex ad4c3e939d..bac4609f9a 100644--- a/web/packages/new/photos/components/DeleteAccount.tsx+++ b/web/apps/photos/src/components/DeleteAccount.tsx@@ -1,3 +1,4 @@+import { DropdownInput, type DropdownOption } from "@/components/DropdownInput";import {Checkbox,FormControlLabel,@@ -12,10 +13,6 @@ import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton"import { LoadingButton } from "ente-base/components/mui/LoadingButton";import type { ModalVisibilityProps } from "ente-base/components/utils/modal";import { useBaseContext } from "ente-base/context";-import {- DropdownInput,- type DropdownOption,-} from "ente-new/photos/components/DropdownInput";import {decryptDeleteAccountChallenge,deleteAccount,diff --git a/web/packages/new/photos/components/DropdownInput.tsx b/web/apps/photos/src/components/DropdownInput.tsxsimilarity index 100%rename from web/packages/new/photos/components/DropdownInput.tsxrename to web/apps/photos/src/components/DropdownInput.tsxdiff --git a/web/apps/photos/src/components/FamilyManagement.tsx b/web/apps/photos/src/components/FamilyManagement.tsxindex fdd795f349..d6e4d3c0ea 100644--- a/web/apps/photos/src/components/FamilyManagement.tsx+++ b/web/apps/photos/src/components/FamilyManagement.tsx@@ -1,3 +1,4 @@+import { avatarBackgroundColor, avatarTextColor } from "@/services/avatar";import {createFamily,inviteFamilyMember,@@ -38,10 +39,6 @@ import { useBaseContext } from "ente-base/context";import { isHTTPErrorWithStatus } from "ente-base/http";import { formattedStorageByteSize } from "ente-gallery/utils/units";import { useUserDetailsSnapshot } from "ente-new/photos/components/utils/use-snapshot";-import {- avatarBackgroundColor,- avatarTextColor,-} from "ente-new/photos/services/avatar";import {familyUsage,isFamilyAdmin,diff --git a/web/packages/new/photos/components/PlanSelector.tsx b/web/apps/photos/src/components/PlanSelector.tsxsimilarity index 100%rename from web/packages/new/photos/components/PlanSelector.tsxrename to web/apps/photos/src/components/PlanSelector.tsxdiff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsxindex 63a34cdb26..35123b447a 100644--- a/web/apps/photos/src/components/Sidebar.tsx+++ b/web/apps/photos/src/components/Sidebar.tsx@@ -1,4 +1,12 @@+import { DeleteAccount } from "@/components/DeleteAccount";+import { DropdownInput } from "@/components/DropdownInput";import { WatchFolder } from "@/components/WatchFolder";+import { ShapeIcon } from "@/components/icons/ShapeIcon";+import { AppLockSettings } from "@/components/sidebar/AppLockSettings";+import { ReferralSettings } from "@/components/sidebar/ReferralSettings";+import { SessionsSettings } from "@/components/sidebar/SessionsSettings";+import { TwoFactorSettings } from "@/components/sidebar/TwoFactorSettings";+import { downloadAppDialogAttributes } from "@/components/utils/download";import {Delete02Icon,Download05Icon,@@ -69,15 +77,7 @@ import {isHLSGenerationSupported,toggleHLSGeneration,} from "ente-gallery/services/video";-import { DeleteAccount } from "ente-new/photos/components/DeleteAccount";-import { DropdownInput } from "ente-new/photos/components/DropdownInput";-import { ShapeIcon } from "ente-new/photos/components/icons/ShapeIcon";-import { AppLockSettings } from "ente-new/photos/components/sidebar/AppLockSettings";import { MLSettings } from "ente-new/photos/components/sidebar/MLSettings";-import { ReferralSettings } from "ente-new/photos/components/sidebar/ReferralSettings";-import { SessionsSettings } from "ente-new/photos/components/sidebar/SessionsSettings";-import { TwoFactorSettings } from "ente-new/photos/components/sidebar/TwoFactorSettings";-import { downloadAppDialogAttributes } from "ente-new/photos/components/utils/download";import {useAppLockSnapshot,useHLSGenerationStatusSnapshot,diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsxindex a8be1c5825..2e147046c2 100644--- a/web/apps/photos/src/components/Upload.tsx+++ b/web/apps/photos/src/components/Upload.tsx@@ -3,8 +3,10 @@/* eslint-disable react-hooks/exhaustive-deps *//* eslint-disable @typescript-eslint/no-misused-promises *//* eslint-disable @typescript-eslint/no-floating-promises */+import { CollectionMappingChoice } from "@/components/CollectionMappingChoice";import { TakeoutOptions } from "@/components/TakeoutOptions";import { UploadConfirmationDialog } from "@/components/UploadConfirmationDialog";+import { downloadAppDialogAttributes } from "@/components/utils/download";import type {InProgressUpload,SegregatedFinishedUploads,@@ -69,10 +71,8 @@ import {import { hasReliableCanvasReadback } from "ente-gallery/utils/upload/canvas-integrity";import { CollectionSubType, type Collection } from "ente-media/collection";import type { EnteFile } from "ente-media/file";-import { CollectionMappingChoice } from "ente-new/photos/components/CollectionMappingChoice";import type { CollectionSelectorAttributes } from "ente-new/photos/components/CollectionSelector";import type { RemotePullOpts } from "ente-new/photos/components/gallery";-import { downloadAppDialogAttributes } from "ente-new/photos/components/utils/download";import { suppressAutoLockOnBlurForTrustedPrompt } from "ente-new/photos/services/app-lock";import {addOrCopyToCollection,diff --git a/web/apps/photos/src/components/WatchFolder.tsx b/web/apps/photos/src/components/WatchFolder.tsxindex 35cdd93101..6c0a50c44a 100644--- a/web/apps/photos/src/components/WatchFolder.tsx+++ b/web/apps/photos/src/components/WatchFolder.tsx@@ -1,3 +1,4 @@+import { CollectionMappingChoice } from "@/components/CollectionMappingChoice";import watcher from "@/services/watch";import AddIcon from "@mui/icons-material/Add";import CheckIcon from "@mui/icons-material/Check";@@ -34,7 +35,6 @@ import {} from "ente-base/electron";import { basename, dirname } from "ente-base/file-name";import type { CollectionMapping, FolderWatch } from "ente-base/types/ipc";-import { CollectionMappingChoice } from "ente-new/photos/components/CollectionMappingChoice";import { t } from "i18next";import React, { useEffect, useRef, useState } from "react";diff --git a/web/packages/new/photos/components/WhatsNew.tsx b/web/apps/photos/src/components/WhatsNew.tsxsimilarity index 95%rename from web/packages/new/photos/components/WhatsNew.tsxrename to web/apps/photos/src/components/WhatsNew.tsxindex 8b36adccb7..efdb60942b 100644--- a/web/packages/new/photos/components/WhatsNew.tsx+++ b/web/apps/photos/src/components/WhatsNew.tsx@@ -1,3 +1,4 @@+import { didShowWhatsNew } from "@/services/changelog";import ArrowForwardIcon from "@mui/icons-material/ArrowForward";import {Box,@@ -14,9 +15,8 @@ import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton"import { useIsSmallWidth } from "ente-base/components/utils/hooks";import { ensureElectron } from "ente-base/electron";import { ut } from "ente-base/i18n";+import { SlideUpTransition } from "ente-new/photos/components/mui/SlideUpTransition";import React, { useEffect } from "react";-import { didShowWhatsNew } from "../services/changelog";-import { SlideUpTransition } from "./mui/SlideUpTransition";interface WhatsNewProps {/** If `true`, then the dialog is shown. */diff --git a/web/packages/new/photos/components/app-lock/AppLockCard.tsx b/web/apps/photos/src/components/app-lock/AppLockCard.tsxsimilarity index 100%rename from web/packages/new/photos/components/app-lock/AppLockCard.tsxrename to web/apps/photos/src/components/app-lock/AppLockCard.tsxdiff --git a/web/packages/new/photos/components/app-lock/AppLockFeedback.tsx b/web/apps/photos/src/components/app-lock/AppLockFeedback.tsxsimilarity index 100%rename from web/packages/new/photos/components/app-lock/AppLockFeedback.tsxrename to web/apps/photos/src/components/app-lock/AppLockFeedback.tsxdiff --git a/web/packages/new/photos/components/app-lock/AppLockIllustrations.tsx b/web/apps/photos/src/components/app-lock/AppLockIllustrations.tsxsimilarity index 100%rename from web/packages/new/photos/components/app-lock/AppLockIllustrations.tsxrename to web/apps/photos/src/components/app-lock/AppLockIllustrations.tsxdiff --git a/web/packages/new/photos/components/app-lock/AppLockPrompt.tsx b/web/apps/photos/src/components/app-lock/AppLockPrompt.tsxsimilarity index 94%rename from web/packages/new/photos/components/app-lock/AppLockPrompt.tsxrename to web/apps/photos/src/components/app-lock/AppLockPrompt.tsxindex cbfbe84677..c9926f7e8e 100644--- a/web/packages/new/photos/components/app-lock/AppLockPrompt.tsx+++ b/web/apps/photos/src/components/app-lock/AppLockPrompt.tsx@@ -1,11 +1,11 @@import CloseIcon from "@mui/icons-material/Close";import { IconButton } from "@mui/material";import { useBaseContext } from "ente-base/context";+import { useAppLockSnapshot } from "ente-new/photos/components/utils/use-snapshot";+import { cancelReauthentication } from "ente-new/photos/services/app-lock";import { t } from "i18next";import type { ReactNode } from "react";import { useCallback, useEffect, useState } from "react";-import { cancelReauthentication } from "../../services/app-lock";-import { useAppLockSnapshot } from "../utils/use-snapshot";import { AppLockLogoutConfirmation } from "./AppLockFeedback";import { AppLockUnlockForm } from "./AppLockUnlockForm";diff --git a/web/packages/new/photos/components/app-lock/AppLockReauthenticationDialog.tsx b/web/apps/photos/src/components/app-lock/AppLockReauthenticationDialog.tsxsimilarity index 94%rename from web/packages/new/photos/components/app-lock/AppLockReauthenticationDialog.tsxrename to web/apps/photos/src/components/app-lock/AppLockReauthenticationDialog.tsxindex 6a4fbdd8e0..6c1ea7b0fd 100644--- a/web/packages/new/photos/components/app-lock/AppLockReauthenticationDialog.tsx+++ b/web/apps/photos/src/components/app-lock/AppLockReauthenticationDialog.tsx@@ -3,9 +3,9 @@*/import { Box, Modal } from "@mui/material";+import { useAppLockSnapshot } from "ente-new/photos/components/utils/use-snapshot";import { t } from "i18next";import type { CSSProperties } from "react";-import { useAppLockSnapshot } from "../utils/use-snapshot";import { AppLockPrompt } from "./AppLockPrompt";export const AppLockReauthenticationDialog = () => {diff --git a/web/packages/new/photos/components/app-lock/AppLockUnlockForm.tsx b/web/apps/photos/src/components/app-lock/AppLockUnlockForm.tsxsimilarity index 99%rename from web/packages/new/photos/components/app-lock/AppLockUnlockForm.tsxrename to web/apps/photos/src/components/app-lock/AppLockUnlockForm.tsxindex 6add1d3e82..78a2beface 100644--- a/web/packages/new/photos/components/app-lock/AppLockUnlockForm.tsx+++ b/web/apps/photos/src/components/app-lock/AppLockUnlockForm.tsx@@ -9,16 +9,16 @@ import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton"import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";import { useBaseContext } from "ente-base/context";import log from "ente-base/log";-import { t } from "i18next";-import type { ReactNode } from "react";-import { useCallback, useEffect, useMemo, useRef, useState } from "react";+import { useAppLockSnapshot } from "ente-new/photos/components/utils/use-snapshot";import {attemptDeviceLockUnlock,attemptUnlock,type DeviceLockUnlockResult,type UnlockResult,-} from "../../services/app-lock";-import { useAppLockSnapshot } from "../utils/use-snapshot";+} from "ente-new/photos/services/app-lock";+import { t } from "i18next";+import type { ReactNode } from "react";+import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { AppLockCard } from "./AppLockCard";import { CooldownScreen, ErrorMessage } from "./AppLockFeedback";import { LockIllustration } from "./AppLockIllustrations";diff --git a/web/apps/photos/src/components/app-lock/LockScreenContents.tsx b/web/apps/photos/src/components/app-lock/LockScreenContents.tsxindex df118b111c..881867aea9 100644--- a/web/apps/photos/src/components/app-lock/LockScreenContents.tsx+++ b/web/apps/photos/src/components/app-lock/LockScreenContents.tsx@@ -1,11 +1,11 @@+import { AppLockCard } from "@/components/app-lock/AppLockCard";+import { AppLockLogoutConfirmation } from "@/components/app-lock/AppLockFeedback";+import { AppLockPrompt } from "@/components/app-lock/AppLockPrompt";import ErrorOutlinedIcon from "@mui/icons-material/ErrorOutlined";import { Box, Modal, Stack, Typography } from "@mui/material";import { EnteLogo } from "ente-base/components/EnteLogo";import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";import { useBaseContext } from "ente-base/context";-import { AppLockCard } from "ente-new/photos/components/app-lock/AppLockCard";-import { AppLockLogoutConfirmation } from "ente-new/photos/components/app-lock/AppLockFeedback";-import { AppLockPrompt } from "ente-new/photos/components/app-lock/AppLockPrompt";import { t } from "i18next";import type { CSSProperties, PropsWithChildren } from "react";import { useState } from "react";diff --git a/web/packages/new/photos/components/app-lock/styles.ts b/web/apps/photos/src/components/app-lock/styles.tssimilarity index 100%rename from web/packages/new/photos/components/app-lock/styles.tsrename to web/apps/photos/src/components/app-lock/styles.tsdiff --git a/web/packages/new/photos/components/icons/ShapeIcon.tsx b/web/apps/photos/src/components/icons/ShapeIcon.tsxsimilarity index 100%rename from web/packages/new/photos/components/icons/ShapeIcon.tsxrename to web/apps/photos/src/components/icons/ShapeIcon.tsxdiff --git a/web/packages/new/photos/components/icons/lock.svg b/web/apps/photos/src/components/icons/lock.svgsimilarity index 100%rename from web/packages/new/photos/components/icons/lock.svgrename to web/apps/photos/src/components/icons/lock.svgdiff --git a/web/packages/new/photos/components/share/PublicLinkCreated.tsx b/web/apps/photos/src/components/share/PublicLinkCreated.tsxsimilarity index 100%rename from web/packages/new/photos/components/share/PublicLinkCreated.tsxrename to web/apps/photos/src/components/share/PublicLinkCreated.tsxdiff --git a/web/packages/new/photos/components/sidebar/AppLockSettings.tsx b/web/apps/photos/src/components/sidebar/AppLockSettings.tsxsimilarity index 99%rename from web/packages/new/photos/components/sidebar/AppLockSettings.tsxrename to web/apps/photos/src/components/sidebar/AppLockSettings.tsxindex 759f3678b9..959bb46f3b 100644--- a/web/packages/new/photos/components/sidebar/AppLockSettings.tsx+++ b/web/apps/photos/src/components/sidebar/AppLockSettings.tsx@@ -18,8 +18,7 @@ import {import { errorDialogAttributes } from "ente-base/components/utils/dialog";import { useBaseContext } from "ente-base/context";import log from "ente-base/log";-import { t } from "i18next";-import React, { useCallback, useEffect, useRef, useState } from "react";+import { useAppLockSnapshot } from "ente-new/photos/components/utils/use-snapshot";import {disableAppLock,setAutoLockTime,@@ -28,8 +27,9 @@ import {setupPin,shouldShowDeviceLockOption,type SetupDeviceLockResult,-} from "../../services/app-lock";-import { useAppLockSnapshot } from "../utils/use-snapshot";+} from "ente-new/photos/services/app-lock";+import { t } from "i18next";+import React, { useCallback, useEffect, useRef, useState } from "react";type DeviceLockEnableOutcome = "success" | "cancelled" | "failed";diff --git a/web/packages/new/photos/components/sidebar/ReferralSettings.tsx b/web/apps/photos/src/components/sidebar/ReferralSettings.tsxsimilarity index 99%rename from web/packages/new/photos/components/sidebar/ReferralSettings.tsxrename to web/apps/photos/src/components/sidebar/ReferralSettings.tsxindex e194ab5e78..d882b0fc53 100644--- a/web/packages/new/photos/components/sidebar/ReferralSettings.tsx+++ b/web/apps/photos/src/components/sidebar/ReferralSettings.tsx@@ -1,3 +1,12 @@+import {+ changeReferralCode,+ claimReferralCode,+ getReferralView,+ getStorageBonusDetails,+ normalizeReferralCode,+ type ReferralView,+ type StorageBonusDetails,+} from "@/services/storage-bonus";import CheckCircleOutlinedIcon from "@mui/icons-material/CheckCircleOutlined";import EditIcon from "@mui/icons-material/Edit";import { Box, Button, IconButton, Stack, Typography } from "@mui/material";@@ -26,15 +35,6 @@ import {import log from "ente-base/log";import { bytesInGB } from "ente-gallery/utils/units";import { useUserDetailsSnapshot } from "ente-new/photos/components/utils/use-snapshot";-import {- changeReferralCode,- claimReferralCode,- getReferralView,- getStorageBonusDetails,- normalizeReferralCode,- type ReferralView,- type StorageBonusDetails,-} from "ente-new/photos/services/storage-bonus";import {familyAdminEmail,isPartOfFamily,diff --git a/web/packages/new/photos/components/sidebar/SessionsSettings.tsx b/web/apps/photos/src/components/sidebar/SessionsSettings.tsxsimilarity index 100%rename from web/packages/new/photos/components/sidebar/SessionsSettings.tsxrename to web/apps/photos/src/components/sidebar/SessionsSettings.tsxdiff --git a/web/packages/new/photos/components/sidebar/TwoFactorSettings.tsx b/web/apps/photos/src/components/sidebar/TwoFactorSettings.tsxsimilarity index 100%rename from web/packages/new/photos/components/sidebar/TwoFactorSettings.tsxrename to web/apps/photos/src/components/sidebar/TwoFactorSettings.tsxdiff --git a/web/packages/new/photos/components/utils/dialog-attributes.tsx b/web/apps/photos/src/components/utils/dialog-attributes.tsxsimilarity index 100%rename from web/packages/new/photos/components/utils/dialog-attributes.tsxrename to web/apps/photos/src/components/utils/dialog-attributes.tsxdiff --git a/web/packages/new/photos/components/utils/download.tsx b/web/apps/photos/src/components/utils/download.tsxsimilarity index 100%rename from web/packages/new/photos/components/utils/download.tsxrename to web/apps/photos/src/components/utils/download.tsxdiff --git a/web/packages/new/photos/components/utils/use-app-lock.ts b/web/apps/photos/src/components/utils/use-app-lock.tssimilarity index 99%rename from web/packages/new/photos/components/utils/use-app-lock.tsrename to web/apps/photos/src/components/utils/use-app-lock.tsindex 51dd1474c2..551f54330b 100644--- a/web/packages/new/photos/components/utils/use-app-lock.ts+++ b/web/apps/photos/src/components/utils/use-app-lock.ts@@ -4,7 +4,6 @@ import {} from "ente-base/electron";import log from "ente-base/log";import { updateSessionFromElectronSafeStorageIfNeeded } from "ente-base/session";-import { useEffect, useRef, useState } from "react";import {appLockSnapshot,clearAutoLockBlurSuppression,@@ -13,7 +12,8 @@ import {refreshAppLockStateFromSession,shouldSuppressAutoLockOnBlur,type AppLockState,-} from "../../services/app-lock";+} from "ente-new/photos/services/app-lock";+import { useEffect, useRef, useState } from "react";const hydrateSessionFromSafeStorageIfNeeded = async () => {try {diff --git a/web/packages/new/photos/components/utils/use-is-offline.ts b/web/apps/photos/src/components/utils/use-is-offline.tssimilarity index 100%rename from web/packages/new/photos/components/utils/use-is-offline.tsrename to web/apps/photos/src/components/utils/use-is-offline.tsdiff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsxindex f4e03e4015..5756e1536a 100644--- a/web/apps/photos/src/pages/_app.tsx+++ b/web/apps/photos/src/pages/_app.tsx@@ -1,6 +1,16 @@+import { AppLockReauthenticationDialog } from "@/components/app-lock/AppLockReauthenticationDialog";import { AppLockSetupError } from "@/components/app-lock/LockScreenContents";+import {+ updateAvailableForDownloadDialogAttributes,+ updateReadyToInstallDialogAttributes,+} from "@/components/utils/download";+import {+ useAutoLockWhenBackgrounded,+ useSetupAppLock,+} from "@/components/utils/use-app-lock";import { useDesktopAppLockRoute } from "@/components/utils/use-app-lock-route";import { photosLogout } from "@/services/logout";+import { runMigrations } from "@/services/migration";import "@fontsource-variable/inter";import "@fontsource-variable/outfit";import ArrowForwardIcon from "@mui/icons-material/ArrowForward";@@ -37,18 +47,8 @@ import {initVideoProcessing,isHLSGenerationSupported,} from "ente-gallery/services/video";-import { AppLockReauthenticationDialog } from "ente-new/photos/components/app-lock/AppLockReauthenticationDialog";-import {- updateAvailableForDownloadDialogAttributes,- updateReadyToInstallDialogAttributes,-} from "ente-new/photos/components/utils/download";-import {- useAutoLockWhenBackgrounded,- useSetupAppLock,-} from "ente-new/photos/components/utils/use-app-lock";import { useAppLockSnapshot } from "ente-new/photos/components/utils/use-snapshot";import { resumeExportsIfNeeded } from "ente-new/photos/services/export";-import { runMigrations } from "ente-new/photos/services/migration";import { initML, isMLSupported } from "ente-new/photos/services/ml";import { PhotosAppContext } from "ente-new/photos/types/context";import { t } from "i18next";diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex 03b85857ab..6cfb2f6e95 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -11,9 +11,17 @@ import { FamilyManagement } from "@/components/FamilyManagement";import type { FileListHeaderOrFooter } from "@/components/FileList";import { FileListWithViewer } from "@/components/FileListWithViewer";import { FixCreationTime } from "@/components/FixCreationTime";+import { PlanSelector } from "@/components/PlanSelector";import { QuickLinkCreatedNotification } from "@/components/QuickLinkCreatedNotification";import { Sidebar } from "@/components/Sidebar";import { Upload } from "@/components/Upload";+import { WhatsNew } from "@/components/WhatsNew";+import {+ notifyOthersFilesDialogAttributes,+ notifyUnsupportedSharedFavoritesDialogAttributes,+} from "@/components/utils/dialog-attributes";+import { useIsOffline } from "@/components/utils/use-is-offline";+import { shouldShowWhatsNew } from "@/services/changelog";import { Upload01Icon } from "@hugeicons/core-free-icons";import { HugeiconsIcon } from "@hugeicons/react";import ArrowBackIcon from "@mui/icons-material/ArrowBack";@@ -67,7 +75,6 @@ import {} from "ente-new/photos/components/CollectionSelector";import { EditLocationDialog } from "ente-new/photos/components/EditLocationDialog";import { Export } from "ente-new/photos/components/Export";-import { PlanSelector } from "ente-new/photos/components/PlanSelector";import {SearchBar,type SearchBarProps,@@ -77,7 +84,6 @@ import {type CollectionOp,type FileOp,} from "ente-new/photos/components/SelectedFileOptions";-import { WhatsNew } from "ente-new/photos/components/WhatsNew";import {GalleryEmptyState,PeopleEmptyState,@@ -93,18 +99,12 @@ import {useGalleryReducer,type GalleryBarMode,} from "ente-new/photos/components/gallery/reducer";-import {- notifyOthersFilesDialogAttributes,- notifyUnsupportedSharedFavoritesDialogAttributes,-} from "ente-new/photos/components/utils/dialog-attributes";-import { useIsOffline } from "ente-new/photos/components/utils/use-is-offline";import {usePeopleStateSnapshot,useSettingsSnapshot,useUserDetailsSnapshot,} from "ente-new/photos/components/utils/use-snapshot";import { reauthenticateWithAppLock } from "ente-new/photos/services/app-lock";-import { shouldShowWhatsNew } from "ente-new/photos/services/changelog";import {addToCollection,addToFavoritesCollection,diff --git a/web/packages/new/photos/services/avatar.ts b/web/apps/photos/src/services/avatar.tssimilarity index 100%rename from web/packages/new/photos/services/avatar.tsrename to web/apps/photos/src/services/avatar.tsdiff --git a/web/packages/new/photos/services/cast.ts b/web/apps/photos/src/services/cast.tssimilarity index 100%rename from web/packages/new/photos/services/cast.tsrename to web/apps/photos/src/services/cast.tsdiff --git a/web/packages/new/photos/services/changelog.ts b/web/apps/photos/src/services/changelog.tssimilarity index 100%rename from web/packages/new/photos/services/changelog.tsrename to web/apps/photos/src/services/changelog.tsdiff --git a/web/packages/new/photos/services/migration.ts b/web/apps/photos/src/services/migration.tssimilarity index 100%rename from web/packages/new/photos/services/migration.tsrename to web/apps/photos/src/services/migration.tsdiff --git a/web/packages/new/photos/services/storage-bonus.ts b/web/apps/photos/src/services/storage-bonus.tssimilarity index 100%rename from web/packages/new/photos/services/storage-bonus.tsrename to web/apps/photos/src/services/storage-bonus.tsdiff --git a/web/packages/new/photos/utils/chromecast-sender.ts b/web/apps/photos/src/utils/chromecast-sender.tssimilarity index 100%rename from web/packages/new/photos/utils/chromecast-sender.tsrename to web/apps/photos/src/utils/chromecast-sender.tsdiff --git a/web/packages/accounts/pages/passkeys/recover.tsx b/web/packages/accounts/pages/passkeys/recover.tsxdeleted file mode 100644index 6d29d53c6a..0000000000--- a/web/packages/accounts/pages/passkeys/recover.tsx+++ /dev/null@@ -1,5 +0,0 @@-import Page_ from "../two-factor/recover";--const Page = () => <Page_ twoFactorType="passkey" />;--export default Page;diff --git a/web/packages/new/photos/services/family.ts b/web/packages/new/photos/services/family.tsdeleted file mode 100644index e69de29bb2..0000000000diff --git a/web/packages/new/photos/services/upload/types.ts b/web/packages/new/photos/services/upload/types.tsdeleted file mode 100644index e69de29bb2..0000000000