From 022f440cb92127d88b55d76d63c961cdb357e1a2 Mon Sep 17 00:00:00 2001 From: Leon Liang Date: Tue, 1 Oct 2019 12:44:47 -0400 Subject: [PATCH 1/2] added Navigation bar to home page --- functions/handlers/users.js | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/handlers/users.js b/functions/handlers/users.js index 240bfdd..df7465a 100644 --- a/functions/handlers/users.js +++ b/functions/handlers/users.js @@ -1,3 +1,4 @@ +/* eslint-disable promise/catch-or-return */ const {db} = require('../util/admin'); const {validateUpdateProfileInfo} = require('../util/validator'); From 60d1d76839194e8a8d1b0c2408a1739d64f7c551 Mon Sep 17 00:00:00 2001 From: Leon Liang Date: Tue, 1 Oct 2019 12:56:34 -0400 Subject: [PATCH 2/2] Added nav bar --- twistter-frontend/src/App.js | 5 ++++- twistter-frontend/src/components/layout/NavBar.js | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js index 1fea229..e6efa6c 100644 --- a/twistter-frontend/src/App.js +++ b/twistter-frontend/src/App.js @@ -6,6 +6,7 @@ import './App.css'; import { BrowserRouter as Router } from 'react-router-dom'; import Route from 'react-router-dom/Route'; +import NavBar, { Navbar } from './components/layout/NavBar'; import home from './Home.js'; import register from './Register.js'; @@ -18,7 +19,9 @@ class App extends Component { render() { return ( - +
+ +
diff --git a/twistter-frontend/src/components/layout/NavBar.js b/twistter-frontend/src/components/layout/NavBar.js index 9a7d6eb..e4ee5c5 100644 --- a/twistter-frontend/src/components/layout/NavBar.js +++ b/twistter-frontend/src/components/layout/NavBar.js @@ -10,8 +10,8 @@ export class Navbar extends Component { return ( - - + )