beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[web] Show email on password screen (#1664)

Browse source 
<img width="292" alt="Screenshot 2024-05-09 at 11 39 46"
src="https://github.com/ente-io/ente/assets/24503581/6e0a615e-473d-4eed-b2b9-7e65ea57b578">
This commit is contained in:
Manav Rathi 2024-05-09 11:43:13 +05:30 committed by GitHub
parent 70878e8f54 75d2396398
commit 9089f0b28d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/apps/photos/src/components/Directory/index.tsx
View file

@ -1,8 +1,7 @@
import { ensureElectron } from "@/next/electron";
import log from "@/next/log";
import LinkButton from "@ente/shared/components/LinkButton";
import { Tooltip } from "@mui/material";
import { styled } from "@mui/material/styles";
import { Tooltip, styled } from "@mui/material";
const DirectoryPathContainer = styled(LinkButton)(
({ width }) => `

3
web/apps/photos/src/components/PhotoViewer/styledComponents/LivePhotoBtn.tsx
View file

@ -1,5 +1,4 @@
import { Paper } from "@mui/material";
import { styled } from "@mui/material/styles";
import { Paper, styled } from "@mui/material";
export const LivePhotoBtnContainer = styled(Paper)`
border-radius: 4px;

2
web/apps/photos/src/components/WatchFolder.tsx
View file

@ -25,8 +25,8 @@ import {
Stack,
Tooltip,
Typography,
styled,
} from "@mui/material";
import { styled } from "@mui/material/styles";
import { CollectionMappingChoiceModal } from "components/Upload/CollectionMappingChoiceModal";
import { t } from "i18next";
import { AppContext } from "pages/_app";

20
web/packages/accounts/pages/credentials.tsx
View file

@ -5,7 +5,6 @@ import { VerticallyCentered } from "@ente/shared/components/Container";
import EnteSpinner from "@ente/shared/components/EnteSpinner";
import FormPaper from "@ente/shared/components/Form/FormPaper";
import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer";
import FormPaperTitle from "@ente/shared/components/Form/FormPaper/Title";
import LinkButton from "@ente/shared/components/LinkButton";
import VerifyMasterPasswordForm, {
VerifyMasterPasswordFormProps,
@ -39,6 +38,7 @@ import {
setKey,
} from "@ente/shared/storage/sessionStorage";
import { KeyAttributes, User } from "@ente/shared/user/types";
import { Typography, styled } from "@mui/material";
import { t } from "i18next";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
@ -259,7 +259,7 @@ export default function Credentials({ appContext, appName }: PageProps) {
return (
<VerticallyCentered>
<FormPaper style={{ minWidth: "320px" }}>
<FormPaperTitle>{t("PASSWORD")}</FormPaperTitle>
<Title>{user.email}</Title>
<VerifyMasterPasswordForm
buttonText={t("VERIFY_PASSPHRASE")}
@ -281,3 +281,19 @@ export default function Credentials({ appContext, appName }: PageProps) {
</VerticallyCentered>
);
}
const Title: React.FC<React.PropsWithChildren> = ({ children }) => {
return (
<Title_>
<Typography variant="h2">{t("PASSWORD")}</Typography>
<Typography color="text.faint">{children}</Typography>
</Title_>
);
};
const Title_ = styled("div")`
margin-block-end: 4rem;
display: flex;
flex-direction: column;
gap: 8px;
`;