diff --git a/client/package-lock.json b/client/package-lock.json
index dcdd66c..50da680 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -98,7 +98,10 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.1.0.tgz",
       "integrity": "sha512-MMoDGWn1y9LdQJQSHiCC20x3uZ3CwQnv9QMz6pCmJOrqdgM9YxsoVVY0wtrdXbmfSgnV0KNk6zi09NAhMR2jvg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@ctrl/tinycolor": "^3.6.1"
       }
@@ -107,7 +110,10 @@
       "version": "1.21.1",
       "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-1.21.1.tgz",
       "integrity": "sha512-tyWnlK+XH7Bumd0byfbCiZNK43HEubMoCcu9VxwsAwiHdHTgWa+tMN0/yvxa+e8EzuFP1WdUNNPclRpVtD33lg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "@emotion/hash": "^0.8.0",
@@ -126,7 +132,10 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.0.tgz",
       "integrity": "sha512-E9nOWObXx7Dy7hdyuYlOFaer/LtPO7oyZVxZphh0CYEslr5EmhJPM3WI0Q2RBHRtYg6dSNqeSK73kvZjPN3IMQ==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@ant-design/cssinjs": "^1.21.0",
         "@babel/runtime": "^7.23.2",
@@ -140,26 +149,41 @@
     "node_modules/@ant-design/cssinjs/node_modules/@emotion/hash": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
       "license": "MIT"
+=======
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+>>>>>>> Stashed changes
     },
     "node_modules/@ant-design/cssinjs/node_modules/@emotion/unitless": {
       "version": "0.7.5",
       "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
       "license": "MIT"
+=======
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+>>>>>>> Stashed changes
     },
     "node_modules/@ant-design/cssinjs/node_modules/stylis": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==",
       "license": "MIT"
+=======
+      "integrity": "sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now=="
+>>>>>>> Stashed changes
     },
     "node_modules/@ant-design/fast-color": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@ant-design/fast-color/-/fast-color-2.0.6.tgz",
       "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.24.7"
       },
@@ -171,7 +195,10 @@
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.5.1.tgz",
       "integrity": "sha512-0UrM02MA2iDIgvLatWrj6YTCYe0F/cwXvVE0E2SqGrL7PZireQwgEKTKBisWpZyal5eXZLvuM98kju6YtYne8w==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@ant-design/colors": "^7.0.0",
         "@ant-design/icons-svg": "^4.4.0",
@@ -190,14 +217,21 @@
     "node_modules/@ant-design/icons-svg": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==",
       "license": "MIT"
+=======
+      "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA=="
+>>>>>>> Stashed changes
     },
     "node_modules/@ant-design/react-slick": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz",
       "integrity": "sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.4",
         "classnames": "^2.2.5",
@@ -517,7 +551,10 @@
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
       "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "engines": {
         "node": ">=10"
       }
@@ -2407,7 +2444,10 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@rc-component/async-validator/-/async-validator-5.0.4.tgz",
       "integrity": "sha512-qgGdcVIF604M9EqjNF0hbUTz42bz/RDtxWdWuU5EQe3hi7M8ob54B6B35rOsvX5eSvIHIzT9iH1R3n+hk3CGfg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.24.4"
       },
@@ -2419,7 +2459,10 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@rc-component/color-picker/-/color-picker-2.0.1.tgz",
       "integrity": "sha512-WcZYwAThV/b2GISQ8F+7650r5ZZJ043E57aVBFkQ+kSY4C6wdofXgB0hBx+GPGpIU0Z81eETNoDUJMr7oy/P8Q==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@ant-design/fast-color": "^2.0.6",
         "@babel/runtime": "^7.23.6",
@@ -2435,7 +2478,10 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@rc-component/context/-/context-1.4.0.tgz",
       "integrity": "sha512-kFcNxg9oLRMoL3qki0OMxK+7g5mypjgaaJp/pkOis/6rVxma9nJBF/8kCIuTYHUQNr0ii7MxqE33wirPZLJQ2w==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "rc-util": "^5.27.0"
@@ -2449,7 +2495,10 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.1.0.tgz",
       "integrity": "sha512-jS4E7T9Li2GuYwI6PyiVXmxTiM6b07rlD9Ge8uGZSCz3WlzcG5ZK7g5bbuKNeZ9pgUuPK/5guV781ujdVpm4HQ==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.0"
       },
@@ -2461,7 +2510,10 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rc-component/mutate-observer/-/mutate-observer-1.1.0.tgz",
       "integrity": "sha512-QjrOsDXQusNwGZPf4/qRQasg7UFEj06XiCJ8iuiq/Io7CrHrgVi6Uuetw60WAMG1799v+aM8kyc+1L/GBbHSlw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.0",
         "classnames": "^2.3.2",
@@ -2479,7 +2531,10 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
       "integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.0",
         "classnames": "^2.3.2",
@@ -2497,7 +2552,10 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@rc-component/qrcode/-/qrcode-1.0.0.tgz",
       "integrity": "sha512-L+rZ4HXP2sJ1gHMGHjsg9jlYBX/SLN2D6OxP9Zn3qgtpMWtO2vUfxVFwiogHpAIqs54FnALxraUy/BCO1yRIgg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.24.7",
         "classnames": "^2.3.2",
@@ -2515,7 +2573,10 @@
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/@rc-component/tour/-/tour-1.15.1.tgz",
       "integrity": "sha512-Tr2t7J1DKZUpfJuDZWHxyxWpfmj8EZrqSgyMZ+BCdvKZ6r1UDsfU46M/iWAAFBy961Ssfom2kv5f3UcjIL2CmQ==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.0",
         "@rc-component/portal": "^1.0.0-9",
@@ -2535,7 +2596,10 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.3.tgz",
       "integrity": "sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.23.2",
         "@rc-component/portal": "^1.1.0",
@@ -2990,6 +3054,7 @@
       "version": "18.3.0",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
       "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/react": "*"
@@ -3121,7 +3186,10 @@
       "version": "5.21.3",
       "resolved": "https://registry.npmjs.org/antd/-/antd-5.21.3.tgz",
       "integrity": "sha512-Yby3gU6jfuvhNFRPsrHB4Yc/G3LHLNHHy0kShwNmmZf1QTCiW5TmqP3DT5m/NHbJsTgEwJpwo3AaOWo+KQyEjw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@ant-design/colors": "^7.1.0",
         "@ant-design/cssinjs": "^1.21.1",
@@ -3258,8 +3326,12 @@
     "node_modules/array-tree-filter": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==",
       "license": "MIT"
+=======
+      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+>>>>>>> Stashed changes
     },
     "node_modules/array.prototype.findlast": {
       "version": "1.2.5",
@@ -3765,8 +3837,12 @@
     "node_modules/compute-scroll-into-view": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==",
       "license": "MIT"
+=======
+      "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg=="
+>>>>>>> Stashed changes
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -3795,7 +3871,10 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
       "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "toggle-selection": "^1.0.6"
       }
@@ -3935,8 +4014,12 @@
     "node_modules/dayjs": {
       "version": "1.11.13",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
       "license": "MIT"
+=======
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+>>>>>>> Stashed changes
     },
     "node_modules/debug": {
       "version": "4.3.7",
@@ -5908,7 +5991,10 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
       "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "string-convert": "^0.2.0"
       }
@@ -6970,7 +7056,10 @@
       "version": "3.28.1",
       "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.28.1.tgz",
       "integrity": "sha512-9+8oHIMWVLHxuaapDiqFNmD9KSyKN/P4bo9x/MBuDbyTqP8f2/POmmZxdXWBO3yq/uE3pKyQCXYNUxrNfHRv2A==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "array-tree-filter": "^2.1.0",
@@ -6988,7 +7077,10 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-3.3.0.tgz",
       "integrity": "sha512-Ih3ZaAcoAiFKJjifzwsGiT/f/quIkxJoklW4yKGho14Olulwn8gN7hOBve0/WGDg5o/l/5mL0w7ff7/YGvefVw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.3.2",
@@ -7003,7 +7095,10 @@
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.8.0.tgz",
       "integrity": "sha512-YVBkssrKPBG09TGfcWWGj8zJBYD9G3XuTy89t5iUmSXrIXEAnO1M+qjUxRW6b4Qi0+wNWG6MHJF/+US+nmIlzA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
@@ -7019,7 +7114,10 @@
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.6.0.tgz",
       "integrity": "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "@rc-component/portal": "^1.0.0-8",
@@ -7036,7 +7134,10 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-7.2.0.tgz",
       "integrity": "sha512-9lOQ7kBekEJRdEpScHvtmEtXnAsy+NGDXiRWc2ZVC7QXAazNVbeT4EraQKYwCME8BJLa8Bxqxvs5swwyOepRwg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.23.9",
         "@rc-component/portal": "^1.1.1",
@@ -7053,7 +7154,10 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-4.2.0.tgz",
       "integrity": "sha512-odM8Ove+gSh0zU27DUj5cG1gNKg7mLWBYzB5E4nNLrLwBmYEgYP43vHKDGOVZcJSVElQBI0+jTQgjnq0NfLjng==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@rc-component/trigger": "^2.0.0",
@@ -7069,7 +7173,10 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-2.4.0.tgz",
       "integrity": "sha512-XZ/lF9iqf9HXApIHQHqzJK5v2w4mkUMsVqAzOyWVzoiwwXEavY6Tpuw7HavgzIoD+huVff4JghSGcgEfX6eycg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.0",
         "@rc-component/async-validator": "^5.0.3",
@@ -7087,7 +7194,10 @@
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-7.11.0.tgz",
       "integrity": "sha512-aZkTEZXqeqfPZtnSdNUnKQA0N/3MbgR7nUnZ+/4MfSFWPFHZau4p5r5ShaI0KPEMnNjv4kijSCFq/9wtJpwykw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "@rc-component/portal": "^1.0.2",
@@ -7105,7 +7215,10 @@
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/rc-input/-/rc-input-1.6.3.tgz",
       "integrity": "sha512-wI4NzuqBS8vvKr8cljsvnTUqItMfG1QbJoxovCgL+DX4eVUcHIjVwharwevIxyy7H/jbLryh+K7ysnJr23aWIA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
@@ -7120,7 +7233,10 @@
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-9.2.0.tgz",
       "integrity": "sha512-5XZFhBCV5f9UQ62AZ2hFbEY8iZT/dm23Q1kAg0H8EvOgD3UDbYYJAayoVIkM3lQaCqYAW5gV0yV3vjw1XtzWHg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "@rc-component/mini-decimal": "^1.0.1",
@@ -7137,7 +7253,10 @@
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-2.16.1.tgz",
       "integrity": "sha512-GnhSTGP9Mtv6pqFFGQze44LlrtWOjHNrUUAcsdo9DnNAhN4pwVPEWy4z+2jpjkiGlJ3VoXdvMHcNDQdfI9fEaw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.22.5",
         "@rc-component/trigger": "^2.0.0",
@@ -7156,7 +7275,10 @@
       "version": "9.15.1",
       "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-9.15.1.tgz",
       "integrity": "sha512-UKporqU6LPfHnpPmtP6hdEK4iO5Q+b7BRv/uRpxdIyDGplZy9jwUjsnpev5bs3PQKB0H0n34WAPDfjAfn3kAPA==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "@rc-component/trigger": "^2.0.0",
@@ -7174,7 +7296,10 @@
       "version": "2.9.3",
       "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.3.tgz",
       "integrity": "sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
@@ -7189,7 +7314,10 @@
       "version": "5.6.2",
       "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.2.tgz",
       "integrity": "sha512-Id4IYMoii3zzrG0lB0gD6dPgJx4Iu95Xu0BQrhHIbp7ZnAZbLqdqQ73aIWH0d0UFcElxwaKjnzNovTjo7kXz7g==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
@@ -7208,7 +7336,10 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.3.2.tgz",
       "integrity": "sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
@@ -7224,7 +7355,10 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-4.3.0.tgz",
       "integrity": "sha512-UubEWA0ShnroQ1tDa291Fzw6kj0iOeF26IsUObxYTpimgj4/qPCWVFl18RLZE+0Up1IZg0IK4pMn6nB3mjvB7g==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.3.2",
@@ -7239,7 +7373,10 @@
       "version": "4.6.15",
       "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-4.6.15.tgz",
       "integrity": "sha512-OWZ1yrMie+KN2uEUfYCfS4b2Vu6RC1FWwNI0s+qypsc3wRt7g+peuZKVIzXCTaJwyyZruo80+akPg2+GmyiJjw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.24.7",
         "@rc-component/trigger": "^2.0.0",
@@ -7278,7 +7415,10 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-4.0.0.tgz",
       "integrity": "sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.6",
@@ -7293,7 +7433,10 @@
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.13.0.tgz",
       "integrity": "sha512-oxvx1Q5k5wD30sjN5tqAyWTvJfLNNJn7Oq3IeS4HxWfAiC4BOXMITNAsw7u/fzdtO4MS8Ki8uRLOzcnEuoQiAw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.5",
@@ -7311,7 +7454,10 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.4.0.tgz",
       "integrity": "sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.20.7",
         "classnames": "^2.2.1",
@@ -7327,7 +7473,10 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/rc-segmented/-/rc-segmented-2.5.0.tgz",
       "integrity": "sha512-B28Fe3J9iUFOhFJET3RoXAPFJ2u47QvLSYcZWC4tFYNGPEjug5LAxEasZlA/PpAxhdOPqGWsGbSj7ftneukJnw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
@@ -7343,7 +7492,10 @@
       "version": "14.15.2",
       "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.15.2.tgz",
       "integrity": "sha512-oNoXlaFmpqXYcQDzcPVLrEqS2J9c+/+oJuGrlXeVVX/gVgrbHa5YcyiRUXRydFjyuA7GP3elRuLF7Y3Tfwltlw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "@rc-component/trigger": "^2.1.1",
@@ -7365,7 +7517,10 @@
       "version": "11.1.7",
       "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-11.1.7.tgz",
       "integrity": "sha512-ytYbZei81TX7otdC0QvoYD72XSlxvTihNth5OeZ6PMXyEDq/vHdWFulQmfDGyXK1NwKwSlKgpvINOa88uT5g2A==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.5",
@@ -7383,7 +7538,10 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-6.0.1.tgz",
       "integrity": "sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.16.7",
         "classnames": "^2.2.3",
@@ -7401,7 +7559,10 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-4.1.0.tgz",
       "integrity": "sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.21.0",
         "classnames": "^2.2.1",
@@ -7416,7 +7577,10 @@
       "version": "7.47.5",
       "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.47.5.tgz",
       "integrity": "sha512-fzq+V9j/atbPIcvs3emuclaEoXulwQpIiJA6/7ey52j8+9cJ4P8DGmp4YzfUVDrb3qhgedcVeD6eRgUrokwVEQ==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "@rc-component/context": "^1.4.0",
@@ -7437,7 +7601,10 @@
       "version": "15.3.0",
       "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.3.0.tgz",
       "integrity": "sha512-lzE18r+zppT/jZWOAWS6ntdkDUKHOLJzqMi5UAij1LeKwOaQaupupAoI9Srn73GRzVpmGznkECMRrzkRusC40A==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "classnames": "2.x",
@@ -7459,7 +7626,10 @@
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-1.8.2.tgz",
       "integrity": "sha512-UFAezAqltyR00a8Lf0IPAyTd29Jj9ee8wt8DqXyDMal7r/Cg/nDt3e1OOv3Th4W6mKaZijjgwuPXhAfVNTN8sw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.1",
@@ -7476,7 +7646,10 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.2.1.tgz",
       "integrity": "sha512-rws0duD/3sHHsD905Nex7FvoUGy2UBQRhTkKxeEvr2FB+r21HsOxcDJI0TzyO8NHhnAA8ILr8pfbSBg5Jj5KBg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "@rc-component/trigger": "^2.0.0",
@@ -7491,7 +7664,10 @@
       "version": "5.9.0",
       "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.9.0.tgz",
       "integrity": "sha512-CPrgOvm9d/9E+izTONKSngNzQdIEjMox2PBufWjS1wf7vxtvmCWzK1SlpHbRY6IaBfJIeZ+88RkcIevf729cRg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
@@ -7511,7 +7687,10 @@
       "version": "5.23.0",
       "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.23.0.tgz",
       "integrity": "sha512-aQGi2tFSRw1WbXv0UVXPzHm09E0cSvUVZMLxQtMv3rnZZpNmdRXWrnd9QkLNlVH31F+X5rgghmdSFF3yZW0N9A==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
@@ -7528,7 +7707,10 @@
       "version": "4.8.1",
       "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.8.1.tgz",
       "integrity": "sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "classnames": "^2.2.5",
@@ -7543,7 +7725,10 @@
       "version": "5.43.0",
       "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.43.0.tgz",
       "integrity": "sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "react-is": "^18.2.0"
@@ -7557,7 +7742,10 @@
       "version": "3.14.8",
       "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.14.8.tgz",
       "integrity": "sha512-8D0KfzpRYi6YZvlOWIxiOm9BGt4Wf2hQyEaM6RXlDDiY2NhLheuYI+RA+7ZaZj1lq+XQqy3KHlaeeXQfzI5fGg==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "@babel/runtime": "^7.20.0",
         "classnames": "^2.2.6",
@@ -7950,8 +8138,12 @@
     "node_modules/resize-observer-polyfill": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
       "license": "MIT"
+=======
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+>>>>>>> Stashed changes
     },
     "node_modules/resolve": {
       "version": "2.0.0-next.5",
@@ -8138,7 +8330,10 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz",
       "integrity": "sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "dependencies": {
         "compute-scroll-into-view": "^3.0.2"
       }
@@ -8332,8 +8527,12 @@
     "node_modules/string-convert": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==",
       "license": "MIT"
+=======
+      "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
+>>>>>>> Stashed changes
     },
     "node_modules/string-width": {
       "version": "4.2.3",
@@ -8684,7 +8883,10 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
       "integrity": "sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==",
+<<<<<<< Updated upstream
       "license": "MIT",
+=======
+>>>>>>> Stashed changes
       "engines": {
         "node": ">=12.22"
       }
@@ -8720,8 +8922,12 @@
     "node_modules/toggle-selection": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+<<<<<<< Updated upstream
       "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==",
       "license": "MIT"
+=======
+      "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
+>>>>>>> Stashed changes
     },
     "node_modules/toposort": {
       "version": "2.0.2",
diff --git a/client/src/App.jsx b/client/src/App.jsx
index d99a553..2b20001 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -1,66 +1,74 @@
-import { useEffect, useState } from "react";
-import {
-  BrowserRouter as Router,
-  Routes,
-  Route,
-  useLocation,
-} from "react-router-dom";
-import "./App.css";
-import "./index.css";
-import LoadingBar from "react-top-loading-bar";
-import About from "./component/About";
-import Alert from "./component/Alert";
-import Footer from "./component/Footer";
-import Home from "./component/Home";
-import Login from "./component/Login";
-import Navbar from "./component/Navbar";
-import Signup from "./component/Signup";
-import ProjectState from "./context/ProjectState";
-import ProfileState from "./context/ProfileState";
-import CodeOfConduct from "./component/Footers/Codeofconduct";
-import Feedback from "./component/Footers/Feedback";
-import ContactUs from "./component/Footers/Contactus";
-import PrivacyPolicy from "./component/Footers/Privacypolicy";
-import TermOfUse from "./component/Footers/TermOfUse";
-import Community from "./component/Community";
-import MyProfile from "./component/MyProfile";
-import ScrollTop from "./component/ScrollTop";
-import EditProfile from "./component/EditProfile";
-import Contributers from "./component/Contributers";
-import Discussion from "./component/Discussion";
-import { useAtom } from "jotai";
-import { modeAtom } from "./atom/Atom";
-import ForgotPassword from "./component/forgotpass";
-import VerifyEmail from "./component/Verify";
-import NotFound from "./component/NotFound";
-import AnimatedCursor from "react-animated-cursor";
-
+import { BrowserRouter as Router, Routes, Route, useLocation } from 'react-router-dom';
+import './App.css';
+import './index.css';
+import LoadingBar from 'react-top-loading-bar';
+import About from './component/About';
+import Alert from './component/Alert';
+import Footer from './component/Footer';
+import Home from './component/Home';
+import Login from './component/Login';
+import Navbar from './component/Navbar';
+import Signup from './component/Signup';
+import ProjectState from './context/ProjectState';
+import ProfileState from './context/ProfileState';
+import CodeOfConduct from './component/Footers/Codeofconduct';
+import Feedback from './component/Footers/Feedback';
+import ContactUs from './component/Footers/Contactus';
+import PrivacyPolicy from './component/Footers/Privacypolicy';
+import TermOfUse from './component/Footers/TermOfUse';
+import Community from './component/Community';
+import MyProfile from './component/MyProfile';
+import ScrollTop from './component/ScrollTop';
+import EditProfile from './component/EditProfile';
+import Contributers from './component/Contributers';
+import Discussion from './component/Discussion';
+import { useAtom } from 'jotai';
+import { modeAtom } from './atom/Atom';
+import ForgotPassword from './component/forgotpass';
+import VerifyEmail from './component/Verify';
+import NotFound from './component/NotFound';
 // Main Layout Component
 const Layout = ({ children, mode, setProgress, toggleMode, showAlert }) => {
   const location = useLocation(); // Use location inside Router
-
+  
   // Define routes where the footer or navbar should not be shown
-  const hideNavbarRoutes = ["/login", "/signup"];
-  const hideFooterRoutes = ["/login", "/signup"];
+  const hideNavbarRoutes = ['/login', '/signup'];
+  const hideFooterRoutes = ['/login', '/signup'];
+
 
   return (
     <>
       {/* Conditionally render the Navbar */}
-      {!hideNavbarRoutes.includes(location.pathname) && <Navbar />}
+      {!hideNavbarRoutes.includes(location.pathname) && (
+        <Navbar 
+        title="BITBOX"
+        home="Home"
+        about="About Us"
+        community="Community"
+        discussion="Discussion"
+        showAlert={showAlert}
+        mode={mode}
+        toggleMode={toggleMode}
+        />
+      )}
 
       {/* Main content */}
       {children}
 
       {/* Conditionally render the Footer */}
       {!hideFooterRoutes.includes(location.pathname) && (
-        <Footer mode={mode} setProgress={setProgress} setAlert={showAlert} />
+        <Footer 
+          mode={mode} 
+          setProgress={setProgress} 
+          setAlert={showAlert} 
+        />
       )}
     </>
   );
 };
 
 function App() {
-  const [mode] = useAtom(modeAtom);
+  const [mode, setMode]= useAtom(modeAtom)
   const [alert, setAlert] = useState(null);
   const showAlert = (message, type) => {
     setAlert({ msg: message, type: type });
@@ -69,51 +77,34 @@ function App() {
     }, 1500);
   };
 
+  
   const [progress, setProgress] = useState(0);
 
   useEffect(() => {
-    localStorage.setItem("mode", mode);
+    localStorage.setItem('mode', mode);
   }, [mode]);
 
   const toggleMode = () => {
-    if (mode === "light") {
-      setMode("dark");
-      document.body.style.backgroundColor = "black";
-      document
-        .querySelectorAll("*")
-        .forEach((element) => (element.style.color = "white"));
+    if (mode === 'light') {
+      setMode('dark');
+      document.body.style.backgroundColor = 'black';
+      document.querySelectorAll('*').forEach(element => element.style.color = 'white');
       showAlert("Dark Mode Enabled", "success");
     } else {
-      setMode("light");
-      document.body.style.backgroundColor = "white";
-      document
-        .querySelectorAll("*")
-        .forEach((element) => (element.style.color = ""));
+      setMode('light');
+      document.body.style.backgroundColor = 'white';
+      document.querySelectorAll('*').forEach(element => element.style.color = '');
       showAlert("Light Mode Enabled", "success");
     }
   };
 
   return (
     <div>
-      <AnimatedCursor
-        innerSize={8}
-        outerSize={35}
-        innerScale={1}
-        outerScale={2}
-        outerAlpha={0}
-        hasBlendMode={true}
-        innerStyle={{
-          backgroundColor: "var(--cursor-color)",
-        }}
-        outerStyle={{
-          border: "3px solid var(--cursor-color)",
-        }}
-      />
       <ProjectState>
         <ProfileState>
           <Router>
             <LoadingBar
-              color="blue"
+              color='blue'
               progress={progress}
               onLoaderFinished={() => setProgress(0)}
             />
@@ -123,182 +114,28 @@ function App() {
             <ScrollTop />
 
             {/* Wrap everything inside the Layout component */}
-            <Layout
-              mode={mode}
-              setProgress={setProgress}
-              toggleMode={toggleMode}
-              showAlert={showAlert}
-            >
+            <Layout mode={mode} setProgress={setProgress} toggleMode={toggleMode} showAlert={showAlert}>
               <Routes>
-                <Route
-                  exact
-                  path="/"
-                  element={
-                    <Home
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/discussion"
-                  element={
-                    <Discussion
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/community"
-                  element={
-                    <Community
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/about"
-                  element={
-                    <About
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/myprofile"
-                  element={
-                    <MyProfile
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/editprofile"
-                  element={
-                    <EditProfile
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/contributers"
-                  element={
-                    <Contributers
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/login"
-                  element={
-                    <Login
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/signup"
-                  element={
-                    <Signup
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/ForgotPassword"
-                  element={
-                    <ForgotPassword
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/codeofconduct"
-                  element={
-                    <CodeOfConduct
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/feedback"
-                  element={
-                    <Feedback
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/contactus"
-                  element={
-                    <ContactUs
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/privacypolicy"
-                  element={
-                    <PrivacyPolicy
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route
-                  exact
-                  path="/termofuse"
-                  element={
-                    <TermOfUse
-                      mode={mode}
-                      setProgress={setProgress}
-                      showAlert={showAlert}
-                    />
-                  }
-                />
-                <Route exact path="/verify/:token" element={<VerifyEmail />} />
+                <Route exact path="/" element={<Home mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/discussion" element={<Discussion mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/community" element={<Community mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/about" element={<About mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/myprofile" element={<MyProfile mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/editprofile" element={<EditProfile mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/contributers" element={<Contributers mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/login" element={<Login mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/signup" element={<Signup mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/ForgotPassword" element={<ForgotPassword mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/codeofconduct" element={<CodeOfConduct mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/feedback" element={<Feedback mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/contactus" element={<ContactUs mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/privacypolicy" element={<PrivacyPolicy mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/termofuse" element={<TermOfUse mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+                <Route exact path="/verify/:token" element={<VerifyEmail/>} />
                 {/* 404 Route */}
-                <Route exact path="*" element={<NotFound />} />
+                <Route exact path="*" element={<NotFound/>} /> 
               </Routes>
+                
             </Layout>
           </Router>
         </ProfileState>
@@ -307,4 +144,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/client/src/component/Navbar.jsx b/client/src/component/Navbar.jsx
index b08b489..b8bb0e0 100644
--- a/client/src/component/Navbar.jsx
+++ b/client/src/component/Navbar.jsx
@@ -9,11 +9,14 @@ import avatarDropdown from "../assets/images/Dropdown/avatar.png";
 import { auth } from "../component/Firebase/Setup";
 
 function Navbar(props) {
+  const { title, home, about, community, discussion, showAlert, mode, toggleMode } = props;
   const host = "http://localhost:5000";
   const navigate = useNavigate();
   const location = useLocation();
-  const { showAlert, mode } = props;
   const [isScrolled, setIsScrolled] = useState(false); // State to keep track of whether page has been scrolled
+  const [isOpen, setIsOpen] = useState(false);
+  const [isSidebarOpen, setIsSidebarOpen] = useState(false);
+
   useEffect(() => {
     window.onscroll = function () {
       myFunction();
@@ -66,42 +69,64 @@ function Navbar(props) {
     // Fetch initial image when component mounts
     axios
       .get(`${host}/getAvatarImage`)
-      .then((res) => setImage(res.data[res.data.length - 1].image)) // Fetch the last uploaded image
-      .catch((err) => console.log(err));
-  });
+      .then((res) => {
+        // Check if response data is valid
+        if (res.data && res.data.length > 0) {
+          setImage(res.data[res.data.length - 1].image); // Fetch the last uploaded image
+        }
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  }, []); 
+
+  const toggleSidebar = () => {
+    setIsSidebarOpen(!isSidebarOpen); // Toggle sidebar visibility
+  };
+  
 
   return (
     <div>
-      <nav
-        className={`navbar navbar-expand-lg ${
-          isScrolled ? "sticky" : ""
-        } navbar-${props.mode}`}
+           <nav
+        className={`navbar navbar-expand-lg ${isScrolled ? "sticky" : ""} navbar-${props.mode === "dark" ? "dark" : "light"}`}
         style={{
           backgroundColor: props.mode === "dark" ? "black" : "white",
-          borderBottom:
-            props.mode === "dark" ? "1px solid white" : "1px solid white",
+          borderBottom: "1px solid white",
         }}
         id="navbar"
       >
+        {/* Hamburger icon */}
+        <button
+          className="navbar-toggler block lg:hidden absolute right-0 focus:outline-none"
+          type="button"
+          onClick={toggleSidebar}
+          aria-controls="navbarNavDropdown"
+          aria-expanded={isSidebarOpen}
+          aria-label="Toggle navigation"
+          style={{ color: props.mode === "dark" ? "white" : "black" }}
+        >
+          <span className="navbar-toggler-icon"></span>
+        </button>
+
         <div
-          className="container-fluid"
-          style={{ backgroundColor: "{props.mode}" }}
+          className={`visible navbar-collapse rnav ${isOpen ? "show" : ""}` }
+          style={{ backgroundColor: props.mode === "dark" ? "black" : "white" }}
         >
-          <div className="collapse navbar-collapse" id="navbarNavDropdown">
+          {/* <div className="collapse navbar-collapse" id="navbarNavDropdown"> */}
             <Link
               className="navbar-brand d-flex fs-2 fw-bold font-monospace"
               to="/"
             >
               <img
-                className="mx-3"
-                style={{ width: "3rem" }}
+                className="mx-3 logoImg"
+                style={{ width: "3rem"}}
                 src={logo}
                 alt="logo"
               />
-              <div className="logoTitle">{props.title}</div>
+              <div className="logoTitle" style={{ color: props.mode === 'dark' ? 'white' : 'black' }}>{props.title}</div>
             </Link>
             <div
-              className="collapse navbar-collapse justify-content-center"
+            className={`collapse navbar-collapse justify-content-center ${isOpen ? "show" : ""}`}
               id="navbarSupportedContent"
             >
               <ul
@@ -109,7 +134,7 @@ function Navbar(props) {
                 style={{ position: "absolute", left: "36%" }}
               >
                 <li className="nav-item fs-4 fw-medium">
-                  <button className="button">
+                  
                     <Link
                       className={`nav-link ${
                         location.pathname === "/" ? "active" : ""
@@ -119,10 +144,10 @@ function Navbar(props) {
                     >
                       {props.home}
                     </Link>
-                  </button>
+                  
                 </li>
                 <li className="nav-item fs-4">
-                  <button className="button">
+                  
                     <Link
                       className={`nav-link ${
                         location.pathname === "/about" ? "active" : ""
@@ -132,10 +157,10 @@ function Navbar(props) {
                     >
                       {props.about}
                     </Link>
-                  </button>
+                  
                 </li>
                 <li className="nav-item fs-4">
-                  <button className="button">
+                 
                     <Link
                       className={`nav-link ${
                         location.pathname === "/community" ? "active" : ""
@@ -145,10 +170,10 @@ function Navbar(props) {
                     >
                       {props.community}
                     </Link>
-                  </button>
+                  
                 </li>
                 <li className="nav-item fs-4">
-                  <button className="button">
+                  
                     <Link
                       className={`nav-link ${
                         location.pathname === "/discussion" ? "active" : ""
@@ -158,7 +183,7 @@ function Navbar(props) {
                     >
                       {props.discussion}
                     </Link>
-                  </button>
+                  
                 </li>
               </ul>
             </div>
@@ -212,7 +237,7 @@ function Navbar(props) {
                       <Link
                         role="button"
                         to="/login"
-                        className="btn loginbtn mx-2"
+                        className="btn loginbtn mx-2  h-10 "
                         style={{ height: "45px", color: "black" }}
                       >
                         Login
@@ -220,7 +245,7 @@ function Navbar(props) {
                       <Link
                         role="button"
                         to="/signup"
-                        className="btn loginbtn mx-2"
+                        className="btn loginbtn mx-2  h-10 "
                         style={{ height: "45px", color: "black" }}
                       >
                         Signup
@@ -244,7 +269,7 @@ function Navbar(props) {
                               checked={props.mode === "dark"}
                               onChange={props.toggleMode}
                             />
-                            <label htmlFor="darkmode-toggle">
+                            <label htmlFor="darkmode-toggle" className="darkmode">
                               <svg
                                 xmlns="http://www.w3.org/2000/svg"
                                 viewBox="0 0 512 512"
@@ -366,9 +391,37 @@ function Navbar(props) {
                 </>
               )}
             </form>
-          </div>
+          {/* </div> */}
         </div>
       </nav>
+       {/* Sidebar for smaller devices */}
+       <div className={`sidebar ${isSidebarOpen ? "open" : ""}`} style={{ backgroundColor: props.mode === "dark" ? "black" : "white" }}>
+        <button className="close-btn" onClick={() => setIsSidebarOpen(false)} style={{
+                          color: props.mode === "dark" ? "white" : "black",
+                        }}>Close</button>
+        <ul className="sidebar-links">
+          <li>
+            <Link to="/" onClick={() => setIsSidebarOpen(false)}>Home</Link>
+          </li>
+          <li>
+            <Link to="/about" onClick={() => setIsSidebarOpen(false)}>About</Link>
+          </li>
+          <li>
+            <Link to="/community" onClick={() => setIsSidebarOpen(false)}>Community</Link>
+          </li>
+          <li>
+            <Link to="/discussion" onClick={() => setIsSidebarOpen(false)}>Discussion</Link>
+          </li>
+        </ul>
+      </div>
+
+      <button
+        className="sidebar-toggle"
+        onClick={() => setIsSidebarOpen(true)}
+        style={{ display: isOpen ? 'block' : 'none' }}
+      >
+        Menu
+      </button>
     </div>
   );
 }
diff --git a/client/src/component/css/Navbar.css b/client/src/component/css/Navbar.css
index 7ca361f..573bcba 100644
--- a/client/src/component/css/Navbar.css
+++ b/client/src/component/css/Navbar.css
@@ -10,8 +10,11 @@
   /* Black shadow */
   border-bottom: none;
   /* Remove the bottom line */
+  overflow: initial;
+  /* Avoid conflicts with other layouts */
 }
 
+
 .header {
   max-width: 1200px;
   margin: 0 auto;
@@ -99,13 +102,6 @@
   }
 }
 
-/* navbaar css start */
-#navbar {
-  overflow: initial;
-  z-index: 1000;
-  min-height: 10vh;
-}
-
 .logoTitle {
   font-family: 'medium';
   font-weight: lighter;
@@ -119,6 +115,10 @@
   margin-bottom: 0;
 }
 
+.nav-link {
+  font-family: "Exo 2", sans-serif !important;
+}
+
 .sticky {
   position: fixed;
   top: 0;
@@ -251,14 +251,12 @@
   /* Smooth transition for color and shadow changes */
 }
 
-/* Add hover effect */
 .loginbtn:hover {
   color: white;
-  /* Change text color on hover */
-  background: rgba(72, 108, 152, 0.5);
-  /* Optional: Light background on hover */
+  background: #1173eb;
+  /* Make sure only one hover color is applied */
   box-shadow: 0 6px 15px rgba(0, 0, 0, 0.3);
-  /* Enhanced shadow on hover for a more pronounced floating effect */
+  /* Enhanced shadow effect */
 }
 
 .button {
@@ -274,14 +272,6 @@
   box-shadow: 0 6px 15px rgba(0, 0, 0, 0.3);
 }
 
-/* Add hover effect */
-.loginbtn:hover {
-  color: white;
-  /* Change text color on hover */
-  background: #1173eb;
-  /* Background color on hover */
-  /* Optional: you can use a different color or remove this line */
-}
 
 /* .......................... */
 
@@ -365,3 +355,154 @@
 .modal-backdrop {
   --bs-backdrop-zindex: 0;
 }
+
+/* Media query for desktop screens */
+@media (min-width: 1024px) {
+  .collapse {
+    visibility: visible;
+  }
+}
+
+/* Media query for mobile screens */
+@media (max-width: 768px) {
+  .logoTitle {
+    font-size: 1rem;
+  }
+
+  .logoImg {
+    width: 1.25rem !important;
+  }
+
+  form .btn {
+    height: 30px !important;
+    padding: 0.5rem !important;
+  }
+
+  .darkmode {
+    width: 30px !important;
+    height: 30px;
+  }
+
+  .Navbar-Btn-Group {
+    margin-left: 1rem !important;
+  }
+}
+
+.sidebar {
+  position: fixed;
+  top: 0;
+  left: -250px;
+  /* Hide off-screen */
+  width: 250px;
+  height: 100%;
+  background-color: white;
+  /* Change according to your theme */
+  transition: left 0.3s ease;
+  z-index: 1000;
+  /* Ensure it is above other elements */
+}
+
+.sidebar.open {
+  left: 0;
+  /* Show sidebar */
+}
+
+.sidebar-links {
+  list-style: none;
+  padding: 20px;
+}
+
+.sidebar-links li {
+  margin: 15px 0;
+}
+
+.sidebar-links a {
+  text-decoration: none;
+  color: black !important;
+  /* Change according to your theme */
+  font-size: 18px;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  font-size: 24px;
+  cursor: pointer;
+  margin: 15px;
+}
+
+.sidebar-toggle {
+  position: fixed;
+  top: 20px;
+  right: 20px;
+  background-color: #007bff;
+  color: white;
+  border: none;
+  padding: 10px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+@media (min-width: 768px) {
+  .sidebar {
+    display: none;
+    /* Hide on larger screens */
+  }
+
+  .sidebar-toggle {
+    display: none;
+    /* Hide toggle on larger screens */
+  }
+
+
+}
+
+/* Navbar styles */
+.navbar {
+  display: flex;
+  justify-content: space-between;
+  padding: 1rem;
+}
+
+.sidebar {
+  position: fixed;
+  top: 0;
+  right: -300px;
+  /* Hidden by default */
+  width: 250px;
+  height: 100%;
+  background-color: black;
+  color: white;
+  transition: right 0.3s ease;
+}
+
+.sidebar.open {
+  right: 0;
+  /* Slide in */
+  top: 11%;
+}
+
+.sidebar-links {
+  list-style-type: none;
+  padding: 0;
+}
+
+.sidebar-links li {
+  padding: 1rem;
+}
+
+.sidebar-links li a {
+  color: white;
+  text-decoration: none;
+}
+
+.sticky {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  z-index: 1000;
+}
+
+.rnav {
+  display: flex;
+}
\ No newline at end of file
diff --git a/client/src/component/css/Theme.css b/client/src/component/css/Theme.css
index ef457c0..909653a 100644
--- a/client/src/component/css/Theme.css
+++ b/client/src/component/css/Theme.css
@@ -1,12 +1,11 @@
     /* Light theme styles */
-  .light {
-    background-color: #ffffff;
-    color: #000000;
-  }
-  
-  /* Dark theme styles */
-  .dark {
-    background-color: #333333;
-    color: #ffffff;
-  }
-  
\ No newline at end of file
+    .light {
+      background-color: #ffffff;
+      color: #000000;
+    }
+
+    /* Dark theme styles */
+    .dark {
+      background-color: #333333;
+      color: #ffffff;
+    }
\ No newline at end of file