Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Simplify Paste web structure

Manav Rathie6020dddfa88
diff --git a/web/apps/paste/src/features/paste/utils/browser.ts b/web/apps/paste/src/browser.ts
similarity index 100%
rename from web/apps/paste/src/features/paste/utils/browser.ts
rename to web/apps/paste/src/browser.ts
diff --git a/web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx b/web/apps/paste/src/components/PasteCreatePanel.tsx
similarity index 96%
rename from web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx
rename to web/apps/paste/src/components/PasteCreatePanel.tsx
index 9f46227d6d..dd90a936bc 100644
--- a/web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx
+++ b/web/apps/paste/src/components/PasteCreatePanel.tsx
@@ -1,6 +1,7 @@
-import { MAX_PASTE_CHARS } from "@/features/paste/hooks/useCreatePaste";
-import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
-import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
+import { copyTextToClipboard, shareUrlOrCopy } from "@/browser";
+import { MAX_PASTE_CHARS } from "@/paste";
+import { getPasteThemeTokens, usePasteColorMode } from "@/theme";
+import { useCreatePaste } from "@/usePaste";
import { Navigation06Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import LockOpenRoundedIcon from "@mui/icons-material/LockOpenRounded";
@@ -26,29 +27,16 @@ import { PasteLinkCard } from "./PasteLinkCard";
import { downloadPasteQrCode } from "./qrCode";
import { pasteTextFieldSx } from "./textFieldSx";
-interface PasteCreatePanelProps {
- inputText: string;
- creating: boolean;
- createError: string | null;
- createdLink: string | null;
- createdLinkPasswordProtected: boolean;
- onInputChange: (value: string) => void;
- onCreate: (password?: string) => Promise<void>;
- onCopyLink: (value: string) => Promise<void>;
- onShareLink: (url: string) => Promise<void>;
-}
-
-export const PasteCreatePanel = ({
- inputText,
- creating,
- createError,
- createdLink,
- createdLinkPasswordProtected,
- onInputChange,
- onCreate,
- onCopyLink,
- onShareLink,
-}: PasteCreatePanelProps) => {
+export const PasteCreatePanel = () => {
+ const {
+ inputText,
+ setInputText,
+ creating,
+ createError,
+ createdLink,
+ createdLinkPasswordProtected,
+ createSecureLink,
+ } = useCreatePaste();
const { resolvedMode } = usePasteColorMode();
const tokens = getPasteThemeTokens(resolvedMode);
const [passwordProtected, setPasswordProtected] = useState(false);
@@ -216,7 +204,7 @@ export const PasteCreatePanel = ({
const submittedPassword = password;
setPasswordDialogOpen(false);
resetPasswordDialog();
- void onCreate(submittedPassword);
+ void createSecureLink(submittedPassword);
};
const handleDownloadQrClick = () => {
@@ -257,7 +245,7 @@ export const PasteCreatePanel = ({
placeholder="Paste text (keys, snippets, notes, instructions...)"
value={inputText}
onChange={(event) => {
- onInputChange(event.target.value);
+ setInputText(event.target.value);
}}
sx={[
pasteTextFieldSx(tokens, "20px"),
@@ -391,7 +379,7 @@ export const PasteCreatePanel = ({
if (passwordProtected) {
setPasswordDialogOpen(true);
} else {
- void onCreate();
+ void createSecureLink();
}
}}
disabled={isCreateDisabled}
@@ -524,8 +512,8 @@ export const PasteCreatePanel = ({
<Box sx={{ mt: 0, width: "100%", minWidth: 0 }}>
<PasteLinkCard
link={createdLink}
- onCopy={onCopyLink}
- onShare={onShareLink}
+ onCopy={copyTextToClipboard}
+ onShare={shareUrlOrCopy}
passwordProtected={createdLinkPasswordProtected}
/>
<Box
diff --git a/web/apps/paste/src/features/paste/components/PasteFooter.tsx b/web/apps/paste/src/components/PasteFooter.tsx
similarity index 95%
rename from web/apps/paste/src/features/paste/components/PasteFooter.tsx
rename to web/apps/paste/src/components/PasteFooter.tsx
index d52ed7e156..9795dc9c85 100644
--- a/web/apps/paste/src/features/paste/components/PasteFooter.tsx
+++ b/web/apps/paste/src/components/PasteFooter.tsx
@@ -1,5 +1,4 @@
-import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
-import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
+import { getPasteThemeTokens, usePasteColorMode } from "@/theme";
import { Box, Stack, Typography } from "@mui/material";
import { EnteLogo } from "ente-base/components/EnteLogo";
diff --git a/web/apps/paste/src/features/paste/components/PasteFrame.tsx b/web/apps/paste/src/components/PasteFrame.tsx
similarity index 94%
rename from web/apps/paste/src/features/paste/components/PasteFrame.tsx
rename to web/apps/paste/src/components/PasteFrame.tsx
index b0eb2c1a25..a3d08bb054 100644
--- a/web/apps/paste/src/features/paste/components/PasteFrame.tsx
+++ b/web/apps/paste/src/components/PasteFrame.tsx
@@ -1,16 +1,11 @@
-import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
-import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
+import { getPasteThemeTokens, usePasteColorMode } from "@/theme";
import GitHubIcon from "@mui/icons-material/GitHub";
import { Box, IconButton, Stack, Typography } from "@mui/material";
import { EnteLogo } from "ente-base/components/EnteLogo";
import type { ReactNode } from "react";
+import { PasteFooter } from "./PasteFooter";
-interface PasteFrameProps {
- children: ReactNode;
- footer: ReactNode;
-}
-
-export const PasteFrame = ({ children, footer }: PasteFrameProps) => {
+export const PasteFrame = ({ children }: { children: ReactNode }) => {
const { resolvedMode } = usePasteColorMode();
const tokens = getPasteThemeTokens(resolvedMode);
@@ -145,7 +140,7 @@ export const PasteFrame = ({ children, footer }: PasteFrameProps) => {
pb: { xs: 3, md: 3.25 },
}}
>
- {footer}
+ <PasteFooter />
</Box>
</Box>
</Box>
diff --git a/web/apps/paste/src/features/paste/components/PasteLinkCard.tsx b/web/apps/paste/src/components/PasteLinkCard.tsx
similarity index 99%
rename from web/apps/paste/src/features/paste/components/PasteLinkCard.tsx
rename to web/apps/paste/src/components/PasteLinkCard.tsx
index ae00700f04..7fe8440af2 100644
--- a/web/apps/paste/src/features/paste/components/PasteLinkCard.tsx
+++ b/web/apps/paste/src/components/PasteLinkCard.tsx
@@ -1,5 +1,4 @@
-import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
-import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
+import { getPasteThemeTokens, usePasteColorMode } from "@/theme";
import { Link01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
@@ -17,7 +16,7 @@ import {
parseArrowLottie,
type ParsedArrow,
type ParsedArrowPath,
-} from "../utils/lottie";
+} from "./arrow";
import { PasteQrCode } from "./PasteQrCode";
interface PasteLinkCardProps {
diff --git a/web/apps/paste/src/features/paste/components/PasteQrCode.tsx b/web/apps/paste/src/components/PasteQrCode.tsx
similarity index 98%
rename from web/apps/paste/src/features/paste/components/PasteQrCode.tsx
rename to web/apps/paste/src/components/PasteQrCode.tsx
index 3851513a8b..2a46bb16c0 100644
--- a/web/apps/paste/src/features/paste/components/PasteQrCode.tsx
+++ b/web/apps/paste/src/components/PasteQrCode.tsx
@@ -1,7 +1,4 @@
-import type {
- PasteResolvedMode,
- PasteThemeTokens,
-} from "@/features/paste/theme/pasteThemeTokens";
+import type { PasteResolvedMode, PasteThemeTokens } from "@/theme";
import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
import { Box, IconButton } from "@mui/material";
import useMediaQuery from "@mui/material/useMediaQuery";
diff --git a/web/apps/paste/src/features/paste/components/PasteViewPanel.tsx b/web/apps/paste/src/components/PasteViewPanel.tsx
similarity index 95%
rename from web/apps/paste/src/features/paste/components/PasteViewPanel.tsx
rename to web/apps/paste/src/components/PasteViewPanel.tsx
index 64c94b4b40..4d07ec9eef 100644
--- a/web/apps/paste/src/features/paste/components/PasteViewPanel.tsx
+++ b/web/apps/paste/src/components/PasteViewPanel.tsx
@@ -1,5 +1,6 @@
-import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
-import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
+import { copyTextToClipboard } from "@/browser";
+import { getPasteThemeTokens, usePasteColorMode } from "@/theme";
+import { useConsumePaste } from "@/usePaste";
import { Alert02Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import ContentCopyRoundedIcon from "@mui/icons-material/ContentCopyRounded";
@@ -15,25 +16,15 @@ import type { SubmitEvent } from "react";
import { useEffect, useRef, useState } from "react";
import { pasteTextFieldSx } from "./textFieldSx";
-interface PasteViewPanelProps {
- consuming: boolean;
- consumeError: string | null;
- resolvedText: string | null;
- passwordRequired: boolean;
- passwordError: string | null;
- onSubmitPassword: (password: string) => Promise<void>;
- onCopyText: (value: string) => Promise<void>;
-}
-
-export const PasteViewPanel = ({
- consuming,
- consumeError,
- resolvedText,
- passwordRequired,
- passwordError,
- onSubmitPassword,
- onCopyText,
-}: PasteViewPanelProps) => {
+export const PasteViewPanel = () => {
+ const {
+ consuming,
+ consumeError,
+ resolvedText,
+ passwordRequired,
+ passwordError,
+ submitPassword,
+ } = useConsumePaste();
const { resolvedMode } = usePasteColorMode();
const tokens = getPasteThemeTokens(resolvedMode);
const [copied, setCopied] = useState(false);
@@ -61,7 +52,7 @@ export const PasteViewPanel = ({
if (!password) {
return;
}
- void onSubmitPassword(password);
+ void submitPassword(password);
};
return (
@@ -346,7 +337,7 @@ export const PasteViewPanel = ({
size="small"
disableElevation
onClick={() => {
- void onCopyText(resolvedText)
+ void copyTextToClipboard(resolvedText)
.then(() => {
setCopied(true);
if (
diff --git a/web/apps/paste/src/features/paste/utils/lottie.ts b/web/apps/paste/src/components/arrow.ts
similarity index 100%
rename from web/apps/paste/src/features/paste/utils/lottie.ts
rename to web/apps/paste/src/components/arrow.ts
diff --git a/web/apps/paste/src/features/paste/components/qrCode.ts b/web/apps/paste/src/components/qrCode.ts
similarity index 97%
rename from web/apps/paste/src/features/paste/components/qrCode.ts
rename to web/apps/paste/src/components/qrCode.ts
index 61a98ef501..a180eaff4e 100644
--- a/web/apps/paste/src/features/paste/components/qrCode.ts
+++ b/web/apps/paste/src/components/qrCode.ts
@@ -1,4 +1,4 @@
-import type { PasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
+import type { PasteThemeTokens } from "@/theme";
export interface QRCodeStylingInstance {
append(container: HTMLElement): void;
diff --git a/web/apps/paste/src/features/paste/components/textFieldSx.ts b/web/apps/paste/src/components/textFieldSx.ts
similarity index 96%
rename from web/apps/paste/src/features/paste/components/textFieldSx.ts
rename to web/apps/paste/src/components/textFieldSx.ts
index f1785b42a3..e48d8afe5f 100644
--- a/web/apps/paste/src/features/paste/components/textFieldSx.ts
+++ b/web/apps/paste/src/components/textFieldSx.ts
@@ -1,4 +1,4 @@
-import type { PasteThemeTokens } from "../theme/pasteThemeTokens";
+import type { PasteThemeTokens } from "@/theme";
type PasteTextFieldTokens = Pick<
PasteThemeTokens,
diff --git a/web/apps/paste/src/features/paste/components/PasteHero.tsx b/web/apps/paste/src/features/paste/components/PasteHero.tsx
deleted file mode 100644
index 362a5c4b9b..0000000000
--- a/web/apps/paste/src/features/paste/components/PasteHero.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
-import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
-import { Typography } from "@mui/material";
-
-export const PasteHero = () => {
- const { resolvedMode } = usePasteColorMode();
- const tokens = getPasteThemeTokens(resolvedMode);
-
- return (
- <Typography
- sx={{
- fontSize: { xs: "2rem", md: "2.3rem" },
- lineHeight: 1.05,
- fontWeight: 700,
- color: tokens.text.primary,
- }}
- >
- Ente Paste
- </Typography>
- );
-};
diff --git a/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts b/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts
deleted file mode 100644
index 57a8a92c5d..0000000000
--- a/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { pasteClient } from "@/services/paste";
-import { useState } from "react";
-
-// Duplicate the constant to avoid loading the entire WASM.
-export const MAX_PASTE_CHARS = 4000;
-
-const createErrorMessage = (error: unknown) => {
- if (!(error instanceof Error)) return "Failed to create paste";
- switch (error.name) {
- case "empty_text":
- return "Enter some text first";
- case "text_too_long":
- return `Paste is limited to ${MAX_PASTE_CHARS} characters`;
- case "network":
- return "Couldn't connect to Ente";
- default:
- return "Failed to create paste";
- }
-};
-
-export const useCreatePaste = () => {
- const [inputText, setInputText] = useState("");
- const [creating, setCreating] = useState(false);
- const [createError, setCreateError] = useState<string | null>(null);
- const [createdLink, setCreatedLink] = useState<string | null>(null);
- const [createdLinkPasswordProtected, setCreatedLinkPasswordProtected] =
- useState(false);
-
- const createSecureLink = async (password?: string) => {
- setCreating(true);
- setCreateError(null);
- try {
- const paste = await (
- await pasteClient()
- ).create(window.location.origin, inputText, password);
- setCreatedLink(paste.url);
- setCreatedLinkPasswordProtected(paste.passwordRequired);
- } catch (error) {
- setCreateError(createErrorMessage(error));
- } finally {
- setCreating(false);
- }
- };
-
- return {
- inputText,
- setInputText,
- creating,
- createError,
- createdLink,
- createdLinkPasswordProtected,
- createSecureLink,
- };
-};
diff --git a/web/apps/paste/src/features/paste/hooks/usePasteColorMode.ts b/web/apps/paste/src/features/paste/hooks/usePasteColorMode.ts
deleted file mode 100644
index f212a1c292..0000000000
--- a/web/apps/paste/src/features/paste/hooks/usePasteColorMode.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useColorScheme } from "@mui/material/styles";
-import { useEffect } from "react";
-import type { PasteResolvedMode } from "../theme/pasteThemeTokens";
-
-interface UsePasteColorModeResult {
- resolvedMode: PasteResolvedMode;
-}
-
-export const usePasteColorMode = (): UsePasteColorModeResult => {
- const { systemMode, setMode } = useColorScheme();
-
- useEffect(() => {
- setMode("system");
- }, [setMode]);
-
- const resolvedMode: PasteResolvedMode = systemMode ?? "dark";
-
- return { resolvedMode };
-};
diff --git a/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts b/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts
deleted file mode 100644
index ccb7025233..0000000000
--- a/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useEffect, useState } from "react";
-import type { PageMode } from "../types";
-
-export const usePasteRoute = () => {
- const [mode, setMode] = useState<PageMode>("create");
-
- useEffect(() => {
- const cleanPath = window.location.pathname.replace(/^\/+|\/+$/g, "");
- if (!cleanPath) {
- setMode("create");
- return;
- }
-
- setMode("view");
- }, []);
-
- return mode;
-};
diff --git a/web/apps/paste/src/features/paste/types.ts b/web/apps/paste/src/features/paste/types.ts
deleted file mode 100644
index 3fde21d7be..0000000000
--- a/web/apps/paste/src/features/paste/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type PageMode = "create" | "view";
diff --git a/web/apps/paste/src/pages/_app.tsx b/web/apps/paste/src/pages/_app.tsx
index 4a7550e789..0165c10f9f 100644
--- a/web/apps/paste/src/pages/_app.tsx
+++ b/web/apps/paste/src/pages/_app.tsx
@@ -12,7 +12,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
useSetupLogs({ disableDiskLogs: true });
return (
- <ThemeProvider theme={shareTheme} defaultMode="dark">
+ <ThemeProvider theme={shareTheme} defaultMode="system">
<CustomHead title="Ente Paste" />
<CssBaseline enableColorScheme />
<Component {...pageProps} />
diff --git a/web/apps/paste/src/pages/index.tsx b/web/apps/paste/src/pages/index.tsx
index 4a22a6a0fd..36d1a84b9f 100644
--- a/web/apps/paste/src/pages/index.tsx
+++ b/web/apps/paste/src/pages/index.tsx
@@ -1,39 +1,13 @@
-import { PasteCreatePanel } from "@/features/paste/components/PasteCreatePanel";
-import { PasteFooter } from "@/features/paste/components/PasteFooter";
-import { PasteFrame } from "@/features/paste/components/PasteFrame";
-import { PasteViewPanel } from "@/features/paste/components/PasteViewPanel";
-import { useConsumePaste } from "@/features/paste/hooks/useConsumePaste";
-import { useCreatePaste } from "@/features/paste/hooks/useCreatePaste";
-import { usePasteRoute } from "@/features/paste/hooks/usePasteRoute";
-import {
- copyTextToClipboard,
- shareUrlOrCopy,
-} from "@/features/paste/utils/browser";
+import { PasteCreatePanel } from "@/components/PasteCreatePanel";
+import { PasteFrame } from "@/components/PasteFrame";
+import { PasteViewPanel } from "@/components/PasteViewPanel";
+import { usePasteRoute } from "@/usePaste";
import { Stack } from "@mui/material";
import Head from "next/head";
const Page = () => {
const mode = usePasteRoute();
- const {
- inputText,
- setInputText,
- creating,
- createError,
- createdLink,
- createdLinkPasswordProtected,
- createSecureLink,
- } = useCreatePaste();
-
- const {
- consuming,
- consumeError,
- resolvedText,
- passwordRequired,
- passwordError,
- submitPassword,
- } = useConsumePaste(mode);
-
return (
<>
<Head>
@@ -51,7 +25,7 @@ const Page = () => {
/>
</Head>
- <PasteFrame footer={<PasteFooter />}>
+ <PasteFrame>
<Stack
spacing={2.5}
sx={{
@@ -61,33 +35,9 @@ const Page = () => {
mx: "auto",
}}
>
- {mode === "create" && (
- <PasteCreatePanel
- inputText={inputText}
- creating={creating}
- createError={createError}
- createdLink={createdLink}
- createdLinkPasswordProtected={
- createdLinkPasswordProtected
- }
- onInputChange={setInputText}
- onCreate={createSecureLink}
- onCopyLink={copyTextToClipboard}
- onShareLink={shareUrlOrCopy}
- />
- )}
+ {mode === "create" && <PasteCreatePanel />}
- {mode === "view" && (
- <PasteViewPanel
- consuming={consuming}
- consumeError={consumeError}
- resolvedText={resolvedText}
- passwordRequired={passwordRequired}
- passwordError={passwordError}
- onSubmitPassword={submitPassword}
- onCopyText={copyTextToClipboard}
- />
- )}
+ {mode === "view" && <PasteViewPanel />}
</Stack>
</PasteFrame>
</>
diff --git a/web/apps/paste/src/paste.ts b/web/apps/paste/src/paste.ts
new file mode 100644
index 0000000000..80f8ccaeab
--- /dev/null
+++ b/web/apps/paste/src/paste.ts
@@ -0,0 +1,41 @@
+import { apiOrigin } from "ente-base/origins";
+import { PasteClient } from "ente-paste-wasm";
+
+// Duplicate the constant to avoid loading the entire WASM.
+export const MAX_PASTE_CHARS = 4000;
+
+const createErrorMessages: Record<string, string> = {
+ empty_text: "Enter some text first",
+ text_too_long: `Paste is limited to ${MAX_PASTE_CHARS} characters`,
+ network: "Couldn't connect to Ente",
+};
+
+const consumeErrorMessages: Record<string, string> = {
+ missing_key: "Missing key in URL",
+ invalid_link: "Invalid paste link",
+ invalid_access_token: "Invalid paste link",
+ key_mismatch: "Invalid paste link",
+ invalid_key: "Invalid key in URL",
+ unavailable: "This paste has expired or was already opened",
+ network: "Couldn't connect to Ente",
+ request_failed: "Couldn't open paste",
+ crypto: "Unable to decrypt paste",
+ malformed_payload: "Unable to decrypt paste",
+};
+
+const errorMessage = (
+ error: unknown,
+ messages: Record<string, string>,
+ fallback: string,
+) => (error instanceof Error ? (messages[error.name] ?? fallback) : fallback);
+
+let client: Promise<PasteClient> | undefined;
+
+export const pasteClient = () =>
+ (client ??= apiOrigin().then((origin) => PasteClient.init(origin)));
+
+export const createPasteErrorMessage = (error: unknown) =>
+ errorMessage(error, createErrorMessages, "Failed to create paste");
+
+export const consumePasteErrorMessage = (error: unknown) =>
+ errorMessage(error, consumeErrorMessages, "Paste is unavailable");
diff --git a/web/apps/paste/src/services/paste.ts b/web/apps/paste/src/services/paste.ts
deleted file mode 100644
index a11acad77f..0000000000
--- a/web/apps/paste/src/services/paste.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { apiOrigin } from "ente-base/origins";
-import { PasteClient } from "ente-paste-wasm";
-
-let client: Promise<PasteClient> | undefined;
-
-export const pasteClient = () =>
- (client ??= apiOrigin().then((origin) => PasteClient.init(origin)));
diff --git a/web/apps/paste/src/features/paste/theme/pasteThemeTokens.ts b/web/apps/paste/src/theme.ts
similarity index 97%
rename from web/apps/paste/src/features/paste/theme/pasteThemeTokens.ts
rename to web/apps/paste/src/theme.ts
index 74aa93daf2..269254db14 100644
--- a/web/apps/paste/src/features/paste/theme/pasteThemeTokens.ts
+++ b/web/apps/paste/src/theme.ts
@@ -1,3 +1,5 @@
+import { useColorScheme } from "@mui/material/styles";
+
export type PasteResolvedMode = "light" | "dark";
export interface PasteThemeTokens {
@@ -272,3 +274,9 @@ const lightTokens: PasteThemeTokens = {
export const getPasteThemeTokens = (
mode: PasteResolvedMode,
): PasteThemeTokens => (mode === "light" ? lightTokens : darkTokens);
+
+export const usePasteColorMode = () => {
+ const { systemMode } = useColorScheme();
+ const resolvedMode: PasteResolvedMode = systemMode ?? "dark";
+ return { resolvedMode };
+};
diff --git a/web/apps/paste/src/features/paste/hooks/useConsumePaste.ts b/web/apps/paste/src/usePaste.ts
similarity index 52%
rename from web/apps/paste/src/features/paste/hooks/useConsumePaste.ts
rename to web/apps/paste/src/usePaste.ts
index 461baa151f..b58f015899 100644
--- a/web/apps/paste/src/features/paste/hooks/useConsumePaste.ts
+++ b/web/apps/paste/src/usePaste.ts
@@ -1,34 +1,58 @@
-import { pasteClient } from "@/services/paste";
+import { waitUntilVisible } from "@/browser";
+import {
+ consumePasteErrorMessage,
+ createPasteErrorMessage,
+ pasteClient,
+} from "@/paste";
import { useEffect, useRef, useState } from "react";
-import type { PageMode } from "../types";
-import { waitUntilVisible } from "../utils/browser";
-const consumeErrorMessage = (error: unknown) => {
- if (!(error instanceof Error)) return "Paste is unavailable";
- switch (error.name) {
- case "missing_key":
- return "Missing key in URL";
- case "invalid_link":
- case "invalid_access_token":
- case "key_mismatch":
- return "Invalid paste link";
- case "invalid_key":
- return "Invalid key in URL";
- case "unavailable":
- return "This paste has expired or was already opened";
- case "network":
- return "Couldn't connect to Ente";
- case "request_failed":
- return "Couldn't open paste";
- case "crypto":
- case "malformed_payload":
- return "Unable to decrypt paste";
- default:
- return "Paste is unavailable";
- }
+export const usePasteRoute = () => {
+ const [mode, setMode] = useState<"create" | "view">("create");
+
+ useEffect(() => {
+ const cleanPath = window.location.pathname.replace(/^\/+|\/+$/g, "");
+ setMode(cleanPath ? "view" : "create");
+ }, []);
+
+ return mode;
+};
+
+export const useCreatePaste = () => {
+ const [inputText, setInputText] = useState("");
+ const [creating, setCreating] = useState(false);
+ const [createError, setCreateError] = useState<string | null>(null);
+ const [createdLink, setCreatedLink] = useState<string | null>(null);
+ const [createdLinkPasswordProtected, setCreatedLinkPasswordProtected] =
+ useState(false);
+
+ const createSecureLink = async (password?: string) => {
+ setCreating(true);
+ setCreateError(null);
+ try {
+ const paste = await (
+ await pasteClient()
+ ).create(window.location.origin, inputText, password);
+ setCreatedLink(paste.url);
+ setCreatedLinkPasswordProtected(paste.passwordRequired);
+ } catch (error) {
+ setCreateError(createPasteErrorMessage(error));
+ } finally {
+ setCreating(false);
+ }
+ };
+
+ return {
+ inputText,
+ setInputText,
+ creating,
+ createError,
+ createdLink,
+ createdLinkPasswordProtected,
+ createSecureLink,
+ };
};
-export const useConsumePaste = (mode: PageMode) => {
+export const useConsumePaste = () => {
const [consuming, setConsuming] = useState(false);
const [consumeError, setConsumeError] = useState<string | null>(null);
const [resolvedText, setResolvedText] = useState<string | null>(null);
@@ -38,7 +62,7 @@ export const useConsumePaste = (mode: PageMode) => {
const consumeInFlightRef = useRef(false);
useEffect(() => {
- if (mode !== "view" || openStartedRef.current) return;
+ if (openStartedRef.current) return;
openStartedRef.current = true;
const open = async () => {
@@ -55,14 +79,14 @@ export const useConsumePaste = (mode: PageMode) => {
setResolvedText(paste.text);
}
} catch (error) {
- setConsumeError(consumeErrorMessage(error));
+ setConsumeError(consumePasteErrorMessage(error));
} finally {
setConsuming(false);
}
};
void open();
- }, [mode]);
+ }, []);
const submitPassword = async (password: string) => {
if (!password) {
@@ -80,15 +104,13 @@ export const useConsumePaste = (mode: PageMode) => {
);
setPasswordRequired(false);
} catch (error) {
- if (error instanceof Error && error.name === "incorrect_password") {
+ const code = error instanceof Error ? error.name : undefined;
+ if (code === "incorrect_password") {
setPasswordError("Incorrect paste password");
- } else if (
- error instanceof Error &&
- error.name === "password_required"
- ) {
+ } else if (code === "password_required") {
setPasswordError("Enter the paste password");
} else {
- setConsumeError(consumeErrorMessage(error));
+ setConsumeError(consumePasteErrorMessage(error));
}
} finally {
consumeInFlightRef.current = false;