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

fix merge

Browse Source
This commit is contained in:
Clayton Wilson 2019-11-05 17:38:11 -05:00
commit 7a6ac8499c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,9 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import axios from 'axios'; import axios from 'axios';
//import '../App.css'; //import '../App.css';
// Material-UI
// Material UI and React Router import withStyles from '@material-ui/core/styles/withStyles';
import { makeStyles, styled } from '@material-ui/core/styles'; import { makeStyles, styled } from '@material-ui/core/styles';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import Card from '@material-ui/core/Card'; import Card from '@material-ui/core/Card';
@ -19,11 +19,10 @@ import Typography from '@material-ui/core/Typography';
import AddCircle from '@material-ui/icons/AddCircle'; import AddCircle from '@material-ui/icons/AddCircle';
import TextField from '@material-ui/core/TextField'; import TextField from '@material-ui/core/TextField';
import VerifiedIcon from '@material-ui/icons/CheckSharp'; import VerifiedIcon from '@material-ui/icons/CheckSharp';
import withStyles from '@material-ui/core/styles/withStyles'; import Paper from '@material-ui/core/Paper';
import GridList from '@material-ui/core/GridList'; import GridList from '@material-ui/core/GridList';
import GridListTile from '@material-ui/core/GridListTile'; import GridListTile from '@material-ui/core/GridListTile';
import GridListTileBar from '@material-ui/core/GridListTileBar'; import GridListTileBar from '@material-ui/core/GridListTileBar';
import Paper from '@material-ui/core/Paper';
import Container from '@material-ui/core/Container'; import Container from '@material-ui/core/Container';
// component // component