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

Merge pull request #24 from ClaytonWWilson/profile_display

Browse Source 
Profile display
This commit is contained in:
Leon Liang 2019-10-02 23:30:05 -04:00 committed by GitHub
commit d072a5ff95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,13 @@
import React, { Component } from 'react';
import './App.css';
import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
import { BrowserRouter as Router } from 'react-router-dom';
import Route from 'react-router-dom/Route';
import Navbar from './components/layout/NavBar';
import themeObject from './util/theme';
import home from './pages/Home';
import register from './pages/Register';
@ -16,10 +19,13 @@ import writeMicroblog from './Writing_Microblogs.js';
import edit from './pages/edit.js';
import userLine from './Userline.js';
const theme = createMuiTheme(themeObject);
class App extends Component {
render() {
return (
<Router>
<MuiThemeProvider theme={theme}>
<Router>
<div className='container' >
<Navbar />
</div>
@ -34,6 +40,7 @@ class App extends Component {
</div>
</Router>
</MuiThemeProvider>
);
}
}

2
twistter-frontend/src/util/theme.js
View File

@ -94,4 +94,4 @@ export default {
margin: '20px 10px'
}
}
};
};