From 789783a370fee25ff1486942b3c9e1906d2f4493 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Tue, 21 May 2024 18:34:06 +0530 Subject: [PATCH] Inline --- .../src/components/Sidebar/HelpSection.tsx | 62 ------------------- .../photos/src/components/Sidebar/index.tsx | 57 ++++++++++++++++- 2 files changed, 56 insertions(+), 63 deletions(-) delete mode 100644 web/apps/photos/src/components/Sidebar/HelpSection.tsx diff --git a/web/apps/photos/src/components/Sidebar/HelpSection.tsx b/web/apps/photos/src/components/Sidebar/HelpSection.tsx deleted file mode 100644 index 4cc97c414a..0000000000 --- a/web/apps/photos/src/components/Sidebar/HelpSection.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import { t } from "i18next"; -import { useContext } from "react"; - -import EnteSpinner from "@ente/shared/components/EnteSpinner"; -import { Typography } from "@mui/material"; -import { EnteMenuItem } from "components/Menu/EnteMenuItem"; -import { NoStyleAnchor } from "components/pages/sharedAlbum/GoToEnte"; -import isElectron from "is-electron"; -import { AppContext } from "pages/_app"; -import { GalleryContext } from "pages/gallery"; -import exportService from "services/export"; -import { openLink } from "utils/common"; -import { getDownloadAppMessage } from "utils/ui"; - -export default function HelpSection() { - const { setDialogMessage } = useContext(AppContext); - const { openExportModal } = useContext(GalleryContext); - - const openRoadmap = () => - openLink("https://github.com/ente-io/ente/discussions", true); - - const contactSupport = () => openLink("mailto:support@ente.io", true); - - function openExport() { - if (isElectron()) { - openExportModal(); - } else { - setDialogMessage(getDownloadAppMessage()); - } - } - - return ( - <> - - - - {t("SUPPORT")} - - - } - variant="secondary" - /> - - ) - } - variant="secondary" - /> - - ); -} diff --git a/web/apps/photos/src/components/Sidebar/index.tsx b/web/apps/photos/src/components/Sidebar/index.tsx index b076bd6bc0..efa10a4b0b 100644 --- a/web/apps/photos/src/components/Sidebar/index.tsx +++ b/web/apps/photos/src/components/Sidebar/index.tsx @@ -1,19 +1,25 @@ import log from "@/next/log"; import { savedLogs } from "@/next/log-web"; +import EnteSpinner from "@ente/shared/components/EnteSpinner"; import { downloadAsFile } from "@ente/shared/utils"; import { Divider, Stack } from "@mui/material"; import Typography from "@mui/material/Typography"; import DeleteAccountModal from "components/DeleteAccountModal"; import { EnteMenuItem } from "components/Menu/EnteMenuItem"; +import { NoStyleAnchor } from "components/pages/sharedAlbum/GoToEnte"; import { t } from "i18next"; +import isElectron from "is-electron"; import { AppContext } from "pages/_app"; +import { GalleryContext } from "pages/gallery"; import { useContext, useEffect, useState } from "react"; import { Trans } from "react-i18next"; +import exportService from "services/export"; import { CollectionSummaries } from "types/collection"; +import { openLink } from "utils/common"; +import { getDownloadAppMessage } from "utils/ui"; import { isInternalUser } from "utils/user"; import { testUpload } from "../../../tests/upload.test"; import HeaderSection from "./Header"; -import HelpSection from "./HelpSection"; import ShortcutSection from "./ShortcutSection"; import UtilitySection from "./UtilitySection"; import { DrawerSidebar } from "./styledComponents"; @@ -51,6 +57,55 @@ export default function Sidebar({ ); } +const HelpSection: React.FC = () => { + const { setDialogMessage } = useContext(AppContext); + const { openExportModal } = useContext(GalleryContext); + + const openRoadmap = () => + openLink("https://github.com/ente-io/ente/discussions", true); + + const contactSupport = () => openLink("mailto:support@ente.io", true); + + function openExport() { + if (isElectron()) { + openExportModal(); + } else { + setDialogMessage(getDownloadAppMessage()); + } + } + + return ( + <> + + + + {t("SUPPORT")} + + + } + variant="secondary" + /> + + ) + } + variant="secondary" + /> + + ); +}; + const ExitSection: React.FC = () => { const { setDialogMessage, logout } = useContext(AppContext);