Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Login page rework #1703

Merged
merged 4 commits into from
Dec 20, 2021
Merged

Login page rework #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf1e0db
Rework login page
dominik-zeglen Dec 17, 2021
3a9af58
Remove outline
dominik-zeglen Dec 20, 2021
fabf4c3
Fix logo and footer placement
dominik-zeglen Dec 20, 2021
f496ade
Sort imports
dominik-zeglen Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
339 changes: 141 additions & 198 deletions assets/images/login-background.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 14 additions & 8 deletions assets/images/logo-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion assets/images/logo-light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"@material-ui/styles": "^4.11.4",
"@saleor/macaw-ui": "^0.3.0-a.5",
"@saleor/macaw-ui": "^0.3.0-a.6",
"@saleor/sdk": "^0.4.0",
"@sentry/react": "^6.0.0",
"@types/faker": "^5.1.6",
Expand Down
36 changes: 22 additions & 14 deletions src/auth/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import SVG from "react-inlinesvg";

const useStyles = makeStyles(
theme => ({
footer: {
position: "absolute",
bottom: theme.spacing(4)
},
logo: {
display: "block",
height: 40,
Expand All @@ -22,7 +26,7 @@ const useStyles = makeStyles(
flexDirection: "column",
height: "100vh",
justifyContent: "center",
padding: theme.spacing(6),
padding: theme.spacing(5, 6, 4, 6),
width: "100%"
},
mainPanelContent: {
Expand All @@ -33,27 +37,30 @@ const useStyles = makeStyles(
width: 328
},
"@media (min-width: 1440px)": {
width: 464
width: 380
},
margin: "auto",
width: "100%"
},
root: {
[theme.breakpoints.up("lg")]: {
gridTemplateColumns: "376px 1fr"
gridTemplateColumns: "560px 1fr"
},
"@media (min-width: 1440px)": {
gridTemplateColumns: "520px 1fr"
gridTemplateColumns: "780px 1fr"
},
display: "grid",
gridTemplateColumns: "1fr",
gap: theme.spacing(3),
height: "100vh",
overflow: "hidden",
position: "relative",
width: "100vw"
},
sidebar: {
[theme.breakpoints.up("lg")]: {
display: "block"
alignItems: "center",
display: "flex"
},
display: "none"
},
Expand All @@ -76,18 +83,19 @@ const Layout: React.FC = props => {

return (
<div className={classes.root}>
<div className={classes.mainPanel}>
<SVG
className={classes.logo}
src={themeType === "dark" ? saleorDarkLogo : saleorLightLogo}
/>
<div className={classes.mainPanelContent}>{children}</div>
<footer className={classes.footer}>
©2021 Saleor Commerce. All rights reserved
</footer>
</div>
<div className={classes.sidebar}>
<SVG className={classes.sidebarArt} src={backgroundArt} />
</div>
<div className={classes.mainPanel}>
<div className={classes.mainPanelContent}>
<SVG
className={classes.logo}
src={themeType === "dark" ? saleorDarkLogo : saleorLightLogo}
/>
{children}
</div>
</div>
</div>
);
};
Expand Down
121 changes: 50 additions & 71 deletions src/auth/components/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,14 @@ import { AvailableExternalAuthentications_shop_availableExternalAuthentications
import { FormSpacer } from "@saleor/components/FormSpacer";
import { SubmitPromise } from "@saleor/hooks/useForm";
import { commonMessages } from "@saleor/intl";
import { Button, makeStyles } from "@saleor/macaw-ui";
import { Button, EyeIcon, IconButton } from "@saleor/macaw-ui";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";

import useStyles from "../styles";
import LoginForm, { LoginFormData } from "./form";
import { getErrorMessage } from "./messages";

const useStyles = makeStyles(
theme => ({
buttonContainer: {
display: "flex",
justifyContent: "flex-end"
},
link: {
color: theme.palette.primary.main,
cursor: "pointer",
textDecoration: "underline"
},
loading: {
alignItems: "center",
display: "flex",
minHeight: "80vh",
justifyContent: "center"
},
loginButton: {
width: 140
},
panel: {
"& span": {
color: theme.palette.error.contrastText
},
background: theme.palette.error.main,
borderRadius: theme.spacing(),
marginBottom: theme.spacing(3),
padding: theme.spacing(1.5)
}
}),
{ name: "LoginCard" }
);

export interface LoginCardProps {
error?: UserContextError;
disabled: boolean;
Expand All @@ -72,6 +40,7 @@ const LoginCard: React.FC<LoginCardProps> = props => {

const classes = useStyles(props);
const intl = useIntl();
const [showPassword, setShowPassword] = React.useState(false);

if (loading) {
return (
Expand All @@ -85,11 +54,15 @@ const LoginCard: React.FC<LoginCardProps> = props => {
<LoginForm onSubmit={onSubmit}>
{({ change: handleChange, data, submit }) => (
<>
<Typography variant="h3" className={classes.header}>
<FormattedMessage
defaultMessage="Sign In"
description="card header"
/>
</Typography>
{error && (
<div className={classes.panel} data-test="loginErrorMessage">
<Typography variant="caption">
{getErrorMessage(error, intl)}
</Typography>
{getErrorMessage(error, intl)}
</div>
)}
<TextField
Expand All @@ -106,22 +79,44 @@ const LoginCard: React.FC<LoginCardProps> = props => {
disabled={disabled}
/>
<FormSpacer />
<TextField
fullWidth
autoComplete="password"
label={intl.formatMessage({
defaultMessage: "Password"
})}
name="password"
onChange={handleChange}
type="password"
value={data.password}
inputProps={{
"data-test": "password"
}}
disabled={disabled}
/>
<FormSpacer />
<div className={classes.passwordWrapper}>
<TextField
fullWidth
autoComplete="password"
label={intl.formatMessage({
defaultMessage: "Password"
})}
name="password"
onChange={handleChange}
type={showPassword ? "text" : "password"}
value={data.password}
inputProps={{
"data-test": "password"
}}
disabled={disabled}
/>
{/* Not using endAdornment as it looks weird with autocomplete */}
<IconButton
className={classes.showPasswordBtn}
variant="secondary"
hoverOutline={false}
onMouseDown={() => setShowPassword(true)}
onMouseUp={() => setShowPassword(false)}
>
<EyeIcon />
</IconButton>
</div>
<Typography
component="a"
className={classes.link}
onClick={onPasswordRecovery}
variant="body2"
>
<FormattedMessage
defaultMessage="Forgot password?"
description="description"
/>
</Typography>
<div className={classes.buttonContainer}>
<Button
className={classes.loginButton}
Expand All @@ -131,26 +126,10 @@ const LoginCard: React.FC<LoginCardProps> = props => {
type="submit"
data-test="submit"
>
<FormattedMessage defaultMessage="Login" description="button" />
<FormattedMessage defaultMessage="Sign in" description="button" />
</Button>
</div>
<FormSpacer />
<Typography>
<FormattedMessage
defaultMessage="Forgot password? {resetPasswordLink}"
description="description"
values={{
resetPasswordLink: (
<a className={classes.link} onClick={onPasswordRecovery}>
<FormattedMessage
defaultMessage="Use this link to recover it"
description="link"
/>
</a>
)
}}
/>
</Typography>

{externalAuthentications.length > 0 && (
<>
<FormSpacer />
Expand Down
Loading