Merge branch 'master' into styling-fix

agiledev-students-fall2023 · Dec 7, 2023 · 267476e · 267476e
2 parents 01735a1 + 9e237f2
commit 267476e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/front-end/public/index.html b/front-end/public/index.html
@@ -9,7 +9,7 @@
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="icon" href="%PUBLIC_URL%/logo.png" type="image/png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Bill Balancer</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/front-end/public/logo.png b/front-end/public/logo.png
diff --git a/front-end/src/App.js b/front-end/src/App.js
@@ -122,12 +122,13 @@ function App() {
 // dark mode should not affect Login and ForgotPassword page
 function AppContainer({ isDarkMode, children }) {
   const location = useLocation();
-  // check if the current route is either the login page or the forgot password page
+  // check if the current route is the login page, the forgot password page, or the signup page
   const isLoginPage = location.pathname === "/";
   const isForgotPasswordPage = location.pathname === "/forgot-password";
-  // disable dark mode on Login and ForgotPassword page
+  const isSignupPage = location.pathname === "/signup";
+  // disable dark mode on Login, ForgotPassword, and Signup page
   const containerClass =
-    isDarkMode && !isLoginPage && !isForgotPasswordPage
+    isDarkMode && !isLoginPage && !isForgotPasswordPage && !isSignupPage
       ? "container dark-mode"
       : "container";
   return <div className={containerClass}>{children}</div>;