From 0536156e3fab4ba4293033642e14cbcb4fcb9e8a Mon Sep 17 00:00:00 2001
From: Serena Li <serena.li.usa@gmail.com>
Date: Fri, 23 Dec 2022 20:56:58 -0800
Subject: [PATCH 1/2] link login, register, passwordforgot pages to each other

---
 frontend/src/views/login.js           | 23 ++++++++++++++++-------
 frontend/src/views/passwordForgot.jsx | 21 ++++++++++++++++++++-
 frontend/src/views/register.js        | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/login.js b/frontend/src/views/login.js
index 977b1be6a..71ead329d 100644
--- a/frontend/src/views/login.js
+++ b/frontend/src/views/login.js
@@ -219,13 +219,22 @@ class LoginRegister extends Component {
               </div>
               {buttons}
               <br />
-              <a
-                href={"/password_forgot"}
-                className="btn btn-secondary btn-block btn-fill"
-              >
-                Forgot Password
-              </a>
-
+              <div className="row text-center">
+                <div className="col-xs-6">
+                  <a
+                    href={"/register"}
+                  >
+                    Register
+                  </a>
+                </div>
+                <div className="col-xs-6 border-right">
+                  <a
+                    href={"/password_forgot"}
+                  >
+                    Forgot Password
+                  </a>
+                </div>
+              </div>
               <div className="clearfix" />
             </div>
           </div>
diff --git a/frontend/src/views/passwordForgot.jsx b/frontend/src/views/passwordForgot.jsx
index 77ff4d937..f5404b466 100644
--- a/frontend/src/views/passwordForgot.jsx
+++ b/frontend/src/views/passwordForgot.jsx
@@ -49,6 +49,25 @@ class PasswordForgot extends Component {
           left: "0px",
         }}
       >
+        <h1
+          style={{
+            textAlign: "center",
+            fontWeight: "bold",
+            color: "white",
+          }}
+        >
+          Battlecode
+        </h1>
+        <p
+          style={{
+            textAlign: "center",
+            fontWeight: "bold",
+            color: "white",
+          }}
+        >
+          {/* Note that this page does not change depending on episode */}
+          Enter your email below to receive a password reset email. Contact battlecode@mit.edu if you encounter any issues. 
+        </p>
         {error && (
           <div
             className="card"
@@ -85,7 +104,7 @@ class PasswordForgot extends Component {
           className="card"
           style={{
             width: Math.min(window.innerWidth, 350),
-            margin: error ? "20px auto" : "100px auto",
+            margin: error ? "20px auto" : "30px auto",
           }}
         >
           <div className="content">
diff --git a/frontend/src/views/register.js b/frontend/src/views/register.js
index 0c16cd941..b82776803 100644
--- a/frontend/src/views/register.js
+++ b/frontend/src/views/register.js
@@ -268,6 +268,24 @@ class Register extends Component {
                 />
               </div>
               {buttons}
+              <br />
+              <div className="row text-center">
+                <div className="col-xs-6">
+                  <a
+                    href={"/login"}
+                  >
+                    Log In
+                  </a>
+                </div>
+                <div className="col-xs-6">
+                  <a
+                    href={"/password_forgot"}
+                  >
+                    Forgot Password
+                  </a>
+                </div>
+                </div>
+              <div className="clearfix" />
             </div>
           </div>
         </form>

From edb3a4411e63e7269ac3cec40d80f4903159db26 Mon Sep 17 00:00:00 2001
From: Serena Li <serena.li.usa@gmail.com>
Date: Fri, 23 Dec 2022 21:12:39 -0800
Subject: [PATCH 2/2] add links to passwordforgot page

---
 frontend/src/views/login.js           | 15 +++------------
 frontend/src/views/passwordForgot.jsx | 11 ++++++++++-
 frontend/src/views/register.js        | 17 ++++-------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/frontend/src/views/login.js b/frontend/src/views/login.js
index 71ead329d..290a56823 100644
--- a/frontend/src/views/login.js
+++ b/frontend/src/views/login.js
@@ -218,21 +218,12 @@ class LoginRegister extends Component {
                 </div>
               </div>
               {buttons}
-              <br />
-              <div className="row text-center">
+              <div className="row text-center" style={{ marginTop: "10px" }}>
                 <div className="col-xs-6">
-                  <a
-                    href={"/register"}
-                  >
-                    Register
-                  </a>
+                  <a href={"/register"}>Register</a>
                 </div>
                 <div className="col-xs-6 border-right">
-                  <a
-                    href={"/password_forgot"}
-                  >
-                    Forgot Password
-                  </a>
+                  <a href={"/password_forgot"}>Forgot Password</a>
                 </div>
               </div>
               <div className="clearfix" />
diff --git a/frontend/src/views/passwordForgot.jsx b/frontend/src/views/passwordForgot.jsx
index f5404b466..f0586a623 100644
--- a/frontend/src/views/passwordForgot.jsx
+++ b/frontend/src/views/passwordForgot.jsx
@@ -66,7 +66,8 @@ class PasswordForgot extends Component {
           }}
         >
           {/* Note that this page does not change depending on episode */}
-          Enter your email below to receive a password reset email. Contact battlecode@mit.edu if you encounter any issues. 
+          Enter your email below to receive a password reset email. Contact
+          battlecode@mit.edu if you encounter any issues.
         </p>
         {error && (
           <div
@@ -125,6 +126,14 @@ class PasswordForgot extends Component {
               >
                 Forgot Password
               </button>
+              <div className="row text-center" style={{ marginTop: "10px" }}>
+                <div className="col-xs-6 border-right">
+                  <a href={"/login"}>Log In</a>
+                </div>
+                <div className="col-xs-6">
+                  <a href={"/register"}>Register</a>
+                </div>
+              </div>
               <div className="clearfix" />
             </form>
           </div>
diff --git a/frontend/src/views/register.js b/frontend/src/views/register.js
index b82776803..288072612 100644
--- a/frontend/src/views/register.js
+++ b/frontend/src/views/register.js
@@ -268,23 +268,14 @@ class Register extends Component {
                 />
               </div>
               {buttons}
-              <br />
-              <div className="row text-center">
+              <div className="row text-center" style={{ marginTop: "10px" }}>
                 <div className="col-xs-6">
-                  <a
-                    href={"/login"}
-                  >
-                    Log In
-                  </a>
+                  <a href={"/login"}>Log In</a>
                 </div>
                 <div className="col-xs-6">
-                  <a
-                    href={"/password_forgot"}
-                  >
-                    Forgot Password
-                  </a>
-                </div>
+                  <a href={"/password_forgot"}>Forgot Password</a>
                 </div>
+              </div>
               <div className="clearfix" />
             </div>
           </div>