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 branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24

Browse Source
This commit is contained in:
Aaron Sun 2019-10-01 13:57:44 -04:00
commit 13b57eedc6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
functions/handlers/users.js
View File

@ -1,3 +1,4 @@
/* eslint-disable promise/catch-or-return */
const {db} = require('../util/admin'); const {db} = require('../util/admin');
const {validateUpdateProfileInfo} = require('../util/validator'); const {validateUpdateProfileInfo} = require('../util/validator');

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

@ -6,6 +6,7 @@ import './App.css';
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, { Navbar } from './components/layout/NavBar';
import home from './Home.js'; import home from './Home.js';
import register from './Register.js'; import register from './Register.js';
@ -18,7 +19,9 @@ class App extends Component {
render() { render() {
return ( return (
<Router> <Router>
<div className='container'>
<Navbar />
</div>
<div className="app"> <div className="app">
<Route exact path="/" component={home}/> <Route exact path="/" component={home}/>

8
twistter-frontend/src/components/layout/NavBar.js
View File

@ -10,8 +10,8 @@ export class Navbar extends Component {
return ( return (
<AppBar> <AppBar>
<ToolBar> <ToolBar>
<Button component={ Link } to='/user'> <Button component={ Link } to='/'>
User Home
</Button> </Button>
<Button component={ Link } to='/login'> <Button component={ Link } to='/login'>
Login Login
@ -19,9 +19,7 @@ export class Navbar extends Component {
<Button component={ Link } to='/register'> <Button component={ Link } to='/register'>
Register Register
</Button> </Button>
<Button component={ Link } to='/'>
Home
</Button>
</ToolBar> </ToolBar>
</AppBar> </AppBar>
) )