From f0c9284700b0375f2f47e5ac1a6c15fd18e2ee75 Mon Sep 17 00:00:00 2001
From: Jizhen Wang <jzwang43@gmail.com>
Date: Tue, 30 Nov 2021 02:43:13 -0800
Subject: [PATCH] Update NavBar.js

---
 frontend/src/components/NavBar.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/NavBar.js b/frontend/src/components/NavBar.js
index 79924a5be..36ceae1e9 100644
--- a/frontend/src/components/NavBar.js
+++ b/frontend/src/components/NavBar.js
@@ -359,7 +359,12 @@ class NavBar extends React.Component<{
                                 <Link to='/account/signup'>
                                     <Button color='inherit'>Sign Up</Button>
                                 </Link>
-                                <Link to='/account/login'>
+                                <Link
+                                    to={{
+                                        pathname: '/account/login',
+                                        state: { from: this.props.location },
+                                    }}
+                                >
                                     <Button color='inherit'>Login</Button>
                                 </Link>
                             </React.Fragment>