From 4a723bc2f63e2cc825fe0688a389e9b0fa2282e7 Mon Sep 17 00:00:00 2001 From: "Satuti@99" Date: Wed, 19 Jun 2024 09:52:55 +0530 Subject: [PATCH 1/4] Updated the footer Add all necessary functionalities --- client/package-lock.json | 39 +- client/src/App.jsx | 6 + client/src/Components/Footer.jsx | 84 ++-- client/src/Pages/AboutUs.jsx | 63 +++ client/src/Pages/OurTeam.jsx | 66 +++ client/src/Pages/TermsOfUse.jsx | 83 ++++ client/src/assets/Jayesh.png | Bin 0 -> 185561 bytes client/src/assets/Terms.png | Bin 0 -> 31657 bytes client/src/assets/nishit.png | Bin 0 -> 86887 bytes client/src/assets/vinayak.png | Bin 0 -> 52906 bytes client/src/assets/yash.png | Bin 0 -> 291910 bytes server/package-lock.json | 786 ++++++++++++++++++------------- server/package.json | 2 +- 13 files changed, 737 insertions(+), 392 deletions(-) create mode 100644 client/src/Pages/AboutUs.jsx create mode 100644 client/src/Pages/OurTeam.jsx create mode 100644 client/src/Pages/TermsOfUse.jsx create mode 100644 client/src/assets/Jayesh.png create mode 100644 client/src/assets/Terms.png create mode 100644 client/src/assets/nishit.png create mode 100644 client/src/assets/vinayak.png create mode 100644 client/src/assets/yash.png diff --git a/client/package-lock.json b/client/package-lock.json index 872d1b0..3945263 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4704,11 +4704,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -6222,9 +6223,10 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -6875,6 +6877,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -8498,9 +8501,10 @@ } }, "node_modules/metro/node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "license": "MIT", "peer": true, "engines": { "node": ">=8.3.0" @@ -9563,9 +9567,10 @@ } }, "node_modules/react-devtools-core/node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "license": "MIT", "peer": true, "engines": { "node": ">=8.3.0" @@ -11136,6 +11141,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -11693,9 +11699,10 @@ } }, "node_modules/ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", + "license": "MIT", "peer": true, "dependencies": { "async-limiter": "~1.0.0" diff --git a/client/src/App.jsx b/client/src/App.jsx index efcedac..71961cf 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -43,6 +43,9 @@ import Admin from "./Pages/AdminPage/Admin"; import Contact from "./Components/Contact"; import PrivacyPolicy from "./Pages/PrivacyPolicy"; import Licensing from "./Pages/Licensing"; +import TermsOfUse from "./Pages/TermsOfUse"; +import AboutUs from "./Pages/AboutUs"; +import OurTeam from "./Pages/OurTeam"; function App() { // const token = cookies.get("TOKEN"); @@ -133,6 +136,9 @@ const locomotiveScroll = new LocomotiveScroll(); }> }/> }/> + }/> + }/> + }/> }> }> diff --git a/client/src/Components/Footer.jsx b/client/src/Components/Footer.jsx index 7bfee42..e473a78 100644 --- a/client/src/Components/Footer.jsx +++ b/client/src/Components/Footer.jsx @@ -1,14 +1,19 @@ -/** @format */ - import React from "react"; import { Link } from "react-router-dom"; export default function Footer() { + const scrollToTop = () => { + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + }; + return ( -