From a07b42c98c8d794a180f26ad3ec1848764fcff9f Mon Sep 17 00:00:00 2001
From: Daniel Zhang <z331317@gmail.com>
Date: Sun, 30 Jun 2024 13:31:14 -0400
Subject: [PATCH 1/3] Fix login and create placeholder landing page

---
 frontend/src/App.tsx                          |  4 +-
 frontend/src/components/auth/Login.tsx        | 63 +++----------------
 frontend/src/components/pages/LandingPage.tsx | 11 ++++
 3 files changed, 20 insertions(+), 58 deletions(-)
 create mode 100644 frontend/src/components/pages/LandingPage.tsx

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 612aab5..5181a87 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -6,7 +6,7 @@ import Login from "./components/auth/Login";
 import Signup from "./components/auth/Signup";
 import PrivateRoute from "./components/auth/PrivateRoute";
 import CreatePage from "./components/pages/CreatePage";
-import Default from "./components/pages/Default";
+import LandingPage from "./components/pages/LandingPage";
 import DisplayPage from "./components/pages/DisplayPage";
 import SimpleEntityCreatePage from "./components/pages/SimpleEntityCreatePage";
 import SimpleEntityDisplayPage from "./components/pages/SimpleEntityDisplayPage";
@@ -55,7 +55,7 @@ const App = (): React.ReactElement => {
             <Switch>
               <Route exact path={Routes.LOGIN_PAGE} component={Login} />
               <Route exact path={Routes.SIGNUP_PAGE} component={Signup} />
-              <PrivateRoute exact path={Routes.HOME_PAGE} component={Default} />
+              <PrivateRoute exact path={Routes.HOME_PAGE} component={LandingPage} />
               <PrivateRoute
                 exact
                 path={Routes.CREATE_ENTITY_PAGE}
diff --git a/frontend/src/components/auth/Login.tsx b/frontend/src/components/auth/Login.tsx
index 295aeda..1a8d864 100644
--- a/frontend/src/components/auth/Login.tsx
+++ b/frontend/src/components/auth/Login.tsx
@@ -1,44 +1,19 @@
 import React, { useContext, useState } from "react";
-import { Redirect, useHistory } from "react-router-dom";
-import {
-  GoogleLogin,
-  GoogleLoginResponse,
-  GoogleLoginResponseOffline,
-} from "react-google-login";
+import { Redirect } from "react-router-dom"; 
 
 import authAPIClient from "../../APIClients/AuthAPIClient";
-import { HOME_PAGE, SIGNUP_PAGE } from "../../constants/Routes";
+import { HOME_PAGE } from "../../constants/Routes";
 import AuthContext from "../../contexts/AuthContext";
 import { AuthenticatedUser } from "../../types/AuthTypes";
-
-type GoogleResponse = GoogleLoginResponse | GoogleLoginResponseOffline;
-
-type GoogleErrorResponse = {
-  error: string;
-  details: string;
-};
-
+ 
 const Login = (): React.ReactElement => {
   const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext);
   const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const history = useHistory();
-
+  const [password, setPassword] = useState(""); 
   const onLogInClick = async () => {
     const user: AuthenticatedUser = await authAPIClient.login(email, password);
     setAuthenticatedUser(user);
-  };
-
-  const onSignUpClick = () => {
-    history.push(SIGNUP_PAGE);
-  };
-
-  const onGoogleLoginSuccess = async (tokenId: string) => {
-    const user: AuthenticatedUser = await authAPIClient.loginWithGoogle(
-      tokenId,
-    );
-    setAuthenticatedUser(user);
-  };
+  }; 
 
   if (authenticatedUser) {
     return <Redirect to={HOME_PAGE} />;
@@ -73,32 +48,8 @@ const Login = (): React.ReactElement => {
             Log In
           </button>
         </div>
-        <GoogleLogin
-          clientId={process.env.REACT_APP_OAUTH_CLIENT_ID || ""}
-          buttonText="Login with Google"
-          onSuccess={(response: GoogleResponse): void => {
-            if ("tokenId" in response) {
-              onGoogleLoginSuccess(response.tokenId);
-            } else {
-              // eslint-disable-next-line no-alert
-              window.alert(response);
-            }
-          }}
-          onFailure={(error: GoogleErrorResponse) =>
-            // eslint-disable-next-line no-alert
-            window.alert(JSON.stringify(error))
-          }
-        />
-      </form>
-      <div>
-        <button
-          className="btn btn-primary"
-          type="button"
-          onClick={onSignUpClick}
-        >
-          Sign Up
-        </button>
-      </div>
+         
+      </form> 
     </div>
   );
 };
diff --git a/frontend/src/components/pages/LandingPage.tsx b/frontend/src/components/pages/LandingPage.tsx
new file mode 100644
index 0000000..f350c28
--- /dev/null
+++ b/frontend/src/components/pages/LandingPage.tsx
@@ -0,0 +1,11 @@
+import React from "react";
+
+const GetPage = (): React.ReactElement => {
+  return (
+    <div style={{ textAlign: "center", width: "25%", margin: "0px auto" }}>
+      <h1>Pets</h1> 
+    </div>
+  );
+};
+
+export default GetPage;

From 717ed31970ceaecd59ec7eaf9c3d09178f250b10 Mon Sep 17 00:00:00 2001
From: Daniel Zhang <z331317@gmail.com>
Date: Sun, 30 Jun 2024 13:35:03 -0400
Subject: [PATCH 2/3] Fix linting

---
 frontend/src/App.tsx                          |  6 +++++-
 frontend/src/components/auth/Login.tsx        | 11 +++++------
 frontend/src/components/pages/LandingPage.tsx |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 5181a87..bd1a9f8 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -55,7 +55,11 @@ const App = (): React.ReactElement => {
             <Switch>
               <Route exact path={Routes.LOGIN_PAGE} component={Login} />
               <Route exact path={Routes.SIGNUP_PAGE} component={Signup} />
-              <PrivateRoute exact path={Routes.HOME_PAGE} component={LandingPage} />
+              <PrivateRoute
+                exact
+                path={Routes.HOME_PAGE}
+                component={LandingPage}
+              />
               <PrivateRoute
                 exact
                 path={Routes.CREATE_ENTITY_PAGE}
diff --git a/frontend/src/components/auth/Login.tsx b/frontend/src/components/auth/Login.tsx
index 1a8d864..d74b22e 100644
--- a/frontend/src/components/auth/Login.tsx
+++ b/frontend/src/components/auth/Login.tsx
@@ -1,19 +1,19 @@
 import React, { useContext, useState } from "react";
-import { Redirect } from "react-router-dom"; 
+import { Redirect } from "react-router-dom";
 
 import authAPIClient from "../../APIClients/AuthAPIClient";
 import { HOME_PAGE } from "../../constants/Routes";
 import AuthContext from "../../contexts/AuthContext";
 import { AuthenticatedUser } from "../../types/AuthTypes";
- 
+
 const Login = (): React.ReactElement => {
   const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext);
   const [email, setEmail] = useState("");
-  const [password, setPassword] = useState(""); 
+  const [password, setPassword] = useState("");
   const onLogInClick = async () => {
     const user: AuthenticatedUser = await authAPIClient.login(email, password);
     setAuthenticatedUser(user);
-  }; 
+  };
 
   if (authenticatedUser) {
     return <Redirect to={HOME_PAGE} />;
@@ -48,8 +48,7 @@ const Login = (): React.ReactElement => {
             Log In
           </button>
         </div>
-         
-      </form> 
+      </form>
     </div>
   );
 };
diff --git a/frontend/src/components/pages/LandingPage.tsx b/frontend/src/components/pages/LandingPage.tsx
index f350c28..a95525c 100644
--- a/frontend/src/components/pages/LandingPage.tsx
+++ b/frontend/src/components/pages/LandingPage.tsx
@@ -3,7 +3,7 @@ import React from "react";
 const GetPage = (): React.ReactElement => {
   return (
     <div style={{ textAlign: "center", width: "25%", margin: "0px auto" }}>
-      <h1>Pets</h1> 
+      <h1>Pets</h1>
     </div>
   );
 };

From 1bb65e74f87085d98cf2a61962b6ca4c5a756457 Mon Sep 17 00:00:00 2001
From: Daniel Zhang <z331317@gmail.com>
Date: Tue, 2 Jul 2024 20:41:11 -0400
Subject: [PATCH 3/3] Renamed Landing Page

---
 frontend/src/App.tsx                                          | 4 ++--
 .../src/components/pages/{LandingPage.tsx => PetListPage.tsx} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename frontend/src/components/pages/{LandingPage.tsx => PetListPage.tsx} (100%)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index bd1a9f8..40e2834 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -6,7 +6,7 @@ import Login from "./components/auth/Login";
 import Signup from "./components/auth/Signup";
 import PrivateRoute from "./components/auth/PrivateRoute";
 import CreatePage from "./components/pages/CreatePage";
-import LandingPage from "./components/pages/LandingPage";
+import PetListPage from "./components/pages/PetListPage";
 import DisplayPage from "./components/pages/DisplayPage";
 import SimpleEntityCreatePage from "./components/pages/SimpleEntityCreatePage";
 import SimpleEntityDisplayPage from "./components/pages/SimpleEntityDisplayPage";
@@ -58,7 +58,7 @@ const App = (): React.ReactElement => {
               <PrivateRoute
                 exact
                 path={Routes.HOME_PAGE}
-                component={LandingPage}
+                component={PetListPage}
               />
               <PrivateRoute
                 exact
diff --git a/frontend/src/components/pages/LandingPage.tsx b/frontend/src/components/pages/PetListPage.tsx
similarity index 100%
rename from frontend/src/components/pages/LandingPage.tsx
rename to frontend/src/components/pages/PetListPage.tsx