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

Converted tabs back to spaces

Browse Source
This commit is contained in:
Clayton Wilson 2019-10-29 23:02:36 -04:00
parent 7cc8a3f11f
commit 947e5b01a4
1 changed files with 41 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
twistter-frontend/src/pages/user.js
View File

@ -37,16 +37,16 @@ const MyChip = styled(Chip)({
}); });
const styles = { const styles = {
button: { button: {
positon: 'relative', positon: 'relative',
float: 'left', float: 'left',
marginLeft: 30, marginLeft: 30,
marginTop: 15 marginTop: 15
}, },
paper: { paper: {
// marginLeft: "10%", // marginLeft: "10%",
// marginRight: "10%" // marginRight: "10%"
} }
}; };
class user extends Component { class user extends Component {
@ -181,96 +181,39 @@ class user extends Component {
) : null; ) : null;
return ( return (
// <Grid container spacing={24}>
// <Grid item sm={4} xs={8}>
// {imageMarkup}
// {profileMarkup}
// {topicsMarkup}
// <TextField
// id="newTopic"
// label="new topic"
// defaultValue=""
// margin="normal"
// variant="outlined"
// value={this.state.newTopic}
// onChange={(event) => this.handleChange(event)}
// />
// <AddCircle
// color="primary"
// clickable
// onClick={this.handleAddCircle}
// />
// <br />
// <Grid container direction="column">
// <Grid item>
// {
// authenticated &&
// <Button
// style={{width:150, marginBottom: 10, marginTop: 5}}
// component={ Link }
// to='/edit'
// variant="outlined"
// color="primary"
// >
// Edit Profile
// </Button>}
// </Grid>
// <Grid item>
// {
// authenticated &&
// this.state.profile === 'Admin' &&
// <Button
// style={{width:150}}
// component={ Link }
// variant="outlined"
// color="primary"
// to='/verify'
// >
// Verify Users
// </Button>}
// </Grid>
// </Grid>
// </Grid>
// <Grid item sm={4} xs={8}>
// {postMarkup}
// </Grid>
// <Grid item sm={4} xs={8}>
// <Writing_Microblogs />
// </Grid>
//       
// </Grid>
<div> <div>
<Grid container> {/* <Paper className={classes.paper}> */}
<Grid item sm>
{editButtonMarkup} <Grid container>
</Grid> <Grid item sm>
<Grid item sm> {editButtonMarkup}
<Grid container direction="column"> </Grid>
<Grid item sm> <Grid item sm>
{imageMarkup} <Grid container direction="column">
{profileMarkup} <Grid item sm>
{topicsMarkup} {imageMarkup}
<TextField {profileMarkup}
id="newTopic" {topicsMarkup}
label="new topic" <TextField
defaultValue="" id="newTopic"
margin="normal" label="new topic"
variant="outlined" defaultValue=""
value={this.state.newTopic} margin="normal"
onChange={(event) => this.handleChange(event)} variant="outlined"
/> value={this.state.newTopic}
<AddCircle color="primary" clickable onClick={this.handleAddCircle} /> onChange={(event) => this.handleChange(event)}
</Grid> />
<Grid item sm> <AddCircle color="primary" clickable onClick={this.handleAddCircle} />
<p>posts here</p> </Grid>
</Grid> <Grid item sm>
</Grid> {postMarkup}
</Grid> </Grid>
<Grid item sm /> </Grid>
</Grid> </Grid>
</div> <Grid item sm />
</Grid>
</div>
); );
} }
} }