mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2025-12-16 10:18:48 +00:00
Merge pull request #24 from ClaytonWWilson/profile_display
Profile display
This commit is contained in:
commit
d072a5ff95
@ -2,10 +2,13 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
import './App.css';
|
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 { BrowserRouter as Router } from 'react-router-dom';
|
||||||
import Route from 'react-router-dom/Route';
|
import Route from 'react-router-dom/Route';
|
||||||
import Navbar from './components/layout/NavBar';
|
import Navbar from './components/layout/NavBar';
|
||||||
|
import themeObject from './util/theme';
|
||||||
|
|
||||||
import home from './pages/Home';
|
import home from './pages/Home';
|
||||||
import register from './pages/Register';
|
import register from './pages/Register';
|
||||||
@ -16,10 +19,13 @@ 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';
|
||||||
|
|
||||||
|
const theme = createMuiTheme(themeObject);
|
||||||
|
|
||||||
class App extends Component {
|
class App extends Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<Router>
|
<MuiThemeProvider theme={theme}>
|
||||||
|
<Router>
|
||||||
<div className='container' >
|
<div className='container' >
|
||||||
<Navbar />
|
<Navbar />
|
||||||
</div>
|
</div>
|
||||||
@ -34,6 +40,7 @@ class App extends Component {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</Router>
|
</Router>
|
||||||
|
</MuiThemeProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -94,4 +94,4 @@ export default {
|
|||||||
margin: '20px 10px'
|
margin: '20px 10px'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user