jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 19:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Webatrice: update deps (#4700)

Browse source 
* save work

* fix reset styling

* fix toast reducer

* update non-react deps

* update react libraries

* remove jquery, use sanitize-html instead

* add missing change

* fix deps and dev deps

* update workflow to target Node 16

* run @mui/codemod to remove @mui/styles

* add default body font size

* update react 17 to 18

* declare enum before use

* add rel attr to links

* fix font sizing issue

* trailing commas

* refactor deep destructuring

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>
This commit is contained in:
Jeremy Letto 2022-11-01 12:41:42 -05:00 • committed by GitHub
parent 5854a635ca
commit 26d7fe2ff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 26225 additions and 3552 deletions
Download patch file Download diff file Expand all files Collapse all files

19
webclient/src/containers/Login/Login.tsx
View file

@ -1,8 +1,8 @@
import { useState, useCallback } from 'react';
import { styled } from '@mui/material/styles';
import { useTranslation } from 'react-i18next';
import { connect } from 'react-redux';
import { Navigate } from 'react-router-dom';
import makeStyles from '@mui/styles/makeStyles';
import Button from '@mui/material/Button';
import Paper from '@mui/material/Paper';
import Typography from '@mui/material/Typography';
@ -20,8 +20,14 @@ import { ServerSelectors, ServerTypes } from 'store';
import './Login.css';
import { useToast } from 'components/Toast';
const useStyles = makeStyles(theme => ({
root: {
const PREFIX = 'Login';
const classes = {
root: `${PREFIX}-root`
};
const Root = styled('div')(({ theme }) => ({
[`&.${classes.root}`]: {
'& .login-content__header': {
color: theme.palette.success.light
},
@ -54,11 +60,10 @@ const useStyles = makeStyles(theme => ({
display: 'flex',
},
},
},
}
}));
const Login = ({ state, description, connectOptions }: LoginProps) => {
const classes = useStyles();
const { t } = useTranslation();
const isConnected = AuthenticationService.isConnected(state);
@ -220,7 +225,7 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
};
return (
<div className={'login overflow-scroll ' + classes.root}>
<Root className={'login overflow-scroll ' + classes.root}>
{ isConnected && <Navigate to={RouteEnum.SERVER} />}
<div className="login__wrapper">
@ -333,7 +338,7 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
onSubmit={handleAccountActivationDialogSubmit}
handleClose={closeActivateAccountDialog}
/>
</div>
</Root>
);
}