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 #18 from ClaytonWWilson/file_org

Browse Source 
File org for twistter-frontend js files
This commit is contained in:
Leon Liang 2019-10-01 19:00:40 -04:00 committed by GitHub
commit ec6e41d16f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,4 +49,5 @@
.container { .container {
margin: 80px auto 0 auto; margin: 80px auto 0 auto;
max-width: 1200px; max-width: 1200px;
color: #1da1f2;
} }

12
twistter-frontend/src/App.js
View File

@ -7,11 +7,11 @@ import { BrowserRouter as Router } from 'react-router-dom';
import Route from 'react-router-dom/Route'; import Route from 'react-router-dom/Route';
import NavBar, { Navbar } from './components/layout/NavBar'; import NavBar, { Navbar } from './components/layout/NavBar';
// Pages import home from './pages/Home';
import home from './Home.js'; import register from './pages/Register';
import register from './Register.js'; import login from './pages/Login';
import login from './Login.js'; import user from './pages/User';
import user from './pages/user';
import writeMicroblog from './Writing_Microblogs.js'; import writeMicroblog from './Writing_Microblogs.js';
import edit from './pages/edit.js'; import edit from './pages/edit.js';
import userLine from './Userline.js'; import userLine from './Userline.js';
@ -20,7 +20,7 @@ class App extends Component {
render() { render() {
return ( return (
<Router> <Router>
<div className='container'> <div className='container' >
<Navbar /> <Navbar />
</div> </div>

4
twistter-frontend/src/components/topic/ChipsArray.js
View File

@ -3,7 +3,9 @@ import { makeStyles } from '@material-ui/core/styles';
import Chip from '@material-ui/core/Chip'; import Chip from '@material-ui/core/Chip';
import Paper from '@material-ui/core/Paper'; import Paper from '@material-ui/core/Paper';
const useStyles = makeStyles(theme => ({
// TODO: fix the style
const styles = makeStyles(theme => ({
root: { root: {
display: 'flex', display: 'flex',
justifyContent: 'center', justifyContent: 'center',

4
twistter-frontend/src/Home.js → twistter-frontend/src/pages/Home.js
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import './App.css'; import '../App.css';
import logo from './images/twistter-logo.png'; import logo from '../images/twistter-logo.png';
class Home extends Component { class Home extends Component {

4
twistter-frontend/src/Login.js → twistter-frontend/src/pages/Login.js
View File

@ -1,8 +1,8 @@
/* eslint-disable */ /* eslint-disable */
import React, { Component } from 'react'; import React, { Component } from 'react';
import './App.css'; import '../App.css';
import logo from './images/twistter-logo.png'; import logo from '../images/twistter-logo.png';
import TextField from '@material-ui/core/TextField'; import TextField from '@material-ui/core/TextField';
class Login extends Component { class Login extends Component {

4
twistter-frontend/src/Register.js → twistter-frontend/src/pages/Register.js
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import './App.css'; import '../App.css';
import logo from './images/twistter-logo.png'; import logo from '../images/twistter-logo.png';
import TextField from '@material-ui/core/TextField'; import TextField from '@material-ui/core/TextField';
class Register extends Component { class Register extends Component {