From 5573ea3e410b8a18fc352c27f49cf79fc1a45bf7 Mon Sep 17 00:00:00 2001
From: Majoodeh <Majdhussein144@gmail.com>
Date: Sun, 8 Mar 2026 19:46:37 +0100
Subject: [PATCH 1/2] feat: add privacy policy, terms and conditions, and
 return policy pages

---
 client/package-lock.json                      |  35 +++-
 client/src/components/footer/Footer.tsx       |  36 +++-
 client/src/pages/legal/PrivacyPolicyPage.tsx  | 190 ++++++++++++++++++
 client/src/pages/legal/ReturnPolicyPage.tsx   | 152 ++++++++++++++
 .../pages/legal/TermsAndConditionsPage.tsx    | 138 +++++++++++++
 .../router/routesVariables/pathVariables.ts   |   3 +
 .../router/routesVariables/publicRoutes.tsx   |  16 ++
 server/package-lock.json                      |  12 ++
 8 files changed, 564 insertions(+), 18 deletions(-)
 create mode 100644 client/src/pages/legal/PrivacyPolicyPage.tsx
 create mode 100644 client/src/pages/legal/ReturnPolicyPage.tsx
 create mode 100644 client/src/pages/legal/TermsAndConditionsPage.tsx

diff --git a/client/package-lock.json b/client/package-lock.json
index fcf79b1c..aaa77f5e 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -130,6 +130,7 @@
       "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.28.6",
         "@babel/generator": "^7.28.6",
@@ -2123,6 +2124,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -2146,6 +2148,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -4901,6 +4904,7 @@
       "resolved": "https://registry.npmjs.org/@stream-io/video-client/-/video-client-1.43.0.tgz",
       "integrity": "sha512-DIP24SzyvvhCZ0ac6jrZ2ks4G9KWYCySlVGaRrRGVpsqQNINW6tOXXuKCCoZAQPlv279M3Jt1hf/fQjZMqNtvg==",
       "license": "See license in LICENSE",
+      "peer": true,
       "dependencies": {
         "@protobuf-ts/runtime": "^2.11.1",
         "@protobuf-ts/runtime-rpc": "^2.11.1",
@@ -5338,8 +5342,7 @@
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -5461,6 +5464,7 @@
       "integrity": "sha512-Lpo8kgb/igvMIPeNV2rsYKTgaORYdO1XGVZ4Qz3akwOj0ySGYMPlQWa8BaLn0G63D1aSaAQ5ldR06wCpChQCjA==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -5471,6 +5475,7 @@
       "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -5614,6 +5619,7 @@
       "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.54.0",
         "@typescript-eslint/types": "8.54.0",
@@ -6541,6 +6547,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7112,6 +7119,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -7265,6 +7273,7 @@
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
       "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -7734,8 +7743,7 @@
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/dotenv": {
       "version": "17.2.3",
@@ -8120,6 +8128,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -8180,6 +8189,7 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -11317,6 +11327,7 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -11892,7 +11903,6 @@
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -12713,6 +12723,7 @@
       "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -12858,6 +12869,7 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -13054,7 +13066,6 @@
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -13070,7 +13081,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -13163,6 +13173,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
       "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13182,6 +13193,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
       "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -13194,6 +13206,7 @@
       "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.71.1.tgz",
       "integrity": "sha512-9SUJKCGKo8HUSsCO+y0CtqkqI5nNuaDqTxyqPsZPqIwudpj4rCrAz/jZV+jn57bx5gtZKOh3neQu94DXMc+w5w==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
@@ -13210,8 +13223,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/react-refresh": {
       "version": "0.18.0",
@@ -14397,6 +14409,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -14645,6 +14658,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -14888,6 +14902,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -14979,6 +14994,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15459,6 +15475,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/client/src/components/footer/Footer.tsx b/client/src/components/footer/Footer.tsx
index 91d2af27..fa8fb981 100644
--- a/client/src/components/footer/Footer.tsx
+++ b/client/src/components/footer/Footer.tsx
@@ -1,3 +1,6 @@
+import { Link } from "react-router-dom";
+import { publicRoutesVariables } from "../../router/routesVariables/pathVariables";
+
 export default function Footer({ className }: { className?: string }) {
   return (
     <footer
@@ -5,10 +8,10 @@ export default function Footer({ className }: { className?: string }) {
         className || "relative bg-[#1a161f] backdrop-blur-md w-full py-8 pl-6"
       }
     >
-      <div className="max-w-7xl mx-auto px-4 flex flex-col lg:flex-row justify-between items-start lg:items-center text-white gap-8 lg:gap-0">
-        <div className="max-w-sm w-full lg:w-auto">
-          <h3 className="font-bold text-2xl mb-4">StudyBridge</h3>
-          <p className="text-sm opacity-65 leading-6">
+      <div className="flex lg:flex-row flex-col justify-between items-start lg:items-center gap-8 lg:gap-0 mx-auto px-4 max-w-7xl text-white">
+        <div className="w-full lg:w-auto max-w-sm">
+          <h3 className="mb-4 font-bold text-2xl">StudyBridge</h3>
+          <p className="opacity-65 text-sm leading-6">
             Our platform offers an easy-to-use learning experience with video
             lessons, live video calls, and fast, secure payments — all in one
             place.
@@ -16,11 +19,26 @@ export default function Footer({ className }: { className?: string }) {
         </div>
 
         <div className="w-full lg:w-36">
-          <h4 className="text-sm opacity-65 mb-4">Legal</h4>
-          <div className="text-base space-y-2">
-            <p>Privacy Policy</p>
-            <p>Terms & Conditions</p>
-            <p>Return Policy</p>
+          <h4 className="opacity-65 mb-4 text-sm">Legal</h4>
+          <div className="space-y-2 text-base">
+            <Link
+              to={publicRoutesVariables.privacyPolicy}
+              className="block hover:text-gray-300 hover:underline transition-colors cursor-pointer"
+            >
+              Privacy Policy
+            </Link>
+            <Link
+              to={publicRoutesVariables.termsAndConditions}
+              className="block hover:text-gray-300 hover:underline transition-colors cursor-pointer"
+            >
+              Terms & Conditions
+            </Link>
+            <Link
+              to={publicRoutesVariables.returnPolicy}
+              className="block hover:text-gray-300 hover:underline transition-colors cursor-pointer"
+            >
+              Return Policy
+            </Link>
           </div>
         </div>
       </div>
diff --git a/client/src/pages/legal/PrivacyPolicyPage.tsx b/client/src/pages/legal/PrivacyPolicyPage.tsx
new file mode 100644
index 00000000..b5432cb3
--- /dev/null
+++ b/client/src/pages/legal/PrivacyPolicyPage.tsx
@@ -0,0 +1,190 @@
+import { NavLink } from "react-router-dom";
+import React from "react";
+import { Button } from "../../components/ui/button/Button";
+
+interface PolicySection {
+  id: string;
+  title: string;
+}
+
+export const PrivacyPolicyPage: React.FC = () => {
+  const sections: PolicySection[] = [
+    { id: "intro", title: "1. Introduction" },
+    { id: "collection", title: "2. Information We Collect" },
+    { id: "usage", title: "3. How We Use Your Information" },
+    { id: "sharing", title: "4. Sharing of Information" },
+    { id: "cookies", title: "5. Cookies & Tracking" },
+    { id: "retention", title: "6. Data Retention" },
+    { id: "security", title: "7. Data Security" },
+    { id: "rights", title: "8. Your Privacy Rights" },
+    { id: "contact", title: "9. Contact Us" },
+  ];
+
+  return (
+    <div className="bg-transparent px-4 pt-32 pb-20 min-h-screen text-white">
+      <div className="mx-auto max-w-4xl">
+        <h1 className="pt-10 pb-4 font-bold text-white text-5xl tracking-tight">
+          Privacy & Data Protection
+        </h1>
+        <nav className="bg-dark-900 mb-12 p-8 border border-blue-400 rounded-xl">
+          <h2 className="mb-6 font-semibold text-white text-xl">
+            Table of Contents
+          </h2>
+          <ul className="gap-3 grid md:grid-rows-5 grid-flow-row md:grid-flow-col">
+            {sections.map((section) => (
+              <li key={section.id}>
+                <a
+                  href={`#${section.id}`}
+                  className="text-gray-300 hover:text-white hover:underline transition-all"
+                >
+                  {section.title}
+                </a>
+              </li>
+            ))}
+          </ul>
+        </nav>
+
+        <div className="space-y-16">
+          <section id="intro" className="scroll-mt-24">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              1. Introduction
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              Welcome to <strong>StudyBridge</strong>. We respect your privacy
+              and are committed to protecting your personal data. This policy
+              outlines our practices regarding the collection, use, and
+              disclosure of your information when you access our tutoring
+              services, mobile applications, or website.
+            </p>
+          </section>
+
+          <section id="collection">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              2. Information We Collect
+            </h2>
+            <div className="space-y-4 text-gray-300">
+              <p>
+                We collect information that identifies, relates to, or could
+                reasonably be linked to you:
+              </p>
+              <ul className="space-y-3 ml-6 list-disc">
+                <li>
+                  <strong>Account Information:</strong> Name, email, and
+                  encrypted password.
+                </li>
+                <li>
+                  <strong>Educational Profile:</strong> Subjects of interest,
+                  grade level, and learning goals.
+                </li>
+                <li>
+                  <strong>Technical Data:</strong> IP addresses and browser
+                  types collected automatically.
+                </li>
+              </ul>
+            </div>
+          </section>
+
+          <section id="usage">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              3. How We Use Your Information
+            </h2>
+            <p className="mb-4 text-gray-300">
+              We use your data strictly for the following purposes:
+            </p>
+            <ul className="gap-4 grid grid-cols-1 md:grid-cols-1">
+              <li className="bg-dark-900 p-4 border border-gray-700 rounded-lg">
+                <span className="block mb-1 font-bold text-blue-400">
+                  Service Delivery
+                </span>
+                To connect students with the right tutors and manage session
+                scheduling.
+              </li>
+              <li className="bg-dark-900 p-4 border border-gray-700 rounded-lg">
+                <span className="block mb-1 font-bold text-blue-400">
+                  Product Improvement
+                </span>
+                To analyze platform usage trends and develop new educational
+                tools.
+              </li>
+            </ul>
+          </section>
+
+          <section id="sharing">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              4. Sharing of Information
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              StudyBridge does not trade or sell your personal information. We
+              only share data with authorized service providers (e.g., hosting),
+              legal authorities when required by law, or with tutors to
+              facilitate your scheduled sessions.
+            </p>
+          </section>
+
+          <section id="cookies">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              5. Cookies & Tracking
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              We use cookies to enhance your experience, remember your login
+              details, and analyze site traffic. You can manage cookie
+              preferences through your browser settings.
+            </p>
+          </section>
+
+          <section id="retention">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              6. Data Retention
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              We retain your personal information only for as long as is
+              necessary. If you close your account, we will delete your data
+              within 30 days, unless legal obligations require otherwise.
+            </p>
+          </section>
+          <section id="security" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-500 border-l-4 font-bold text-2xl">
+              7. Data Security
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              We use secure servers and encryption to protect your data. Only
+              authorized staff can access your information to help with your
+              account or sessions. While we work hard to keep everything safe,
+              please remember that no internet service is 100% secure.
+            </p>
+          </section>
+          <section id="rights" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-500 border-l-4 font-bold text-2xl">
+              8. Your Privacy Rights
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              You have the right to see the data we have about you, ask us to
+              fix any mistakes, or request that we delete your information
+              entirely. You can manage most of these options directly through
+              your account settings.
+            </p>
+          </section>
+
+          <section id="contact" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              9. Contact Us
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              For any privacy-related requests or questions, please reach out to
+              our team:
+              <span className="ml-1 text-blue-400">
+                support@studybridge.com
+              </span>
+            </p>
+          </section>
+        </div>
+
+        <div className="mt-20 pt-8 border-gray-800 border-t">
+          <Button as={NavLink} to="/" variant="secondary">
+            ← Back to Home
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/client/src/pages/legal/ReturnPolicyPage.tsx b/client/src/pages/legal/ReturnPolicyPage.tsx
new file mode 100644
index 00000000..c0148349
--- /dev/null
+++ b/client/src/pages/legal/ReturnPolicyPage.tsx
@@ -0,0 +1,152 @@
+import { NavLink } from "react-router-dom";
+import React from "react";
+import { Button } from "../../components/ui/button/Button";
+
+interface PolicySection {
+  id: string;
+  title: string;
+}
+
+export const ReturnPolicyPage: React.FC = () => {
+  const sections: PolicySection[] = [
+    { id: "overview", title: "1. Overview" },
+    { id: "student-cancel", title: "2. Cancellation by Student" },
+    { id: "teacher-cancel", title: "3. Cancellation by Teacher" },
+    { id: "technical", title: "4. Technical Issues" },
+    { id: "process", title: "5. Refund Process" },
+    { id: "request", title: "6. How to Request" },
+    { id: "dispute", title: "7. Dispute Resolution" },
+  ];
+
+  return (
+    <div className="bg-transparent px-4 pt-32 pb-20 min-h-screen text-white">
+      <div className="mx-auto max-w-4xl">
+        <h1 className="pt-10 pb-4 font-bold text-white text-5xl tracking-tight">
+          Return Policy
+        </h1>
+
+        <nav className="bg-dark-900 mb-12 p-8 border border-blue-400 rounded-xl">
+          <h2 className="mb-6 font-semibold text-white text-xl">
+            Table of Contents
+          </h2>
+          <ul className="gap-3 grid md:grid-rows-4 grid-flow-row md:grid-flow-col">
+            {sections.map((section) => (
+              <li key={section.id}>
+                <a
+                  href={`#${section.id}`}
+                  className="text-gray-300 hover:text-white hover:underline transition-all"
+                >
+                  {section.title}
+                </a>
+              </li>
+            ))}
+          </ul>
+        </nav>
+
+        <div className="space-y-16">
+          <section id="overview" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              1. Overview
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              This Return Policy outlines the terms and conditions for refunds
+              and cancellations for lessons booked through the{" "}
+              <strong>StudyBridge</strong> platform. Our goal is to ensure a
+              fair experience for both students and teachers.
+            </p>
+          </section>
+
+          <section id="student-cancel" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              2. Cancellation by Student
+            </h2>
+            <div className="space-y-4 text-gray-300">
+              <ul className="space-y-3 ml-6 list-disc">
+                <li>
+                  <strong>More than 24 hours before the session:</strong> Full
+                  refund will be issued to your original payment method.
+                </li>
+                <li>
+                  <strong>Less than 24 hours notice:</strong> Partial or no
+                  refund may apply depending on the teacher's specific policy.
+                </li>
+                <li>
+                  <strong>No-show or cancellation during the session:</strong>{" "}
+                  No refund will be provided.
+                </li>
+              </ul>
+            </div>
+          </section>
+
+          <section id="teacher-cancel" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              3. Cancellation by Teacher
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              If a teacher cancels a session, students will receive a{" "}
+              <strong>full refund</strong>
+              automatically. Teachers are encouraged to provide advance notice
+              to minimize inconvenience to students.
+            </p>
+          </section>
+
+          <section id="technical" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              4. Technical Issues
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              If a session cannot be completed due to technical issues on our
+              platform, a full refund or rescheduling option will be provided.
+              Please contact{" "}
+              <span className="font-medium text-blue-400">
+                support@studybridge.com
+              </span>{" "}
+              within 24 hours of the scheduled session.
+            </p>
+          </section>
+
+          <section id="process" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              5. Refund Process
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              Refunds are processed within <strong>5-7 business days</strong>{" "}
+              after the cancellation request is approved. The refund will be
+              issued to the original payment method used for the booking.
+            </p>
+          </section>
+
+          <section id="request" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              6. How to Request a Refund
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              To request a refund, please contact our support team at
+              <span className="ml-1 text-blue-400">
+                support@studybridge.com
+              </span>
+              . Please include your session ID and the reason for the request.
+            </p>
+          </section>
+
+          <section id="dispute" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
+              7. Dispute Resolution
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              If you are not satisfied with the resolution, you can file a
+              dispute through our platform. Our support team will review your
+              case and provide a final decision within 7 business days.
+            </p>
+          </section>
+        </div>
+
+        <div className="mt-20 pt-8 border-gray-800 border-t">
+          <Button as={NavLink} to="/" variant="secondary">
+            ← Back to Home
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/client/src/pages/legal/TermsAndConditionsPage.tsx b/client/src/pages/legal/TermsAndConditionsPage.tsx
new file mode 100644
index 00000000..0dec3225
--- /dev/null
+++ b/client/src/pages/legal/TermsAndConditionsPage.tsx
@@ -0,0 +1,138 @@
+import { NavLink } from "react-router-dom";
+import React from "react";
+import { Button } from "../../components/ui/button/Button";
+
+interface TermSection {
+  id: string;
+  title: string;
+}
+
+export const TermsAndConditionsPage: React.FC = () => {
+  const sections: TermSection[] = [
+    { id: "acceptance", title: "1. Acceptance of Terms" },
+    { id: "description", title: "2. Description of Service" },
+    { id: "responsibilities", title: "3. User Responsibilities" },
+    { id: "payment", title: "4. Payment and Refund Terms" },
+    { id: "liability", title: "5. Limitation of Liability" },
+    { id: "modifications", title: "6. Changes to Terms" },
+    { id: "contact", title: "7. Contact Information" },
+  ];
+
+  return (
+    <div className="bg-transparent px-4 pt-32 pb-20 min-h-screen text-white">
+      <div className="mx-auto max-w-4xl">
+        <h1 className="mb-4 font-bold text-white text-4xl">
+          Terms & Conditions
+        </h1>
+        <p className="mb-4 text-gray-400">
+          Please read these rules carefully before using StudyBridge.
+        </p>
+
+        <nav className="bg-dark-900 mb-16 p-6 border border-blue-400 rounded-xl">
+          <h2 className="mb-4 font-semibold text-blue-400 text-lg">
+            Quick Navigation
+          </h2>
+          <ul className="gap-3 grid md:grid-rows-4 grid-flow-row md:grid-flow-col">
+            {sections.map((section) => (
+              <li key={section.id}>
+                <a
+                  href={`#${section.id}`}
+                  className="text-gray-400 hover:text-white transition-colors"
+                >
+                  {section.title}
+                </a>
+              </li>
+            ))}
+          </ul>
+        </nav>
+
+        <div className="space-y-16">
+          <section id="acceptance" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              1. Acceptance of Terms
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              By using <strong className="text-white">StudyBridge</strong>, you
+              agree to these terms. If you do not agree, you should not use the
+              platform.
+            </p>
+          </section>
+
+          <section id="description" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              2. Description of Service
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              We provide a platform to connect students and teachers. We help
+              with booking and payments, but we are not responsible for the
+              actual teaching content provided by the teachers.
+            </p>
+          </section>
+          <section id="responsibilities" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              3. User Responsibilities
+            </h2>
+            <ul className="space-y-3 ml-6 text-gray-300 list-disc">
+              <li>You must provide real information when signing up.</li>
+              <li>You are responsible for keeping your password safe.</li>
+              <li>
+                You must be <strong className="text-white">18 or older</strong>,
+                or have a parent's permission.
+              </li>
+              <li>You must follow all local laws while using the site.</li>
+            </ul>
+          </section>
+
+          <section id="payment" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              4. Payment and Refund Terms
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              Payments are handled securely. Teachers set their own prices. If
+              you need a refund, it must follow our specific refund rules found
+              in our Help Center.
+            </p>
+          </section>
+
+          <section id="liability" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              5. Limitation of Liability
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              StudyBridge is not responsible for any issues, tech failures, or
+              disagreements between users. Use the service at your own risk.
+            </p>
+          </section>
+
+          <section id="modifications" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              6. Changes to Terms
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              We might update these rules from time to time. If we do, we will
+              post the new version here. Continuing to use the site means you
+              agree to the new rules.
+            </p>
+          </section>
+
+          <section id="contact" className="scroll-mt-32">
+            <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-bold text-2xl">
+              7. Contact Information
+            </h2>
+            <p className="text-gray-300 leading-relaxed">
+              If you have any questions, please email us at:
+              <span className="ml-1 text-blue-400">
+                support@studybridge.com
+              </span>
+            </p>
+          </section>
+        </div>
+        <div className="mt-20 pt-8 border-gray-800 border-t">
+          <Button as={NavLink} to="/" variant="secondary">
+            ← Back to Home
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/client/src/router/routesVariables/pathVariables.ts b/client/src/router/routesVariables/pathVariables.ts
index c9a1fcd5..0d2f3256 100644
--- a/client/src/router/routesVariables/pathVariables.ts
+++ b/client/src/router/routesVariables/pathVariables.ts
@@ -6,6 +6,9 @@ export const publicRoutesVariables = {
   home: "/",
   teachers: "/teachers",
   teacher: "/teacher/:id",
+  privacyPolicy: "/privacy-policy",
+  termsAndConditions: "/terms-and-conditions",
+  returnPolicy: "/return-policy",
 };
 
 export const authRoutesVariables = {
diff --git a/client/src/router/routesVariables/publicRoutes.tsx b/client/src/router/routesVariables/publicRoutes.tsx
index 89169dc3..93a4c448 100644
--- a/client/src/router/routesVariables/publicRoutes.tsx
+++ b/client/src/router/routesVariables/publicRoutes.tsx
@@ -3,6 +3,9 @@ import { publicRoutesVariables } from "./pathVariables";
 import { Home } from "../../pages/home/Home";
 import { TeacherDetail } from "../../pages/teacherDetail/teacherDetail";
 import { TeachersPage } from "../../pages/teachersPage/TeachersPage";
+import { PrivacyPolicyPage } from "../../pages/legal/PrivacyPolicyPage";
+import { TermsAndConditionsPage } from "../../pages/legal/TermsAndConditionsPage";
+import { ReturnPolicyPage } from "../../pages/legal/ReturnPolicyPage";
 
 export const publicRoutes: RouteObject[] = [
   { index: true, element: <Home /> },
@@ -11,4 +14,17 @@ export const publicRoutes: RouteObject[] = [
     path: `${publicRoutesVariables.teacher}`,
     element: <TeacherDetail />,
   },
+
+  {
+    path: `${publicRoutesVariables.privacyPolicy}`,
+    element: <PrivacyPolicyPage />,
+  },
+  {
+    path: `${publicRoutesVariables.termsAndConditions}`,
+    element: <TermsAndConditionsPage />,
+  },
+  {
+    path: `${publicRoutesVariables.returnPolicy}`,
+    element: <ReturnPolicyPage />,
+  },
 ];
diff --git a/server/package-lock.json b/server/package-lock.json
index dc0ccc2c..361e3727 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -92,6 +92,7 @@
       "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.28.6",
         "@babel/generator": "^7.28.6",
@@ -3400,6 +3401,7 @@
       "integrity": "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^5.0.0",
@@ -3797,6 +3799,7 @@
       "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.54.0",
         "@typescript-eslint/types": "8.54.0",
@@ -4742,6 +4745,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5362,6 +5366,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -6484,6 +6489,7 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -6560,6 +6566,7 @@
       "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -6623,6 +6630,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -8731,6 +8739,7 @@
       "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/core": "30.2.0",
         "@jest/types": "30.2.0",
@@ -11322,6 +11331,7 @@
       "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -12731,6 +12741,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -13083,6 +13094,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"

From cefa7fe7bc2b0204d5fb8da51a4605b0c8b7b70f Mon Sep 17 00:00:00 2001
From: Majoodeh <Majdhussein144@gmail.com>
Date: Sun, 8 Mar 2026 20:04:08 +0100
Subject: [PATCH 2/2] fixed Copilot suggestions

---
 client/src/pages/legal/PrivacyPolicyPage.tsx      | 10 +++++-----
 client/src/pages/legal/ReturnPolicyPage.tsx       |  3 ++-
 client/src/pages/legal/TermsAndConditionsPage.tsx |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/legal/PrivacyPolicyPage.tsx b/client/src/pages/legal/PrivacyPolicyPage.tsx
index b5432cb3..92856995 100644
--- a/client/src/pages/legal/PrivacyPolicyPage.tsx
+++ b/client/src/pages/legal/PrivacyPolicyPage.tsx
@@ -58,7 +58,7 @@ export const PrivacyPolicyPage: React.FC = () => {
             </p>
           </section>
 
-          <section id="collection">
+          <section id="collection" className="scroll-mt-32">
             <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
               2. Information We Collect
             </h2>
@@ -84,7 +84,7 @@ export const PrivacyPolicyPage: React.FC = () => {
             </div>
           </section>
 
-          <section id="usage">
+          <section id="usage" className="scroll-mt-32">
             <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
               3. How We Use Your Information
             </h2>
@@ -109,7 +109,7 @@ export const PrivacyPolicyPage: React.FC = () => {
             </ul>
           </section>
 
-          <section id="sharing">
+          <section id="sharing" className="scroll-mt-32">
             <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
               4. Sharing of Information
             </h2>
@@ -121,7 +121,7 @@ export const PrivacyPolicyPage: React.FC = () => {
             </p>
           </section>
 
-          <section id="cookies">
+          <section id="cookies" className="scroll-mt-32">
             <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
               5. Cookies & Tracking
             </h2>
@@ -132,7 +132,7 @@ export const PrivacyPolicyPage: React.FC = () => {
             </p>
           </section>
 
-          <section id="retention">
+          <section id="retention" className="scroll-mt-32">
             <h2 className="mb-4 pl-4 border-blue-400 border-l-4 font-semibold text-2xl">
               6. Data Retention
             </h2>
diff --git a/client/src/pages/legal/ReturnPolicyPage.tsx b/client/src/pages/legal/ReturnPolicyPage.tsx
index c0148349..fde3394b 100644
--- a/client/src/pages/legal/ReturnPolicyPage.tsx
+++ b/client/src/pages/legal/ReturnPolicyPage.tsx
@@ -68,7 +68,8 @@ export const ReturnPolicyPage: React.FC = () => {
                 </li>
                 <li>
                   <strong>Less than 24 hours notice:</strong> Partial or no
-                  refund may apply depending on the teacher's specific policy.
+                  refund may apply depending on the teacher&apos;s specific
+                  policy.
                 </li>
                 <li>
                   <strong>No-show or cancellation during the session:</strong>{" "}
diff --git a/client/src/pages/legal/TermsAndConditionsPage.tsx b/client/src/pages/legal/TermsAndConditionsPage.tsx
index 0dec3225..be61b347 100644
--- a/client/src/pages/legal/TermsAndConditionsPage.tsx
+++ b/client/src/pages/legal/TermsAndConditionsPage.tsx
@@ -77,7 +77,7 @@ export const TermsAndConditionsPage: React.FC = () => {
               <li>You are responsible for keeping your password safe.</li>
               <li>
                 You must be <strong className="text-white">18 or older</strong>,
-                or have a parent's permission.
+                or have a parent&apos;s permission.
               </li>
               <li>You must follow all local laws while using the site.</li>
             </ul>