ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 21:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made the date in posts look prettier

Browse Source
This commit is contained in:
Aaron Sun
2019-11-19 23:32:37 -05:00
parent 54ba36abeb
commit e1343d503c
4 changed files with 15 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
twistter-frontend/src/pages/Home.js
View File

@@ -3,6 +3,8 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import axios from 'axios';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
// Material UI and React Router
import Grid from '@material-ui/core/Grid';
@@ -32,6 +34,7 @@ class Home extends Component {
}
render() {
dayjs.extend(relativeTime);
let authenticated = this.props.user.authenticated;
let postMarkup = this.state.posts ? (
@@ -45,7 +48,7 @@ class Home extends Component {
}
</Typography>
<Typography variant="h7"><b>{post.userHandle}</b></Typography>
<Typography variant="body2" color={"textSecondary"}>{post.createdAt}</Typography>
<Typography variant="body2" color={"textSecondary"}>{dayjs(post.createdAt).fromNow()}</Typography>
<br />
<Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
<Typography variant="body2">{post.body}</Typography>

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

@@ -3,6 +3,8 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import axios from 'axios';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
// Material UI and React Router
import { Link } from 'react-router-dom';
@@ -89,6 +91,7 @@ class user extends Component {
}
render() {
dayjs.extend(relativeTime);
let authenticated = this.props.user.authenticated;
let classes = this.props;
let profileMarkup = this.state.profile ? (
@@ -112,12 +115,12 @@ class user extends Component {
<CardContent>
<Typography>
{
this.state.imageUrl ? (<img src={this.state.imageUrl} height="250" width="250" />) :
this.state.imageUrl ? (<img src={this.state.imageUrl} height="50" width="50" />) :
(<img src={noImage} height="50" width="50"/>)
}
</Typography>
<Typography variant="h7"><b>{post.userHandle}</b></Typography>
<Typography variant="body2" color={"textSecondary"}>{post.createdAt}</Typography>
<Typography variant="body2" color={"textSecondary"}>{dayjs(post.createdAt).fromNow()}</Typography>
<br />
<Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
<Typography variant="body2">{post.body}</Typography>