From bac2cd771987838b2752e10dd1eea52901b04aec Mon Sep 17 00:00:00 2001
From: Leon Liang <liang268@purdue.edu>
Date: Thu, 3 Oct 2019 11:06:14 -0400
Subject: [PATCH 1/2] modified app.css to adjust the app background

---
 twistter-frontend/package-lock.json |  6 +++---
 twistter-frontend/src/App.css       |  4 ++++
 twistter-frontend/src/pages/user.js | 22 +++++++++++++++-------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/twistter-frontend/package-lock.json b/twistter-frontend/package-lock.json
index f7ffc91..ef130a9 100644
--- a/twistter-frontend/package-lock.json
+++ b/twistter-frontend/package-lock.json
@@ -454,9 +454,9 @@
           }
         },
         "is-buffer": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
         }
       }
     },
diff --git a/twistter-frontend/src/App.css b/twistter-frontend/src/App.css
index 8189649..6c1497d 100644
--- a/twistter-frontend/src/App.css
+++ b/twistter-frontend/src/App.css
@@ -1,3 +1,7 @@
+html,
+body {
+  background-color: rgb(245, 245, 245);
+}
 .app {
   font-family: "Segoe UI";
   font-size: large;
diff --git a/twistter-frontend/src/pages/user.js b/twistter-frontend/src/pages/user.js
index a9faf1b..9b67f3a 100644
--- a/twistter-frontend/src/pages/user.js
+++ b/twistter-frontend/src/pages/user.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import React, { Component } from 'react';
+import axios from 'axios';
 //import '../App.css';
 import { makeStyles, styled } from '@material-ui/core/styles';
 import Grid from '@material-ui/core/Grid';
@@ -12,20 +13,27 @@ const PostCard = styled(Card)({
   border: 3,
   borderRadius: 3,
   height:225,
-  width: 645,
+  width: 345,
   padding: '0 30px',
 });
 
 class user extends Component {
+  componentDidMount(){
+    //TODO: get user details
+    //TODO: get posts
+  }
+
   render() {
     
     return (
-      <div>
-        <h1>User Profile</h1>
-        <br/><br/>
-        <PostCard>Some card and content</PostCard>
-        <br/><br/>
-      </div>
+      <Grid container spacing={16}>
+        <Grid item sm={8} xs={12}>
+          <p>Post</p>
+        </Grid>
+        <Grid item sm={4} xs={12}>
+          <PostCard>Profile here</PostCard>
+        </Grid>
+      </Grid>
     )
   }
 }

From 3cbcb5054c554fbe9d47ff0cf550f3302678db5b Mon Sep 17 00:00:00 2001
From: Leon Liang <liang268@purdue.edu>
Date: Thu, 3 Oct 2019 11:46:50 -0400
Subject: [PATCH 2/2] Modifed user.js using grid displaying

---
 twistter-frontend/src/pages/user.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/twistter-frontend/src/pages/user.js b/twistter-frontend/src/pages/user.js
index 9b67f3a..f1113a0 100644
--- a/twistter-frontend/src/pages/user.js
+++ b/twistter-frontend/src/pages/user.js
@@ -7,16 +7,20 @@ import Grid from '@material-ui/core/Grid';
 import Card from '@material-ui/core/Card';
 import CardMedia from '@material-ui/core/CardMedia';
 import CardContent from '@material-ui/core/CardContent';
+import Chip from '@material-ui/core/Chip';
+import Paper from '@material-ui/core/Paper';
+
 
 const PostCard = styled(Card)({
   background: 'linear-gradient(45deg, #1da1f2 90%)',
   border: 3,
   borderRadius: 3,
-  height:225,
+  height:325,
   width: 345,
   padding: '0 30px',
 });
 
+
 class user extends Component {
   componentDidMount(){
     //TODO: get user details
@@ -24,17 +28,19 @@ class user extends Component {
   }
 
   render() {
-    
     return (
       <Grid container spacing={16}>
         <Grid item sm={8} xs={12}>
           <p>Post</p>
         </Grid>
         <Grid item sm={4} xs={12}>
-          <PostCard>Profile here</PostCard>
+          <PostCard>
+            <CardMedia image="./no-img-png" />
+            <CardContent>Username</CardContent>
+          </PostCard>
         </Grid>
       </Grid>
-    )
+    );
   }
 }