diff --git a/twistter-frontend/src/pages/user.js b/twistter-frontend/src/pages/user.js index 763d31f..82add8f 100644 --- a/twistter-frontend/src/pages/user.js +++ b/twistter-frontend/src/pages/user.js @@ -24,7 +24,7 @@ import GridList from '@material-ui/core/GridList'; import GridListTile from '@material-ui/core/GridListTile'; import GridListTileBar from '@material-ui/core/GridListTileBar'; import Paper from '@material-ui/core/Paper'; - +import Container from '@material-ui/core/Container'; // component import '../App.css'; @@ -41,11 +41,26 @@ const styles = { positon: 'relative', float: 'left', marginLeft: 30, - marginTop: 15 + marginTop: 20 }, paper: { // marginLeft: "10%", // marginRight: "10%" + }, + profileImage: { + marginTop: 20 + }, + topicsContainer: { + border: "lightgray solid 1px", + marginTop: 20, + paddingTop: 10, + paddingBottom: 10, + height: 300 + }, + addCircle: { + width: 65, + height: 65, + marginTop: 10 } }; @@ -151,7 +166,7 @@ class user extends Component { { - this.state.imageUrl ? () : + this.state.imageUrl ? () : () } @@ -181,7 +196,6 @@ class user extends Component { ) : null; return ( -
{/* */} @@ -194,24 +208,34 @@ class user extends Component { {imageMarkup} {profileMarkup} - {topicsMarkup} - this.handleChange(event)} - /> - {postMarkup} - + + + {topicsMarkup} + + this.handleChange(event)} + /> + +
);