diff --git a/twistter-frontend/src/pages/user.js b/twistter-frontend/src/pages/user.js index a91dffe..ec3fe4f 100644 --- a/twistter-frontend/src/pages/user.js +++ b/twistter-frontend/src/pages/user.js @@ -16,6 +16,7 @@ import Button from '@material-ui/core/Button'; import GridList from '@material-ui/core/GridList'; import GridListTile from '@material-ui/core/GridListTile'; import GridListTileBar from '@material-ui/core/GridListTileBar'; +import Container from '@material-ui/core/Container'; // component import Userline from '../Userline'; @@ -27,11 +28,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 } }; @@ -113,9 +129,9 @@ class user extends Component { ); let imageMarkup = this.state.imageUrl ? ( - + ) : ( - + ); // FIX: This needs to check if user's profile page being displayed @@ -130,31 +146,6 @@ class user extends Component { ) : null; return ( - // - // - //

Posts go here

- //
- // - // {editButtonMarkup} - // {imageMarkup} - // {profileMarkup} - // {topicsMarkup} - // this.handleChange(event)} - // /> - // - // - //
{/* */} @@ -167,24 +158,34 @@ class user extends Component { {imageMarkup} {profileMarkup} - {topicsMarkup} - this.handleChange(event)} - /> -

posts here

- + + + {topicsMarkup} + + this.handleChange(event)} + /> + + {/*
*/}