From 21e9f3342ffa2c55592dec2c3d42315544561f9b Mon Sep 17 00:00:00 2001
From: jkalsi1 <jkalsi@calpoly.edu>
Date: Fri, 31 May 2024 09:57:20 -0700
Subject: [PATCH 1/6] about us started

---
 packages/react-frontend/src/Components/Navbar.jsx |  2 ++
 packages/react-frontend/src/Styles/Navbar.css     | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/react-frontend/src/Components/Navbar.jsx b/packages/react-frontend/src/Components/Navbar.jsx
index 8b320a2..13f54e2 100644
--- a/packages/react-frontend/src/Components/Navbar.jsx
+++ b/packages/react-frontend/src/Components/Navbar.jsx
@@ -9,6 +9,7 @@ import AddOrders from "../Views/AddOrders";
 import OrderStatistics from "../Views/OrderStatistics";
 import ProfilePage from "../Views/Profile";
 import ProductPage from "../Views/ProductPage"; // Import ProductPage component
+import AboutUs from "../Views/AboutUs";
 import "../Styles/Navbar.css";
 
 function App() {
@@ -29,6 +30,7 @@ function App() {
         <Route path="/profile" element={<ProfilePage user_id={user} />} />
         <Route path="/" element={<HomePage />} />
         <Route path="/product/:id" element={<ProductPage />} />
+        <Route path="/about-us" element={<AboutUs/>}/>
       </Routes>
       <Footer />
     </Router>
diff --git a/packages/react-frontend/src/Styles/Navbar.css b/packages/react-frontend/src/Styles/Navbar.css
index a82c54e..0e58198 100644
--- a/packages/react-frontend/src/Styles/Navbar.css
+++ b/packages/react-frontend/src/Styles/Navbar.css
@@ -201,4 +201,14 @@
 
 .input-container button:hover {
   background-color: #123CE2;
+}
+
+.about-us-container {
+  max-width: 600px;
+  margin: 0 auto;
+  padding: 20px;
+  border: 1px solid #ccc;
+  border-radius: 8px;
+  background-color: #f9f9f9;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
\ No newline at end of file

From 56b2f0dba409151fe0506d5814b99d30c2faf24a Mon Sep 17 00:00:00 2001
From: jkalsi1 <jkalsi@calpoly.edu>
Date: Fri, 31 May 2024 09:57:44 -0700
Subject: [PATCH 2/6] files added

---
 packages/react-frontend/src/Views/AboutUs.jsx | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 packages/react-frontend/src/Views/AboutUs.jsx

diff --git a/packages/react-frontend/src/Views/AboutUs.jsx b/packages/react-frontend/src/Views/AboutUs.jsx
new file mode 100644
index 0000000..9544966
--- /dev/null
+++ b/packages/react-frontend/src/Views/AboutUs.jsx
@@ -0,0 +1,28 @@
+import React from "react";
+import "../Styles/Profile.css";
+import "../Styles/Navbar.css";
+
+function AboutUs() {
+
+  return (
+    <div>
+      <div className="about-us-container">
+        <div className="profile-bio">
+          <h3>About Us</h3>
+          <div>
+            <text>
+                SafeHaven is a company dedicated to optimizing storage management solutions for businesses. 
+                Our product scales easily, displays critical order insights, and is affordably priced.
+            </text>            
+          </div>
+          <div>
+            <text>Choose SafeHaven!</text>
+          </div>
+        </div>
+      </div>
+      <div className="bottom-margin"></div>
+    </div>
+  );
+}
+
+export default AboutUs;
\ No newline at end of file

From 7231ca254d22146ba120499dd8029fbb3c8de730 Mon Sep 17 00:00:00 2001
From: jkalsi1 <jkalsi@calpoly.edu>
Date: Mon, 3 Jun 2024 09:10:46 -0700
Subject: [PATCH 3/6] ready to push

---
 .../react-frontend/src/Components/Navbar.jsx  |  2 +
 .../src/Views/TermsAndConds.jsx               | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 packages/react-frontend/src/Views/TermsAndConds.jsx

diff --git a/packages/react-frontend/src/Components/Navbar.jsx b/packages/react-frontend/src/Components/Navbar.jsx
index 13f54e2..80967fd 100644
--- a/packages/react-frontend/src/Components/Navbar.jsx
+++ b/packages/react-frontend/src/Components/Navbar.jsx
@@ -10,6 +10,7 @@ import OrderStatistics from "../Views/OrderStatistics";
 import ProfilePage from "../Views/Profile";
 import ProductPage from "../Views/ProductPage"; // Import ProductPage component
 import AboutUs from "../Views/AboutUs";
+import TermsAndConds from "../Views/TermsAndConds";
 import "../Styles/Navbar.css";
 
 function App() {
@@ -31,6 +32,7 @@ function App() {
         <Route path="/" element={<HomePage />} />
         <Route path="/product/:id" element={<ProductPage />} />
         <Route path="/about-us" element={<AboutUs/>}/>
+        <Route path="/terms-and-conditions" element={<TermsAndConds/>}/>
       </Routes>
       <Footer />
     </Router>
diff --git a/packages/react-frontend/src/Views/TermsAndConds.jsx b/packages/react-frontend/src/Views/TermsAndConds.jsx
new file mode 100644
index 0000000..91e5e0a
--- /dev/null
+++ b/packages/react-frontend/src/Views/TermsAndConds.jsx
@@ -0,0 +1,49 @@
+import React from "react";
+import "../Styles/Profile.css";
+import "../Styles/Navbar.css";
+
+function TermsAndConds() {
+
+  return (
+    <div>
+      <div className="about-us-container">
+        <div className="profile-bio">
+          <h3>Terms and Conditions</h3>
+          <h4>1. Introduction</h4>
+            <div>
+            <text>
+                Welcome to SafeHaven ("Company", "we", "our", "us"). These Terms and Conditions ("Terms") govern your use of SafeHaven ("Software"). By accessing or using the Software, you agree to be bound by these Terms. If you disagree with any part of the terms, you may not access the Software.
+            </text>            
+            </div>
+            <h4>2. License</h4>
+            <div>
+            <text>
+                SafeHaven grants you a non-exclusive, non-transferable, limited license to use the Software strictly in accordance with these Terms.
+            </text>            
+            </div>
+            <h4>3. Restrictions</h4>
+            <div>
+            <text>
+                You agree not to modify, distribute, sell, or lease any part of the Software, nor reverse engineer or attempt to extract the source code of the Software.
+            </text>            
+            </div>
+            <h4>4. Updates</h4>
+            <div>
+            <text>
+                SafeHaven may provide updates that may modify or delete certain features of the Software. You agree that SafeHaven has no obligation to provide any updates or to continue providing or enabling any particular features of the Software.
+            </text>            
+            </div>
+            <h4>5. Termination</h4>
+            <div>
+            <text>
+                SafeHaven may terminate or suspend your access to the Software immediately, without prior notice or liability, for any reason. Upon termination, your right to use the Software will cease immediately.
+            </text>            
+            </div>
+        </div>
+      </div>
+      
+    </div>
+  );
+}
+
+export default TermsAndConds;
\ No newline at end of file

From 9f5f69d32c859363847ccad1c5124ab6ea85af91 Mon Sep 17 00:00:00 2001
From: jkalsi1 <jkalsi@calpoly.edu>
Date: Mon, 3 Jun 2024 09:38:04 -0700
Subject: [PATCH 4/6] home button click takes to /

---
 packages/react-frontend/src/Components/Navbar.jsx | 14 ++++++++------
 packages/react-frontend/src/Styles/Navbar.css     | 12 ++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/react-frontend/src/Components/Navbar.jsx b/packages/react-frontend/src/Components/Navbar.jsx
index 80967fd..39f383b 100644
--- a/packages/react-frontend/src/Components/Navbar.jsx
+++ b/packages/react-frontend/src/Components/Navbar.jsx
@@ -45,9 +45,11 @@ function NavBar() {
       <nav className="navbar">
         <ul className="nav-list">
           <li>
-            <img className="logo" src="../assets/yes.png" />
+            <a href="/">
+              <img className="logo" src="../assets/yes.png"/>
+            </a>
           </li>
-          <li>
+          <li className="hover">
             <Link to="/inventory">Inventory</Link>
           </li>
           <li className="dropdown">
@@ -65,16 +67,16 @@ function NavBar() {
             </ul>
           </li>
           <div className="left">
-            <li>
+            <li className="hover">
               <Link to="/signup">Sign up</Link>
             </li>
-            <li>
+            <li className="hover">
               <Link to="/login">Login</Link>
             </li>
-            <li>
+            <li className="hover">
               <Link to="/profile">Profile</Link>
             </li>
-            <li>
+            <li className="hover">
               <Link to="/logout">Logout</Link>
             </li>
           </div>
diff --git a/packages/react-frontend/src/Styles/Navbar.css b/packages/react-frontend/src/Styles/Navbar.css
index 0e58198..32471f6 100644
--- a/packages/react-frontend/src/Styles/Navbar.css
+++ b/packages/react-frontend/src/Styles/Navbar.css
@@ -24,7 +24,11 @@
   text-decoration: none;
 }
 
-.nav-list li a:hover {
+.hover a:hover {
+  background-color: #2980b9;
+}
+
+.dropdown a:hover {
   background-color: #2980b9;
 }
 
@@ -77,13 +81,13 @@
 }
 
 .logo {
-  padding: 0 1rem;
   color: red;
   display: block;
   text-align: center;
-  padding: 14px 20px;
   text-decoration: none;
-  margin-top: -12px;
+  width: 5rem;
+  max-height: 3rem;
+  margin-top: -10px;
 }
 
 .title {

From f9c533ead652f1d1af492d43977824eb03360192 Mon Sep 17 00:00:00 2001
From: jkalsi1 <102557286+jkalsi1@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:53:24 -0700
Subject: [PATCH 5/6] Update README.md with project description

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 78c4d1f..f33f19d 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,7 @@ Also, make sure to create a .env file in express-backend and add
 `MONGODB_URI = "your_connection_string"`
 and
 `TOKEN_SECRET = 1234`
+
+Project Description:
+SafeHaven is a company dedicated to optimizing storage management solutions for businesses. Our product scales easily, displays critical order insights, and is affordably priced.
+We offer a seamless inventory and order tracking system, suiting the needs of businesses in many industries.

From 1489632b60cf4244601da085c9185cad525f80a9 Mon Sep 17 00:00:00 2001
From: Cameron <cameron.maloney@warriorlife.net>
Date: Wed, 5 Jun 2024 10:49:32 -0700
Subject: [PATCH 6/6] Change head

---
 packages/react-frontend/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-frontend/index.html b/packages/react-frontend/index.html
index 0c589ec..d9b9d47 100644
--- a/packages/react-frontend/index.html
+++ b/packages/react-frontend/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="shortcut icon" href="#" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React</title>
   </head>