π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refractor(locker):LockerPage-shared-component
Aswin Asok836e496274a3
diff --git a/web/apps/locker/src/components/locker/LockerPage.tsx b/web/apps/locker/src/components/locker/LockerPage.tsxnew file mode 100644index 0000000000..8f70a102b3--- /dev/null+++ b/web/apps/locker/src/components/locker/LockerPage.tsx@@ -0,0 +1,352 @@+import { DeleteCollectionDialog } from "@/components/collections/DeleteCollectionDialog";+import { LockerCollectionShareDrawer } from "@/components/collections/LockerCollectionShareDrawer";+import { CreateItemDialog } from "@/components/create-item/CreateItemDialog";+import { ItemList } from "@/components/items/ItemList";+import { EmptyTrashDialog } from "@/components/locker/EmptyTrashDialog";+import { LockerDragOverlay } from "@/components/locker/LockerDragOverlay";+import { useLockerActions } from "@/components/locker/use-locker-actions";+import { useLockerData } from "@/components/locker/use-locker-data";+import { useLockerNavigation } from "@/components/locker/use-locker-navigation";+import { LockerNavbar } from "@/components/LockerNavbar";+import { LockerSidebar } from "@/components/sidebar/LockerSidebar";+import { LockerConfirmDialog } from "@/components/ui/LockerConfirmDialog";+import { useSetupLockerI18n } from "@/i18n/locker";+import { fetchCollectionSharees } from "@/services/remote";+import { lockerColorSx } from "@/styles/tokens";+import { PlusSignIcon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { Box, Button, Fab, Snackbar, Stack, Typography } from "@mui/material";+import { LoadingIndicator } from "ente-base/components/loaders";+import { useBaseContext } from "ente-base/context";+import { t } from "i18next";+import { useRouter } from "next/router";+import React, { useCallback, useState } from "react";++export const LockerPage: React.FC = () => {+ const { logout, showMiniDialog } = useBaseContext();+ const router = useRouter();+ const isLockerI18nReady = useSetupLockerI18n();+ const [sidebarOpen, setSidebarOpen] = useState(false);+ const [searchTerm, setSearchTerm] = useState("");++ const closeSidebar = useCallback(() => {+ setSidebarOpen(false);+ }, []);++ const {+ handleNavigateBack,+ handleSelectCollection,+ handleSelectCollections,+ handleSelectTrash,+ isCollectionRoutePending,+ isCollectionsView,+ isTrashView,+ navigateHome,+ selectedCollectionID,+ } = useLockerNavigation({ router, onAfterNavigate: closeSidebar });++ const {+ collections,+ ensureUploadLimitState,+ hasFetched,+ initialLoadError,+ masterKey,+ refreshData,+ removeCollectionFromState,+ trashItems,+ trashLastUpdatedAt,+ userDetails,+ warmContacts,+ } = useLockerData({ router, logout, showMiniDialog });++ const {+ confirmDialog,+ visibleConfirmDialog,+ closeConfirmDialog,+ handleConfirmDialogConfirm,+ createDialogOpen,+ deleteCollectionDialog,+ editItem,+ emptyTrashDialog,+ ensureCollectionsExist,+ handleConfirmDeleteCollection,+ handleConfirmEmptyTrash,+ handleCreateCollection,+ handleCreateDialogClose,+ handleCreateItem,+ handleDeleteCollection,+ handleDeleteItem,+ handleDeleteItems,+ handleDragEnter,+ handleDragLeave,+ handleDragOver,+ handleDrop,+ handleEditItem,+ handleEmptyTrash,+ handleLeaveCollection,+ handleOpenShareCollection,+ handlePermanentlyDelete,+ handleRenameCollection,+ handleRestoreItem,+ handleShareCollection,+ handleUnshareCollection,+ handleUpdateItem,+ handleUploadFileWithProgress,+ handleUploadItemComplete,+ handleUploadsFinished,+ isDragActive,+ openCreateDialog,+ prefilledUploadItems,+ setDeleteCollectionDialog,+ setEditItem,+ setEmptyTrashDialog,+ setShareCollectionID,+ shareCollectionID,+ setToast,+ toast,+ visibleDeleteCollectionDialog,+ visibleEmptyTrashDialog,+ } = useLockerActions({+ collections,+ ensureUploadLimitState,+ masterKey,+ selectedCollectionID,+ routerPathname: router.pathname,+ refreshData,+ navigateHome,+ removeCollectionFromState,+ trashLastUpdatedAt,+ });++ const sharedCollection =+ shareCollectionID === null+ ? null+ : (collections.find(+ (collection) => collection.id === shareCollectionID,+ ) ?? null);+ const isViewLoading =+ !hasFetched || !isLockerI18nReady || isCollectionRoutePending;++ if (isViewLoading) {+ return <LoadingIndicator />;+ }++ if (initialLoadError && collections.length === 0) {+ return (+ <Stack sx={{ height: "100dvh", overflow: "hidden" }}>+ <LockerNavbar+ onOpenSidebar={() => setSidebarOpen(true)}+ showMenuButton+ searchTerm={searchTerm}+ onSearchTermChange={setSearchTerm}+ />+ <Box+ sx={{+ flex: 1,+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ px: 3,+ }}+ >+ <Stack+ sx={{+ width: "100%",+ maxWidth: 480,+ gap: 1.5,+ alignItems: "center",+ textAlign: "center",+ }}+ >+ <Typography variant="h3">{t("error")}</Typography>+ <Typography variant="body" sx={{ color: "text.muted" }}>+ {initialLoadError}+ </Typography>+ <Button+ variant="contained"+ onClick={() => router.reload()}+ >+ {t("retry")}+ </Button>+ </Stack>+ </Box>+ </Stack>+ );+ }++ return (+ <Stack+ sx={{ height: "100dvh", overflow: "hidden", position: "relative" }}+ onDragEnter={handleDragEnter}+ onDragOver={handleDragOver}+ onDragLeave={handleDragLeave}+ onDrop={handleDrop}+ >+ <LockerNavbar+ onOpenSidebar={() => setSidebarOpen(true)}+ showMenuButton+ searchTerm={searchTerm}+ onSearchTermChange={setSearchTerm}+ />+ <Box+ sx={{+ flex: 1,+ minWidth: 0,+ minHeight: 0,+ display: "flex",+ overflow: "hidden",+ }}+ >+ <ItemList+ collections={collections}+ trashItems={isTrashView ? trashItems : undefined}+ isTrashView={isTrashView}+ isCollectionsView={isCollectionsView}+ selectedCollectionID={selectedCollectionID}+ onSelectCollection={handleSelectCollection}+ onEditItem={handleEditItem}+ onDeleteItem={handleDeleteItem}+ onDeleteItems={handleDeleteItems}+ onPermanentlyDelete={handlePermanentlyDelete}+ onRestoreItem={handleRestoreItem}+ onEmptyTrash={handleEmptyTrash}+ onRenameCollection={handleRenameCollection}+ onDeleteCollection={handleDeleteCollection}+ onCreateCollection={handleCreateCollection}+ onShareCollection={handleOpenShareCollection}+ onLeaveCollection={handleLeaveCollection}+ searchTerm={searchTerm}+ onNavigateBack={handleNavigateBack}+ />+ </Box>+ <LockerSidebar+ open={sidebarOpen}+ onClose={closeSidebar}+ collections={collections}+ onSelectCollections={handleSelectCollections}+ onSelectTrash={handleSelectTrash}+ isTrashView={isTrashView}+ isCollectionsView={isCollectionsView}+ userDetails={userDetails}+ />+ <LockerCollectionShareDrawer+ open={shareCollectionID !== null}+ collection={sharedCollection}+ onClose={() => setShareCollectionID(null)}+ onShareCollection={handleShareCollection}+ onUnshareCollection={handleUnshareCollection}+ onLeaveCollection={handleLeaveCollection}+ onRefreshSharees={fetchCollectionSharees}+ warmContacts={warmContacts}+ />+ <LockerConfirmDialog+ open={confirmDialog !== null}+ illustration={visibleConfirmDialog?.illustration ?? ""}+ title={visibleConfirmDialog?.title ?? ""}+ body={visibleConfirmDialog?.body}+ confirmLabel={visibleConfirmDialog?.confirmLabel ?? ""}+ tone={visibleConfirmDialog?.tone}+ loading={visibleConfirmDialog?.loading}+ error={visibleConfirmDialog?.error}+ onClose={closeConfirmDialog}+ onConfirm={handleConfirmDialogConfirm}+ />+ <EmptyTrashDialog+ dialogState={emptyTrashDialog}+ visibleDialogState={visibleEmptyTrashDialog}+ onClose={() => setEmptyTrashDialog(null)}+ onConfirm={handleConfirmEmptyTrash}+ />+ <DeleteCollectionDialog+ dialogState={deleteCollectionDialog}+ visibleDialogState={visibleDeleteCollectionDialog}+ onClose={() => setDeleteCollectionDialog(null)}+ onConfirm={handleConfirmDeleteCollection}+ onToggleDeleteFromEverywhere={(checked) =>+ setDeleteCollectionDialog((current) =>+ current+ ? { ...current, deleteFromEverywhere: checked }+ : current,+ )+ }+ />++ {!isTrashView && (+ <Fab+ color="primary"+ aria-label={t("saveToLocker")}+ onClick={openCreateDialog}+ sx={(theme) => ({+ position: "fixed",+ right: "max(16px, env(safe-area-inset-right))",+ bottom: "max(16px, env(safe-area-inset-bottom))",+ width: 56,+ height: 56,+ minHeight: 56,+ ...lockerColorSx(theme, {+ color: "specialWhite",+ backgroundColor: "primary",+ }),+ boxShadow: "0px 8px 16px rgba(0, 0, 0, 0.08)",+ zIndex: 1200,+ "&:hover": {+ ...lockerColorSx(theme, {+ backgroundColor: "primaryDark",+ }),+ boxShadow: "0px 12px 24px rgba(0, 0, 0, 0.14)",+ },+ })}+ >+ <HugeiconsIcon+ icon={PlusSignIcon}+ size={24}+ strokeWidth={1.5}+ />+ </Fab>+ )}++ <CreateItemDialog+ open={createDialogOpen}+ onClose={handleCreateDialogClose}+ collections={collections}+ onSave={handleCreateItem}+ onUploadProgress={handleUploadFileWithProgress}+ onUploadItemComplete={handleUploadItemComplete}+ onUploadsFinished={handleUploadsFinished}+ onCreateCollection={handleCreateCollection}+ onEnsureCollections={ensureCollectionsExist}+ onEnsureUploadLimitState={ensureUploadLimitState}+ defaultCollectionID={selectedCollectionID}+ initialItems={prefilledUploadItems}+ userDetails={userDetails}+ />++ {editItem && (+ <CreateItemDialog+ open={!!editItem}+ onClose={() => setEditItem(null)}+ collections={collections}+ onSave={handleUpdateItem}+ onCreateCollection={handleCreateCollection}+ editItem={editItem}+ userDetails={userDetails}+ />+ )}++ <Snackbar+ open={toast !== null}+ message={toast}+ autoHideDuration={3000}+ onClose={(_event, reason) => {+ if (reason === "clickaway") {+ return;+ }+ setToast(null);+ }}+ />+ {isDragActive && <LockerDragOverlay />}+ </Stack>+ );+};++export default LockerPage;diff --git a/web/apps/locker/src/pages/collection.tsx b/web/apps/locker/src/pages/collection.tsxindex 85c6cff69f..7d0936576f 100644--- a/web/apps/locker/src/pages/collection.tsx+++ b/web/apps/locker/src/pages/collection.tsx@@ -1 +1 @@-export { LockerPage as default } from "./locker";+export { LockerPage as default } from "@/components/locker/LockerPage";diff --git a/web/apps/locker/src/pages/collections.tsx b/web/apps/locker/src/pages/collections.tsxindex 85c6cff69f..7d0936576f 100644--- a/web/apps/locker/src/pages/collections.tsx+++ b/web/apps/locker/src/pages/collections.tsx@@ -1 +1 @@-export { LockerPage as default } from "./locker";+export { LockerPage as default } from "@/components/locker/LockerPage";diff --git a/web/apps/locker/src/pages/index.tsx b/web/apps/locker/src/pages/index.tsxindex 85c6cff69f..7d0936576f 100644--- a/web/apps/locker/src/pages/index.tsx+++ b/web/apps/locker/src/pages/index.tsx@@ -1 +1 @@-export { LockerPage as default } from "./locker";+export { LockerPage as default } from "@/components/locker/LockerPage";diff --git a/web/apps/locker/src/pages/locker.tsx b/web/apps/locker/src/pages/locker.tsxindex 8f70a102b3..7d0936576f 100644--- a/web/apps/locker/src/pages/locker.tsx+++ b/web/apps/locker/src/pages/locker.tsx@@ -1,352 +1 @@-import { DeleteCollectionDialog } from "@/components/collections/DeleteCollectionDialog";-import { LockerCollectionShareDrawer } from "@/components/collections/LockerCollectionShareDrawer";-import { CreateItemDialog } from "@/components/create-item/CreateItemDialog";-import { ItemList } from "@/components/items/ItemList";-import { EmptyTrashDialog } from "@/components/locker/EmptyTrashDialog";-import { LockerDragOverlay } from "@/components/locker/LockerDragOverlay";-import { useLockerActions } from "@/components/locker/use-locker-actions";-import { useLockerData } from "@/components/locker/use-locker-data";-import { useLockerNavigation } from "@/components/locker/use-locker-navigation";-import { LockerNavbar } from "@/components/LockerNavbar";-import { LockerSidebar } from "@/components/sidebar/LockerSidebar";-import { LockerConfirmDialog } from "@/components/ui/LockerConfirmDialog";-import { useSetupLockerI18n } from "@/i18n/locker";-import { fetchCollectionSharees } from "@/services/remote";-import { lockerColorSx } from "@/styles/tokens";-import { PlusSignIcon } from "@hugeicons/core-free-icons";-import { HugeiconsIcon } from "@hugeicons/react";-import { Box, Button, Fab, Snackbar, Stack, Typography } from "@mui/material";-import { LoadingIndicator } from "ente-base/components/loaders";-import { useBaseContext } from "ente-base/context";-import { t } from "i18next";-import { useRouter } from "next/router";-import React, { useCallback, useState } from "react";--export const LockerPage: React.FC = () => {- const { logout, showMiniDialog } = useBaseContext();- const router = useRouter();- const isLockerI18nReady = useSetupLockerI18n();- const [sidebarOpen, setSidebarOpen] = useState(false);- const [searchTerm, setSearchTerm] = useState("");-- const closeSidebar = useCallback(() => {- setSidebarOpen(false);- }, []);-- const {- handleNavigateBack,- handleSelectCollection,- handleSelectCollections,- handleSelectTrash,- isCollectionRoutePending,- isCollectionsView,- isTrashView,- navigateHome,- selectedCollectionID,- } = useLockerNavigation({ router, onAfterNavigate: closeSidebar });-- const {- collections,- ensureUploadLimitState,- hasFetched,- initialLoadError,- masterKey,- refreshData,- removeCollectionFromState,- trashItems,- trashLastUpdatedAt,- userDetails,- warmContacts,- } = useLockerData({ router, logout, showMiniDialog });-- const {- confirmDialog,- visibleConfirmDialog,- closeConfirmDialog,- handleConfirmDialogConfirm,- createDialogOpen,- deleteCollectionDialog,- editItem,- emptyTrashDialog,- ensureCollectionsExist,- handleConfirmDeleteCollection,- handleConfirmEmptyTrash,- handleCreateCollection,- handleCreateDialogClose,- handleCreateItem,- handleDeleteCollection,- handleDeleteItem,- handleDeleteItems,- handleDragEnter,- handleDragLeave,- handleDragOver,- handleDrop,- handleEditItem,- handleEmptyTrash,- handleLeaveCollection,- handleOpenShareCollection,- handlePermanentlyDelete,- handleRenameCollection,- handleRestoreItem,- handleShareCollection,- handleUnshareCollection,- handleUpdateItem,- handleUploadFileWithProgress,- handleUploadItemComplete,- handleUploadsFinished,- isDragActive,- openCreateDialog,- prefilledUploadItems,- setDeleteCollectionDialog,- setEditItem,- setEmptyTrashDialog,- setShareCollectionID,- shareCollectionID,- setToast,- toast,- visibleDeleteCollectionDialog,- visibleEmptyTrashDialog,- } = useLockerActions({- collections,- ensureUploadLimitState,- masterKey,- selectedCollectionID,- routerPathname: router.pathname,- refreshData,- navigateHome,- removeCollectionFromState,- trashLastUpdatedAt,- });-- const sharedCollection =- shareCollectionID === null- ? null- : (collections.find(- (collection) => collection.id === shareCollectionID,- ) ?? null);- const isViewLoading =- !hasFetched || !isLockerI18nReady || isCollectionRoutePending;-- if (isViewLoading) {- return <LoadingIndicator />;- }-- if (initialLoadError && collections.length === 0) {- return (- <Stack sx={{ height: "100dvh", overflow: "hidden" }}>- <LockerNavbar- onOpenSidebar={() => setSidebarOpen(true)}- showMenuButton- searchTerm={searchTerm}- onSearchTermChange={setSearchTerm}- />- <Box- sx={{- flex: 1,- display: "flex",- alignItems: "center",- justifyContent: "center",- px: 3,- }}- >- <Stack- sx={{- width: "100%",- maxWidth: 480,- gap: 1.5,- alignItems: "center",- textAlign: "center",- }}- >- <Typography variant="h3">{t("error")}</Typography>- <Typography variant="body" sx={{ color: "text.muted" }}>- {initialLoadError}- </Typography>- <Button- variant="contained"- onClick={() => router.reload()}- >- {t("retry")}- </Button>- </Stack>- </Box>- </Stack>- );- }-- return (- <Stack- sx={{ height: "100dvh", overflow: "hidden", position: "relative" }}- onDragEnter={handleDragEnter}- onDragOver={handleDragOver}- onDragLeave={handleDragLeave}- onDrop={handleDrop}- >- <LockerNavbar- onOpenSidebar={() => setSidebarOpen(true)}- showMenuButton- searchTerm={searchTerm}- onSearchTermChange={setSearchTerm}- />- <Box- sx={{- flex: 1,- minWidth: 0,- minHeight: 0,- display: "flex",- overflow: "hidden",- }}- >- <ItemList- collections={collections}- trashItems={isTrashView ? trashItems : undefined}- isTrashView={isTrashView}- isCollectionsView={isCollectionsView}- selectedCollectionID={selectedCollectionID}- onSelectCollection={handleSelectCollection}- onEditItem={handleEditItem}- onDeleteItem={handleDeleteItem}- onDeleteItems={handleDeleteItems}- onPermanentlyDelete={handlePermanentlyDelete}- onRestoreItem={handleRestoreItem}- onEmptyTrash={handleEmptyTrash}- onRenameCollection={handleRenameCollection}- onDeleteCollection={handleDeleteCollection}- onCreateCollection={handleCreateCollection}- onShareCollection={handleOpenShareCollection}- onLeaveCollection={handleLeaveCollection}- searchTerm={searchTerm}- onNavigateBack={handleNavigateBack}- />- </Box>- <LockerSidebar- open={sidebarOpen}- onClose={closeSidebar}- collections={collections}- onSelectCollections={handleSelectCollections}- onSelectTrash={handleSelectTrash}- isTrashView={isTrashView}- isCollectionsView={isCollectionsView}- userDetails={userDetails}- />- <LockerCollectionShareDrawer- open={shareCollectionID !== null}- collection={sharedCollection}- onClose={() => setShareCollectionID(null)}- onShareCollection={handleShareCollection}- onUnshareCollection={handleUnshareCollection}- onLeaveCollection={handleLeaveCollection}- onRefreshSharees={fetchCollectionSharees}- warmContacts={warmContacts}- />- <LockerConfirmDialog- open={confirmDialog !== null}- illustration={visibleConfirmDialog?.illustration ?? ""}- title={visibleConfirmDialog?.title ?? ""}- body={visibleConfirmDialog?.body}- confirmLabel={visibleConfirmDialog?.confirmLabel ?? ""}- tone={visibleConfirmDialog?.tone}- loading={visibleConfirmDialog?.loading}- error={visibleConfirmDialog?.error}- onClose={closeConfirmDialog}- onConfirm={handleConfirmDialogConfirm}- />- <EmptyTrashDialog- dialogState={emptyTrashDialog}- visibleDialogState={visibleEmptyTrashDialog}- onClose={() => setEmptyTrashDialog(null)}- onConfirm={handleConfirmEmptyTrash}- />- <DeleteCollectionDialog- dialogState={deleteCollectionDialog}- visibleDialogState={visibleDeleteCollectionDialog}- onClose={() => setDeleteCollectionDialog(null)}- onConfirm={handleConfirmDeleteCollection}- onToggleDeleteFromEverywhere={(checked) =>- setDeleteCollectionDialog((current) =>- current- ? { ...current, deleteFromEverywhere: checked }- : current,- )- }- />-- {!isTrashView && (- <Fab- color="primary"- aria-label={t("saveToLocker")}- onClick={openCreateDialog}- sx={(theme) => ({- position: "fixed",- right: "max(16px, env(safe-area-inset-right))",- bottom: "max(16px, env(safe-area-inset-bottom))",- width: 56,- height: 56,- minHeight: 56,- ...lockerColorSx(theme, {- color: "specialWhite",- backgroundColor: "primary",- }),- boxShadow: "0px 8px 16px rgba(0, 0, 0, 0.08)",- zIndex: 1200,- "&:hover": {- ...lockerColorSx(theme, {- backgroundColor: "primaryDark",- }),- boxShadow: "0px 12px 24px rgba(0, 0, 0, 0.14)",- },- })}- >- <HugeiconsIcon- icon={PlusSignIcon}- size={24}- strokeWidth={1.5}- />- </Fab>- )}-- <CreateItemDialog- open={createDialogOpen}- onClose={handleCreateDialogClose}- collections={collections}- onSave={handleCreateItem}- onUploadProgress={handleUploadFileWithProgress}- onUploadItemComplete={handleUploadItemComplete}- onUploadsFinished={handleUploadsFinished}- onCreateCollection={handleCreateCollection}- onEnsureCollections={ensureCollectionsExist}- onEnsureUploadLimitState={ensureUploadLimitState}- defaultCollectionID={selectedCollectionID}- initialItems={prefilledUploadItems}- userDetails={userDetails}- />-- {editItem && (- <CreateItemDialog- open={!!editItem}- onClose={() => setEditItem(null)}- collections={collections}- onSave={handleUpdateItem}- onCreateCollection={handleCreateCollection}- editItem={editItem}- userDetails={userDetails}- />- )}-- <Snackbar- open={toast !== null}- message={toast}- autoHideDuration={3000}- onClose={(_event, reason) => {- if (reason === "clickaway") {- return;- }- setToast(null);- }}- />- {isDragActive && <LockerDragOverlay />}- </Stack>- );-};--export default LockerPage;+export { LockerPage as default } from "@/components/locker/LockerPage";diff --git a/web/apps/locker/src/pages/trash.tsx b/web/apps/locker/src/pages/trash.tsxindex 85c6cff69f..7d0936576f 100644--- a/web/apps/locker/src/pages/trash.tsx+++ b/web/apps/locker/src/pages/trash.tsx@@ -1 +1 @@-export { LockerPage as default } from "./locker";+export { LockerPage as default } from "@/components/locker/LockerPage";