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

Merge pull request #28 from ClaytonWWilson/profile_display

Browse Source 
Profile display
This commit is contained in:
Leon Liang 2019-10-03 11:53:31 -04:00 committed by GitHub
commit c2ef222cf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twistter-frontend/package-lock.json generated
View File

@ -454,9 +454,9 @@
} }
}, },
"is-buffer": { "is-buffer": {
"version": "2.0.3", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
"integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
} }
} }
}, },

4
twistter-frontend/src/App.css
View File

@ -1,3 +1,7 @@
html,
body {
background-color: rgb(245, 245, 245);
}
.app { .app {
font-family: "Segoe UI"; font-family: "Segoe UI";
font-size: large; font-size: large;

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

@ -1,32 +1,46 @@
/* eslint-disable */ /* eslint-disable */
import React, { Component } from 'react'; import React, { Component } from 'react';
import axios from 'axios';
//import '../App.css'; //import '../App.css';
import { makeStyles, styled } from '@material-ui/core/styles'; import { makeStyles, styled } from '@material-ui/core/styles';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import Card from '@material-ui/core/Card'; import Card from '@material-ui/core/Card';
import CardMedia from '@material-ui/core/CardMedia'; import CardMedia from '@material-ui/core/CardMedia';
import CardContent from '@material-ui/core/CardContent'; 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)({ const PostCard = styled(Card)({
background: 'linear-gradient(45deg, #1da1f2 90%)', background: 'linear-gradient(45deg, #1da1f2 90%)',
border: 3, border: 3,
borderRadius: 3, borderRadius: 3,
height:225, height:325,
width: 645, width: 345,
padding: '0 30px', padding: '0 30px',
}); });
class user extends Component {
render() {
class user extends Component {
componentDidMount(){
//TODO: get user details
//TODO: get posts
}
render() {
return ( return (
<div> <Grid container spacing={16}>
<h1>User Profile</h1> <Grid item sm={8} xs={12}>
<br/><br/> <p>Post</p>
<PostCard>Some card and content</PostCard> </Grid>
<br/><br/> <Grid item sm={4} xs={12}>
</div> <PostCard>
) <CardMedia image="./no-img-png" />
<CardContent>Username</CardContent>
</PostCard>
</Grid>
</Grid>
);
} }
} }