Merge pull request #22 from sjohn198/Develop

Develop
sjohn198 · Jun 6, 2024 · 716335b · 716335b
2 parents 5b31bfe + 1489632
commit 716335b
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 10 deletions.
diff --git 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.
diff --git 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>

diff --git a/packages/react-frontend/src/Components/Navbar.jsx b/packages/react-frontend/src/Components/Navbar.jsx
@@ -9,6 +9,8 @@ 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 TermsAndConds from "../Views/TermsAndConds";
 import EditProfile from "../Views/EditProfile";
 import "../Styles/Navbar.css";
 
@@ -31,6 +33,8 @@ function App() {
         <Route path="/profile/edit" element={<EditProfile/>} />
         <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>
@@ -43,9 +47,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">
@@ -63,16 +69,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
@@ -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 {
@@ -201,4 +205,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);
 }
diff --git a/packages/react-frontend/src/Views/AboutUs.jsx 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;
diff --git a/packages/react-frontend/src/Views/TermsAndConds.jsx 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;