ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 02:08:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing UI

Browse Source
This commit is contained in:
shobhitm23 2019-11-01 15:36:22 -04:00
parent 16567e2373
commit d3bfd8b5f3
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
twistter-frontend/src/pages/Login.js
View File

@ -16,13 +16,15 @@ import withStyles from "@material-ui/core/styles/withStyles";
// Redux stuff // Redux stuff
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { loginUser } from '../redux/actions/userActions'; import { loginUser } from '../redux/actions/userActions';
import { fontFamily } from '@material-ui/system';
//Theme
const styles = { const styles = {
form: { form: {
textAlign: "center" textAlign: "center"
}, },
textField: { textField: {
marginBottom: 30 marginBottom: 20
}, },
pageTitle: { pageTitle: {
// marginTop: 20, // marginTop: 20,
@ -34,6 +36,9 @@ const styles = {
}, },
progress: { progress: {
position: "absolute" position: "absolute"
},
p: {
fontFamily: "cursive",
} }
}; };
@ -104,9 +109,12 @@ export class Login extends Component {
<Grid item sm /> <Grid item sm />
<Grid item sm> <Grid item sm>
<img src={logo} className="app-logo" alt="logo" /> <img src={logo} className="app-logo" alt="logo" />
<Typography variant="h2" className={classes.pageTitle}> <br></br>
Log in to Twistter <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
<b>Log in to Twistter</b>
<br></br>
</Typography> </Typography>
<br></br>
<form noValidate onSubmit={this.handleSubmit}> <form noValidate onSubmit={this.handleSubmit}>
<TextField <TextField
id="email" id="email"

23
twistter-frontend/src/pages/Signup.js
View File

@ -16,13 +16,17 @@ import withStyles from "@material-ui/core/styles/withStyles";
// Redux stuff // Redux stuff
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { signupUser } from '../redux/actions/userActions'; import { signupUser } from '../redux/actions/userActions';
import { border } from '@material-ui/system';
const styles = { const styles = {
form: { form: {
textAlign: "center" textAlign: "center"
}, },
textField: { textField: {
marginBottom: 30 marginBottom: 20,
//border: "1px solid #234",
display: "inline-block",
boxSizing: "border-box",
}, },
pageTitle: { pageTitle: {
marginBottom: 40 marginBottom: 40
@ -33,6 +37,14 @@ const styles = {
}, },
progress: { progress: {
position: "absolute" position: "absolute"
},
div: {
borderRadius: "5px",
backgroundColor: "grey",
padding: "20px",
},
p: {
fontFamily: "Segoe UI",
} }
}; };
@ -92,9 +104,12 @@ export class Signup extends Component {
<Grid item sm /> <Grid item sm />
<Grid item sm> <Grid item sm>
<img src={logo} className="app-logo" alt="logo" /> <img src={logo} className="app-logo" alt="logo" />
<Typography variant="h2" className={classes.pageTitle}> <br></br>
Create a new account <Typography variant="p" className={classes.pageTitle}>
<b>Create a new account</b>
<br></br>
</Typography> </Typography>
<br></br>
<form noValidate onSubmit={this.handleSubmit}> <form noValidate onSubmit={this.handleSubmit}>
<TextField <TextField
id="handle" id="handle"
@ -146,6 +161,8 @@ export class Signup extends Component {
onChange={this.handleChange} onChange={this.handleChange}
fullWidth fullWidth
/> />
<br></br>
<br></br>
<Button <Button
type="submit" type="submit"
variant="contained" variant="contained"