From c8ef9106210e68f3b7bb0db4ad5657fbb7761737 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Sun, 24 Nov 2024 10:39:10 -0800
Subject: [PATCH 01/15] partially refactored navbar and resuable primary and
 secondary cl buttons

---
 backend/package-lock.json                     | 383 +--------------
 backend/package.json                          |   1 -
 frontend/package-lock.json                    | 451 ++++--------------
 frontend/package.json                         |   3 +-
 frontend/src/App.css                          |   7 -
 frontend/src/assets/logo.svg                  |  15 +
 frontend/src/components/Buttons/CLButtons.jsx |  69 +++
 .../components/Buttons/CreateNewLogButton.css |   4 -
 .../components/Buttons/CreateNewLogButton.jsx |  23 -
 .../components/Buttons/LogHistoryButton.css   |   4 -
 .../components/Buttons/LogHistoryButton.jsx   |  23 -
 frontend/src/components/Navbar/Navbar.css     |  95 +++-
 frontend/src/components/Navbar/Navbar.jsx     |  79 ++-
 frontend/src/components/inputs/CLInputs.jsx   |  33 ++
 frontend/src/index.css                        |  32 +-
 frontend/src/pages/Dashboard.jsx              |  28 +-
 frontend/src/pages/Homepage.jsx               |   4 +-
 frontend/src/pages/NewLog.jsx                 |   2 +-
 18 files changed, 376 insertions(+), 880 deletions(-)
 create mode 100644 frontend/src/assets/logo.svg
 create mode 100644 frontend/src/components/Buttons/CLButtons.jsx
 delete mode 100644 frontend/src/components/Buttons/CreateNewLogButton.css
 delete mode 100644 frontend/src/components/Buttons/CreateNewLogButton.jsx
 delete mode 100644 frontend/src/components/Buttons/LogHistoryButton.css
 delete mode 100644 frontend/src/components/Buttons/LogHistoryButton.jsx
 create mode 100644 frontend/src/components/inputs/CLInputs.jsx

diff --git a/backend/package-lock.json b/backend/package-lock.json
index a19137fa..f85c7b95 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -9,7 +9,6 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "dependencies": "^0.0.1",
         "@supabase/supabase-js": "^2.46.1",
         "cors": "^2.8.5",
         "dotenv": "^16.4.5",
@@ -2933,6 +2932,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3008,45 +3008,6 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
-    "node_modules/asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
-      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="
-    },
     "node_modules/babel-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
@@ -3194,14 +3155,6 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "node_modules/bin-links": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz",
@@ -3426,11 +3379,6 @@
         }
       ]
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -3563,17 +3511,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/commander": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
@@ -3640,11 +3577,6 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
-    },
     "node_modules/cors": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@@ -3691,17 +3623,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -3771,14 +3692,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -3787,17 +3700,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/dependencies": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/dependencies/-/dependencies-0.0.1.tgz",
-      "integrity": "sha512-geDgiSknEUQ3IV0hr8EnkrZRdgdybxMzySyWRE8P/TE4teCV7g1rRrHAjd6TdlOLIkZVQm+tZU9AxdLv/m57kg==",
-      "dependencies": {
-        "async": "*",
-        "node-walker": "*",
-        "request": "*",
-        "underscore": "*"
-      }
-    },
     "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
@@ -3841,15 +3743,6 @@
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -4300,23 +4193,11 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
@@ -4337,7 +4218,8 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -4497,27 +4379,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
     "node_modules/formdata-polyfill": {
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
@@ -4636,14 +4497,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -4706,27 +4559,6 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4801,20 +4633,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/https-proxy-agent": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
@@ -5030,21 +4848,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
-    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -5783,11 +5591,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
-    },
     "node_modules/jsesc": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
@@ -5812,15 +5615,11 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -5828,11 +5627,6 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
-    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -5877,20 +5671,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/jwa": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
@@ -6258,14 +6038,6 @@
       "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true
     },
-    "node_modules/node-walker": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/node-walker/-/node-walker-0.1.0.tgz",
-      "integrity": "sha512-oC1skUd/BuOroGKhTnUJn1B20ETn9SFaHjRRfS911XcdQxTlzDEWTaK0KJpgluI66tHvFBC3QnN5x7YlZb5SeQ==",
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/nodemon": {
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz",
@@ -6356,14 +6128,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -6586,11 +6350,6 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
       "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
-    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -6707,14 +6466,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/psl": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.10.0.tgz",
-      "integrity": "sha512-KSKHEbjAnpUuAUserOq0FxGXCUrzC3WniuSJhvdbs102rL55266ZcHBqLWOsG30spQMlPdpy7icATiAQehg/iA==",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      }
-    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -6725,6 +6476,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -6895,45 +6647,6 @@
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -7296,30 +7009,6 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "node_modules/sshpk": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -7557,18 +7246,6 @@
         "nodetouch": "bin/nodetouch.js"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -7586,22 +7263,6 @@
         "typescript": ">=4.2.0"
       }
     },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -7667,11 +7328,6 @@
       "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
       "dev": true
     },
-    "node_modules/underscore": {
-      "version": "1.13.7",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
-      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="
-    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
@@ -7759,6 +7415,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -7771,15 +7428,6 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -7802,19 +7450,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "node_modules/walker": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
diff --git a/backend/package.json b/backend/package.json
index 9634e7a3..b593bde9 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -16,7 +16,6 @@
   "dependencies": {
     "@supabase/supabase-js": "^2.46.1",
     "cors": "^2.8.5",
-    "dependencies": "^0.0.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
     "jsonwebtoken": "^9.0.2",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 25e3d790..bc586bc1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,11 +8,12 @@
       "name": "frontend",
       "version": "0.0.0",
       "dependencies": {
-        "dependencies": "^0.0.1",
         "@emotion/react": "^11.13.3",
         "@emotion/styled": "^11.13.0",
+        "@heroicons/react": "^2.2.0",
         "@mui/icons-material": "^6.1.2",
         "@mui/material": "^6.1.2",
+        "@mui/x-date-pickers": "^7.22.3",
         "@supabase/supabase-js": "^2.45.5",
         "axios": "^1.7.7",
         "pdfjs-dist": "^4.7.76",
@@ -2485,6 +2486,14 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@heroicons/react": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz",
+      "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==",
+      "peerDependencies": {
+        "react": ">= 16 || ^19.0.0-rc"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -3248,6 +3257,90 @@
         }
       }
     },
+    "node_modules/@mui/x-date-pickers": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.22.3.tgz",
+      "integrity": "sha512-shNp92IrST5BiVy2f4jbrmRaD32QhyUthjh1Oexvpcn0v6INyuWgxfodoTi5ZCnE5Ue5UVFSs4R9Xre0UbJ5DQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.25.7",
+        "@mui/utils": "^5.16.6 || ^6.0.0",
+        "@mui/x-internals": "7.21.0",
+        "@types/react-transition-group": "^4.4.11",
+        "clsx": "^2.1.1",
+        "prop-types": "^15.8.1",
+        "react-transition-group": "^4.4.5"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "@emotion/react": "^11.9.0",
+        "@emotion/styled": "^11.8.1",
+        "@mui/material": "^5.15.14 || ^6.0.0",
+        "@mui/system": "^5.15.14 || ^6.0.0",
+        "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0",
+        "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0",
+        "dayjs": "^1.10.7",
+        "luxon": "^3.0.2",
+        "moment": "^2.29.4",
+        "moment-hijri": "^2.1.2 || ^3.0.0",
+        "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0",
+        "react": "^17.0.0 || ^18.0.0",
+        "react-dom": "^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@emotion/react": {
+          "optional": true
+        },
+        "@emotion/styled": {
+          "optional": true
+        },
+        "date-fns": {
+          "optional": true
+        },
+        "date-fns-jalali": {
+          "optional": true
+        },
+        "dayjs": {
+          "optional": true
+        },
+        "luxon": {
+          "optional": true
+        },
+        "moment": {
+          "optional": true
+        },
+        "moment-hijri": {
+          "optional": true
+        },
+        "moment-jalaali": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@mui/x-internals": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.21.0.tgz",
+      "integrity": "sha512-94YNyZ0BhK5Z+Tkr90RKf47IVCW8R/1MvdUhh6MCQg6sZa74jsX+x+gEZ4kzuCqOsuyTyxikeQ8vVuCIQiP7UQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.25.7",
+        "@mui/utils": "^5.16.6 || ^6.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4108,6 +4201,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4319,27 +4413,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4360,19 +4433,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
-      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="
-    },
     "node_modules/axios": {
       "version": "1.7.7",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
@@ -4572,14 +4632,6 @@
       ],
       "optional": true
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "node_modules/bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -4755,11 +4807,6 @@
         "node": "^18.12.0 || >= 20.9.0"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
-    },
     "node_modules/chalk": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -4901,11 +4948,6 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
-    },
     "node_modules/cosmiconfig": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
@@ -4983,17 +5025,6 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/data-view-buffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
@@ -5185,17 +5216,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/dependencies": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/dependencies/-/dependencies-0.0.1.tgz",
-      "integrity": "sha512-geDgiSknEUQ3IV0hr8EnkrZRdgdybxMzySyWRE8P/TE4teCV7g1rRrHAjd6TdlOLIkZVQm+tZU9AxdLv/m57kg==",
-      "dependencies": {
-        "async": "*",
-        "node-walker": "*",
-        "request": "*",
-        "underscore": "*"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
@@ -5250,15 +5270,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "node_modules/electron-to-chromium": {
       "version": "1.5.62",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.62.tgz",
@@ -5910,23 +5921,11 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
@@ -5959,7 +5958,8 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -6074,14 +6074,6 @@
         "is-callable": "^1.1.3"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/form-data": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
@@ -6231,14 +6223,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -6324,27 +6308,6 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -6444,20 +6407,6 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/human-signals": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -6943,11 +6892,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-    },
     "node_modules/is-weakmap": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
@@ -7000,11 +6944,6 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
-    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -8139,11 +8078,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
-    },
     "node_modules/jsesc": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
@@ -8166,15 +8100,11 @@
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -8182,11 +8112,6 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
-    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -8199,20 +8124,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -8549,14 +8460,6 @@
       "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true
     },
-    "node_modules/node-walker": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/node-walker/-/node-walker-0.1.0.tgz",
-      "integrity": "sha512-oC1skUd/BuOroGKhTnUJn1B20ETn9SFaHjRRfS911XcdQxTlzDEWTaK0KJpgluI66tHvFBC3QnN5x7YlZb5SeQ==",
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -8578,14 +8481,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -8879,11 +8774,6 @@
         "path2d": "^0.2.1"
       }
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
-    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -9111,14 +9001,6 @@
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
-    "node_modules/psl": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.10.0.tgz",
-      "integrity": "sha512-KSKHEbjAnpUuAUserOq0FxGXCUrzC3WniuSJhvdbs102rL55266ZcHBqLWOsG30spQMlPdpy7icATiAQehg/iA==",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      }
-    },
     "node_modules/pump": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
@@ -9133,6 +9015,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -9153,14 +9036,6 @@
         }
       ]
     },
-    "node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -9455,50 +9330,6 @@
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -9659,7 +9490,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "optional": true
     },
     "node_modules/safe-regex-test": {
       "version": "1.0.3",
@@ -9678,11 +9510,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
     "node_modules/scheduler": {
       "version": "0.23.2",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
@@ -9865,30 +9692,6 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "node_modules/sshpk": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -10185,18 +9988,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -10218,6 +10009,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -10225,11 +10017,6 @@
         "node": "*"
       }
     },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -10365,11 +10152,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.13.7",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
-      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="
-    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
@@ -10449,6 +10231,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -10459,15 +10242,6 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "optional": true
     },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -10482,19 +10256,6 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "node_modules/vite": {
       "version": "5.4.11",
       "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 9894ef85..3df53f78 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,11 +13,12 @@
   "dependencies": {
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
+    "@heroicons/react": "^2.2.0",
     "@mui/icons-material": "^6.1.2",
     "@mui/material": "^6.1.2",
+    "@mui/x-date-pickers": "^7.22.3",
     "@supabase/supabase-js": "^2.45.5",
     "axios": "^1.7.7",
-    "dependencies": "^0.0.1",
     "pdfjs-dist": "^4.7.76",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 346c36a1..ca8e8130 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -1,10 +1,3 @@
-#root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-}
-
 .logo {
   height: 6em;
   padding: 1.5em;
diff --git a/frontend/src/assets/logo.svg b/frontend/src/assets/logo.svg
new file mode 100644
index 00000000..4e3d4a67
--- /dev/null
+++ b/frontend/src/assets/logo.svg
@@ -0,0 +1,15 @@
+<svg width="100" height="95" viewBox="0 0 100 95" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M79.1842 18.052C79.4813 18.8236 79.7542 19.5947 80 20.3842C80.0499 20.5439 80.0499 20.5439 80.1007 20.7068C80.2106 21.0587 80.3199 21.4108 80.4291 21.7629C80.5078 22.0154 80.5865 22.2679 80.6652 22.5204C80.877 23.2002 81.0883 23.8802 81.2995 24.5601C81.4314 24.9846 81.5634 25.4091 81.6954 25.8335C83.1516 30.5134 84.5982 35.1962 86.036 39.8818C86.16 40.2858 86.2843 40.6898 86.4089 41.0937C86.6877 41.9991 86.9627 42.9052 87.2273 43.8149C87.2748 43.9762 87.3223 44.1376 87.3713 44.3038C87.4583 44.5999 87.5438 44.8965 87.6274 45.1936C87.9233 46.1942 88.3116 46.6619 89.177 47.2488C90.7109 48.386 91.5769 50.2679 91.9264 52.1087C92.2221 54.3114 91.6218 55.8303 90.2673 57.5996C89.233 58.8029 88.1951 59.6596 86.6297 60.0571C86.0702 60.2833 85.9292 60.477 85.6169 60.9831C85.5213 61.135 85.4256 61.287 85.3271 61.4435C85.2272 61.6078 85.1273 61.7721 85.0244 61.9414C84.9176 62.1127 84.8106 62.2839 84.7033 62.4549C84.4843 62.8046 84.2665 63.155 84.0498 63.5061C83.5929 64.2425 83.1235 64.9708 82.6542 65.6993C82.4799 65.9714 82.3057 66.2436 82.1315 66.5158C81.5158 67.478 80.8995 68.4399 80.2832 69.4018C79.8444 70.0868 79.4057 70.7717 78.9673 71.4569C77.4194 73.8753 75.8642 76.2891 74.3075 78.7019C73.2885 80.2818 72.2711 81.8625 71.2663 83.4513C70.8804 84.0608 70.4877 84.6641 70.0826 85.2612C69.1411 85.2132 68.5445 84.7361 67.8072 84.2063C67.7004 84.1314 67.5936 84.0564 67.4836 83.9791C67.2365 83.8052 66.9907 83.6292 66.7453 83.4529C66.795 82.4782 67.1455 81.9679 67.7408 81.2113C68.5685 80.1168 69.335 78.9956 70.0731 77.8395C70.1751 77.6798 70.2771 77.52 70.3823 77.3554C70.5875 77.0333 70.7924 76.7111 70.9971 76.3887C71.3728 75.7976 71.7511 75.2083 72.1296 74.6189C72.9408 73.3553 73.7475 72.0887 74.5524 70.8211C75.3961 69.4931 76.2455 68.1687 77.0948 66.8442C77.3585 66.4329 77.6219 66.0214 77.8853 65.6099C79.8713 62.5066 81.8633 59.4074 83.8867 56.3281C84.2158 56.4074 84.533 56.4922 84.8537 56.6012C85.3217 56.6344 85.5463 56.5184 85.918 56.2416C86.8028 55.4628 87.7277 54.4893 87.8704 53.2789C87.8325 52.0649 87.1958 50.5547 86.3144 49.7082C85.8424 49.4578 85.4553 49.5911 84.9485 49.6976C84.5164 48.7628 84.214 47.8009 83.9104 46.8185C83.855 46.6408 83.7996 46.4632 83.7425 46.2801C83.5934 45.8014 83.4447 45.3226 83.2964 44.8436C83.141 44.3423 82.9849 43.8412 82.829 43.34C82.4727 42.1945 82.1177 41.0486 81.763 39.9025C81.7194 39.7618 81.6758 39.621 81.6309 39.476C80.9092 37.1455 80.1965 34.8124 79.484 32.4791C79.4297 32.3013 79.3754 32.1234 79.3194 31.9402C79.0397 31.0244 78.7602 30.1086 78.4808 29.1927C77.9748 27.5349 77.4671 25.8776 76.9508 24.2228C76.9078 24.0847 76.8648 23.9467 76.8205 23.8044C76.6227 23.17 76.4243 22.5358 76.2247 21.9019C76.1556 21.6809 76.0866 21.4599 76.0176 21.239C75.929 20.9573 75.929 20.9573 75.8386 20.67C75.7053 20.1975 75.6 19.745 75.5435 19.2576C75.862 18.7068 76.5303 18.5851 77.1079 18.4005C77.2067 18.3666 77.3056 18.3327 77.4074 18.2978C78.0179 18.0981 78.5429 18.0155 79.1842 18.052Z" fill="#244B94"/>
+<path d="M41.5642 8.40773C41.8928 8.69258 42.1767 8.99401 42.4744 9.31189C43.0224 9.51551 43.6166 9.51004 44.1958 9.54262C44.3647 9.55281 44.3647 9.55281 44.537 9.5632C44.9144 9.58583 45.2919 9.60764 45.6694 9.62946C45.9401 9.64552 46.2107 9.66163 46.4813 9.67779C47.0644 9.71249 47.6476 9.74683 48.2307 9.7809C49.154 9.83482 50.0772 9.88954 51.0004 9.94437C52.4622 10.0311 53.9239 10.1173 55.3857 10.2032C57.9993 10.3569 60.6127 10.5114 63.2262 10.6662C64.1426 10.7205 65.059 10.7745 65.9755 10.8283C66.5479 10.8619 67.1203 10.8957 67.6926 10.9295C67.9565 10.9451 68.2204 10.9606 68.4844 10.976C69.8784 11.0574 71.2705 11.146 72.6614 11.2709C72.7185 13.8376 72.7185 13.8376 72.3581 15.0382C72.308 15.088 72.2579 15.1377 72.2064 15.1889C71.7352 15.1798 71.2684 15.1609 70.7981 15.1346C70.6545 15.1272 70.5109 15.1197 70.3629 15.1121C69.9155 15.0885 69.4681 15.0636 69.0208 15.0382C68.8904 15.0308 68.76 15.0235 68.6257 15.0159C67.8597 14.9719 67.0939 14.9254 66.3281 14.8778C65.8975 14.851 65.4669 14.8246 65.0363 14.7982C64.4144 14.76 63.7924 14.7218 63.1705 14.6834C61.5189 14.5815 59.8673 14.4803 58.2156 14.3795C58.0476 14.3693 57.8796 14.359 57.7064 14.3485C55.2404 14.1981 52.774 14.0529 50.3074 13.9122C50.0794 13.8991 50.0794 13.8991 49.8469 13.8858C48.3932 13.8028 46.9394 13.7202 45.4856 13.639C44.9569 13.6094 44.4283 13.5794 43.8997 13.5493C43.6561 13.5355 43.4125 13.5219 43.1689 13.5086C42.8373 13.4903 42.5057 13.4715 42.1741 13.4525C41.9892 13.4422 41.8043 13.4319 41.6138 13.4212C41.135 13.3827 40.6713 13.316 40.199 13.2299C40.224 13.0714 40.2491 12.9129 40.2748 12.7496C40.2574 12.1962 40.2574 12.1962 39.9928 11.9478C38.9084 11.2045 37.4118 10.9614 36.1169 11.1614C35.0842 11.5181 34.1957 12.6044 33.6762 13.5313C33.53 13.9795 33.4358 14.421 33.3728 14.8875C33.573 15.0367 33.7732 15.1859 33.9796 15.3396C33.8904 15.8323 33.7413 16.0885 33.3953 16.4492C33.2595 16.5921 33.2595 16.5921 33.1209 16.7379C33.0226 16.8391 32.9242 16.9402 32.8229 17.0443C32.6712 17.2027 32.6712 17.2027 32.5165 17.3643C31.7133 18.1989 30.8944 19.0183 30.0642 19.8265C29.6121 20.2689 29.18 20.7184 28.7663 21.1966C28.1565 21.8985 27.4961 22.5448 26.831 23.1945C25.8977 24.0963 25.8977 24.0963 25.0403 25.0676C24.8848 25.25 24.8848 25.25 24.7262 25.4361C24.6261 25.4361 24.526 25.4361 24.4229 25.4361C24.385 25.5229 24.3471 25.6098 24.308 25.6993C24.0931 26.0862 23.8481 26.3402 23.5299 26.6487C23.3537 26.8212 23.3537 26.8212 23.174 26.9971C23.0511 27.116 22.9282 27.2349 22.8016 27.3574C21.8056 28.3217 21.8056 28.3217 20.8693 29.3423C20.0735 30.2637 19.1851 31.0977 18.3154 31.9494C17.6283 32.6261 16.9653 33.3088 16.336 34.0388C15.776 34.6684 15.1603 35.2459 14.5568 35.8339C13.9526 36.4272 13.3785 37.0345 12.8276 37.6772C12.4709 38.0784 12.1256 38.3925 11.6806 38.6971C11.0274 38.6804 10.6534 38.1846 10.23 37.7458C10.157 37.6725 10.0839 37.5991 10.0087 37.5236C9.80378 37.3156 9.6043 37.1023 9.40518 36.8887C9.30682 36.7871 9.20846 36.6856 9.10712 36.5809C8.95009 36.286 8.95009 36.286 9.05098 35.934C9.28144 35.4771 9.54089 35.1978 9.90944 34.842C10.0406 34.7139 10.1717 34.5858 10.3067 34.4538C10.4441 34.3218 10.5815 34.1898 10.723 34.0538C11.5416 33.2608 12.3438 32.471 13.0872 31.6076C13.6795 30.9418 14.332 30.3313 14.9698 29.709C15.5819 29.1076 16.1616 28.4926 16.7229 27.8445C17.2878 27.2124 17.9056 26.6304 18.5127 26.0388C19.0068 25.5537 19.4855 25.0649 19.9384 24.5413C20.6458 23.7254 21.4248 22.9824 22.1972 22.2279C22.7286 21.7055 23.2484 21.1823 23.7355 20.6186C24.4703 19.7692 25.2844 18.9979 26.0873 18.2128C26.7484 17.5624 27.3785 16.901 27.9834 16.1989C28.2777 15.8732 28.6078 15.6014 28.9452 15.3208C29.679 14.6091 29.741 13.9711 29.8275 12.9833C30.0217 11.2353 31.3816 9.59222 32.6143 8.40773C35.2077 6.39149 38.8521 6.67538 41.5642 8.40773Z" fill="#244B94"/>
+<path d="M10.315 44.8755C12.6109 47.431 13.9056 51.3853 15.4424 54.4495C15.6835 54.9302 15.925 55.4106 16.1664 55.8911C16.5348 56.6242 16.903 57.3575 17.2709 58.0908C17.5958 58.738 17.9215 59.3848 18.2481 60.0311C19.104 61.726 19.937 63.4321 20.7725 65.137C21.5251 66.6721 22.2798 68.2055 23.0614 69.7263C23.1192 69.8393 23.177 69.9522 23.2366 70.0686C23.5041 70.5908 23.7732 71.1121 24.0456 71.6318C24.1395 71.8144 24.2333 71.9971 24.3271 72.1798C24.4083 72.3355 24.4895 72.4912 24.5732 72.6516C24.7343 73.0775 24.7436 73.2432 24.5742 73.6579C24.3739 73.7076 24.1737 73.7573 23.9674 73.8086C23.6969 75.152 23.9863 76.3506 24.7353 77.51C25.4318 78.3804 26.054 78.5806 27.153 78.7815C28.1336 78.8702 28.9138 78.937 29.7318 78.3294C29.8662 77.9389 29.8662 77.9389 29.8834 77.5759C31.0362 77.6818 32.1381 77.9617 33.2592 78.2393C33.4761 78.2925 33.6931 78.3456 33.91 78.3987C34.4965 78.5425 35.0828 78.6871 35.6691 78.832C36.1633 78.954 36.6577 79.0755 37.1521 79.197C41.0224 80.1486 44.8879 81.1185 48.7512 82.0971C50.9625 82.6571 53.1746 83.2121 55.3923 83.7467C55.5833 83.7928 55.7744 83.8389 55.9713 83.8865C56.8617 84.1012 57.7525 84.3145 58.6438 84.5256C58.9528 84.5997 59.2619 84.6738 59.571 84.748C59.711 84.7806 59.8511 84.8133 59.9954 84.847C60.122 84.8775 60.2486 84.9081 60.3791 84.9396C60.4888 84.9655 60.5984 84.9915 60.7114 85.0182C60.9807 85.1106 60.9807 85.1106 61.284 85.412C61.3511 86.5268 60.9889 87.7241 60.5256 88.7272C60.0705 89.0286 60.0705 89.0286 59.6226 88.9689C59.3456 88.9 59.3456 88.9 59.0629 88.8296C58.96 88.8046 58.8571 88.7795 58.751 88.7537C58.4047 88.6689 58.0592 88.5813 57.7136 88.4938C57.466 88.4325 57.2183 88.3714 56.9705 88.3105C56.2957 88.1441 55.6216 87.9752 54.9476 87.8059C54.2401 87.6287 53.5321 87.4537 52.8242 87.2784C51.4795 86.9452 50.1353 86.61 48.7913 86.274C47.2741 85.8949 45.7563 85.5179 44.2385 85.1412C42.1208 84.6155 40.0033 84.0891 37.8863 83.5607C37.3881 83.4364 36.8899 83.3124 36.3915 83.1885C35.4005 82.9421 34.4099 82.6947 33.4221 82.4358C33.2788 82.3986 33.1354 82.3615 32.9877 82.3232C32.74 82.2588 32.4925 82.1931 32.2455 82.1258C31.355 81.8955 30.8125 81.9885 30.0144 82.4034C29.2168 82.7654 28.5031 82.7861 27.6365 82.7654C27.4897 82.7634 27.3429 82.7614 27.1917 82.7594C25.4258 82.7152 23.5936 82.3707 22.233 81.159C20.6099 79.3294 19.8978 77.0971 19.9819 74.6939C20.0234 74.11 20.0234 74.11 20.1511 73.652C20.187 72.757 19.7975 72.1402 19.3858 71.3598C19.2601 71.1135 19.2601 71.1135 19.1318 70.8622C18.8627 70.3361 18.5899 69.8119 18.3168 69.2878C18.051 68.7719 17.786 68.2556 17.5213 67.7392C17.3567 67.4189 17.1915 67.0989 17.0253 66.7794C16.4789 65.724 15.9595 64.6579 15.4468 63.586C14.6471 61.9158 13.8147 60.2634 12.972 58.6143C12.5482 57.784 12.1267 56.9525 11.7048 56.1213C11.1724 55.0726 10.6393 54.0243 10.1037 52.9772C9.66592 52.1213 9.2305 51.2642 8.79666 50.4063C8.63174 50.0812 8.46595 49.7566 8.29928 49.4324C8.06829 48.9829 7.84032 48.5319 7.61303 48.0806C7.54364 47.9473 7.47425 47.814 7.40275 47.6766C7.34176 47.554 7.28077 47.4314 7.21793 47.3051C7.16389 47.199 7.10985 47.0929 7.05416 46.9836C6.9777 46.6838 6.9777 46.6838 7.08309 46.3638C7.4073 45.9008 7.8974 45.6927 8.39035 45.4406C8.49115 45.3858 8.59195 45.331 8.69581 45.2746C9.73161 44.7331 9.73161 44.7331 10.315 44.8755Z" fill="#244B94"/>
+<path d="M74.4811 22.5731C75.0352 22.7614 75.2063 22.8249 75.5429 23.3266C75.6297 23.6493 75.705 23.975 75.774 24.3019C75.8187 24.5079 75.8635 24.7138 75.9084 24.9196C75.9321 25.0295 75.9557 25.1393 75.9801 25.2524C77.7473 33.3835 80.3348 41.585 83.908 49.1184C85.3928 52.2934 85.3928 52.2934 84.9479 53.7666C84.0759 55.5911 82.6108 57.1441 81.28 58.6513C80.5587 59.472 79.8843 60.3209 79.2272 61.1931C79.0185 61.4697 78.8081 61.7449 78.5975 62.02C74.7387 67.0755 71.1916 72.4407 68.1544 78.0235C68.0931 78.1353 68.0319 78.2471 67.9688 78.3623C67.8586 78.5649 67.7501 78.7683 67.6437 78.9728C67.3298 79.5506 67.046 79.8647 66.4413 80.1379C66.3412 80.1379 66.2411 80.1379 66.1379 80.1379C66 78.9525 66.4468 78.2635 67.067 77.2747C67.2631 76.9524 67.459 76.63 67.6549 76.3076C67.7558 76.1434 67.8567 75.9791 67.9606 75.8099C68.3421 75.1835 68.7104 74.5501 69.0782 73.9157C72.4667 68.0767 76.3798 62.5762 80.7005 57.3832C80.3747 57.3832 80.0316 57.7876 79.7998 57.9766C79.6639 58.0867 79.528 58.1968 79.388 58.3103C78.1485 59.3459 76.9777 60.4506 75.8332 61.5878C75.6097 61.8094 75.3851 62.0298 75.1604 62.2501C74.3305 63.0698 73.5587 63.9172 72.8284 64.8272C72.5244 65.2004 72.209 65.5576 71.8845 65.9133C71.2877 66.5737 70.7466 67.2662 70.2147 67.9788C70.1173 68.1088 70.02 68.2388 69.9197 68.3727C68.2934 70.5545 66.7596 72.7726 65.3403 75.0932C65.2018 75.3181 65.0632 75.543 64.9244 75.7678C64.8674 75.8614 64.8104 75.955 64.7516 76.0514C64.4632 76.5079 64.3414 76.6619 63.8246 76.8791C63.6869 76.9102 63.5493 76.9413 63.4074 76.9733C63.2873 75.8364 63.6474 75.2238 64.2702 74.2891C64.3593 74.1512 64.4484 74.0133 64.5401 73.8712C64.8165 73.4462 65.0972 73.0244 65.3795 72.6032C65.4629 72.478 65.5463 72.3528 65.6322 72.2238C67.4013 69.5785 69.2931 67.0296 71.3558 64.6031C71.573 64.3457 71.7863 64.0858 71.9983 63.8242C73.0527 62.5407 74.2255 61.3724 75.4007 60.1993C75.527 60.0727 75.527 60.0727 75.6558 59.9435C76.7305 58.868 77.8333 57.8718 79.0319 56.9311C79.2195 56.7778 79.4067 56.6239 79.593 56.469C79.8242 56.2772 80.0554 56.0854 80.2866 55.8936C80.4752 55.7372 80.6637 55.5807 80.8522 55.4242C79.8907 55.7134 79.0088 56.0776 78.1217 56.545C77.9976 56.6104 77.8735 56.6758 77.7456 56.7431C75.5995 57.9019 73.7145 59.3837 71.9023 60.9998C71.7781 61.1092 71.7781 61.1092 71.6515 61.2208C70.8154 61.9579 70.0045 62.6995 69.2856 63.5528C68.9749 63.9158 68.6467 64.2596 68.3185 64.6071C67.4083 65.5987 66.607 66.6661 65.7948 67.7372C65.3462 68.3246 64.8884 68.9048 64.4314 69.4858C63.0807 71.187 63.0807 71.187 61.8087 72.9458C61.4848 73.3261 61.1601 73.314 60.6769 73.3567C60.6041 72.5532 60.7984 72.1553 61.2458 71.4919C61.3067 71.4013 61.3675 71.3108 61.4302 71.2175C62.713 69.3341 64.1391 67.5524 65.5994 65.8031C65.815 65.5441 66.0282 65.2833 66.241 65.0221C67.2292 63.8271 68.312 62.7265 69.4088 61.6309C69.4821 61.5573 69.5554 61.4837 69.6309 61.4079C70.6384 60.3985 71.6892 59.47 72.8124 58.5888C72.9769 58.456 73.1412 58.3232 73.3054 58.1902C75.9359 56.1302 80.0198 53.095 83.5827 53.3145C83.5827 53.215 83.5827 53.1156 83.5827 53.0131C83.4736 52.9729 83.3645 52.9327 83.2521 52.8913C76.3393 49.9903 71.9521 40.9124 69.3079 34.4722C68.7724 33.1511 68.2861 31.8142 67.8255 30.4656C67.7919 30.3687 67.7583 30.2717 67.7237 30.1718C67.6295 29.898 67.5384 29.6232 67.4475 29.3484C67.3957 29.1927 67.3439 29.037 67.2905 28.8765C67.1927 28.4167 67.2069 28.1417 67.3515 27.6967C67.4516 27.5972 67.5517 27.4977 67.6549 27.3953C68.3634 28.0009 68.6397 28.5815 68.949 29.4479C68.9965 29.5751 69.0439 29.7023 69.0928 29.8334C69.1944 30.1061 69.2952 30.3791 69.3951 30.6524C69.6587 31.3718 69.9299 32.0883 70.2011 32.8049C70.2551 32.9481 70.3092 33.0913 70.3649 33.2388C72.8267 39.7249 76.1075 46.1472 81.7624 50.4513C81.5495 50.0054 81.3043 49.6049 81.0235 49.1981C80.9372 49.072 80.8509 48.9459 80.762 48.816C80.6697 48.6812 80.5775 48.5464 80.4825 48.4075C79.4723 46.9152 78.5433 45.3936 77.6666 43.8208C77.605 43.712 77.5434 43.6031 77.4798 43.491C74.7127 38.5848 70.5692 30.8073 70.8404 25.1349C70.9155 24.9111 70.9155 24.9111 70.9921 24.6828C71.5822 24.9051 71.7636 25.1915 72.054 25.7376C72.1501 26.0263 72.235 26.3189 72.3106 26.6135C72.356 26.7858 72.4014 26.958 72.4482 27.1354C72.4964 27.3206 72.5447 27.5058 72.5944 27.6967C74.3799 34.3515 77.19 43.498 82.2175 48.4923C82.1772 48.402 82.137 48.3118 82.0956 48.2187C79.398 42.1226 77.3718 35.7952 75.6946 29.3543C75.6615 29.2275 75.6283 29.1008 75.5941 28.9702C75.3931 28.2014 75.195 27.4318 75.0008 26.6613C74.9394 26.4185 74.8773 26.176 74.8146 25.9336C74.7275 25.5962 74.6433 25.2583 74.5599 24.92C74.5115 24.7282 74.4632 24.5364 74.4134 24.3388C74.3169 23.6953 74.3726 23.2116 74.4811 22.5731ZM82.3691 48.7937C82.5208 49.0951 82.5208 49.0951 82.5208 49.0951L82.3691 48.7937Z" fill="#244B94"/>
+<path d="M40.9669 13.9363C41.1357 13.9631 41.3045 13.9899 41.4785 14.0175C42.5329 14.1873 43.5838 14.3742 44.6343 14.5661C51.2376 15.7702 57.9735 16.3267 64.6844 16.4251C64.8272 16.4274 64.97 16.4298 65.1171 16.4322C65.8098 16.4434 66.5023 16.4516 67.1951 16.454C67.4454 16.4572 67.6956 16.4605 67.9459 16.4639C68.1159 16.4628 68.1159 16.4628 68.2893 16.4616C69.0294 16.4757 69.4046 16.6325 69.9309 17.1479C69.4657 17.6085 69.0708 17.6535 68.4274 17.6589C68.3086 17.6575 68.1898 17.6562 68.0673 17.6547C67.9412 17.655 67.8151 17.6552 67.6852 17.6554C67.2676 17.6552 66.8501 17.6513 66.4325 17.6471C66.1382 17.6454 65.8439 17.6437 65.5496 17.6419C57.7542 17.5798 49.9864 16.9381 42.3227 15.4903C49.4708 18.2528 56.8605 19.8197 64.5268 20.2348C64.6314 20.2407 64.7359 20.2466 64.8436 20.2527C65.347 20.281 65.8501 20.3063 66.354 20.3261C66.6231 20.3401 66.6231 20.3401 66.8976 20.3543C67.0554 20.3609 67.2131 20.3675 67.3756 20.3742C67.904 20.4831 68.1728 20.707 68.5657 21.0659C68.118 21.4959 67.7672 21.5723 67.1514 21.5732C67.0424 21.5706 66.9334 21.5679 66.8212 21.5651C66.6432 21.5624 66.6432 21.5624 66.4617 21.5596C57.7347 21.3644 49.052 19.6337 40.9574 16.3945C46.0328 21.5597 54.8168 22.8592 61.6162 23.8067C62.1683 23.8839 62.7204 23.9614 63.2723 24.0402C63.6115 24.0885 63.9509 24.1361 64.2903 24.1826C64.4425 24.2043 64.5947 24.2259 64.7515 24.2483C64.8844 24.2667 65.0172 24.2852 65.1541 24.3043C65.8381 24.4436 66.1982 24.5454 66.5937 25.1347C66.4408 25.3613 66.4408 25.3613 66.1386 25.5867C65.7236 25.6126 65.3559 25.608 64.944 25.5773C64.8188 25.5691 64.6936 25.5609 64.5647 25.5524C56.1683 24.9257 46.4655 22.8661 39.8956 17.2986C39.7125 17.1445 39.7125 17.1445 39.5258 16.9872C38.8734 16.4254 38.3153 15.8541 37.7719 15.1889C37.7666 15.2773 37.7614 15.3658 37.756 15.4569C37.1242 25.4812 30.9411 34.0575 24.1728 41.1393C23.7486 41.4606 23.4314 41.5143 22.9059 41.5602C22.9544 40.6096 23.2481 40.1729 23.8919 39.4882C24.0593 39.3025 24.2266 39.1167 24.3938 38.9307C24.5178 38.7946 24.5178 38.7946 24.6444 38.6556C24.9648 38.2989 25.2678 37.9295 25.57 37.5574C25.9778 37.0574 26.3924 36.5651 26.8164 36.0786C30.8268 31.4564 36.1032 24.4653 36.1032 18.0521C36.0429 18.1767 36.0429 18.1767 35.9813 18.3038C32.6999 25.0428 28.2653 31.0175 23.0627 36.4177C22.8399 36.649 22.6179 36.8811 22.3965 37.1137C22.0158 37.5122 21.6317 37.9071 21.2467 38.3015C21.0663 38.4912 21.0663 38.4912 20.8822 38.6848C19.9165 39.6618 19.9165 39.6618 19.2552 39.7578C19.1083 39.7558 18.9614 39.7539 18.8101 39.7519C18.8431 38.7396 19.2108 38.3277 19.9348 37.6475C20.0331 37.5515 20.1314 37.4555 20.2326 37.3566C20.5464 37.0509 20.8632 36.7484 21.1804 36.4461C21.4936 36.1436 21.8061 35.8406 22.1183 35.5371C22.3123 35.3491 22.507 35.1616 22.7024 34.975C23.3653 34.3379 23.9748 33.6665 24.5745 32.9707C24.7185 32.8075 24.8626 32.6444 25.0071 32.4815C26.1905 31.1338 27.2916 29.7332 28.3668 28.2992C28.4484 28.1912 28.53 28.0832 28.614 27.9719C30.3435 25.675 31.8592 23.2631 33.259 20.7551C33.365 20.5655 33.365 20.5655 33.4732 20.372C33.5702 20.1954 33.5702 20.1954 33.669 20.0152C33.7256 19.9122 33.7821 19.8093 33.8404 19.7032C33.9806 19.406 34.0626 19.1258 34.1312 18.8055C34.0786 18.8699 34.026 18.9343 33.9718 19.0006C33.4513 19.6375 32.9304 20.2742 32.4094 20.9108C32.2021 21.1642 31.9951 21.4179 31.7882 21.6717C30.3883 23.3831 28.9397 25.0438 27.4227 26.6537C27.2175 26.874 27.0142 27.0962 26.8119 27.3191C25.6945 28.5459 24.5308 29.722 23.3515 30.89C23.0275 31.2111 22.7043 31.533 22.3812 31.8549C22.1716 32.0631 21.9619 32.2711 21.7522 32.4792C21.6575 32.5735 21.5628 32.6679 21.4653 32.7651C20.8918 33.3318 20.2999 33.8688 19.688 34.3942C19.3741 34.6653 19.0713 34.9459 18.7716 35.2323C18.664 35.3343 18.5563 35.4362 18.4454 35.5413C18.2263 35.7498 18.0074 35.9585 17.7889 36.1676C16.0699 37.7929 16.0699 37.7929 15.1695 37.7929C15.1841 37.0829 15.275 36.7191 15.7858 36.2106C15.9822 36.0319 16.1814 35.8561 16.383 35.6832C16.4689 35.6084 16.5547 35.5336 16.6432 35.4566C16.8318 35.2929 17.0209 35.1297 17.2103 34.9669C19.048 33.3564 20.7829 31.6376 22.5129 29.9148C22.909 29.5205 23.3059 29.127 23.7029 28.7336C23.9587 28.4794 24.2145 28.2251 24.4702 27.9708C24.587 27.855 24.7038 27.7393 24.8241 27.6201C25.4477 26.998 26.0471 26.3636 26.6229 25.6975C26.9604 25.3089 27.3131 24.9357 27.6653 24.5601C28.3171 23.8592 28.9345 23.1379 29.5365 22.3939C29.8373 22.0268 30.1455 21.6676 30.4574 21.3098C31.2498 20.398 31.9854 19.4518 32.7091 18.4853C36.6544 13.2185 36.6544 13.2185 40.9669 13.9363Z" fill="#244B94"/>
+<path d="M21.9954 44.7248C22.7633 45.0055 23.0499 45.3064 23.3861 46.0121C23.4371 46.1281 23.4882 46.2441 23.5408 46.3636C23.5975 46.4878 23.6542 46.612 23.7126 46.74C27.4792 55.1736 30.7162 65.4232 27.7597 74.562C27.898 74.4872 28.0362 74.4124 28.1787 74.3354C36.1519 70.1341 46.0333 71.0327 54.5811 72.7631C54.7637 72.8001 54.9464 72.837 55.1346 72.8751C57.6164 73.399 57.6164 73.399 58.0226 73.9875C58.0477 74.0776 58.0727 74.1678 58.0985 74.2606C57.5798 74.6042 57.4724 74.5882 56.8779 74.5219C56.729 74.5053 56.58 74.4887 56.4266 74.4717C55.7536 74.3818 55.0865 74.271 54.4187 74.1488C54.1257 74.0966 53.8326 74.0444 53.5395 73.9923C53.389 73.9653 53.2385 73.9383 53.0834 73.9104C45.6418 72.5811 38.003 71.6812 30.7936 74.562C30.969 74.5511 31.1444 74.5403 31.3251 74.5291C39.7908 74.0444 48.1361 75.0564 56.2971 77.3122C56.56 77.3838 56.56 77.3838 56.8283 77.4569C57.0681 77.5263 57.0681 77.5263 57.3127 77.5971C57.4508 77.6368 57.5889 77.6764 57.7312 77.7173C58.1617 77.9048 58.4053 78.123 58.7052 78.48C58.7052 78.5795 58.7052 78.679 58.7052 78.7814C57.4954 79.1821 56.421 78.7422 55.2447 78.3953C47.9796 76.3326 40.1742 75.1385 32.6139 75.7676C32.9081 76.0598 33.4361 76.0313 33.8387 76.0884C34.0709 76.1227 34.303 76.157 34.5351 76.1915C34.659 76.2098 34.7828 76.228 34.9104 76.2468C41.6285 77.2471 48.1703 78.8918 54.6569 80.8817C54.8971 80.9547 54.8971 80.9547 55.1422 81.0292C55.5967 81.1679 56.0504 81.3089 56.5039 81.4509C56.639 81.492 56.7742 81.5331 56.9134 81.5754C57.6241 81.8017 58.1505 82.0297 58.7052 82.5488C58.6552 82.6979 58.6051 82.8471 58.5536 83.0008C57.7801 83.1944 57.2259 83.076 56.4909 82.8237C56.3796 82.7874 56.2683 82.7512 56.1536 82.7138C55.913 82.6354 55.6727 82.5562 55.4326 82.4763C54.7835 82.2608 54.1318 82.0534 53.4801 81.8459C53.3463 81.8033 53.2125 81.7606 53.0746 81.7167C46.5323 79.6452 39.7206 78.132 32.9179 77.2139C32.7944 77.1972 32.6709 77.1805 32.5436 77.1633C31.9585 77.0851 31.3733 77.0096 30.7873 76.9388C27.4484 76.5245 27.4484 76.5245 26.5997 75.6598C25.4967 74.2257 24.952 72.3365 24.3796 70.6439C22.998 66.5742 21.3403 62.6265 19.4849 58.7477C19.2655 58.2884 19.0488 57.8278 18.8323 57.3671C18.0069 55.6217 17.1341 53.9046 16.2215 52.2029C16.17 52.1068 16.1185 52.0107 16.0655 51.9117C15.5593 50.9697 15.0456 50.0341 14.4919 49.1184C14.4134 48.9883 14.3349 48.8583 14.254 48.7242C14.1115 48.4912 13.9666 48.2595 13.8187 48.0298C13.3637 47.2909 13.2786 46.7962 13.3488 45.9303C13.8665 46.0586 14.1817 46.1383 14.526 46.5544C14.5976 46.6876 14.6693 46.8208 14.7431 46.9581C14.8259 47.1085 14.9086 47.2589 14.9939 47.4139C15.0799 47.577 15.1659 47.7401 15.2545 47.9082C15.3463 48.0767 15.438 48.2453 15.5326 48.419C15.7239 48.771 15.9142 49.1233 16.1029 49.4768C16.3656 49.967 16.6321 50.4549 16.9006 50.942C17.3123 51.6895 17.7199 52.4391 18.125 53.1901C18.2732 53.4646 18.4218 53.7389 18.5708 54.013C21.3876 59.1984 23.6347 64.6517 25.636 70.1919C24.7162 62.3076 21.9519 53.975 17.8142 47.1461C17.4114 46.4515 17.3956 45.9563 17.4446 45.1769C18.0357 45.2607 18.2719 45.4858 18.6581 45.9303C18.9327 46.3666 19.1702 46.8198 19.4071 47.2771C19.4789 47.415 19.5506 47.5528 19.6246 47.6948C23.4432 55.1384 25.9329 62.9917 27.153 71.2468C28.3265 65.7386 27.1161 60.0657 25.3326 54.8212C25.2876 54.6879 25.2425 54.5547 25.1961 54.4173C24.6949 52.9544 24.1283 51.5202 23.5366 50.0915C23.485 49.9665 23.4334 49.8415 23.3802 49.7128C23.1196 49.0821 22.857 48.4523 22.5912 47.8238C22.4936 47.5898 22.3962 47.3558 22.2988 47.1217C22.2528 47.015 22.2069 46.9082 22.1596 46.7982C21.9061 46.1841 21.7802 45.6898 21.8437 45.0262C21.8937 44.9267 21.9438 44.8272 21.9954 44.7248Z" fill="#244B94"/>
+<path d="M40.1982 23.0249C40.6323 23.0614 40.8768 23.0847 41.1693 23.4174C41.6851 24.4217 42.0933 25.4551 42.4926 26.5097C44.0795 30.6001 45.9967 34.2325 49.0036 37.4703C49.2436 37.7316 49.4681 37.9958 49.6886 38.2732C50.0767 38.7181 50.4885 39.0872 50.9394 39.4675C51.1573 39.6539 51.3713 39.845 51.5806 40.0409C57.7837 45.8335 65.7724 48.7799 73.8693 50.841C74.5292 51.0091 75.1881 51.1804 75.8462 51.3552C76.078 51.4162 76.078 51.4162 76.3144 51.4785C76.69 51.5877 76.69 51.5877 77.2115 51.8073C77.3199 52.1224 77.3199 52.1224 77.3632 52.4101C75.4179 53.3097 72.7411 52.5465 70.6999 52.2553C63.5478 51.251 56.3437 52.8773 49.9066 56.0267C49.7617 56.0966 49.6167 56.1664 49.4674 56.2384C44.6016 58.5995 40.2995 61.7356 36.4948 65.5517C36.1953 65.8521 35.8945 66.1512 35.5935 66.4501C34.3194 67.7151 34.3194 67.7151 33.1305 69.0583C32.8764 69.3312 32.6279 69.5427 32.3101 69.7398C31.893 69.6173 31.893 69.6173 31.5517 69.4384C31.7466 68.0711 32.8691 67.0363 33.7779 66.0584C34.2622 65.5264 34.712 64.9691 35.1651 64.4108C35.4634 64.0522 35.7734 63.7128 36.093 63.373C40.0466 58.9711 41.7501 52.8336 42.6253 47.1358C42.6433 47.0235 42.6613 46.9111 42.6798 46.7953C43.7162 40.0224 42.5209 33.2747 40.5892 26.7858C40.5403 26.6217 40.4915 26.4575 40.4412 26.2883C40.3979 26.1451 40.3546 26.0018 40.31 25.8542C40.128 25.1732 40.0251 24.5111 40.0276 23.8066C40.027 23.6327 40.027 23.6327 40.0264 23.4552C40.0465 23.1756 40.0465 23.1756 40.1982 23.0249ZM42.3219 29.0526C42.4736 29.354 42.4736 29.354 42.4736 29.354L42.3219 29.0526ZM42.4736 29.354C42.5743 30.4315 42.7707 31.4698 42.9951 32.528C44.9536 42.0236 43.9646 52.8927 38.833 61.301C38.5881 61.6593 38.3337 62.0074 38.0745 62.3558C38.1246 62.4553 38.1746 62.5547 38.2262 62.6572C38.3461 62.5511 38.4659 62.4451 38.5894 62.3358C46.7624 55.191 57.4405 50.6441 68.4132 51.0538C68.814 51.0864 69.2129 51.1266 69.6124 51.1713C69.9789 51.2096 70.3393 51.2198 70.7076 51.2139C70.9986 51.2093 70.9986 51.2093 71.2954 51.2045C70.8231 50.8917 70.4558 50.7733 69.9124 50.6194C69.725 50.5655 69.5375 50.5115 69.3444 50.456C69.2452 50.4276 69.1459 50.3992 69.0436 50.37C62.1737 48.3963 55.8917 45.2037 50.5857 40.3929C50.331 40.1626 50.0741 39.9347 49.8154 39.7089C49.0203 39.0133 48.3027 38.3047 47.6312 37.4914C47.5667 37.4158 47.5022 37.3401 47.4358 37.2622C45.3813 34.85 43.9337 32.225 42.6253 29.354C42.5753 29.354 42.5252 29.354 42.4736 29.354Z" fill="#244B94"/>
+<path d="M39.8949 18.052C40.4967 18.1158 40.8637 18.4492 41.3265 18.8149C41.5028 18.9524 41.6792 19.0897 41.8556 19.227C41.9533 19.3034 42.051 19.3799 42.1517 19.4586C47.2101 23.4028 52.6211 26.9854 58.7223 29.1382C59.3539 29.3687 59.7804 29.578 60.2218 30.1075C60.1718 30.2567 60.1217 30.4059 60.0701 30.5596C59.4 30.7107 58.9999 30.7108 58.3642 30.4536C58.2139 30.3937 58.0637 30.3338 57.9088 30.272C57.7492 30.2053 57.5895 30.1386 57.425 30.0698C57.258 30.0015 57.091 29.9333 56.9189 29.8629C52.4577 28.0145 48.0519 25.7735 44.294 22.7235C44.2156 22.6609 44.1372 22.5983 44.0564 22.5338C43.0117 21.6981 42.0327 20.8077 41.08 19.8698C40.9325 19.7253 40.9325 19.7253 40.782 19.578C40.6905 19.4864 40.5989 19.3949 40.5046 19.3006C40.3828 19.1791 40.3828 19.1791 40.2586 19.0551C40.0309 18.787 39.8882 18.5215 39.7432 18.2027C39.7933 18.153 39.8433 18.1033 39.8949 18.052Z" fill="#244B94"/>
+<path d="M63.7108 34.7791C64.4526 34.9665 64.7656 35.1661 65.1898 35.7963C65.2922 35.9445 65.3947 36.0927 65.5003 36.2454C65.6657 36.4893 65.6657 36.4893 65.8345 36.7381C66.0851 37.0945 66.3387 37.4486 66.593 37.8024C66.6575 37.8925 66.7221 37.9825 66.7887 38.0753C67.3531 38.8584 67.9458 39.6135 68.565 40.3547C68.6911 40.5063 68.8172 40.6578 68.9472 40.8139C70.7446 42.957 72.6295 45.0576 74.8271 46.8022C75.2296 47.128 75.6146 47.4663 75.998 47.8141C76.6395 48.3942 77.3017 48.9419 77.9759 49.484C78.7926 50.1466 79.5939 50.8274 80.3971 51.506C80.322 51.7298 80.322 51.7298 80.2454 51.9581C78.2681 51.222 76.5733 49.9369 74.9361 48.6429C74.8502 48.5754 74.7643 48.508 74.6758 48.4385C73.4057 47.4299 72.2488 46.3049 71.0964 45.1675C70.9569 45.0304 70.8175 44.8933 70.6738 44.752C69.7546 43.8345 68.9212 42.8738 68.1099 41.8617C67.9435 41.6615 67.7767 41.4617 67.6092 41.2624C66.5076 39.9406 65.4792 38.5804 64.5063 37.1622C64.3298 36.9066 64.1476 36.655 63.965 36.4038C63.6028 35.8067 63.6635 35.4602 63.7108 34.7791Z" fill="#244B94"/>
+<path d="M79.7907 53.465C79.8407 53.6142 79.8908 53.7634 79.9423 53.9171C79.8236 53.9677 79.7048 54.0184 79.5824 54.0706C72.7693 56.9801 66.2089 60.0104 60.6215 64.9606C60.1338 65.2762 59.735 65.3242 59.1603 65.3698C59.1883 64.7095 59.2428 64.3926 59.6901 63.8905C59.8585 63.7495 60.0298 63.6117 60.2032 63.4767C60.297 63.4005 60.3909 63.3243 60.4876 63.2459C60.8004 62.9951 61.1172 62.7502 61.4357 62.5066C61.5459 62.4219 61.6561 62.3373 61.7696 62.2501C66.2374 58.8453 73.8329 53.0951 79.7907 53.465Z" fill="#244B94"/>
+<path d="M37.7719 18.6547C37.9721 18.7045 38.1723 18.7542 38.3786 18.8054C38.6504 25.9138 36.2102 34.888 32.1592 40.8066C31.7603 41.1666 31.6457 41.2587 31.0973 41.2587C31.0417 40.3469 31.1665 39.7631 31.6188 38.9606C31.7315 38.748 31.8436 38.5351 31.9553 38.322C32.014 38.2109 32.0727 38.0999 32.1331 37.9855C35.2664 31.9327 36.5924 25.2983 37.7719 18.6547Z" fill="#244B94"/>
+<path d="M51.8032 66.6977C52.0032 66.695 52.0032 66.695 52.2073 66.6922C52.3352 66.6919 52.4631 66.6916 52.5949 66.6913C52.709 66.6906 52.8231 66.69 52.9406 66.6894C53.2443 66.726 53.2443 66.726 53.6994 67.0274C53.4339 67.6113 53.4339 67.6113 53.0926 67.7809C52.7535 67.8182 52.4136 67.8476 52.0734 67.8733C51.8598 67.8901 51.6463 67.907 51.4327 67.924C51.32 67.9329 51.2074 67.9417 51.0913 67.9508C44.7694 68.4542 38.923 69.938 32.9748 72.055C32.8321 72.1056 32.6894 72.1562 32.5423 72.2083C32.2897 72.2986 32.0375 72.3903 31.7861 72.4838C30.9947 72.7701 30.9947 72.7701 30.4902 72.603C30.7435 71.8484 31.4831 71.6533 32.1684 71.3033C32.3246 71.2232 32.4808 71.1432 32.6418 71.0607C38.4058 68.1745 45.3544 66.7026 51.8032 66.6977Z" fill="#244B94"/>
+<path d="M29.7317 47.5879C30.0973 47.7332 30.2984 47.8224 30.503 48.1638C30.6403 48.4883 30.7092 48.7634 30.7604 49.1108C30.7784 49.2319 30.7965 49.353 30.815 49.4779C30.9141 50.2036 31.0096 50.9294 31.097 51.6566C31.1135 51.7928 31.13 51.9289 31.147 52.0692C31.78 57.5885 32.4538 66.0823 29.58 71.0961C29.2663 71.1894 29.2663 71.1894 28.9733 71.2468C28.9839 71.1595 28.9945 71.0722 29.0054 70.9822C29.0999 70.204 29.1939 69.4257 29.2873 68.6473C29.3727 67.9375 29.4594 67.2279 29.5475 66.5184C29.9854 63.0154 29.9854 63.0154 30.1868 59.4927C30.1929 59.3136 30.1989 59.1345 30.2052 58.95C30.2586 56.0353 30.0479 53.0297 29.5615 50.1555C29.4285 49.3287 29.4059 48.5634 29.58 47.7386C29.6301 47.6889 29.6802 47.6392 29.7317 47.5879Z" fill="#244B94"/>
+</svg>
diff --git a/frontend/src/components/Buttons/CLButtons.jsx b/frontend/src/components/Buttons/CLButtons.jsx
new file mode 100644
index 00000000..0f4fc01e
--- /dev/null
+++ b/frontend/src/components/Buttons/CLButtons.jsx
@@ -0,0 +1,69 @@
+const DEFAULT_HEIGHT = "54px"
+const DEFAULT_WIDTH = "fit-content"
+const DEFAULT_BORDER_RADIUS = "20px"
+const DEFAULT_ON_CLICK = () => {}
+
+// PRIMARY specific styles
+const PRIMARY_COLOR = "#F7FAFF"
+const PRIMARY_BACKGROUND_COLOR = "#244B94"
+
+// SECONDARY specific styles
+const SECONDARY_COLOR = "#4F607E"
+const SECONDARY_BACKGROUND_COLOR = "#F7FAFF"
+const SECONDARY_BORDER = "1px solid #9AB0E1"
+
+/**
+ * PRIMARY variant of the clinical logging button.
+ * Should work out of the box for most use cases (with the exception of onClick which does nothing by default).
+ * The height and width are customizable if necessary.
+ */
+export const CLButtonPrimary = ({
+  children,
+  height = DEFAULT_HEIGHT,
+  width = DEFAULT_WIDTH,
+  onClick = DEFAULT_ON_CLICK
+}) => {
+
+  return (
+    <button 
+      onClick={onClick}
+      style={{
+        height: height,
+        width: width,
+        color: PRIMARY_COLOR,
+        backgroundColor: PRIMARY_BACKGROUND_COLOR,
+        borderRadius: DEFAULT_BORDER_RADIUS
+      }}
+    >
+      {children}
+    </button>
+  )
+}
+
+/**
+ * SECONDARY variant of the clinical logging button.
+ * Should work out of the box for most use cases (with the exception of onClick which does nothing by default).
+ * The height and width are customizable if necessary.
+ */
+export const CLButtonSecondary = ({
+  children,
+  height = DEFAULT_HEIGHT,
+  width = DEFAULT_WIDTH,
+  onClick = DEFAULT_ON_CLICK
+}) => {
+  return (
+    <button 
+      onClick={onClick}
+      style={{
+        height: height,
+        width: width,
+        color: SECONDARY_COLOR,
+        backgroundColor: SECONDARY_BACKGROUND_COLOR,
+        border: SECONDARY_BORDER,
+        borderRadius: DEFAULT_BORDER_RADIUS
+      }}
+    >
+      {children}
+    </button>
+  )
+}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/CreateNewLogButton.css b/frontend/src/components/Buttons/CreateNewLogButton.css
deleted file mode 100644
index 3831f023..00000000
--- a/frontend/src/components/Buttons/CreateNewLogButton.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.add-icon {
-    margin-right: 9px;
-    vertical-align: -6px;
-}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/CreateNewLogButton.jsx b/frontend/src/components/Buttons/CreateNewLogButton.jsx
deleted file mode 100644
index f39087fb..00000000
--- a/frontend/src/components/Buttons/CreateNewLogButton.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import AddIcon from "@mui/icons-material/Add";
-import { useNavigate } from "react-router-dom";
-import "./CreateNewLogButton.css";
-
-export default function CreateNewLogButton({ variant }) {
-  const navigate = useNavigate();
-
-  const handleCreateNewLog = () => {
-    navigate("/newLog");
-  };
-
-  return (
-    <button
-      onClick={handleCreateNewLog}
-      className={`create-new-log-button ${
-        variant === "navbar" ? "navbar-style" : ""
-      }`}
-    >
-      {variant !== "navbar" && <AddIcon className="add-icon" />}
-      Create New Log
-    </button>
-  );
-}
diff --git a/frontend/src/components/Buttons/LogHistoryButton.css b/frontend/src/components/Buttons/LogHistoryButton.css
deleted file mode 100644
index f9a21a14..00000000
--- a/frontend/src/components/Buttons/LogHistoryButton.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.history-icon {
-    margin-right: 9px;
-    vertical-align: -6px;
-}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/LogHistoryButton.jsx b/frontend/src/components/Buttons/LogHistoryButton.jsx
deleted file mode 100644
index 84954962..00000000
--- a/frontend/src/components/Buttons/LogHistoryButton.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useNavigate } from "react-router-dom";
-import HistoryIcon from "@mui/icons-material/History";
-import "./LogHistoryButton.css";
-
-export default function LogHistoryButton({ variant }) {
-  const navigate = useNavigate();
-
-  const handleViewHistory = () => {
-    navigate("/logHistory");
-  };
-
-  return (
-    <button
-      onClick={handleViewHistory}
-      className={`log-history-button ${
-        variant === "navbar" ? "navbar-style" : ""
-      }`}
-    >
-      {variant !== "navbar" && <HistoryIcon className="history-icon" />}
-      View Log History
-    </button>
-  );
-}
diff --git a/frontend/src/components/Navbar/Navbar.css b/frontend/src/components/Navbar/Navbar.css
index 49db6121..7db9f269 100644
--- a/frontend/src/components/Navbar/Navbar.css
+++ b/frontend/src/components/Navbar/Navbar.css
@@ -1,21 +1,90 @@
 .navbar {
     display: flex;
+    flex-direction: column;
+    position: absolute;
+    top: 20%;
+    left: 52px;
+    height: 600px;
+    width: 100px;
     justify-content: space-between;
     align-items: center;
-    padding: 16px;
-    width: 100vw;
-    height: 80px;
-    background-color: #242424;
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    border-bottom: 2px solid rgba(255, 255, 255, 0.3);
-}
-
-.nav-buttons-container {
+}
+
+.nav-button-container {
+    height: 400px;
+    width: 100px;
+    padding: 24px 0 24px 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    background-color: white;
+    border-radius: 50px;
+    box-shadow: 0px 0px 10px #CDD8F0;
+}
+
+.nav-button {
+    background-color: transparent;
+}
+
+.nav-button-icon-container {
+    height: 74px;
+    width: 74px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 40px;
+    color: #244B94;
+    background-color: #CDD8F0;
+}
+
+.nav-button-icon-container-selected {
+    height: 74px;
+    width: 74px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 40px;
+    color: #F7FAFF;
+    background-color: #244B94;
+}
+
+.nav-button-icon-container:hover {
+    background-color: #244B94;
+    color: white;
+}
+
+.nav-button-text {
+    margin-top: 4px;
+    color: #666B6F;
+}
+
+.nav-button-text-selected {
+    margin-top: 4px;
+    color: #244B94;
+    font-weight: bold;
+}
+
+.logout-button {
+    height: 74px;
+    width: 74px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 40px;
+    color: #244B94;
+    background-color: white;
+    box-shadow: 0px 0px 10px #CDD8F0
+}
+
+.icon {
+    height: 40px;
+    width: 40px;
+}
+
+/* .nav-buttons-container {
     display: flex;
     gap: 8px;
     margin-top: 10px;
     margin-right: 30px;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx
index 9666a7a4..cb580ee6 100644
--- a/frontend/src/components/Navbar/Navbar.jsx
+++ b/frontend/src/components/Navbar/Navbar.jsx
@@ -1,51 +1,42 @@
-import Logo from "../Logo/Logo";
-import HomeButton from "../Buttons/HomeButton";
-import CreateNewLogButton from "../Buttons/CreateNewLogButton";
-import LogHistoryButton from "../Buttons/LogHistoryButton";
-import SignInButton from "../Buttons/SignInButton";
-import { useAuth } from "../../contexts/AuthContext";
+// import Logo from "../Logo/Logo";
+// import HomeButton from "../Buttons/HomeButton";
+// import SignInButton from "../Buttons/SignInButton";
+// import { useAuth } from "../../contexts/AuthContext";
 import "./Navbar.css";
-import SignOutButton from "../Buttons/SignOutButton";
+import {
+  HomeIcon,
+  BookOpenIcon,
+  ClockIcon,
+  ArrowLeftStartOnRectangleIcon
+} from '@heroicons/react/24/outline';
+// import SignOutButton from "../Buttons/SignOutButton";
 
-export default function Navbar({ variant }) {
-  return (
-    <div>
-      <NavbarComponent variant={variant} />
-    </div>
-  );
-}
-
-function NavbarComponent({ variant }) {
+export default function Navbar() {
   return (
     <div className="navbar">
-      <Logo />
-      <NavButtons variant={variant} />
-    </div>
-  );
-}
-
-function NavButtons({ variant }) {
-  return (
-    <div className="nav-buttons-container">
-      {variant === "homepage" ? (
-        <Buttons />
-      ) : (
-        <>
-          <HomeButton />
-          <CreateNewLogButton variant="navbar" />
-          <LogHistoryButton variant="navbar" />
-        </>
-      )}
-    </div>
-  );
-}
-
-function Buttons() {
-  const { session } = useAuth();
-
-  return (
-    <div className="nav-buttons-container">
-      {session ? <SignOutButton /> : <SignInButton />}
+      <div className="nav-button-container">
+        <button className="nav-button">
+          <div className="nav-button-icon-container-selected">
+            <HomeIcon className="icon"/>
+          </div>
+          <p className="nav-button-text-selected">Home</p>
+        </button>
+        <button className="nav-button">
+          <div className="nav-button-icon-container">
+            <BookOpenIcon className="icon"/>
+          </div>
+          <p className="nav-button-text">Logs</p>
+        </button>
+        <button className="nav-button">
+          <div className="nav-button-icon-container">
+            <ClockIcon className="icon"/>
+          </div>
+          <p className="nav-button-text">History</p>
+        </button>
+      </div>
+      <button className="logout-button">
+        <ArrowLeftStartOnRectangleIcon className="icon"/>
+      </button>
     </div>
   );
 }
diff --git a/frontend/src/components/inputs/CLInputs.jsx b/frontend/src/components/inputs/CLInputs.jsx
new file mode 100644
index 00000000..100224ec
--- /dev/null
+++ b/frontend/src/components/inputs/CLInputs.jsx
@@ -0,0 +1,33 @@
+import { DemoContainer } from '@mui/x-date-pickers/internals/demo';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
+import { DatePicker } from '@mui/x-date-pickers/DatePicker';
+
+const DEFAULT_HEIGHT = "67px"
+const DEFAULT_WIDTH = "100%"
+const DEFAULT_PADDING = ""
+const DEFAULT_BORDER = ""
+const DEFAULT_BORDER_RADIUS = ""
+const DEFAULT_BACKGROUND_COLOR = "transparent"
+
+export const CLTextInput = () => {
+  return (
+    <input type="text"/>
+  )
+}
+
+export const CLNumberInput = () => {
+  return (
+    <input type="number"/>
+  )
+}
+
+export const CLDatePicker = () => {
+  return (
+    <LocalizationProvider dateAdapter={AdapterDayjs}>
+      <DemoContainer components={['DatePicker']}>
+        <DatePicker label="Basic date picker" />
+      </DemoContainer>
+    </LocalizationProvider>
+  );
+}
\ No newline at end of file
diff --git a/frontend/src/index.css b/frontend/src/index.css
index d7ff7205..7a1839a0 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -4,8 +4,8 @@
   font-weight: 400;
 
   color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+  color: #1E1E1E;
+  background-color: #F7FAFF;
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;
@@ -31,37 +31,9 @@ h1 {
 }
 
 button {
-  border-radius: 8px;
   border: 1px solid transparent;
-  padding: 0.6em 1.2em;
   font-size: 1em;
   font-weight: 500;
   font-family: inherit;
-  background-color: #1a1a1a;
   cursor: pointer;
-  transition: border-color 0.25s;
 }
-
-button:hover {
-  border-color: #646cff;
-}
-
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-
-  a:hover {
-    color: #747bff;
-  }
-
-  button {
-    background-color: #f9f9f9;
-  }
-}
\ No newline at end of file
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index 2156cd07..e2a30c86 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -1,14 +1,12 @@
-import Logo from "../components/Logo/Logo";
-import CreateNewLogButton from "../components/Buttons/CreateNewLogButton";
-import LogHistoryButton from "../components/Buttons/LogHistoryButton";
+import Navbar from "../components/Navbar/Navbar";
+import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButtons";
+import { useNavigate } from "react-router-dom";
 import "./styles/Dashboard.css";
 
 export default function Dashboard() {
   return (
     <div className="page-container">
-      <div className="sidebar">
-        <Logo variant="sidebar" />
-      </div>
+      <Navbar />
       <div className="main-content">
         <MainContent />
       </div>
@@ -31,10 +29,24 @@ function MainContent() {
 }
 
 function Buttons() {
+  const navigate = useNavigate();
+
+  const handleCreateNewLog = () => {
+    navigate("/newLog");
+  };
+
+  const handleViewHistory = () => {
+    navigate("/logHistory");
+  };
+
   return (
     <div className="buttons-container">
-      <CreateNewLogButton />
-      <LogHistoryButton />
+      <CLButtonPrimary onClick={handleCreateNewLog} width={"332px"}>
+        Create New Log
+      </CLButtonPrimary>
+      <CLButtonSecondary onClick={handleViewHistory} width={"332px"}>
+        View Log History
+      </CLButtonSecondary>
     </div>
   );
 }
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
index 82aabaf2..7c1d988b 100644
--- a/frontend/src/pages/Homepage.jsx
+++ b/frontend/src/pages/Homepage.jsx
@@ -5,8 +5,8 @@ const mainColour = "#646cff";
 
 export default function Home() {
   return (
-    <div className="home-container">
-      <Navbar variant="homepage" />
+    <div>
+      <Navbar />
       <CTASection mainColour={mainColour} />
     </div>
   );
diff --git a/frontend/src/pages/NewLog.jsx b/frontend/src/pages/NewLog.jsx
index f434b282..fb199a98 100644
--- a/frontend/src/pages/NewLog.jsx
+++ b/frontend/src/pages/NewLog.jsx
@@ -7,7 +7,7 @@ import "./styles/NewLog.css";
 export default function NewLog() {
   return (
     <div>
-      <Navbar variant="newLog" />
+      <Navbar />
       <CTASection />
     </div>
   );

From d277a85c2e98de1977b3cb9ea0745667c6de7afa Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Sun, 24 Nov 2024 10:47:42 -0800
Subject: [PATCH 02/15] minor changes

---
 frontend/src/components/inputs/CLInputs.jsx | 12 ++++++------
 frontend/src/pages/Dashboard.jsx            |  6 +++---
 frontend/src/pages/styles/Dashboard.css     |  6 ------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/inputs/CLInputs.jsx b/frontend/src/components/inputs/CLInputs.jsx
index 100224ec..d0aafe2d 100644
--- a/frontend/src/components/inputs/CLInputs.jsx
+++ b/frontend/src/components/inputs/CLInputs.jsx
@@ -3,12 +3,12 @@ import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 
-const DEFAULT_HEIGHT = "67px"
-const DEFAULT_WIDTH = "100%"
-const DEFAULT_PADDING = ""
-const DEFAULT_BORDER = ""
-const DEFAULT_BORDER_RADIUS = ""
-const DEFAULT_BACKGROUND_COLOR = "transparent"
+// const DEFAULT_HEIGHT = "67px"
+// const DEFAULT_WIDTH = "100%"
+// const DEFAULT_PADDING = ""
+// const DEFAULT_BORDER = ""
+// const DEFAULT_BORDER_RADIUS = ""
+// const DEFAULT_BACKGROUND_COLOR = "transparent"
 
 export const CLTextInput = () => {
   return (
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index e2a30c86..49b3ddd6 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -16,11 +16,11 @@ export default function Dashboard() {
 
 function MainContent() {
   return (
-    <div className="main-content-text">
-      <span>
+    <div>
+      <p>
         Convert handwritten clinical logs to a <br />
         standardized Excel template with just a click of a button!
-      </span>
+      </p>
       <div className="main-content-buttons">
         <Buttons />
       </div>
diff --git a/frontend/src/pages/styles/Dashboard.css b/frontend/src/pages/styles/Dashboard.css
index d2a593a5..876c0cd1 100644
--- a/frontend/src/pages/styles/Dashboard.css
+++ b/frontend/src/pages/styles/Dashboard.css
@@ -1,9 +1,3 @@
-.main-content-text {
-    font-size: 20px;
-    font-weight: 800;
-    margin-top: -100px;
-}
-
 .main-content-buttons {
     font-size: 17px;
     display: flex;

From f97a53c78172c15d1fff6262883b0cd4c9c3f6f4 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Tue, 26 Nov 2024 20:34:48 -0800
Subject: [PATCH 03/15] add partially implemented app bar

---
 .../{logo.svg => flow-leaflets-logo.svg}      |   0
 frontend/src/assets/magnifying-glass.jpg      | Bin 0 -> 4595 bytes
 frontend/src/components/AppBar/AppBar.css     |  84 ++++++++++++++++++
 frontend/src/components/AppBar/AppBar.jsx     |  34 +++++++
 frontend/src/components/Buttons/CLButtons.jsx |   1 +
 frontend/src/components/Navbar/Navbar.css     |  46 +++++-----
 frontend/src/components/Navbar/Navbar.jsx     |  32 +++----
 frontend/src/index.css                        |   2 +-
 frontend/src/pages/Dashboard.jsx              |  12 ++-
 frontend/src/pages/Homepage.jsx               |   2 +-
 frontend/src/pages/LogHistory.jsx             |   2 +-
 frontend/src/pages/NewLog.jsx                 |   2 +-
 12 files changed, 170 insertions(+), 47 deletions(-)
 rename frontend/src/assets/{logo.svg => flow-leaflets-logo.svg} (100%)
 create mode 100644 frontend/src/assets/magnifying-glass.jpg
 create mode 100644 frontend/src/components/AppBar/AppBar.css
 create mode 100644 frontend/src/components/AppBar/AppBar.jsx

diff --git a/frontend/src/assets/logo.svg b/frontend/src/assets/flow-leaflets-logo.svg
similarity index 100%
rename from frontend/src/assets/logo.svg
rename to frontend/src/assets/flow-leaflets-logo.svg
diff --git a/frontend/src/assets/magnifying-glass.jpg b/frontend/src/assets/magnifying-glass.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d3bcfdf54061665358e2cd3336e16eed1d79285c
GIT binary patch
literal 4595
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
MrEw41F^41n0^Zq^X#fBK

literal 0
HcmV?d00001

diff --git a/frontend/src/components/AppBar/AppBar.css b/frontend/src/components/AppBar/AppBar.css
new file mode 100644
index 00000000..e1beb8d7
--- /dev/null
+++ b/frontend/src/components/AppBar/AppBar.css
@@ -0,0 +1,84 @@
+.app-bar {
+  display: flex;
+  flex-direction: row;
+  box-sizing: border-box;
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 120px;
+  width: 100vw;
+  padding: 1rem 3rem 1rem 2rem;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.logo {
+  padding: 0px;
+  height: 85px;
+  width: 85px;
+}
+
+.icon-search-filter-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 100px;
+}
+
+.search-filter-container {
+  display: flex;
+  flex-direction: row;
+  gap: 12px;
+}
+
+.search-input {
+  height: 18px;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  background-color: white;
+  background-image: url('../../assets/magnifying-glass.jpg');
+  background-position: 10px 10px; 
+  background-repeat: no-repeat;
+  background-size: 20px 20px;
+  background-color: #FBFCFE;
+  border: none;
+  border-radius: 20px;
+  box-shadow: 0px 0px 10px #e3e8f2;
+}
+
+.filter-button {
+  display: flex;
+  height: 40px;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  color: #2F3C50 !important;
+  background-color: #FBFCFE !important;
+  box-shadow: 0px 0px 10px #e3e8f2;
+  border-radius: 20px !important;
+  gap: 10px;
+}
+
+.small-icon-buttons-container {
+  display: flex;
+  flex-direction: row;
+  gap: 12px;
+}
+
+.small-icon-button {
+  display: flex;
+  height: 48px;
+  width: 54px;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  color: #2F3C50;
+  background-color: #FBFCFE;
+  box-shadow: 0px 0px 10px #e3e8f2;
+  border-radius: 20px;
+}
+
+.app-bar-icon {
+  height: 24px;
+  width: 24px;
+}
diff --git a/frontend/src/components/AppBar/AppBar.jsx b/frontend/src/components/AppBar/AppBar.jsx
new file mode 100644
index 00000000..d534d98e
--- /dev/null
+++ b/frontend/src/components/AppBar/AppBar.jsx
@@ -0,0 +1,34 @@
+import Logo from "../../assets/flow-leaflets-logo.svg";
+import {
+  AdjustmentsHorizontalIcon,
+  BellIcon,
+  UserCircleIcon
+} from '@heroicons/react/24/outline';
+import "./AppBar.css"
+
+export const AppBar = () => {
+  return (
+    <div className="app-bar">
+      <div className="icon-search-filter-container">
+        <img src={Logo} className="logo" />
+        <div className="search-filter-container">
+          <input type="text" className="search-input" name="search" placeholder="Search..." />
+          <button className="filter-button">
+            <AdjustmentsHorizontalIcon className="app-bar-icon" />
+            <p>Filter</p>
+          </button>
+        </div>
+      </div>
+      <div>
+      <div className="small-icon-buttons-container">
+        <button className="small-icon-button">
+          <BellIcon className="app-bar-icon" />
+        </button>
+        <button className="small-icon-button">
+          <UserCircleIcon className="app-bar-icon" />
+        </button>
+      </div>
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/CLButtons.jsx b/frontend/src/components/Buttons/CLButtons.jsx
index 0f4fc01e..b88c187b 100644
--- a/frontend/src/components/Buttons/CLButtons.jsx
+++ b/frontend/src/components/Buttons/CLButtons.jsx
@@ -51,6 +51,7 @@ export const CLButtonSecondary = ({
   width = DEFAULT_WIDTH,
   onClick = DEFAULT_ON_CLICK
 }) => {
+  
   return (
     <button 
       onClick={onClick}
diff --git a/frontend/src/components/Navbar/Navbar.css b/frontend/src/components/Navbar/Navbar.css
index 7db9f269..9a013523 100644
--- a/frontend/src/components/Navbar/Navbar.css
+++ b/frontend/src/components/Navbar/Navbar.css
@@ -1,18 +1,18 @@
-.navbar {
+.nav-bar {
     display: flex;
     flex-direction: column;
     position: absolute;
-    top: 20%;
-    left: 52px;
-    height: 600px;
+    top: 24%;
+    left: 32px;
+    height: 540px;
     width: 100px;
     justify-content: space-between;
     align-items: center;
 }
 
 .nav-button-container {
-    height: 400px;
-    width: 100px;
+    height: 350px;
+    width: 80px;
     padding: 24px 0 24px 0;
     display: flex;
     flex-direction: column;
@@ -20,16 +20,19 @@
     align-items: center;
     background-color: white;
     border-radius: 50px;
-    box-shadow: 0px 0px 10px #CDD8F0;
+    box-shadow: 0px 0px 10px #e3e8f2;
 }
 
 .nav-button {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
     background-color: transparent;
 }
 
 .nav-button-icon-container {
-    height: 74px;
-    width: 74px;
+    height: 64px;
+    width: 64px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -39,8 +42,8 @@
 }
 
 .nav-button-icon-container-selected {
-    height: 74px;
-    width: 74px;
+    height: 60px;
+    width: 60px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -66,25 +69,22 @@
 }
 
 .logout-button {
-    height: 74px;
-    width: 74px;
+    height: 60px;
+    width: 60px;
     display: flex;
     justify-content: center;
     align-items: center;
     border-radius: 40px;
     color: #244B94;
     background-color: white;
-    box-shadow: 0px 0px 10px #CDD8F0
+    box-shadow: 0px 0px 10px #e3e8f2
 }
 
-.icon {
-    height: 40px;
-    width: 40px;
+.logout-button:hover {
+    background-color: #CDD8F0;
 }
 
-/* .nav-buttons-container {
-    display: flex;
-    gap: 8px;
-    margin-top: 10px;
-    margin-right: 30px;
-} */
\ No newline at end of file
+.nav-icon {
+    height: 34px !important;
+    width: 34px !important;
+}
diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx
index cb580ee6..6649469e 100644
--- a/frontend/src/components/Navbar/Navbar.jsx
+++ b/frontend/src/components/Navbar/Navbar.jsx
@@ -1,42 +1,42 @@
-// import Logo from "../Logo/Logo";
 // import HomeButton from "../Buttons/HomeButton";
 // import SignInButton from "../Buttons/SignInButton";
+// import SignOutButton from "../Buttons/SignOutButton";
 // import { useAuth } from "../../contexts/AuthContext";
-import "./Navbar.css";
+import { NavLink } from 'react-router-dom';
 import {
   HomeIcon,
   BookOpenIcon,
   ClockIcon,
   ArrowLeftStartOnRectangleIcon
 } from '@heroicons/react/24/outline';
-// import SignOutButton from "../Buttons/SignOutButton";
+import "./Navbar.css";
 
-export default function Navbar() {
+export const Navbar = () => {
   return (
-    <div className="navbar">
+    <nav className="nav-bar">
       <div className="nav-button-container">
-        <button className="nav-button">
+        <NavLink className="nav-button" to="/dashboard">
           <div className="nav-button-icon-container-selected">
-            <HomeIcon className="icon"/>
+            <HomeIcon className="nav-icon"/>
           </div>
           <p className="nav-button-text-selected">Home</p>
-        </button>
-        <button className="nav-button">
+        </NavLink>
+        <NavLink className="nav-button" to="/newLog">
           <div className="nav-button-icon-container">
-            <BookOpenIcon className="icon"/>
+            <BookOpenIcon className="nav-icon"/>
           </div>
           <p className="nav-button-text">Logs</p>
-        </button>
-        <button className="nav-button">
+        </NavLink>
+        <NavLink className="nav-button" to="/logHistory">
           <div className="nav-button-icon-container">
-            <ClockIcon className="icon"/>
+            <ClockIcon className="nav-icon"/>
           </div>
           <p className="nav-button-text">History</p>
-        </button>
+        </NavLink>
       </div>
       <button className="logout-button">
-        <ArrowLeftStartOnRectangleIcon className="icon"/>
+        <ArrowLeftStartOnRectangleIcon className="nav-icon"/>
       </button>
-    </div>
+    </nav>
   );
 }
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 7a1839a0..fabc8fed 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -3,7 +3,7 @@
   line-height: 1.5;
   font-weight: 400;
 
-  color-scheme: light dark;
+  color-scheme: light;
   color: #1E1E1E;
   background-color: #F7FAFF;
 
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index 49b3ddd6..ceea6d7a 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -1,14 +1,18 @@
-import Navbar from "../components/Navbar/Navbar";
+import { AppBar } from "../components/AppBar/AppBar"
+import { Navbar } from "../components/Navbar/Navbar";
 import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButtons";
 import { useNavigate } from "react-router-dom";
 import "./styles/Dashboard.css";
 
 export default function Dashboard() {
   return (
-    <div className="page-container">
+    <div>
+      <AppBar />
       <Navbar />
-      <div className="main-content">
-        <MainContent />
+      <div className="page-container">
+        <div className="main-content">
+          <MainContent />
+        </div>
       </div>
     </div>
   );
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
index 7c1d988b..9594f94e 100644
--- a/frontend/src/pages/Homepage.jsx
+++ b/frontend/src/pages/Homepage.jsx
@@ -1,5 +1,5 @@
 import SignUpButton from "../components/Buttons/SignUpButton";
-import Navbar from "../components/Navbar/Navbar";
+import { Navbar } from "../components/Navbar/Navbar";
 
 const mainColour = "#646cff";
 
diff --git a/frontend/src/pages/LogHistory.jsx b/frontend/src/pages/LogHistory.jsx
index baba06c1..d56750be 100644
--- a/frontend/src/pages/LogHistory.jsx
+++ b/frontend/src/pages/LogHistory.jsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import Navbar from "../components/Navbar/Navbar";
+import { Navbar } from "../components/Navbar/Navbar";
 import SearchFilterSort from "../components/LogHistory/SearchFilterSort";
 import LogTable from "../components/LogHistory/LogTable";
 import Pagination from "../components/LogHistory/Pagination";
diff --git a/frontend/src/pages/NewLog.jsx b/frontend/src/pages/NewLog.jsx
index fb199a98..b09ac30c 100644
--- a/frontend/src/pages/NewLog.jsx
+++ b/frontend/src/pages/NewLog.jsx
@@ -1,7 +1,7 @@
 import { useNavigate } from "react-router-dom";
 import ImageIcon from "@mui/icons-material/Image";
 import ModeIcon from "@mui/icons-material/Mode";
-import Navbar from "../components/Navbar/Navbar";
+import { Navbar } from "../components/Navbar/Navbar";
 import "./styles/NewLog.css";
 
 export default function NewLog() {

From fc60375b7498ea04ef6a3c9a8a06316a7963be72 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Tue, 26 Nov 2024 20:37:39 -0800
Subject: [PATCH 04/15] use svg instead of jpg for magnifying glass icon

---
 frontend/src/assets/magnifying-glass.jpg  | Bin 4595 -> 0 bytes
 frontend/src/assets/magnifying-glass.svg  |   3 +++
 frontend/src/components/AppBar/AppBar.css |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 frontend/src/assets/magnifying-glass.jpg
 create mode 100644 frontend/src/assets/magnifying-glass.svg

diff --git a/frontend/src/assets/magnifying-glass.jpg b/frontend/src/assets/magnifying-glass.jpg
deleted file mode 100644
index d3bcfdf54061665358e2cd3336e16eed1d79285c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4595
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
MrEw41F^41n0^Zq^X#fBK

diff --git a/frontend/src/assets/magnifying-glass.svg b/frontend/src/assets/magnifying-glass.svg
new file mode 100644
index 00000000..d21368bd
--- /dev/null
+++ b/frontend/src/assets/magnifying-glass.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+</svg>
diff --git a/frontend/src/components/AppBar/AppBar.css b/frontend/src/components/AppBar/AppBar.css
index e1beb8d7..8b33b936 100644
--- a/frontend/src/components/AppBar/AppBar.css
+++ b/frontend/src/components/AppBar/AppBar.css
@@ -36,7 +36,7 @@
   font-size: 16px;
   padding: 12px 20px 12px 40px;
   background-color: white;
-  background-image: url('../../assets/magnifying-glass.jpg');
+  background-image: url('../../assets/magnifying-glass.svg');
   background-position: 10px 10px; 
   background-repeat: no-repeat;
   background-size: 20px 20px;

From 4ee384ac3cbf4d9748447907ae7aadf8767bded9 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Tue, 26 Nov 2024 21:20:19 -0800
Subject: [PATCH 05/15] delete more unnecessary buttons

---
 frontend/src/components/AppBar/AppBar.css     | 10 ++++----
 frontend/src/components/AppBar/AppBar.jsx     |  2 +-
 .../src/components/Buttons/HomeButton.jsx     | 11 ---------
 .../src/components/Buttons/SignInButton.css   | 10 --------
 .../src/components/Buttons/SignInButton.jsx   | 20 ----------------
 .../src/components/Buttons/SignOutButton.css  | 10 --------
 .../src/components/Buttons/SignOutButton.jsx  | 24 -------------------
 frontend/src/components/Navbar/Navbar.css     | 15 ++++--------
 frontend/src/components/Navbar/Navbar.jsx     |  4 ++--
 frontend/src/pages/styles/UploadPhoto.css     |  2 +-
 10 files changed, 13 insertions(+), 95 deletions(-)
 delete mode 100644 frontend/src/components/Buttons/HomeButton.jsx
 delete mode 100644 frontend/src/components/Buttons/SignInButton.css
 delete mode 100644 frontend/src/components/Buttons/SignInButton.jsx
 delete mode 100644 frontend/src/components/Buttons/SignOutButton.css
 delete mode 100644 frontend/src/components/Buttons/SignOutButton.jsx

diff --git a/frontend/src/components/AppBar/AppBar.css b/frontend/src/components/AppBar/AppBar.css
index 8b33b936..f5522753 100644
--- a/frontend/src/components/AppBar/AppBar.css
+++ b/frontend/src/components/AppBar/AppBar.css
@@ -6,7 +6,7 @@
   top: 0;
   left: 0;
   height: 120px;
-  width: 100vw;
+  width: 98vw;
   padding: 1rem 3rem 1rem 2rem;
   justify-content: space-between;
   align-items: center;
@@ -46,16 +46,16 @@
   box-shadow: 0px 0px 10px #e3e8f2;
 }
 
-.filter-button {
+.app-bar-filter-button {
   display: flex;
   height: 40px;
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  color: #2F3C50 !important;
-  background-color: #FBFCFE !important;
+  color: #2F3C50;
+  background-color: #FBFCFE;
   box-shadow: 0px 0px 10px #e3e8f2;
-  border-radius: 20px !important;
+  border-radius: 20px;
   gap: 10px;
 }
 
diff --git a/frontend/src/components/AppBar/AppBar.jsx b/frontend/src/components/AppBar/AppBar.jsx
index d534d98e..11ec72cf 100644
--- a/frontend/src/components/AppBar/AppBar.jsx
+++ b/frontend/src/components/AppBar/AppBar.jsx
@@ -13,7 +13,7 @@ export const AppBar = () => {
         <img src={Logo} className="logo" />
         <div className="search-filter-container">
           <input type="text" className="search-input" name="search" placeholder="Search..." />
-          <button className="filter-button">
+          <button className="app-bar-filter-button">
             <AdjustmentsHorizontalIcon className="app-bar-icon" />
             <p>Filter</p>
           </button>
diff --git a/frontend/src/components/Buttons/HomeButton.jsx b/frontend/src/components/Buttons/HomeButton.jsx
deleted file mode 100644
index f7a8e407..00000000
--- a/frontend/src/components/Buttons/HomeButton.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useNavigate } from "react-router-dom";
-
-export default function HomeButton() {
-  const navigate = useNavigate();
-
-  const handleHomeClick = () => {
-    navigate("/dashboard");
-  };
-
-  return <button onClick={handleHomeClick}>Home</button>;
-}
diff --git a/frontend/src/components/Buttons/SignInButton.css b/frontend/src/components/Buttons/SignInButton.css
deleted file mode 100644
index 3caa433d..00000000
--- a/frontend/src/components/Buttons/SignInButton.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.sign-in-button-container {
-    display: flex;
-    gap: 9px;
-  }
-  
-.login-icon {
-    margin-left: 8px;
-    font-size: 1.2rem;
-    vertical-align: middle;
-}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/SignInButton.jsx b/frontend/src/components/Buttons/SignInButton.jsx
deleted file mode 100644
index 5ddb730a..00000000
--- a/frontend/src/components/Buttons/SignInButton.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useNavigate } from "react-router-dom";
-import LoginIcon from "@mui/icons-material/Login";
-import "./SignInButton.css";
-
-export default function SignInButton() {
-  const navigate = useNavigate();
-
-  const handleSignInClick = () => {
-    navigate("/login");
-  };
-
-  return (
-    <div className="sign-in-button-container">
-      <button onClick={handleSignInClick}>
-        Sign In
-        <LoginIcon className="login-icon" />
-      </button>
-    </div>
-  );
-}
diff --git a/frontend/src/components/Buttons/SignOutButton.css b/frontend/src/components/Buttons/SignOutButton.css
deleted file mode 100644
index 6f6a4b22..00000000
--- a/frontend/src/components/Buttons/SignOutButton.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.sign-out-button-container {
-    display: flex;
-    gap: 9px;
-  }
-  
-.sign-out-icon {
-    margin-left: 8px;
-    font-size: 1.2rem;
-    vertical-align: middle;
-}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/SignOutButton.jsx b/frontend/src/components/Buttons/SignOutButton.jsx
deleted file mode 100644
index 65cd7b9b..00000000
--- a/frontend/src/components/Buttons/SignOutButton.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useAuth } from "../../contexts/AuthContext";
-import LogoutIcon from "@mui/icons-material/Logout";
-import "./SignOutButton.css";
-
-export default function SignOutButton() {
-  const { logout } = useAuth();
-
-  const handleSignOutClick = async () => {
-    try {
-      await logout();
-    } catch {
-      console.log("Failed to logout");
-    }
-  };
-
-  return (
-    <div className="sign-out-button-container">
-      <button onClick={handleSignOutClick}>
-        Sign Out
-        <LogoutIcon className="sign-out-icon" />
-      </button>
-    </div>
-  );
-}
diff --git a/frontend/src/components/Navbar/Navbar.css b/frontend/src/components/Navbar/Navbar.css
index 9a013523..36aae5d0 100644
--- a/frontend/src/components/Navbar/Navbar.css
+++ b/frontend/src/components/Navbar/Navbar.css
@@ -41,20 +41,14 @@
     background-color: #CDD8F0;
 }
 
-.nav-button-icon-container-selected {
-    height: 60px;
-    width: 60px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 40px;
-    color: #F7FAFF;
+.nav-button.active .nav-button-icon-container {
+    color: #F7FAFF; 
     background-color: #244B94;
 }
 
 .nav-button-icon-container:hover {
+    color: #F7FAFF;
     background-color: #244B94;
-    color: white;
 }
 
 .nav-button-text {
@@ -62,8 +56,7 @@
     color: #666B6F;
 }
 
-.nav-button-text-selected {
-    margin-top: 4px;
+.nav-button.active .nav-button-text {
     color: #244B94;
     font-weight: bold;
 }
diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx
index 6649469e..d63663b1 100644
--- a/frontend/src/components/Navbar/Navbar.jsx
+++ b/frontend/src/components/Navbar/Navbar.jsx
@@ -16,10 +16,10 @@ export const Navbar = () => {
     <nav className="nav-bar">
       <div className="nav-button-container">
         <NavLink className="nav-button" to="/dashboard">
-          <div className="nav-button-icon-container-selected">
+          <div className="nav-button-icon-container">
             <HomeIcon className="nav-icon"/>
           </div>
-          <p className="nav-button-text-selected">Home</p>
+          <p className="nav-button-text">Home</p>
         </NavLink>
         <NavLink className="nav-button" to="/newLog">
           <div className="nav-button-icon-container">
diff --git a/frontend/src/pages/styles/UploadPhoto.css b/frontend/src/pages/styles/UploadPhoto.css
index 3eaf9b45..ee903d1e 100644
--- a/frontend/src/pages/styles/UploadPhoto.css
+++ b/frontend/src/pages/styles/UploadPhoto.css
@@ -56,7 +56,7 @@
   
 .page-container {
     display: flex;
-    height: 100vh;
+    height: 98vh;
 }
   
 .main-content {

From fed910df0f5554813c33cf96e0bc9d937a60803d Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Tue, 26 Nov 2024 21:25:56 -0800
Subject: [PATCH 06/15] remove unused buttons

---
 .../src/components/Buttons/SignUpButton.css   |  4 ---
 .../src/components/Buttons/SignUpButton.jsx   | 15 ----------
 frontend/src/components/Navbar/Navbar.jsx     |  4 ---
 frontend/src/main.jsx                         |  2 --
 frontend/src/pages/Homepage.jsx               | 29 -------------------
 5 files changed, 54 deletions(-)
 delete mode 100644 frontend/src/components/Buttons/SignUpButton.css
 delete mode 100644 frontend/src/components/Buttons/SignUpButton.jsx
 delete mode 100644 frontend/src/pages/Homepage.jsx

diff --git a/frontend/src/components/Buttons/SignUpButton.css b/frontend/src/components/Buttons/SignUpButton.css
deleted file mode 100644
index 512fad28..00000000
--- a/frontend/src/components/Buttons/SignUpButton.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.sign-up-button-container {
-    display: flex;
-    gap: 8px;
-}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/SignUpButton.jsx b/frontend/src/components/Buttons/SignUpButton.jsx
deleted file mode 100644
index 6be86bd7..00000000
--- a/frontend/src/components/Buttons/SignUpButton.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useNavigate } from "react-router-dom";
-import "./SignUpButton.css";
-
-export default function SignUpButton() {
-  const navigate = useNavigate();
-
-  const handleSignUpClick = () => {
-    navigate("/signup");
-  };
-  return (
-    <div className="sign-up-button-container">
-      <button onClick={handleSignUpClick}>Sign Up</button>
-    </div>
-  );
-}
diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx
index d63663b1..6c330a5c 100644
--- a/frontend/src/components/Navbar/Navbar.jsx
+++ b/frontend/src/components/Navbar/Navbar.jsx
@@ -1,7 +1,3 @@
-// import HomeButton from "../Buttons/HomeButton";
-// import SignInButton from "../Buttons/SignInButton";
-// import SignOutButton from "../Buttons/SignOutButton";
-// import { useAuth } from "../../contexts/AuthContext";
 import { NavLink } from 'react-router-dom';
 import {
   HomeIcon,
diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index 46329ed2..7cf714b9 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -6,7 +6,6 @@ import App from "./App.jsx";
 import Login from "./pages/login/Login.jsx";
 import SignUp from "./pages/sign_up/SignUp.jsx";
 import NotFound from "./pages/not_found/NotFound.jsx";
-import Home from "./pages/Homepage.jsx";
 import Dashboard from "./pages/Dashboard.jsx";
 import NewLog from "./pages/NewLog.jsx";
 import LogHistory from "./pages/LogHistory.jsx";
@@ -19,7 +18,6 @@ createRoot(document.getElementById("root")).render(
     <BrowserRouter>
       <Routes>
         <Route path="/login" element={<Login />} />
-        <Route path="/homepage" element={<Home />} />
         <Route path="/signup" element={<SignUp />} />
         <Route element={<ProtectedRoutes />}>
           <Route index element={<App />} />
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
deleted file mode 100644
index 9594f94e..00000000
--- a/frontend/src/pages/Homepage.jsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import SignUpButton from "../components/Buttons/SignUpButton";
-import { Navbar } from "../components/Navbar/Navbar";
-
-const mainColour = "#646cff";
-
-export default function Home() {
-  return (
-    <div>
-      <Navbar />
-      <CTASection mainColour={mainColour} />
-    </div>
-  );
-}
-
-function CTASection() {
-  return (
-    <div className="cta-section">
-      <h1>
-        Welcome to <br />
-        <span style={{ color: mainColour }}>FlowLeaflets</span>
-      </h1>
-      <p className="cta-paragraph">
-        Detailed caselogs for patients you see, vital care for those in need,
-        globally
-      </p>
-      <SignUpButton />
-    </div>
-  );
-}

From 0166af6c37bfaea684c19d879047b190644891be Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Tue, 26 Nov 2024 22:07:05 -0800
Subject: [PATCH 07/15] remove unused package

---
 frontend/package-lock.json                  | 85 ---------------------
 frontend/package.json                       |  1 -
 frontend/src/components/inputs/CLInputs.jsx | 33 --------
 frontend/src/pages/Dashboard.jsx            |  7 ++
 4 files changed, 7 insertions(+), 119 deletions(-)
 delete mode 100644 frontend/src/components/inputs/CLInputs.jsx

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index bc586bc1..84259995 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13,7 +13,6 @@
         "@heroicons/react": "^2.2.0",
         "@mui/icons-material": "^6.1.2",
         "@mui/material": "^6.1.2",
-        "@mui/x-date-pickers": "^7.22.3",
         "@supabase/supabase-js": "^2.45.5",
         "axios": "^1.7.7",
         "pdfjs-dist": "^4.7.76",
@@ -3257,90 +3256,6 @@
         }
       }
     },
-    "node_modules/@mui/x-date-pickers": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.22.3.tgz",
-      "integrity": "sha512-shNp92IrST5BiVy2f4jbrmRaD32QhyUthjh1Oexvpcn0v6INyuWgxfodoTi5ZCnE5Ue5UVFSs4R9Xre0UbJ5DQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.25.7",
-        "@mui/utils": "^5.16.6 || ^6.0.0",
-        "@mui/x-internals": "7.21.0",
-        "@types/react-transition-group": "^4.4.11",
-        "clsx": "^2.1.1",
-        "prop-types": "^15.8.1",
-        "react-transition-group": "^4.4.5"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.9.0",
-        "@emotion/styled": "^11.8.1",
-        "@mui/material": "^5.15.14 || ^6.0.0",
-        "@mui/system": "^5.15.14 || ^6.0.0",
-        "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0",
-        "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0",
-        "dayjs": "^1.10.7",
-        "luxon": "^3.0.2",
-        "moment": "^2.29.4",
-        "moment-hijri": "^2.1.2 || ^3.0.0",
-        "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        },
-        "date-fns": {
-          "optional": true
-        },
-        "date-fns-jalali": {
-          "optional": true
-        },
-        "dayjs": {
-          "optional": true
-        },
-        "luxon": {
-          "optional": true
-        },
-        "moment": {
-          "optional": true
-        },
-        "moment-hijri": {
-          "optional": true
-        },
-        "moment-jalaali": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/x-internals": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.21.0.tgz",
-      "integrity": "sha512-94YNyZ0BhK5Z+Tkr90RKf47IVCW8R/1MvdUhh6MCQg6sZa74jsX+x+gEZ4kzuCqOsuyTyxikeQ8vVuCIQiP7UQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.25.7",
-        "@mui/utils": "^5.16.6 || ^6.0.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "react": "^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 3df53f78..981438d9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,6 @@
     "@heroicons/react": "^2.2.0",
     "@mui/icons-material": "^6.1.2",
     "@mui/material": "^6.1.2",
-    "@mui/x-date-pickers": "^7.22.3",
     "@supabase/supabase-js": "^2.45.5",
     "axios": "^1.7.7",
     "pdfjs-dist": "^4.7.76",
diff --git a/frontend/src/components/inputs/CLInputs.jsx b/frontend/src/components/inputs/CLInputs.jsx
deleted file mode 100644
index d0aafe2d..00000000
--- a/frontend/src/components/inputs/CLInputs.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { DemoContainer } from '@mui/x-date-pickers/internals/demo';
-import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
-import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
-import { DatePicker } from '@mui/x-date-pickers/DatePicker';
-
-// const DEFAULT_HEIGHT = "67px"
-// const DEFAULT_WIDTH = "100%"
-// const DEFAULT_PADDING = ""
-// const DEFAULT_BORDER = ""
-// const DEFAULT_BORDER_RADIUS = ""
-// const DEFAULT_BACKGROUND_COLOR = "transparent"
-
-export const CLTextInput = () => {
-  return (
-    <input type="text"/>
-  )
-}
-
-export const CLNumberInput = () => {
-  return (
-    <input type="number"/>
-  )
-}
-
-export const CLDatePicker = () => {
-  return (
-    <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['DatePicker']}>
-        <DatePicker label="Basic date picker" />
-      </DemoContainer>
-    </LocalizationProvider>
-  );
-}
\ No newline at end of file
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index ceea6d7a..18b16684 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -39,6 +39,10 @@ function Buttons() {
     navigate("/newLog");
   };
 
+  const handleAddLogbook = () => {
+    navigate("uploadPhotos")
+  }
+
   const handleViewHistory = () => {
     navigate("/logHistory");
   };
@@ -48,6 +52,9 @@ function Buttons() {
       <CLButtonPrimary onClick={handleCreateNewLog} width={"332px"}>
         Create New Log
       </CLButtonPrimary>
+      <CLButtonSecondary onClick={handleAddLogbook} width={"332px"}>
+        Add Logbook
+      </CLButtonSecondary>
       <CLButtonSecondary onClick={handleViewHistory} width={"332px"}>
         View Log History
       </CLButtonSecondary>

From aaac84b8636b4760359eaf6bf28ac964a49fb8ea Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Tue, 26 Nov 2024 23:55:58 -0800
Subject: [PATCH 08/15] code cleanup

---
 frontend/src/App.jsx                          |  2 +-
 frontend/src/components/AppBar/AppBar.css     |  5 +++--
 .../src/components/LogHistory/Pagination.css  |  6 ++---
 .../LogHistory/SearchFilterSort.css           |  8 +++----
 .../NavContentWrapper/NavContentWrapper.css   |  3 +++
 .../NavContentWrapper/NavContentWrapper.jsx   | 18 +++++++++++++++
 frontend/src/components/Navbar/Navbar.css     |  8 ++++---
 frontend/src/components/Navbar/Navbar.jsx     | 15 +++++++++++--
 frontend/src/main.jsx                         |  4 ++--
 .../src/pages/{Dashboard.jsx => Homepage.jsx} | 21 ++++++------------
 frontend/src/pages/LogHistory.jsx             | 11 +++++-----
 frontend/src/pages/NewLog.jsx                 | 16 +++++++-------
 frontend/src/pages/login/Login.jsx            |  4 ++--
 frontend/src/pages/sign_up/SignUp.jsx         |  4 ++--
 frontend/src/pages/styles/Dashboard.css       | 14 ------------
 frontend/src/pages/styles/Homepage.css        | 22 ++++++++++++++++---
 frontend/src/pages/styles/LogHistory.css      | 12 +++++-----
 frontend/src/pages/styles/NewLog.css          |  1 +
 frontend/src/pages/styles/UploadPhoto.css     | 13 -----------
 frontend/src/utils/ProtectedRoutes.jsx        |  2 +-
 20 files changed, 103 insertions(+), 86 deletions(-)
 create mode 100644 frontend/src/components/NavContentWrapper/NavContentWrapper.css
 create mode 100644 frontend/src/components/NavContentWrapper/NavContentWrapper.jsx
 rename frontend/src/pages/{Dashboard.jsx => Homepage.jsx} (74%)
 delete mode 100644 frontend/src/pages/styles/Dashboard.css

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 4c9327ba..8b251089 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -76,7 +76,7 @@ function App() {
   const handleClickLogout = async () => {
     try {
       await logout();
-      navigate("/home");
+      navigate("/homepage");
     } catch (e) {
       console.log("Failed to logout: " + e.message);
     }
diff --git a/frontend/src/components/AppBar/AppBar.css b/frontend/src/components/AppBar/AppBar.css
index f5522753..55cd95e2 100644
--- a/frontend/src/components/AppBar/AppBar.css
+++ b/frontend/src/components/AppBar/AppBar.css
@@ -1,8 +1,7 @@
 .app-bar {
   display: flex;
-  flex-direction: row;
   box-sizing: border-box;
-  position: absolute;
+  position: sticky;
   top: 0;
   left: 0;
   height: 120px;
@@ -10,6 +9,8 @@
   padding: 1rem 3rem 1rem 2rem;
   justify-content: space-between;
   align-items: center;
+  background-color: #F7FAFF;
+  z-index: 1000;
 }
 
 .logo {
diff --git a/frontend/src/components/LogHistory/Pagination.css b/frontend/src/components/LogHistory/Pagination.css
index 2978869e..36eb5f0d 100644
--- a/frontend/src/components/LogHistory/Pagination.css
+++ b/frontend/src/components/LogHistory/Pagination.css
@@ -3,7 +3,7 @@
     justify-content: space-between;
     align-items: center;
     margin-top: 1em;
-    color: #e0e0e0;
+    color: #1a1a1a;
 }
 
 .pagination span {
@@ -16,8 +16,8 @@
 }
 
 .page-buttons button {
-    background: #1a1a1a;
-    color: #e0e0e0;
+    background: #e0e0e0;
+    color: #1a1a1a;
     padding: 0.4em 0.6em;
     cursor: pointer;
     border-radius: 4px;
diff --git a/frontend/src/components/LogHistory/SearchFilterSort.css b/frontend/src/components/LogHistory/SearchFilterSort.css
index 6661624f..6462ac53 100644
--- a/frontend/src/components/LogHistory/SearchFilterSort.css
+++ b/frontend/src/components/LogHistory/SearchFilterSort.css
@@ -10,8 +10,8 @@
 .search-filter-sort input[type="text"],
 .search-filter-sort select {
     padding: 0.6rem;
-    background-color: #2c2c2c;
-    color: #e0e0e0;
+    background-color: #F7FAFF;
+    color: #666B6F;
     border: 1px solid #444;
     border-radius: 4px;
 }
@@ -19,8 +19,8 @@
 /* Filter button to open/close dropdown */
 .filter-button {
     padding: 0.6rem;
-    background-color: #444;
-    color: #e0e0e0;
+    background-color: #e0e0e0;
+    color: #444;
     border: none;
     cursor: pointer;
     border-radius: 4px;
diff --git a/frontend/src/components/NavContentWrapper/NavContentWrapper.css b/frontend/src/components/NavContentWrapper/NavContentWrapper.css
new file mode 100644
index 00000000..fceb9ce5
--- /dev/null
+++ b/frontend/src/components/NavContentWrapper/NavContentWrapper.css
@@ -0,0 +1,3 @@
+.child-container {
+  margin-left: 200px;
+}
\ No newline at end of file
diff --git a/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx b/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx
new file mode 100644
index 00000000..3a6f3852
--- /dev/null
+++ b/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx
@@ -0,0 +1,18 @@
+import { AppBar } from "../AppBar/AppBar"
+import { Navbar } from "../Navbar/Navbar"
+
+/**
+ * Wraps the provided component in the side navigation bar and the top application bar.
+ * Formats the layout so that only the inner child component is scrollable.
+ */
+export const NavContentWrapper = ({children}) => {
+  return (
+    <div>
+      <AppBar />
+      <Navbar />
+      <div className="child-container">
+        {children}
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/frontend/src/components/Navbar/Navbar.css b/frontend/src/components/Navbar/Navbar.css
index 36aae5d0..9d2bff05 100644
--- a/frontend/src/components/Navbar/Navbar.css
+++ b/frontend/src/components/Navbar/Navbar.css
@@ -1,13 +1,15 @@
 .nav-bar {
     display: flex;
     flex-direction: column;
-    position: absolute;
+    position: fixed;
     top: 24%;
     left: 32px;
     height: 540px;
     width: 100px;
     justify-content: space-between;
     align-items: center;
+    overflow: auto;
+    z-index: 500;
 }
 
 .nav-button-container {
@@ -78,6 +80,6 @@
 }
 
 .nav-icon {
-    height: 34px !important;
-    width: 34px !important;
+    height: 34px;
+    width: 34px;
 }
diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx
index 6c330a5c..09e0276d 100644
--- a/frontend/src/components/Navbar/Navbar.jsx
+++ b/frontend/src/components/Navbar/Navbar.jsx
@@ -1,4 +1,5 @@
 import { NavLink } from 'react-router-dom';
+import { useAuth } from "../../contexts/AuthContext";
 import {
   HomeIcon,
   BookOpenIcon,
@@ -8,10 +9,20 @@ import {
 import "./Navbar.css";
 
 export const Navbar = () => {
+  const { logout } = useAuth();
+
+  const handleSignOut = async () => {
+    try {
+      await logout();
+    } catch {
+      console.log("Failed to logout");
+    }
+  };
+
   return (
     <nav className="nav-bar">
       <div className="nav-button-container">
-        <NavLink className="nav-button" to="/dashboard">
+        <NavLink className="nav-button" to="/homepage">
           <div className="nav-button-icon-container">
             <HomeIcon className="nav-icon"/>
           </div>
@@ -30,7 +41,7 @@ export const Navbar = () => {
           <p className="nav-button-text">History</p>
         </NavLink>
       </div>
-      <button className="logout-button">
+      <button className="logout-button" onClick={handleSignOut}>
         <ArrowLeftStartOnRectangleIcon className="nav-icon"/>
       </button>
     </nav>
diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index 7cf714b9..5eb2386e 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -6,7 +6,7 @@ import App from "./App.jsx";
 import Login from "./pages/login/Login.jsx";
 import SignUp from "./pages/sign_up/SignUp.jsx";
 import NotFound from "./pages/not_found/NotFound.jsx";
-import Dashboard from "./pages/Dashboard.jsx";
+import Home from "./pages/Homepage.jsx";
 import NewLog from "./pages/NewLog.jsx";
 import LogHistory from "./pages/LogHistory.jsx";
 import UploadPhotos from "./pages/UploadPhoto.jsx";
@@ -21,8 +21,8 @@ createRoot(document.getElementById("root")).render(
         <Route path="/signup" element={<SignUp />} />
         <Route element={<ProtectedRoutes />}>
           <Route index element={<App />} />
-          <Route path="/dashboard" element={<Dashboard />} />
           <Route path="/newLog" element={<NewLog />} />
+          <Route path="/homepage" element={<Home />} />
           <Route path="/logHistory" element={<LogHistory />} />
           <Route path="/uploadPhotos" element={<UploadPhotos />} />
           <Route path="/manualEdit" element={<ManualEdit />} />
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Homepage.jsx
similarity index 74%
rename from frontend/src/pages/Dashboard.jsx
rename to frontend/src/pages/Homepage.jsx
index 18b16684..1d93da0b 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Homepage.jsx
@@ -1,26 +1,19 @@
-import { AppBar } from "../components/AppBar/AppBar"
-import { Navbar } from "../components/Navbar/Navbar";
+import { NavContentWrapper } from "../components/NavContentWrapper/NavContentWrapper";
 import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButtons";
 import { useNavigate } from "react-router-dom";
-import "./styles/Dashboard.css";
+import "./styles/Homepage.css";
 
-export default function Dashboard() {
+export default function Homepage() {
   return (
-    <div>
-      <AppBar />
-      <Navbar />
-      <div className="page-container">
-        <div className="main-content">
-          <MainContent />
-        </div>
-      </div>
-    </div>
+    <NavContentWrapper>
+      <MainContent />
+    </NavContentWrapper>
   );
 }
 
 function MainContent() {
   return (
-    <div>
+    <div className="main-content">
       <p>
         Convert handwritten clinical logs to a <br />
         standardized Excel template with just a click of a button!
diff --git a/frontend/src/pages/LogHistory.jsx b/frontend/src/pages/LogHistory.jsx
index d56750be..20b86370 100644
--- a/frontend/src/pages/LogHistory.jsx
+++ b/frontend/src/pages/LogHistory.jsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { Navbar } from "../components/Navbar/Navbar";
+import { NavContentWrapper } from "../components/NavContentWrapper/NavContentWrapper";
 import SearchFilterSort from "../components/LogHistory/SearchFilterSort";
 import LogTable from "../components/LogHistory/LogTable";
 import Pagination from "../components/LogHistory/Pagination";
@@ -131,10 +131,9 @@ const LogHistory = () => {
   );
 
   return (
-    <div className="log-history-container">
-      <Navbar />
-      <div className="container">
-        <div>
+    <NavContentWrapper>
+      <div className="log-history-container">
+        <div className="container">
           <SearchFilterSort
             search={search}
             setSearch={setSearch}
@@ -158,7 +157,7 @@ const LogHistory = () => {
           />
         </div>
       </div>
-    </div>
+    </NavContentWrapper>
   );
 };
 
diff --git a/frontend/src/pages/NewLog.jsx b/frontend/src/pages/NewLog.jsx
index b09ac30c..1b58f463 100644
--- a/frontend/src/pages/NewLog.jsx
+++ b/frontend/src/pages/NewLog.jsx
@@ -1,15 +1,15 @@
 import { useNavigate } from "react-router-dom";
+import { NavContentWrapper } from "../components/NavContentWrapper/NavContentWrapper";
 import ImageIcon from "@mui/icons-material/Image";
 import ModeIcon from "@mui/icons-material/Mode";
-import { Navbar } from "../components/Navbar/Navbar";
+import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButtons";
 import "./styles/NewLog.css";
 
 export default function NewLog() {
   return (
-    <div>
-      <Navbar />
+    <NavContentWrapper>
       <CTASection />
-    </div>
+    </NavContentWrapper>
   );
 }
 
@@ -28,14 +28,14 @@ function CTASection() {
     <div className="cta-section">
       <h2>How would you like to create a new log?</h2>
       <div className="buttons-container">
-        <button onClick={handleUploadPhoto}>
+        <CLButtonPrimary onClick={handleUploadPhoto} width={"240px"}>
           <ImageIcon className="add-icon" />
           Upload Photo
-        </button>
-        <button onClick={handleEnterManually}>
+        </CLButtonPrimary>
+        <CLButtonSecondary onClick={handleEnterManually}  width={"240px"}>
           <ModeIcon className="add-icon" />
           Enter Manually
-        </button>
+        </CLButtonSecondary>
       </div>
     </div>
   );
diff --git a/frontend/src/pages/login/Login.jsx b/frontend/src/pages/login/Login.jsx
index 8045046a..ff249a1a 100644
--- a/frontend/src/pages/login/Login.jsx
+++ b/frontend/src/pages/login/Login.jsx
@@ -13,7 +13,7 @@ export default function Login() {
 
   useEffect(() => {
     if (session) {
-      navigate("/dashboard");
+      navigate("/homepage");
     }
   }, [session, navigate]);
 
@@ -23,7 +23,7 @@ export default function Login() {
     try {
       setLoading(true);
       await login(email, password);
-      navigate("/dashboard");
+      navigate("/homepage");
     } catch {
       alert("Failed to login: Email or Password Incorrect");
     }
diff --git a/frontend/src/pages/sign_up/SignUp.jsx b/frontend/src/pages/sign_up/SignUp.jsx
index 6399c404..1dac43a7 100644
--- a/frontend/src/pages/sign_up/SignUp.jsx
+++ b/frontend/src/pages/sign_up/SignUp.jsx
@@ -16,7 +16,7 @@ export default function SignUp() {
 
   useEffect(() => {
     if (session) {
-      navigate("/dashboard");
+      navigate("/homepage");
     }
   }, [session, navigate]);
 
@@ -32,7 +32,7 @@ export default function SignUp() {
     try {
       setLoading(true);
       await register(firstName, lastName, email, password);
-      navigate("/dashboard");
+      navigate("/homepage");
     } catch (error) {
       if (error.code === "weak_password") {
         alert(
diff --git a/frontend/src/pages/styles/Dashboard.css b/frontend/src/pages/styles/Dashboard.css
deleted file mode 100644
index 876c0cd1..00000000
--- a/frontend/src/pages/styles/Dashboard.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.main-content-buttons {
-    font-size: 17px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-top: 30px;
-    gap: 10px;
-}
-
-.buttons-container {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-}
\ No newline at end of file
diff --git a/frontend/src/pages/styles/Homepage.css b/frontend/src/pages/styles/Homepage.css
index 73cb697c..982ac496 100644
--- a/frontend/src/pages/styles/Homepage.css
+++ b/frontend/src/pages/styles/Homepage.css
@@ -1,12 +1,28 @@
-.cta-section {
+.main-content {
+    flex-grow: 1;
     display: flex;
     flex-direction: column;
+    justify-content: center;
     align-items: center;
-    margin-left: 64px;
-    margin-right: 64px;
+    text-align: center;
     margin-top: 200px;
 }
 
+.main-content-buttons {
+    font-size: 17px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 30px;
+    gap: 10px;
+}
+
+.buttons-container {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
 .cta-paragraph {
     text-align: center;
     font-size: 1.1rem;
diff --git a/frontend/src/pages/styles/LogHistory.css b/frontend/src/pages/styles/LogHistory.css
index 0cf0e828..eb220d40 100644
--- a/frontend/src/pages/styles/LogHistory.css
+++ b/frontend/src/pages/styles/LogHistory.css
@@ -1,9 +1,9 @@
 .log-history-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
 .container {
-    width: 80%;
+  width: 80%;
 }
\ No newline at end of file
diff --git a/frontend/src/pages/styles/NewLog.css b/frontend/src/pages/styles/NewLog.css
index 828ee3d4..12708c0b 100644
--- a/frontend/src/pages/styles/NewLog.css
+++ b/frontend/src/pages/styles/NewLog.css
@@ -2,6 +2,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    justify-content: center;
     margin-left: 64px;
     margin-right: 64px;
     margin-top: 200px;
diff --git a/frontend/src/pages/styles/UploadPhoto.css b/frontend/src/pages/styles/UploadPhoto.css
index ee903d1e..29bf172f 100644
--- a/frontend/src/pages/styles/UploadPhoto.css
+++ b/frontend/src/pages/styles/UploadPhoto.css
@@ -54,19 +54,6 @@
     border-right: 1px solid #e5e7eb;
 }
   
-.page-container {
-    display: flex;
-    height: 98vh;
-}
-  
-.main-content {
-    flex-grow: 1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-}
-  
 .nav-icon-left {
     margin-right: 3px;
     margin-left: -2px;
diff --git a/frontend/src/utils/ProtectedRoutes.jsx b/frontend/src/utils/ProtectedRoutes.jsx
index 78eecd6f..655a0048 100644
--- a/frontend/src/utils/ProtectedRoutes.jsx
+++ b/frontend/src/utils/ProtectedRoutes.jsx
@@ -3,5 +3,5 @@ import { useAuth } from '../contexts/AuthContext';
 
 export const ProtectedRoutes = () => {
   const { session } = useAuth();
-  return session ? <Outlet /> : <Navigate to='/home' />;
+  return session ? <Outlet /> : <Navigate to='/homepage' />;
 }
\ No newline at end of file

From 3402d6f455756de901c37211110b0f123598364e Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 00:12:46 -0800
Subject: [PATCH 09/15] code cleanup

---
 frontend/src/assets/flow-leaflets-logo.svg        | 15 ---------------
 frontend/src/components/AppBar/AppBar.jsx         |  2 +-
 .../NavContentWrapper/NavContentWrapper.jsx       |  2 +-
 frontend/src/pages/Homepage.jsx                   |  6 +++---
 frontend/src/pages/NewLog.jsx                     |  4 ++--
 5 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 frontend/src/assets/flow-leaflets-logo.svg

diff --git a/frontend/src/assets/flow-leaflets-logo.svg b/frontend/src/assets/flow-leaflets-logo.svg
deleted file mode 100644
index 4e3d4a67..00000000
--- a/frontend/src/assets/flow-leaflets-logo.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="100" height="95" viewBox="0 0 100 95" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M79.1842 18.052C79.4813 18.8236 79.7542 19.5947 80 20.3842C80.0499 20.5439 80.0499 20.5439 80.1007 20.7068C80.2106 21.0587 80.3199 21.4108 80.4291 21.7629C80.5078 22.0154 80.5865 22.2679 80.6652 22.5204C80.877 23.2002 81.0883 23.8802 81.2995 24.5601C81.4314 24.9846 81.5634 25.4091 81.6954 25.8335C83.1516 30.5134 84.5982 35.1962 86.036 39.8818C86.16 40.2858 86.2843 40.6898 86.4089 41.0937C86.6877 41.9991 86.9627 42.9052 87.2273 43.8149C87.2748 43.9762 87.3223 44.1376 87.3713 44.3038C87.4583 44.5999 87.5438 44.8965 87.6274 45.1936C87.9233 46.1942 88.3116 46.6619 89.177 47.2488C90.7109 48.386 91.5769 50.2679 91.9264 52.1087C92.2221 54.3114 91.6218 55.8303 90.2673 57.5996C89.233 58.8029 88.1951 59.6596 86.6297 60.0571C86.0702 60.2833 85.9292 60.477 85.6169 60.9831C85.5213 61.135 85.4256 61.287 85.3271 61.4435C85.2272 61.6078 85.1273 61.7721 85.0244 61.9414C84.9176 62.1127 84.8106 62.2839 84.7033 62.4549C84.4843 62.8046 84.2665 63.155 84.0498 63.5061C83.5929 64.2425 83.1235 64.9708 82.6542 65.6993C82.4799 65.9714 82.3057 66.2436 82.1315 66.5158C81.5158 67.478 80.8995 68.4399 80.2832 69.4018C79.8444 70.0868 79.4057 70.7717 78.9673 71.4569C77.4194 73.8753 75.8642 76.2891 74.3075 78.7019C73.2885 80.2818 72.2711 81.8625 71.2663 83.4513C70.8804 84.0608 70.4877 84.6641 70.0826 85.2612C69.1411 85.2132 68.5445 84.7361 67.8072 84.2063C67.7004 84.1314 67.5936 84.0564 67.4836 83.9791C67.2365 83.8052 66.9907 83.6292 66.7453 83.4529C66.795 82.4782 67.1455 81.9679 67.7408 81.2113C68.5685 80.1168 69.335 78.9956 70.0731 77.8395C70.1751 77.6798 70.2771 77.52 70.3823 77.3554C70.5875 77.0333 70.7924 76.7111 70.9971 76.3887C71.3728 75.7976 71.7511 75.2083 72.1296 74.6189C72.9408 73.3553 73.7475 72.0887 74.5524 70.8211C75.3961 69.4931 76.2455 68.1687 77.0948 66.8442C77.3585 66.4329 77.6219 66.0214 77.8853 65.6099C79.8713 62.5066 81.8633 59.4074 83.8867 56.3281C84.2158 56.4074 84.533 56.4922 84.8537 56.6012C85.3217 56.6344 85.5463 56.5184 85.918 56.2416C86.8028 55.4628 87.7277 54.4893 87.8704 53.2789C87.8325 52.0649 87.1958 50.5547 86.3144 49.7082C85.8424 49.4578 85.4553 49.5911 84.9485 49.6976C84.5164 48.7628 84.214 47.8009 83.9104 46.8185C83.855 46.6408 83.7996 46.4632 83.7425 46.2801C83.5934 45.8014 83.4447 45.3226 83.2964 44.8436C83.141 44.3423 82.9849 43.8412 82.829 43.34C82.4727 42.1945 82.1177 41.0486 81.763 39.9025C81.7194 39.7618 81.6758 39.621 81.6309 39.476C80.9092 37.1455 80.1965 34.8124 79.484 32.4791C79.4297 32.3013 79.3754 32.1234 79.3194 31.9402C79.0397 31.0244 78.7602 30.1086 78.4808 29.1927C77.9748 27.5349 77.4671 25.8776 76.9508 24.2228C76.9078 24.0847 76.8648 23.9467 76.8205 23.8044C76.6227 23.17 76.4243 22.5358 76.2247 21.9019C76.1556 21.6809 76.0866 21.4599 76.0176 21.239C75.929 20.9573 75.929 20.9573 75.8386 20.67C75.7053 20.1975 75.6 19.745 75.5435 19.2576C75.862 18.7068 76.5303 18.5851 77.1079 18.4005C77.2067 18.3666 77.3056 18.3327 77.4074 18.2978C78.0179 18.0981 78.5429 18.0155 79.1842 18.052Z" fill="#244B94"/>
-<path d="M41.5642 8.40773C41.8928 8.69258 42.1767 8.99401 42.4744 9.31189C43.0224 9.51551 43.6166 9.51004 44.1958 9.54262C44.3647 9.55281 44.3647 9.55281 44.537 9.5632C44.9144 9.58583 45.2919 9.60764 45.6694 9.62946C45.9401 9.64552 46.2107 9.66163 46.4813 9.67779C47.0644 9.71249 47.6476 9.74683 48.2307 9.7809C49.154 9.83482 50.0772 9.88954 51.0004 9.94437C52.4622 10.0311 53.9239 10.1173 55.3857 10.2032C57.9993 10.3569 60.6127 10.5114 63.2262 10.6662C64.1426 10.7205 65.059 10.7745 65.9755 10.8283C66.5479 10.8619 67.1203 10.8957 67.6926 10.9295C67.9565 10.9451 68.2204 10.9606 68.4844 10.976C69.8784 11.0574 71.2705 11.146 72.6614 11.2709C72.7185 13.8376 72.7185 13.8376 72.3581 15.0382C72.308 15.088 72.2579 15.1377 72.2064 15.1889C71.7352 15.1798 71.2684 15.1609 70.7981 15.1346C70.6545 15.1272 70.5109 15.1197 70.3629 15.1121C69.9155 15.0885 69.4681 15.0636 69.0208 15.0382C68.8904 15.0308 68.76 15.0235 68.6257 15.0159C67.8597 14.9719 67.0939 14.9254 66.3281 14.8778C65.8975 14.851 65.4669 14.8246 65.0363 14.7982C64.4144 14.76 63.7924 14.7218 63.1705 14.6834C61.5189 14.5815 59.8673 14.4803 58.2156 14.3795C58.0476 14.3693 57.8796 14.359 57.7064 14.3485C55.2404 14.1981 52.774 14.0529 50.3074 13.9122C50.0794 13.8991 50.0794 13.8991 49.8469 13.8858C48.3932 13.8028 46.9394 13.7202 45.4856 13.639C44.9569 13.6094 44.4283 13.5794 43.8997 13.5493C43.6561 13.5355 43.4125 13.5219 43.1689 13.5086C42.8373 13.4903 42.5057 13.4715 42.1741 13.4525C41.9892 13.4422 41.8043 13.4319 41.6138 13.4212C41.135 13.3827 40.6713 13.316 40.199 13.2299C40.224 13.0714 40.2491 12.9129 40.2748 12.7496C40.2574 12.1962 40.2574 12.1962 39.9928 11.9478C38.9084 11.2045 37.4118 10.9614 36.1169 11.1614C35.0842 11.5181 34.1957 12.6044 33.6762 13.5313C33.53 13.9795 33.4358 14.421 33.3728 14.8875C33.573 15.0367 33.7732 15.1859 33.9796 15.3396C33.8904 15.8323 33.7413 16.0885 33.3953 16.4492C33.2595 16.5921 33.2595 16.5921 33.1209 16.7379C33.0226 16.8391 32.9242 16.9402 32.8229 17.0443C32.6712 17.2027 32.6712 17.2027 32.5165 17.3643C31.7133 18.1989 30.8944 19.0183 30.0642 19.8265C29.6121 20.2689 29.18 20.7184 28.7663 21.1966C28.1565 21.8985 27.4961 22.5448 26.831 23.1945C25.8977 24.0963 25.8977 24.0963 25.0403 25.0676C24.8848 25.25 24.8848 25.25 24.7262 25.4361C24.6261 25.4361 24.526 25.4361 24.4229 25.4361C24.385 25.5229 24.3471 25.6098 24.308 25.6993C24.0931 26.0862 23.8481 26.3402 23.5299 26.6487C23.3537 26.8212 23.3537 26.8212 23.174 26.9971C23.0511 27.116 22.9282 27.2349 22.8016 27.3574C21.8056 28.3217 21.8056 28.3217 20.8693 29.3423C20.0735 30.2637 19.1851 31.0977 18.3154 31.9494C17.6283 32.6261 16.9653 33.3088 16.336 34.0388C15.776 34.6684 15.1603 35.2459 14.5568 35.8339C13.9526 36.4272 13.3785 37.0345 12.8276 37.6772C12.4709 38.0784 12.1256 38.3925 11.6806 38.6971C11.0274 38.6804 10.6534 38.1846 10.23 37.7458C10.157 37.6725 10.0839 37.5991 10.0087 37.5236C9.80378 37.3156 9.6043 37.1023 9.40518 36.8887C9.30682 36.7871 9.20846 36.6856 9.10712 36.5809C8.95009 36.286 8.95009 36.286 9.05098 35.934C9.28144 35.4771 9.54089 35.1978 9.90944 34.842C10.0406 34.7139 10.1717 34.5858 10.3067 34.4538C10.4441 34.3218 10.5815 34.1898 10.723 34.0538C11.5416 33.2608 12.3438 32.471 13.0872 31.6076C13.6795 30.9418 14.332 30.3313 14.9698 29.709C15.5819 29.1076 16.1616 28.4926 16.7229 27.8445C17.2878 27.2124 17.9056 26.6304 18.5127 26.0388C19.0068 25.5537 19.4855 25.0649 19.9384 24.5413C20.6458 23.7254 21.4248 22.9824 22.1972 22.2279C22.7286 21.7055 23.2484 21.1823 23.7355 20.6186C24.4703 19.7692 25.2844 18.9979 26.0873 18.2128C26.7484 17.5624 27.3785 16.901 27.9834 16.1989C28.2777 15.8732 28.6078 15.6014 28.9452 15.3208C29.679 14.6091 29.741 13.9711 29.8275 12.9833C30.0217 11.2353 31.3816 9.59222 32.6143 8.40773C35.2077 6.39149 38.8521 6.67538 41.5642 8.40773Z" fill="#244B94"/>
-<path d="M10.315 44.8755C12.6109 47.431 13.9056 51.3853 15.4424 54.4495C15.6835 54.9302 15.925 55.4106 16.1664 55.8911C16.5348 56.6242 16.903 57.3575 17.2709 58.0908C17.5958 58.738 17.9215 59.3848 18.2481 60.0311C19.104 61.726 19.937 63.4321 20.7725 65.137C21.5251 66.6721 22.2798 68.2055 23.0614 69.7263C23.1192 69.8393 23.177 69.9522 23.2366 70.0686C23.5041 70.5908 23.7732 71.1121 24.0456 71.6318C24.1395 71.8144 24.2333 71.9971 24.3271 72.1798C24.4083 72.3355 24.4895 72.4912 24.5732 72.6516C24.7343 73.0775 24.7436 73.2432 24.5742 73.6579C24.3739 73.7076 24.1737 73.7573 23.9674 73.8086C23.6969 75.152 23.9863 76.3506 24.7353 77.51C25.4318 78.3804 26.054 78.5806 27.153 78.7815C28.1336 78.8702 28.9138 78.937 29.7318 78.3294C29.8662 77.9389 29.8662 77.9389 29.8834 77.5759C31.0362 77.6818 32.1381 77.9617 33.2592 78.2393C33.4761 78.2925 33.6931 78.3456 33.91 78.3987C34.4965 78.5425 35.0828 78.6871 35.6691 78.832C36.1633 78.954 36.6577 79.0755 37.1521 79.197C41.0224 80.1486 44.8879 81.1185 48.7512 82.0971C50.9625 82.6571 53.1746 83.2121 55.3923 83.7467C55.5833 83.7928 55.7744 83.8389 55.9713 83.8865C56.8617 84.1012 57.7525 84.3145 58.6438 84.5256C58.9528 84.5997 59.2619 84.6738 59.571 84.748C59.711 84.7806 59.8511 84.8133 59.9954 84.847C60.122 84.8775 60.2486 84.9081 60.3791 84.9396C60.4888 84.9655 60.5984 84.9915 60.7114 85.0182C60.9807 85.1106 60.9807 85.1106 61.284 85.412C61.3511 86.5268 60.9889 87.7241 60.5256 88.7272C60.0705 89.0286 60.0705 89.0286 59.6226 88.9689C59.3456 88.9 59.3456 88.9 59.0629 88.8296C58.96 88.8046 58.8571 88.7795 58.751 88.7537C58.4047 88.6689 58.0592 88.5813 57.7136 88.4938C57.466 88.4325 57.2183 88.3714 56.9705 88.3105C56.2957 88.1441 55.6216 87.9752 54.9476 87.8059C54.2401 87.6287 53.5321 87.4537 52.8242 87.2784C51.4795 86.9452 50.1353 86.61 48.7913 86.274C47.2741 85.8949 45.7563 85.5179 44.2385 85.1412C42.1208 84.6155 40.0033 84.0891 37.8863 83.5607C37.3881 83.4364 36.8899 83.3124 36.3915 83.1885C35.4005 82.9421 34.4099 82.6947 33.4221 82.4358C33.2788 82.3986 33.1354 82.3615 32.9877 82.3232C32.74 82.2588 32.4925 82.1931 32.2455 82.1258C31.355 81.8955 30.8125 81.9885 30.0144 82.4034C29.2168 82.7654 28.5031 82.7861 27.6365 82.7654C27.4897 82.7634 27.3429 82.7614 27.1917 82.7594C25.4258 82.7152 23.5936 82.3707 22.233 81.159C20.6099 79.3294 19.8978 77.0971 19.9819 74.6939C20.0234 74.11 20.0234 74.11 20.1511 73.652C20.187 72.757 19.7975 72.1402 19.3858 71.3598C19.2601 71.1135 19.2601 71.1135 19.1318 70.8622C18.8627 70.3361 18.5899 69.8119 18.3168 69.2878C18.051 68.7719 17.786 68.2556 17.5213 67.7392C17.3567 67.4189 17.1915 67.0989 17.0253 66.7794C16.4789 65.724 15.9595 64.6579 15.4468 63.586C14.6471 61.9158 13.8147 60.2634 12.972 58.6143C12.5482 57.784 12.1267 56.9525 11.7048 56.1213C11.1724 55.0726 10.6393 54.0243 10.1037 52.9772C9.66592 52.1213 9.2305 51.2642 8.79666 50.4063C8.63174 50.0812 8.46595 49.7566 8.29928 49.4324C8.06829 48.9829 7.84032 48.5319 7.61303 48.0806C7.54364 47.9473 7.47425 47.814 7.40275 47.6766C7.34176 47.554 7.28077 47.4314 7.21793 47.3051C7.16389 47.199 7.10985 47.0929 7.05416 46.9836C6.9777 46.6838 6.9777 46.6838 7.08309 46.3638C7.4073 45.9008 7.8974 45.6927 8.39035 45.4406C8.49115 45.3858 8.59195 45.331 8.69581 45.2746C9.73161 44.7331 9.73161 44.7331 10.315 44.8755Z" fill="#244B94"/>
-<path d="M74.4811 22.5731C75.0352 22.7614 75.2063 22.8249 75.5429 23.3266C75.6297 23.6493 75.705 23.975 75.774 24.3019C75.8187 24.5079 75.8635 24.7138 75.9084 24.9196C75.9321 25.0295 75.9557 25.1393 75.9801 25.2524C77.7473 33.3835 80.3348 41.585 83.908 49.1184C85.3928 52.2934 85.3928 52.2934 84.9479 53.7666C84.0759 55.5911 82.6108 57.1441 81.28 58.6513C80.5587 59.472 79.8843 60.3209 79.2272 61.1931C79.0185 61.4697 78.8081 61.7449 78.5975 62.02C74.7387 67.0755 71.1916 72.4407 68.1544 78.0235C68.0931 78.1353 68.0319 78.2471 67.9688 78.3623C67.8586 78.5649 67.7501 78.7683 67.6437 78.9728C67.3298 79.5506 67.046 79.8647 66.4413 80.1379C66.3412 80.1379 66.2411 80.1379 66.1379 80.1379C66 78.9525 66.4468 78.2635 67.067 77.2747C67.2631 76.9524 67.459 76.63 67.6549 76.3076C67.7558 76.1434 67.8567 75.9791 67.9606 75.8099C68.3421 75.1835 68.7104 74.5501 69.0782 73.9157C72.4667 68.0767 76.3798 62.5762 80.7005 57.3832C80.3747 57.3832 80.0316 57.7876 79.7998 57.9766C79.6639 58.0867 79.528 58.1968 79.388 58.3103C78.1485 59.3459 76.9777 60.4506 75.8332 61.5878C75.6097 61.8094 75.3851 62.0298 75.1604 62.2501C74.3305 63.0698 73.5587 63.9172 72.8284 64.8272C72.5244 65.2004 72.209 65.5576 71.8845 65.9133C71.2877 66.5737 70.7466 67.2662 70.2147 67.9788C70.1173 68.1088 70.02 68.2388 69.9197 68.3727C68.2934 70.5545 66.7596 72.7726 65.3403 75.0932C65.2018 75.3181 65.0632 75.543 64.9244 75.7678C64.8674 75.8614 64.8104 75.955 64.7516 76.0514C64.4632 76.5079 64.3414 76.6619 63.8246 76.8791C63.6869 76.9102 63.5493 76.9413 63.4074 76.9733C63.2873 75.8364 63.6474 75.2238 64.2702 74.2891C64.3593 74.1512 64.4484 74.0133 64.5401 73.8712C64.8165 73.4462 65.0972 73.0244 65.3795 72.6032C65.4629 72.478 65.5463 72.3528 65.6322 72.2238C67.4013 69.5785 69.2931 67.0296 71.3558 64.6031C71.573 64.3457 71.7863 64.0858 71.9983 63.8242C73.0527 62.5407 74.2255 61.3724 75.4007 60.1993C75.527 60.0727 75.527 60.0727 75.6558 59.9435C76.7305 58.868 77.8333 57.8718 79.0319 56.9311C79.2195 56.7778 79.4067 56.6239 79.593 56.469C79.8242 56.2772 80.0554 56.0854 80.2866 55.8936C80.4752 55.7372 80.6637 55.5807 80.8522 55.4242C79.8907 55.7134 79.0088 56.0776 78.1217 56.545C77.9976 56.6104 77.8735 56.6758 77.7456 56.7431C75.5995 57.9019 73.7145 59.3837 71.9023 60.9998C71.7781 61.1092 71.7781 61.1092 71.6515 61.2208C70.8154 61.9579 70.0045 62.6995 69.2856 63.5528C68.9749 63.9158 68.6467 64.2596 68.3185 64.6071C67.4083 65.5987 66.607 66.6661 65.7948 67.7372C65.3462 68.3246 64.8884 68.9048 64.4314 69.4858C63.0807 71.187 63.0807 71.187 61.8087 72.9458C61.4848 73.3261 61.1601 73.314 60.6769 73.3567C60.6041 72.5532 60.7984 72.1553 61.2458 71.4919C61.3067 71.4013 61.3675 71.3108 61.4302 71.2175C62.713 69.3341 64.1391 67.5524 65.5994 65.8031C65.815 65.5441 66.0282 65.2833 66.241 65.0221C67.2292 63.8271 68.312 62.7265 69.4088 61.6309C69.4821 61.5573 69.5554 61.4837 69.6309 61.4079C70.6384 60.3985 71.6892 59.47 72.8124 58.5888C72.9769 58.456 73.1412 58.3232 73.3054 58.1902C75.9359 56.1302 80.0198 53.095 83.5827 53.3145C83.5827 53.215 83.5827 53.1156 83.5827 53.0131C83.4736 52.9729 83.3645 52.9327 83.2521 52.8913C76.3393 49.9903 71.9521 40.9124 69.3079 34.4722C68.7724 33.1511 68.2861 31.8142 67.8255 30.4656C67.7919 30.3687 67.7583 30.2717 67.7237 30.1718C67.6295 29.898 67.5384 29.6232 67.4475 29.3484C67.3957 29.1927 67.3439 29.037 67.2905 28.8765C67.1927 28.4167 67.2069 28.1417 67.3515 27.6967C67.4516 27.5972 67.5517 27.4977 67.6549 27.3953C68.3634 28.0009 68.6397 28.5815 68.949 29.4479C68.9965 29.5751 69.0439 29.7023 69.0928 29.8334C69.1944 30.1061 69.2952 30.3791 69.3951 30.6524C69.6587 31.3718 69.9299 32.0883 70.2011 32.8049C70.2551 32.9481 70.3092 33.0913 70.3649 33.2388C72.8267 39.7249 76.1075 46.1472 81.7624 50.4513C81.5495 50.0054 81.3043 49.6049 81.0235 49.1981C80.9372 49.072 80.8509 48.9459 80.762 48.816C80.6697 48.6812 80.5775 48.5464 80.4825 48.4075C79.4723 46.9152 78.5433 45.3936 77.6666 43.8208C77.605 43.712 77.5434 43.6031 77.4798 43.491C74.7127 38.5848 70.5692 30.8073 70.8404 25.1349C70.9155 24.9111 70.9155 24.9111 70.9921 24.6828C71.5822 24.9051 71.7636 25.1915 72.054 25.7376C72.1501 26.0263 72.235 26.3189 72.3106 26.6135C72.356 26.7858 72.4014 26.958 72.4482 27.1354C72.4964 27.3206 72.5447 27.5058 72.5944 27.6967C74.3799 34.3515 77.19 43.498 82.2175 48.4923C82.1772 48.402 82.137 48.3118 82.0956 48.2187C79.398 42.1226 77.3718 35.7952 75.6946 29.3543C75.6615 29.2275 75.6283 29.1008 75.5941 28.9702C75.3931 28.2014 75.195 27.4318 75.0008 26.6613C74.9394 26.4185 74.8773 26.176 74.8146 25.9336C74.7275 25.5962 74.6433 25.2583 74.5599 24.92C74.5115 24.7282 74.4632 24.5364 74.4134 24.3388C74.3169 23.6953 74.3726 23.2116 74.4811 22.5731ZM82.3691 48.7937C82.5208 49.0951 82.5208 49.0951 82.5208 49.0951L82.3691 48.7937Z" fill="#244B94"/>
-<path d="M40.9669 13.9363C41.1357 13.9631 41.3045 13.9899 41.4785 14.0175C42.5329 14.1873 43.5838 14.3742 44.6343 14.5661C51.2376 15.7702 57.9735 16.3267 64.6844 16.4251C64.8272 16.4274 64.97 16.4298 65.1171 16.4322C65.8098 16.4434 66.5023 16.4516 67.1951 16.454C67.4454 16.4572 67.6956 16.4605 67.9459 16.4639C68.1159 16.4628 68.1159 16.4628 68.2893 16.4616C69.0294 16.4757 69.4046 16.6325 69.9309 17.1479C69.4657 17.6085 69.0708 17.6535 68.4274 17.6589C68.3086 17.6575 68.1898 17.6562 68.0673 17.6547C67.9412 17.655 67.8151 17.6552 67.6852 17.6554C67.2676 17.6552 66.8501 17.6513 66.4325 17.6471C66.1382 17.6454 65.8439 17.6437 65.5496 17.6419C57.7542 17.5798 49.9864 16.9381 42.3227 15.4903C49.4708 18.2528 56.8605 19.8197 64.5268 20.2348C64.6314 20.2407 64.7359 20.2466 64.8436 20.2527C65.347 20.281 65.8501 20.3063 66.354 20.3261C66.6231 20.3401 66.6231 20.3401 66.8976 20.3543C67.0554 20.3609 67.2131 20.3675 67.3756 20.3742C67.904 20.4831 68.1728 20.707 68.5657 21.0659C68.118 21.4959 67.7672 21.5723 67.1514 21.5732C67.0424 21.5706 66.9334 21.5679 66.8212 21.5651C66.6432 21.5624 66.6432 21.5624 66.4617 21.5596C57.7347 21.3644 49.052 19.6337 40.9574 16.3945C46.0328 21.5597 54.8168 22.8592 61.6162 23.8067C62.1683 23.8839 62.7204 23.9614 63.2723 24.0402C63.6115 24.0885 63.9509 24.1361 64.2903 24.1826C64.4425 24.2043 64.5947 24.2259 64.7515 24.2483C64.8844 24.2667 65.0172 24.2852 65.1541 24.3043C65.8381 24.4436 66.1982 24.5454 66.5937 25.1347C66.4408 25.3613 66.4408 25.3613 66.1386 25.5867C65.7236 25.6126 65.3559 25.608 64.944 25.5773C64.8188 25.5691 64.6936 25.5609 64.5647 25.5524C56.1683 24.9257 46.4655 22.8661 39.8956 17.2986C39.7125 17.1445 39.7125 17.1445 39.5258 16.9872C38.8734 16.4254 38.3153 15.8541 37.7719 15.1889C37.7666 15.2773 37.7614 15.3658 37.756 15.4569C37.1242 25.4812 30.9411 34.0575 24.1728 41.1393C23.7486 41.4606 23.4314 41.5143 22.9059 41.5602C22.9544 40.6096 23.2481 40.1729 23.8919 39.4882C24.0593 39.3025 24.2266 39.1167 24.3938 38.9307C24.5178 38.7946 24.5178 38.7946 24.6444 38.6556C24.9648 38.2989 25.2678 37.9295 25.57 37.5574C25.9778 37.0574 26.3924 36.5651 26.8164 36.0786C30.8268 31.4564 36.1032 24.4653 36.1032 18.0521C36.0429 18.1767 36.0429 18.1767 35.9813 18.3038C32.6999 25.0428 28.2653 31.0175 23.0627 36.4177C22.8399 36.649 22.6179 36.8811 22.3965 37.1137C22.0158 37.5122 21.6317 37.9071 21.2467 38.3015C21.0663 38.4912 21.0663 38.4912 20.8822 38.6848C19.9165 39.6618 19.9165 39.6618 19.2552 39.7578C19.1083 39.7558 18.9614 39.7539 18.8101 39.7519C18.8431 38.7396 19.2108 38.3277 19.9348 37.6475C20.0331 37.5515 20.1314 37.4555 20.2326 37.3566C20.5464 37.0509 20.8632 36.7484 21.1804 36.4461C21.4936 36.1436 21.8061 35.8406 22.1183 35.5371C22.3123 35.3491 22.507 35.1616 22.7024 34.975C23.3653 34.3379 23.9748 33.6665 24.5745 32.9707C24.7185 32.8075 24.8626 32.6444 25.0071 32.4815C26.1905 31.1338 27.2916 29.7332 28.3668 28.2992C28.4484 28.1912 28.53 28.0832 28.614 27.9719C30.3435 25.675 31.8592 23.2631 33.259 20.7551C33.365 20.5655 33.365 20.5655 33.4732 20.372C33.5702 20.1954 33.5702 20.1954 33.669 20.0152C33.7256 19.9122 33.7821 19.8093 33.8404 19.7032C33.9806 19.406 34.0626 19.1258 34.1312 18.8055C34.0786 18.8699 34.026 18.9343 33.9718 19.0006C33.4513 19.6375 32.9304 20.2742 32.4094 20.9108C32.2021 21.1642 31.9951 21.4179 31.7882 21.6717C30.3883 23.3831 28.9397 25.0438 27.4227 26.6537C27.2175 26.874 27.0142 27.0962 26.8119 27.3191C25.6945 28.5459 24.5308 29.722 23.3515 30.89C23.0275 31.2111 22.7043 31.533 22.3812 31.8549C22.1716 32.0631 21.9619 32.2711 21.7522 32.4792C21.6575 32.5735 21.5628 32.6679 21.4653 32.7651C20.8918 33.3318 20.2999 33.8688 19.688 34.3942C19.3741 34.6653 19.0713 34.9459 18.7716 35.2323C18.664 35.3343 18.5563 35.4362 18.4454 35.5413C18.2263 35.7498 18.0074 35.9585 17.7889 36.1676C16.0699 37.7929 16.0699 37.7929 15.1695 37.7929C15.1841 37.0829 15.275 36.7191 15.7858 36.2106C15.9822 36.0319 16.1814 35.8561 16.383 35.6832C16.4689 35.6084 16.5547 35.5336 16.6432 35.4566C16.8318 35.2929 17.0209 35.1297 17.2103 34.9669C19.048 33.3564 20.7829 31.6376 22.5129 29.9148C22.909 29.5205 23.3059 29.127 23.7029 28.7336C23.9587 28.4794 24.2145 28.2251 24.4702 27.9708C24.587 27.855 24.7038 27.7393 24.8241 27.6201C25.4477 26.998 26.0471 26.3636 26.6229 25.6975C26.9604 25.3089 27.3131 24.9357 27.6653 24.5601C28.3171 23.8592 28.9345 23.1379 29.5365 22.3939C29.8373 22.0268 30.1455 21.6676 30.4574 21.3098C31.2498 20.398 31.9854 19.4518 32.7091 18.4853C36.6544 13.2185 36.6544 13.2185 40.9669 13.9363Z" fill="#244B94"/>
-<path d="M21.9954 44.7248C22.7633 45.0055 23.0499 45.3064 23.3861 46.0121C23.4371 46.1281 23.4882 46.2441 23.5408 46.3636C23.5975 46.4878 23.6542 46.612 23.7126 46.74C27.4792 55.1736 30.7162 65.4232 27.7597 74.562C27.898 74.4872 28.0362 74.4124 28.1787 74.3354C36.1519 70.1341 46.0333 71.0327 54.5811 72.7631C54.7637 72.8001 54.9464 72.837 55.1346 72.8751C57.6164 73.399 57.6164 73.399 58.0226 73.9875C58.0477 74.0776 58.0727 74.1678 58.0985 74.2606C57.5798 74.6042 57.4724 74.5882 56.8779 74.5219C56.729 74.5053 56.58 74.4887 56.4266 74.4717C55.7536 74.3818 55.0865 74.271 54.4187 74.1488C54.1257 74.0966 53.8326 74.0444 53.5395 73.9923C53.389 73.9653 53.2385 73.9383 53.0834 73.9104C45.6418 72.5811 38.003 71.6812 30.7936 74.562C30.969 74.5511 31.1444 74.5403 31.3251 74.5291C39.7908 74.0444 48.1361 75.0564 56.2971 77.3122C56.56 77.3838 56.56 77.3838 56.8283 77.4569C57.0681 77.5263 57.0681 77.5263 57.3127 77.5971C57.4508 77.6368 57.5889 77.6764 57.7312 77.7173C58.1617 77.9048 58.4053 78.123 58.7052 78.48C58.7052 78.5795 58.7052 78.679 58.7052 78.7814C57.4954 79.1821 56.421 78.7422 55.2447 78.3953C47.9796 76.3326 40.1742 75.1385 32.6139 75.7676C32.9081 76.0598 33.4361 76.0313 33.8387 76.0884C34.0709 76.1227 34.303 76.157 34.5351 76.1915C34.659 76.2098 34.7828 76.228 34.9104 76.2468C41.6285 77.2471 48.1703 78.8918 54.6569 80.8817C54.8971 80.9547 54.8971 80.9547 55.1422 81.0292C55.5967 81.1679 56.0504 81.3089 56.5039 81.4509C56.639 81.492 56.7742 81.5331 56.9134 81.5754C57.6241 81.8017 58.1505 82.0297 58.7052 82.5488C58.6552 82.6979 58.6051 82.8471 58.5536 83.0008C57.7801 83.1944 57.2259 83.076 56.4909 82.8237C56.3796 82.7874 56.2683 82.7512 56.1536 82.7138C55.913 82.6354 55.6727 82.5562 55.4326 82.4763C54.7835 82.2608 54.1318 82.0534 53.4801 81.8459C53.3463 81.8033 53.2125 81.7606 53.0746 81.7167C46.5323 79.6452 39.7206 78.132 32.9179 77.2139C32.7944 77.1972 32.6709 77.1805 32.5436 77.1633C31.9585 77.0851 31.3733 77.0096 30.7873 76.9388C27.4484 76.5245 27.4484 76.5245 26.5997 75.6598C25.4967 74.2257 24.952 72.3365 24.3796 70.6439C22.998 66.5742 21.3403 62.6265 19.4849 58.7477C19.2655 58.2884 19.0488 57.8278 18.8323 57.3671C18.0069 55.6217 17.1341 53.9046 16.2215 52.2029C16.17 52.1068 16.1185 52.0107 16.0655 51.9117C15.5593 50.9697 15.0456 50.0341 14.4919 49.1184C14.4134 48.9883 14.3349 48.8583 14.254 48.7242C14.1115 48.4912 13.9666 48.2595 13.8187 48.0298C13.3637 47.2909 13.2786 46.7962 13.3488 45.9303C13.8665 46.0586 14.1817 46.1383 14.526 46.5544C14.5976 46.6876 14.6693 46.8208 14.7431 46.9581C14.8259 47.1085 14.9086 47.2589 14.9939 47.4139C15.0799 47.577 15.1659 47.7401 15.2545 47.9082C15.3463 48.0767 15.438 48.2453 15.5326 48.419C15.7239 48.771 15.9142 49.1233 16.1029 49.4768C16.3656 49.967 16.6321 50.4549 16.9006 50.942C17.3123 51.6895 17.7199 52.4391 18.125 53.1901C18.2732 53.4646 18.4218 53.7389 18.5708 54.013C21.3876 59.1984 23.6347 64.6517 25.636 70.1919C24.7162 62.3076 21.9519 53.975 17.8142 47.1461C17.4114 46.4515 17.3956 45.9563 17.4446 45.1769C18.0357 45.2607 18.2719 45.4858 18.6581 45.9303C18.9327 46.3666 19.1702 46.8198 19.4071 47.2771C19.4789 47.415 19.5506 47.5528 19.6246 47.6948C23.4432 55.1384 25.9329 62.9917 27.153 71.2468C28.3265 65.7386 27.1161 60.0657 25.3326 54.8212C25.2876 54.6879 25.2425 54.5547 25.1961 54.4173C24.6949 52.9544 24.1283 51.5202 23.5366 50.0915C23.485 49.9665 23.4334 49.8415 23.3802 49.7128C23.1196 49.0821 22.857 48.4523 22.5912 47.8238C22.4936 47.5898 22.3962 47.3558 22.2988 47.1217C22.2528 47.015 22.2069 46.9082 22.1596 46.7982C21.9061 46.1841 21.7802 45.6898 21.8437 45.0262C21.8937 44.9267 21.9438 44.8272 21.9954 44.7248Z" fill="#244B94"/>
-<path d="M40.1982 23.0249C40.6323 23.0614 40.8768 23.0847 41.1693 23.4174C41.6851 24.4217 42.0933 25.4551 42.4926 26.5097C44.0795 30.6001 45.9967 34.2325 49.0036 37.4703C49.2436 37.7316 49.4681 37.9958 49.6886 38.2732C50.0767 38.7181 50.4885 39.0872 50.9394 39.4675C51.1573 39.6539 51.3713 39.845 51.5806 40.0409C57.7837 45.8335 65.7724 48.7799 73.8693 50.841C74.5292 51.0091 75.1881 51.1804 75.8462 51.3552C76.078 51.4162 76.078 51.4162 76.3144 51.4785C76.69 51.5877 76.69 51.5877 77.2115 51.8073C77.3199 52.1224 77.3199 52.1224 77.3632 52.4101C75.4179 53.3097 72.7411 52.5465 70.6999 52.2553C63.5478 51.251 56.3437 52.8773 49.9066 56.0267C49.7617 56.0966 49.6167 56.1664 49.4674 56.2384C44.6016 58.5995 40.2995 61.7356 36.4948 65.5517C36.1953 65.8521 35.8945 66.1512 35.5935 66.4501C34.3194 67.7151 34.3194 67.7151 33.1305 69.0583C32.8764 69.3312 32.6279 69.5427 32.3101 69.7398C31.893 69.6173 31.893 69.6173 31.5517 69.4384C31.7466 68.0711 32.8691 67.0363 33.7779 66.0584C34.2622 65.5264 34.712 64.9691 35.1651 64.4108C35.4634 64.0522 35.7734 63.7128 36.093 63.373C40.0466 58.9711 41.7501 52.8336 42.6253 47.1358C42.6433 47.0235 42.6613 46.9111 42.6798 46.7953C43.7162 40.0224 42.5209 33.2747 40.5892 26.7858C40.5403 26.6217 40.4915 26.4575 40.4412 26.2883C40.3979 26.1451 40.3546 26.0018 40.31 25.8542C40.128 25.1732 40.0251 24.5111 40.0276 23.8066C40.027 23.6327 40.027 23.6327 40.0264 23.4552C40.0465 23.1756 40.0465 23.1756 40.1982 23.0249ZM42.3219 29.0526C42.4736 29.354 42.4736 29.354 42.4736 29.354L42.3219 29.0526ZM42.4736 29.354C42.5743 30.4315 42.7707 31.4698 42.9951 32.528C44.9536 42.0236 43.9646 52.8927 38.833 61.301C38.5881 61.6593 38.3337 62.0074 38.0745 62.3558C38.1246 62.4553 38.1746 62.5547 38.2262 62.6572C38.3461 62.5511 38.4659 62.4451 38.5894 62.3358C46.7624 55.191 57.4405 50.6441 68.4132 51.0538C68.814 51.0864 69.2129 51.1266 69.6124 51.1713C69.9789 51.2096 70.3393 51.2198 70.7076 51.2139C70.9986 51.2093 70.9986 51.2093 71.2954 51.2045C70.8231 50.8917 70.4558 50.7733 69.9124 50.6194C69.725 50.5655 69.5375 50.5115 69.3444 50.456C69.2452 50.4276 69.1459 50.3992 69.0436 50.37C62.1737 48.3963 55.8917 45.2037 50.5857 40.3929C50.331 40.1626 50.0741 39.9347 49.8154 39.7089C49.0203 39.0133 48.3027 38.3047 47.6312 37.4914C47.5667 37.4158 47.5022 37.3401 47.4358 37.2622C45.3813 34.85 43.9337 32.225 42.6253 29.354C42.5753 29.354 42.5252 29.354 42.4736 29.354Z" fill="#244B94"/>
-<path d="M39.8949 18.052C40.4967 18.1158 40.8637 18.4492 41.3265 18.8149C41.5028 18.9524 41.6792 19.0897 41.8556 19.227C41.9533 19.3034 42.051 19.3799 42.1517 19.4586C47.2101 23.4028 52.6211 26.9854 58.7223 29.1382C59.3539 29.3687 59.7804 29.578 60.2218 30.1075C60.1718 30.2567 60.1217 30.4059 60.0701 30.5596C59.4 30.7107 58.9999 30.7108 58.3642 30.4536C58.2139 30.3937 58.0637 30.3338 57.9088 30.272C57.7492 30.2053 57.5895 30.1386 57.425 30.0698C57.258 30.0015 57.091 29.9333 56.9189 29.8629C52.4577 28.0145 48.0519 25.7735 44.294 22.7235C44.2156 22.6609 44.1372 22.5983 44.0564 22.5338C43.0117 21.6981 42.0327 20.8077 41.08 19.8698C40.9325 19.7253 40.9325 19.7253 40.782 19.578C40.6905 19.4864 40.5989 19.3949 40.5046 19.3006C40.3828 19.1791 40.3828 19.1791 40.2586 19.0551C40.0309 18.787 39.8882 18.5215 39.7432 18.2027C39.7933 18.153 39.8433 18.1033 39.8949 18.052Z" fill="#244B94"/>
-<path d="M63.7108 34.7791C64.4526 34.9665 64.7656 35.1661 65.1898 35.7963C65.2922 35.9445 65.3947 36.0927 65.5003 36.2454C65.6657 36.4893 65.6657 36.4893 65.8345 36.7381C66.0851 37.0945 66.3387 37.4486 66.593 37.8024C66.6575 37.8925 66.7221 37.9825 66.7887 38.0753C67.3531 38.8584 67.9458 39.6135 68.565 40.3547C68.6911 40.5063 68.8172 40.6578 68.9472 40.8139C70.7446 42.957 72.6295 45.0576 74.8271 46.8022C75.2296 47.128 75.6146 47.4663 75.998 47.8141C76.6395 48.3942 77.3017 48.9419 77.9759 49.484C78.7926 50.1466 79.5939 50.8274 80.3971 51.506C80.322 51.7298 80.322 51.7298 80.2454 51.9581C78.2681 51.222 76.5733 49.9369 74.9361 48.6429C74.8502 48.5754 74.7643 48.508 74.6758 48.4385C73.4057 47.4299 72.2488 46.3049 71.0964 45.1675C70.9569 45.0304 70.8175 44.8933 70.6738 44.752C69.7546 43.8345 68.9212 42.8738 68.1099 41.8617C67.9435 41.6615 67.7767 41.4617 67.6092 41.2624C66.5076 39.9406 65.4792 38.5804 64.5063 37.1622C64.3298 36.9066 64.1476 36.655 63.965 36.4038C63.6028 35.8067 63.6635 35.4602 63.7108 34.7791Z" fill="#244B94"/>
-<path d="M79.7907 53.465C79.8407 53.6142 79.8908 53.7634 79.9423 53.9171C79.8236 53.9677 79.7048 54.0184 79.5824 54.0706C72.7693 56.9801 66.2089 60.0104 60.6215 64.9606C60.1338 65.2762 59.735 65.3242 59.1603 65.3698C59.1883 64.7095 59.2428 64.3926 59.6901 63.8905C59.8585 63.7495 60.0298 63.6117 60.2032 63.4767C60.297 63.4005 60.3909 63.3243 60.4876 63.2459C60.8004 62.9951 61.1172 62.7502 61.4357 62.5066C61.5459 62.4219 61.6561 62.3373 61.7696 62.2501C66.2374 58.8453 73.8329 53.0951 79.7907 53.465Z" fill="#244B94"/>
-<path d="M37.7719 18.6547C37.9721 18.7045 38.1723 18.7542 38.3786 18.8054C38.6504 25.9138 36.2102 34.888 32.1592 40.8066C31.7603 41.1666 31.6457 41.2587 31.0973 41.2587C31.0417 40.3469 31.1665 39.7631 31.6188 38.9606C31.7315 38.748 31.8436 38.5351 31.9553 38.322C32.014 38.2109 32.0727 38.0999 32.1331 37.9855C35.2664 31.9327 36.5924 25.2983 37.7719 18.6547Z" fill="#244B94"/>
-<path d="M51.8032 66.6977C52.0032 66.695 52.0032 66.695 52.2073 66.6922C52.3352 66.6919 52.4631 66.6916 52.5949 66.6913C52.709 66.6906 52.8231 66.69 52.9406 66.6894C53.2443 66.726 53.2443 66.726 53.6994 67.0274C53.4339 67.6113 53.4339 67.6113 53.0926 67.7809C52.7535 67.8182 52.4136 67.8476 52.0734 67.8733C51.8598 67.8901 51.6463 67.907 51.4327 67.924C51.32 67.9329 51.2074 67.9417 51.0913 67.9508C44.7694 68.4542 38.923 69.938 32.9748 72.055C32.8321 72.1056 32.6894 72.1562 32.5423 72.2083C32.2897 72.2986 32.0375 72.3903 31.7861 72.4838C30.9947 72.7701 30.9947 72.7701 30.4902 72.603C30.7435 71.8484 31.4831 71.6533 32.1684 71.3033C32.3246 71.2232 32.4808 71.1432 32.6418 71.0607C38.4058 68.1745 45.3544 66.7026 51.8032 66.6977Z" fill="#244B94"/>
-<path d="M29.7317 47.5879C30.0973 47.7332 30.2984 47.8224 30.503 48.1638C30.6403 48.4883 30.7092 48.7634 30.7604 49.1108C30.7784 49.2319 30.7965 49.353 30.815 49.4779C30.9141 50.2036 31.0096 50.9294 31.097 51.6566C31.1135 51.7928 31.13 51.9289 31.147 52.0692C31.78 57.5885 32.4538 66.0823 29.58 71.0961C29.2663 71.1894 29.2663 71.1894 28.9733 71.2468C28.9839 71.1595 28.9945 71.0722 29.0054 70.9822C29.0999 70.204 29.1939 69.4257 29.2873 68.6473C29.3727 67.9375 29.4594 67.2279 29.5475 66.5184C29.9854 63.0154 29.9854 63.0154 30.1868 59.4927C30.1929 59.3136 30.1989 59.1345 30.2052 58.95C30.2586 56.0353 30.0479 53.0297 29.5615 50.1555C29.4285 49.3287 29.4059 48.5634 29.58 47.7386C29.6301 47.6889 29.6802 47.6392 29.7317 47.5879Z" fill="#244B94"/>
-</svg>
diff --git a/frontend/src/components/AppBar/AppBar.jsx b/frontend/src/components/AppBar/AppBar.jsx
index 11ec72cf..afec2805 100644
--- a/frontend/src/components/AppBar/AppBar.jsx
+++ b/frontend/src/components/AppBar/AppBar.jsx
@@ -1,4 +1,4 @@
-import Logo from "../../assets/flow-leaflets-logo.svg";
+import Logo from "../../../../assets/flow-leaflets-logo.svg";
 import {
   AdjustmentsHorizontalIcon,
   BellIcon,
diff --git a/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx b/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx
index 3a6f3852..807b9d8e 100644
--- a/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx
+++ b/frontend/src/components/NavContentWrapper/NavContentWrapper.jsx
@@ -2,7 +2,7 @@ import { AppBar } from "../AppBar/AppBar"
 import { Navbar } from "../Navbar/Navbar"
 
 /**
- * Wraps the provided component in the side navigation bar and the top application bar.
+ * Wraps the child component in the side navigation bar and the top application bar.
  * Formats the layout so that only the inner child component is scrollable.
  */
 export const NavContentWrapper = ({children}) => {
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
index 1d93da0b..370b80ca 100644
--- a/frontend/src/pages/Homepage.jsx
+++ b/frontend/src/pages/Homepage.jsx
@@ -42,13 +42,13 @@ function Buttons() {
 
   return (
     <div className="buttons-container">
-      <CLButtonPrimary onClick={handleCreateNewLog} width={"332px"}>
+      <CLButtonPrimary onClick={handleCreateNewLog} width={"330px"}>
         Create New Log
       </CLButtonPrimary>
-      <CLButtonSecondary onClick={handleAddLogbook} width={"332px"}>
+      <CLButtonSecondary onClick={handleAddLogbook} width={"330px"}>
         Add Logbook
       </CLButtonSecondary>
-      <CLButtonSecondary onClick={handleViewHistory} width={"332px"}>
+      <CLButtonSecondary onClick={handleViewHistory} width={"330px"}>
         View Log History
       </CLButtonSecondary>
     </div>
diff --git a/frontend/src/pages/NewLog.jsx b/frontend/src/pages/NewLog.jsx
index 1b58f463..47cf65eb 100644
--- a/frontend/src/pages/NewLog.jsx
+++ b/frontend/src/pages/NewLog.jsx
@@ -28,11 +28,11 @@ function CTASection() {
     <div className="cta-section">
       <h2>How would you like to create a new log?</h2>
       <div className="buttons-container">
-        <CLButtonPrimary onClick={handleUploadPhoto} width={"240px"}>
+        <CLButtonPrimary onClick={handleUploadPhoto} width={"330px"}>
           <ImageIcon className="add-icon" />
           Upload Photo
         </CLButtonPrimary>
-        <CLButtonSecondary onClick={handleEnterManually}  width={"240px"}>
+        <CLButtonSecondary onClick={handleEnterManually}  width={"330px"}>
           <ModeIcon className="add-icon" />
           Enter Manually
         </CLButtonSecondary>

From 3b9ba22070f1a196535cf4fc2069c436db3b95d2 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 00:14:38 -0800
Subject: [PATCH 10/15] update navigation

---
 frontend/src/App.jsx                   | 2 +-
 frontend/src/utils/ProtectedRoutes.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 8b251089..16e2e5ba 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -76,7 +76,7 @@ function App() {
   const handleClickLogout = async () => {
     try {
       await logout();
-      navigate("/homepage");
+      navigate("/login");
     } catch (e) {
       console.log("Failed to logout: " + e.message);
     }
diff --git a/frontend/src/utils/ProtectedRoutes.jsx b/frontend/src/utils/ProtectedRoutes.jsx
index 655a0048..0e84b34c 100644
--- a/frontend/src/utils/ProtectedRoutes.jsx
+++ b/frontend/src/utils/ProtectedRoutes.jsx
@@ -3,5 +3,5 @@ import { useAuth } from '../contexts/AuthContext';
 
 export const ProtectedRoutes = () => {
   const { session } = useAuth();
-  return session ? <Outlet /> : <Navigate to='/homepage' />;
+  return session ? <Outlet /> : <Navigate to='/login' />;
 }
\ No newline at end of file

From ca759c26d92753f5ebd19633b2b7327f390cafc6 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 00:28:34 -0800
Subject: [PATCH 11/15] comment out frontend build step

---
 .github/workflows/on-pull-request.yml | 8 ++++----
 .github/workflows/on-push.yml         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
index 43031913..cf800415 100644
--- a/.github/workflows/on-pull-request.yml
+++ b/.github/workflows/on-pull-request.yml
@@ -35,10 +35,10 @@ jobs:
         cd frontend
         npm run lint
     
-    - name: Build frontend
-      run: |
-        cd frontend 
-        npm run build --if-present
+    # - name: Build frontend
+    #   run: |
+    #     cd frontend 
+    #     npm run build --if-present
       
     - name: Run frontend tests
       run: |
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 41097209..acaec544 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -35,10 +35,10 @@ jobs:
         cd frontend
         npm run lint
     
-    - name: Build frontend
-      run: |
-        cd frontend 
-        npm run build --if-present
+    # - name: Build frontend
+    #   run: |
+    #     cd frontend 
+    #     npm run build --if-present
       
     - name: Run frontend tests
       run: |

From 56811a598cb9c6f966d00f8a9e9ddecf5c8ecccd Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 00:31:31 -0800
Subject: [PATCH 12/15] code cleanup

---
 .github/workflows/on-pull-request.yml | 9 +++++----
 .github/workflows/on-push.yml         | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
index cf800415..155e757d 100644
--- a/.github/workflows/on-pull-request.yml
+++ b/.github/workflows/on-pull-request.yml
@@ -35,10 +35,11 @@ jobs:
         cd frontend
         npm run lint
     
-    # - name: Build frontend
-    #   run: |
-    #     cd frontend 
-    #     npm run build --if-present
+    - name: Build frontend
+      if: false
+      run: |
+        cd frontend 
+        npm run build --if-present
       
     - name: Run frontend tests
       run: |
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index acaec544..f83b6053 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -35,10 +35,11 @@ jobs:
         cd frontend
         npm run lint
     
-    # - name: Build frontend
-    #   run: |
-    #     cd frontend 
-    #     npm run build --if-present
+    - name: Build frontend
+      if: false
+      run: |
+        cd frontend 
+        npm run build --if-present
       
     - name: Run frontend tests
       run: |

From a2f3d54cd988f72202f449fe4ab053ca137cfebe Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 00:38:46 -0800
Subject: [PATCH 13/15] update comment

---
 frontend/src/components/Buttons/CLButtons.jsx | 4 ++--
 frontend/src/pages/Homepage.jsx               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Buttons/CLButtons.jsx b/frontend/src/components/Buttons/CLButtons.jsx
index b88c187b..a2c18f6f 100644
--- a/frontend/src/components/Buttons/CLButtons.jsx
+++ b/frontend/src/components/Buttons/CLButtons.jsx
@@ -3,11 +3,11 @@ const DEFAULT_WIDTH = "fit-content"
 const DEFAULT_BORDER_RADIUS = "20px"
 const DEFAULT_ON_CLICK = () => {}
 
-// PRIMARY specific styles
+// PRIMARY variant specific styles
 const PRIMARY_COLOR = "#F7FAFF"
 const PRIMARY_BACKGROUND_COLOR = "#244B94"
 
-// SECONDARY specific styles
+// SECONDARY variant specific styles
 const SECONDARY_COLOR = "#4F607E"
 const SECONDARY_BACKGROUND_COLOR = "#F7FAFF"
 const SECONDARY_BORDER = "1px solid #9AB0E1"
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
index 370b80ca..912544cf 100644
--- a/frontend/src/pages/Homepage.jsx
+++ b/frontend/src/pages/Homepage.jsx
@@ -3,7 +3,7 @@ import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButt
 import { useNavigate } from "react-router-dom";
 import "./styles/Homepage.css";
 
-export default function Homepage() {
+export default function Home() {
   return (
     <NavContentWrapper>
       <MainContent />

From abcde00cc5954949f5db4f4f0749cc609daab0ac Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 00:51:01 -0800
Subject: [PATCH 14/15] code cleanup

---
 frontend/src/components/Buttons/CLButtons.css | 12 +++++++++
 frontend/src/components/Buttons/CLButtons.jsx | 25 +++++--------------
 frontend/src/pages/Homepage.jsx               |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 frontend/src/components/Buttons/CLButtons.css

diff --git a/frontend/src/components/Buttons/CLButtons.css b/frontend/src/components/Buttons/CLButtons.css
new file mode 100644
index 00000000..b30c47af
--- /dev/null
+++ b/frontend/src/components/Buttons/CLButtons.css
@@ -0,0 +1,12 @@
+.primary-variant-button {
+  color: #F7FAFF;
+  background-color: #244B94;
+  border-radius: 20px;
+}
+
+.secondary-variant-button {
+  color: #4F607E;
+  background-color: #F7FAFF;
+  border: 1px solid #9AB0E1;
+  border-radius: 20px;
+}
\ No newline at end of file
diff --git a/frontend/src/components/Buttons/CLButtons.jsx b/frontend/src/components/Buttons/CLButtons.jsx
index a2c18f6f..036bdd4e 100644
--- a/frontend/src/components/Buttons/CLButtons.jsx
+++ b/frontend/src/components/Buttons/CLButtons.jsx
@@ -1,17 +1,9 @@
+import "./CLButtons.css"
+
 const DEFAULT_HEIGHT = "54px"
 const DEFAULT_WIDTH = "fit-content"
-const DEFAULT_BORDER_RADIUS = "20px"
 const DEFAULT_ON_CLICK = () => {}
 
-// PRIMARY variant specific styles
-const PRIMARY_COLOR = "#F7FAFF"
-const PRIMARY_BACKGROUND_COLOR = "#244B94"
-
-// SECONDARY variant specific styles
-const SECONDARY_COLOR = "#4F607E"
-const SECONDARY_BACKGROUND_COLOR = "#F7FAFF"
-const SECONDARY_BORDER = "1px solid #9AB0E1"
-
 /**
  * PRIMARY variant of the clinical logging button.
  * Should work out of the box for most use cases (with the exception of onClick which does nothing by default).
@@ -26,13 +18,11 @@ export const CLButtonPrimary = ({
 
   return (
     <button 
+      className="primary-variant-button"
       onClick={onClick}
       style={{
         height: height,
-        width: width,
-        color: PRIMARY_COLOR,
-        backgroundColor: PRIMARY_BACKGROUND_COLOR,
-        borderRadius: DEFAULT_BORDER_RADIUS
+        width: width
       }}
     >
       {children}
@@ -54,14 +44,11 @@ export const CLButtonSecondary = ({
   
   return (
     <button 
+      className="secondary-variant-button"
       onClick={onClick}
       style={{
         height: height,
-        width: width,
-        color: SECONDARY_COLOR,
-        backgroundColor: SECONDARY_BACKGROUND_COLOR,
-        border: SECONDARY_BORDER,
-        borderRadius: DEFAULT_BORDER_RADIUS
+        width: width
       }}
     >
       {children}
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
index 912544cf..a9ab4817 100644
--- a/frontend/src/pages/Homepage.jsx
+++ b/frontend/src/pages/Homepage.jsx
@@ -33,7 +33,7 @@ function Buttons() {
   };
 
   const handleAddLogbook = () => {
-    navigate("uploadPhotos")
+    navigate("/uploadPhotos")
   }
 
   const handleViewHistory = () => {

From 2f7be17e18b5922c8e0db60ff1c9b5eca3167d58 Mon Sep 17 00:00:00 2001
From: melkent <melanie.s.kent@gmail.com>
Date: Wed, 27 Nov 2024 17:50:25 -0800
Subject: [PATCH 15/15] address pr comments

---
 .github/workflows/on-pull-request.yml         |  1 -
 .github/workflows/on-push.yml                 |  1 -
 frontend/src/assets/flow-leaflets-logo.svg    | 15 +++++
 frontend/src/components/AppBar/AppBar.jsx     |  2 +-
 frontend/src/main.jsx                         | 12 ++--
 frontend/src/pages/Homepage.jsx               | 56 -------------------
 .../{styles/Homepage.css => home/Home.css}    |  0
 frontend/src/pages/home/Home.jsx              | 56 +++++++++++++++++++
 .../{styles => log_history}/LogHistory.css    |  0
 .../pages/{ => log_history}/LogHistory.jsx    | 10 ++--
 .../log_history/__tests__/LogHistory.test.js  |  3 +
 .../ManualEntry.jsx}                          |  0
 .../__tests__/ManualEntry.test.js             |  3 +
 .../src/pages/{styles => new_log}/NewLog.css  |  0
 frontend/src/pages/{ => new_log}/NewLog.jsx   | 10 ++--
 .../pages/new_log/__tests__/NewLog.test.js    |  3 +
 .../{styles => upload_photo}/UploadPhoto.css  |  0
 .../pages/{ => upload_photo}/UploadPhoto.jsx  |  6 +-
 .../__tests__/UploadPhoto.test.js             |  3 +
 19 files changed, 103 insertions(+), 78 deletions(-)
 create mode 100644 frontend/src/assets/flow-leaflets-logo.svg
 delete mode 100644 frontend/src/pages/Homepage.jsx
 rename frontend/src/pages/{styles/Homepage.css => home/Home.css} (100%)
 rename frontend/src/pages/{styles => log_history}/LogHistory.css (100%)
 rename frontend/src/pages/{ => log_history}/LogHistory.jsx (93%)
 create mode 100644 frontend/src/pages/log_history/__tests__/LogHistory.test.js
 rename frontend/src/pages/{ManualEdit.jsx => manual_entry/ManualEntry.jsx} (100%)
 create mode 100644 frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js
 rename frontend/src/pages/{styles => new_log}/NewLog.css (100%)
 rename frontend/src/pages/{ => new_log}/NewLog.jsx (79%)
 create mode 100644 frontend/src/pages/new_log/__tests__/NewLog.test.js
 rename frontend/src/pages/{styles => upload_photo}/UploadPhoto.css (100%)
 rename frontend/src/pages/{ => upload_photo}/UploadPhoto.jsx (91%)
 create mode 100644 frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js

diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
index 155e757d..43031913 100644
--- a/.github/workflows/on-pull-request.yml
+++ b/.github/workflows/on-pull-request.yml
@@ -36,7 +36,6 @@ jobs:
         npm run lint
     
     - name: Build frontend
-      if: false
       run: |
         cd frontend 
         npm run build --if-present
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index f83b6053..41097209 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -36,7 +36,6 @@ jobs:
         npm run lint
     
     - name: Build frontend
-      if: false
       run: |
         cd frontend 
         npm run build --if-present
diff --git a/frontend/src/assets/flow-leaflets-logo.svg b/frontend/src/assets/flow-leaflets-logo.svg
new file mode 100644
index 00000000..4e3d4a67
--- /dev/null
+++ b/frontend/src/assets/flow-leaflets-logo.svg
@@ -0,0 +1,15 @@
+<svg width="100" height="95" viewBox="0 0 100 95" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M79.1842 18.052C79.4813 18.8236 79.7542 19.5947 80 20.3842C80.0499 20.5439 80.0499 20.5439 80.1007 20.7068C80.2106 21.0587 80.3199 21.4108 80.4291 21.7629C80.5078 22.0154 80.5865 22.2679 80.6652 22.5204C80.877 23.2002 81.0883 23.8802 81.2995 24.5601C81.4314 24.9846 81.5634 25.4091 81.6954 25.8335C83.1516 30.5134 84.5982 35.1962 86.036 39.8818C86.16 40.2858 86.2843 40.6898 86.4089 41.0937C86.6877 41.9991 86.9627 42.9052 87.2273 43.8149C87.2748 43.9762 87.3223 44.1376 87.3713 44.3038C87.4583 44.5999 87.5438 44.8965 87.6274 45.1936C87.9233 46.1942 88.3116 46.6619 89.177 47.2488C90.7109 48.386 91.5769 50.2679 91.9264 52.1087C92.2221 54.3114 91.6218 55.8303 90.2673 57.5996C89.233 58.8029 88.1951 59.6596 86.6297 60.0571C86.0702 60.2833 85.9292 60.477 85.6169 60.9831C85.5213 61.135 85.4256 61.287 85.3271 61.4435C85.2272 61.6078 85.1273 61.7721 85.0244 61.9414C84.9176 62.1127 84.8106 62.2839 84.7033 62.4549C84.4843 62.8046 84.2665 63.155 84.0498 63.5061C83.5929 64.2425 83.1235 64.9708 82.6542 65.6993C82.4799 65.9714 82.3057 66.2436 82.1315 66.5158C81.5158 67.478 80.8995 68.4399 80.2832 69.4018C79.8444 70.0868 79.4057 70.7717 78.9673 71.4569C77.4194 73.8753 75.8642 76.2891 74.3075 78.7019C73.2885 80.2818 72.2711 81.8625 71.2663 83.4513C70.8804 84.0608 70.4877 84.6641 70.0826 85.2612C69.1411 85.2132 68.5445 84.7361 67.8072 84.2063C67.7004 84.1314 67.5936 84.0564 67.4836 83.9791C67.2365 83.8052 66.9907 83.6292 66.7453 83.4529C66.795 82.4782 67.1455 81.9679 67.7408 81.2113C68.5685 80.1168 69.335 78.9956 70.0731 77.8395C70.1751 77.6798 70.2771 77.52 70.3823 77.3554C70.5875 77.0333 70.7924 76.7111 70.9971 76.3887C71.3728 75.7976 71.7511 75.2083 72.1296 74.6189C72.9408 73.3553 73.7475 72.0887 74.5524 70.8211C75.3961 69.4931 76.2455 68.1687 77.0948 66.8442C77.3585 66.4329 77.6219 66.0214 77.8853 65.6099C79.8713 62.5066 81.8633 59.4074 83.8867 56.3281C84.2158 56.4074 84.533 56.4922 84.8537 56.6012C85.3217 56.6344 85.5463 56.5184 85.918 56.2416C86.8028 55.4628 87.7277 54.4893 87.8704 53.2789C87.8325 52.0649 87.1958 50.5547 86.3144 49.7082C85.8424 49.4578 85.4553 49.5911 84.9485 49.6976C84.5164 48.7628 84.214 47.8009 83.9104 46.8185C83.855 46.6408 83.7996 46.4632 83.7425 46.2801C83.5934 45.8014 83.4447 45.3226 83.2964 44.8436C83.141 44.3423 82.9849 43.8412 82.829 43.34C82.4727 42.1945 82.1177 41.0486 81.763 39.9025C81.7194 39.7618 81.6758 39.621 81.6309 39.476C80.9092 37.1455 80.1965 34.8124 79.484 32.4791C79.4297 32.3013 79.3754 32.1234 79.3194 31.9402C79.0397 31.0244 78.7602 30.1086 78.4808 29.1927C77.9748 27.5349 77.4671 25.8776 76.9508 24.2228C76.9078 24.0847 76.8648 23.9467 76.8205 23.8044C76.6227 23.17 76.4243 22.5358 76.2247 21.9019C76.1556 21.6809 76.0866 21.4599 76.0176 21.239C75.929 20.9573 75.929 20.9573 75.8386 20.67C75.7053 20.1975 75.6 19.745 75.5435 19.2576C75.862 18.7068 76.5303 18.5851 77.1079 18.4005C77.2067 18.3666 77.3056 18.3327 77.4074 18.2978C78.0179 18.0981 78.5429 18.0155 79.1842 18.052Z" fill="#244B94"/>
+<path d="M41.5642 8.40773C41.8928 8.69258 42.1767 8.99401 42.4744 9.31189C43.0224 9.51551 43.6166 9.51004 44.1958 9.54262C44.3647 9.55281 44.3647 9.55281 44.537 9.5632C44.9144 9.58583 45.2919 9.60764 45.6694 9.62946C45.9401 9.64552 46.2107 9.66163 46.4813 9.67779C47.0644 9.71249 47.6476 9.74683 48.2307 9.7809C49.154 9.83482 50.0772 9.88954 51.0004 9.94437C52.4622 10.0311 53.9239 10.1173 55.3857 10.2032C57.9993 10.3569 60.6127 10.5114 63.2262 10.6662C64.1426 10.7205 65.059 10.7745 65.9755 10.8283C66.5479 10.8619 67.1203 10.8957 67.6926 10.9295C67.9565 10.9451 68.2204 10.9606 68.4844 10.976C69.8784 11.0574 71.2705 11.146 72.6614 11.2709C72.7185 13.8376 72.7185 13.8376 72.3581 15.0382C72.308 15.088 72.2579 15.1377 72.2064 15.1889C71.7352 15.1798 71.2684 15.1609 70.7981 15.1346C70.6545 15.1272 70.5109 15.1197 70.3629 15.1121C69.9155 15.0885 69.4681 15.0636 69.0208 15.0382C68.8904 15.0308 68.76 15.0235 68.6257 15.0159C67.8597 14.9719 67.0939 14.9254 66.3281 14.8778C65.8975 14.851 65.4669 14.8246 65.0363 14.7982C64.4144 14.76 63.7924 14.7218 63.1705 14.6834C61.5189 14.5815 59.8673 14.4803 58.2156 14.3795C58.0476 14.3693 57.8796 14.359 57.7064 14.3485C55.2404 14.1981 52.774 14.0529 50.3074 13.9122C50.0794 13.8991 50.0794 13.8991 49.8469 13.8858C48.3932 13.8028 46.9394 13.7202 45.4856 13.639C44.9569 13.6094 44.4283 13.5794 43.8997 13.5493C43.6561 13.5355 43.4125 13.5219 43.1689 13.5086C42.8373 13.4903 42.5057 13.4715 42.1741 13.4525C41.9892 13.4422 41.8043 13.4319 41.6138 13.4212C41.135 13.3827 40.6713 13.316 40.199 13.2299C40.224 13.0714 40.2491 12.9129 40.2748 12.7496C40.2574 12.1962 40.2574 12.1962 39.9928 11.9478C38.9084 11.2045 37.4118 10.9614 36.1169 11.1614C35.0842 11.5181 34.1957 12.6044 33.6762 13.5313C33.53 13.9795 33.4358 14.421 33.3728 14.8875C33.573 15.0367 33.7732 15.1859 33.9796 15.3396C33.8904 15.8323 33.7413 16.0885 33.3953 16.4492C33.2595 16.5921 33.2595 16.5921 33.1209 16.7379C33.0226 16.8391 32.9242 16.9402 32.8229 17.0443C32.6712 17.2027 32.6712 17.2027 32.5165 17.3643C31.7133 18.1989 30.8944 19.0183 30.0642 19.8265C29.6121 20.2689 29.18 20.7184 28.7663 21.1966C28.1565 21.8985 27.4961 22.5448 26.831 23.1945C25.8977 24.0963 25.8977 24.0963 25.0403 25.0676C24.8848 25.25 24.8848 25.25 24.7262 25.4361C24.6261 25.4361 24.526 25.4361 24.4229 25.4361C24.385 25.5229 24.3471 25.6098 24.308 25.6993C24.0931 26.0862 23.8481 26.3402 23.5299 26.6487C23.3537 26.8212 23.3537 26.8212 23.174 26.9971C23.0511 27.116 22.9282 27.2349 22.8016 27.3574C21.8056 28.3217 21.8056 28.3217 20.8693 29.3423C20.0735 30.2637 19.1851 31.0977 18.3154 31.9494C17.6283 32.6261 16.9653 33.3088 16.336 34.0388C15.776 34.6684 15.1603 35.2459 14.5568 35.8339C13.9526 36.4272 13.3785 37.0345 12.8276 37.6772C12.4709 38.0784 12.1256 38.3925 11.6806 38.6971C11.0274 38.6804 10.6534 38.1846 10.23 37.7458C10.157 37.6725 10.0839 37.5991 10.0087 37.5236C9.80378 37.3156 9.6043 37.1023 9.40518 36.8887C9.30682 36.7871 9.20846 36.6856 9.10712 36.5809C8.95009 36.286 8.95009 36.286 9.05098 35.934C9.28144 35.4771 9.54089 35.1978 9.90944 34.842C10.0406 34.7139 10.1717 34.5858 10.3067 34.4538C10.4441 34.3218 10.5815 34.1898 10.723 34.0538C11.5416 33.2608 12.3438 32.471 13.0872 31.6076C13.6795 30.9418 14.332 30.3313 14.9698 29.709C15.5819 29.1076 16.1616 28.4926 16.7229 27.8445C17.2878 27.2124 17.9056 26.6304 18.5127 26.0388C19.0068 25.5537 19.4855 25.0649 19.9384 24.5413C20.6458 23.7254 21.4248 22.9824 22.1972 22.2279C22.7286 21.7055 23.2484 21.1823 23.7355 20.6186C24.4703 19.7692 25.2844 18.9979 26.0873 18.2128C26.7484 17.5624 27.3785 16.901 27.9834 16.1989C28.2777 15.8732 28.6078 15.6014 28.9452 15.3208C29.679 14.6091 29.741 13.9711 29.8275 12.9833C30.0217 11.2353 31.3816 9.59222 32.6143 8.40773C35.2077 6.39149 38.8521 6.67538 41.5642 8.40773Z" fill="#244B94"/>
+<path d="M10.315 44.8755C12.6109 47.431 13.9056 51.3853 15.4424 54.4495C15.6835 54.9302 15.925 55.4106 16.1664 55.8911C16.5348 56.6242 16.903 57.3575 17.2709 58.0908C17.5958 58.738 17.9215 59.3848 18.2481 60.0311C19.104 61.726 19.937 63.4321 20.7725 65.137C21.5251 66.6721 22.2798 68.2055 23.0614 69.7263C23.1192 69.8393 23.177 69.9522 23.2366 70.0686C23.5041 70.5908 23.7732 71.1121 24.0456 71.6318C24.1395 71.8144 24.2333 71.9971 24.3271 72.1798C24.4083 72.3355 24.4895 72.4912 24.5732 72.6516C24.7343 73.0775 24.7436 73.2432 24.5742 73.6579C24.3739 73.7076 24.1737 73.7573 23.9674 73.8086C23.6969 75.152 23.9863 76.3506 24.7353 77.51C25.4318 78.3804 26.054 78.5806 27.153 78.7815C28.1336 78.8702 28.9138 78.937 29.7318 78.3294C29.8662 77.9389 29.8662 77.9389 29.8834 77.5759C31.0362 77.6818 32.1381 77.9617 33.2592 78.2393C33.4761 78.2925 33.6931 78.3456 33.91 78.3987C34.4965 78.5425 35.0828 78.6871 35.6691 78.832C36.1633 78.954 36.6577 79.0755 37.1521 79.197C41.0224 80.1486 44.8879 81.1185 48.7512 82.0971C50.9625 82.6571 53.1746 83.2121 55.3923 83.7467C55.5833 83.7928 55.7744 83.8389 55.9713 83.8865C56.8617 84.1012 57.7525 84.3145 58.6438 84.5256C58.9528 84.5997 59.2619 84.6738 59.571 84.748C59.711 84.7806 59.8511 84.8133 59.9954 84.847C60.122 84.8775 60.2486 84.9081 60.3791 84.9396C60.4888 84.9655 60.5984 84.9915 60.7114 85.0182C60.9807 85.1106 60.9807 85.1106 61.284 85.412C61.3511 86.5268 60.9889 87.7241 60.5256 88.7272C60.0705 89.0286 60.0705 89.0286 59.6226 88.9689C59.3456 88.9 59.3456 88.9 59.0629 88.8296C58.96 88.8046 58.8571 88.7795 58.751 88.7537C58.4047 88.6689 58.0592 88.5813 57.7136 88.4938C57.466 88.4325 57.2183 88.3714 56.9705 88.3105C56.2957 88.1441 55.6216 87.9752 54.9476 87.8059C54.2401 87.6287 53.5321 87.4537 52.8242 87.2784C51.4795 86.9452 50.1353 86.61 48.7913 86.274C47.2741 85.8949 45.7563 85.5179 44.2385 85.1412C42.1208 84.6155 40.0033 84.0891 37.8863 83.5607C37.3881 83.4364 36.8899 83.3124 36.3915 83.1885C35.4005 82.9421 34.4099 82.6947 33.4221 82.4358C33.2788 82.3986 33.1354 82.3615 32.9877 82.3232C32.74 82.2588 32.4925 82.1931 32.2455 82.1258C31.355 81.8955 30.8125 81.9885 30.0144 82.4034C29.2168 82.7654 28.5031 82.7861 27.6365 82.7654C27.4897 82.7634 27.3429 82.7614 27.1917 82.7594C25.4258 82.7152 23.5936 82.3707 22.233 81.159C20.6099 79.3294 19.8978 77.0971 19.9819 74.6939C20.0234 74.11 20.0234 74.11 20.1511 73.652C20.187 72.757 19.7975 72.1402 19.3858 71.3598C19.2601 71.1135 19.2601 71.1135 19.1318 70.8622C18.8627 70.3361 18.5899 69.8119 18.3168 69.2878C18.051 68.7719 17.786 68.2556 17.5213 67.7392C17.3567 67.4189 17.1915 67.0989 17.0253 66.7794C16.4789 65.724 15.9595 64.6579 15.4468 63.586C14.6471 61.9158 13.8147 60.2634 12.972 58.6143C12.5482 57.784 12.1267 56.9525 11.7048 56.1213C11.1724 55.0726 10.6393 54.0243 10.1037 52.9772C9.66592 52.1213 9.2305 51.2642 8.79666 50.4063C8.63174 50.0812 8.46595 49.7566 8.29928 49.4324C8.06829 48.9829 7.84032 48.5319 7.61303 48.0806C7.54364 47.9473 7.47425 47.814 7.40275 47.6766C7.34176 47.554 7.28077 47.4314 7.21793 47.3051C7.16389 47.199 7.10985 47.0929 7.05416 46.9836C6.9777 46.6838 6.9777 46.6838 7.08309 46.3638C7.4073 45.9008 7.8974 45.6927 8.39035 45.4406C8.49115 45.3858 8.59195 45.331 8.69581 45.2746C9.73161 44.7331 9.73161 44.7331 10.315 44.8755Z" fill="#244B94"/>
+<path d="M74.4811 22.5731C75.0352 22.7614 75.2063 22.8249 75.5429 23.3266C75.6297 23.6493 75.705 23.975 75.774 24.3019C75.8187 24.5079 75.8635 24.7138 75.9084 24.9196C75.9321 25.0295 75.9557 25.1393 75.9801 25.2524C77.7473 33.3835 80.3348 41.585 83.908 49.1184C85.3928 52.2934 85.3928 52.2934 84.9479 53.7666C84.0759 55.5911 82.6108 57.1441 81.28 58.6513C80.5587 59.472 79.8843 60.3209 79.2272 61.1931C79.0185 61.4697 78.8081 61.7449 78.5975 62.02C74.7387 67.0755 71.1916 72.4407 68.1544 78.0235C68.0931 78.1353 68.0319 78.2471 67.9688 78.3623C67.8586 78.5649 67.7501 78.7683 67.6437 78.9728C67.3298 79.5506 67.046 79.8647 66.4413 80.1379C66.3412 80.1379 66.2411 80.1379 66.1379 80.1379C66 78.9525 66.4468 78.2635 67.067 77.2747C67.2631 76.9524 67.459 76.63 67.6549 76.3076C67.7558 76.1434 67.8567 75.9791 67.9606 75.8099C68.3421 75.1835 68.7104 74.5501 69.0782 73.9157C72.4667 68.0767 76.3798 62.5762 80.7005 57.3832C80.3747 57.3832 80.0316 57.7876 79.7998 57.9766C79.6639 58.0867 79.528 58.1968 79.388 58.3103C78.1485 59.3459 76.9777 60.4506 75.8332 61.5878C75.6097 61.8094 75.3851 62.0298 75.1604 62.2501C74.3305 63.0698 73.5587 63.9172 72.8284 64.8272C72.5244 65.2004 72.209 65.5576 71.8845 65.9133C71.2877 66.5737 70.7466 67.2662 70.2147 67.9788C70.1173 68.1088 70.02 68.2388 69.9197 68.3727C68.2934 70.5545 66.7596 72.7726 65.3403 75.0932C65.2018 75.3181 65.0632 75.543 64.9244 75.7678C64.8674 75.8614 64.8104 75.955 64.7516 76.0514C64.4632 76.5079 64.3414 76.6619 63.8246 76.8791C63.6869 76.9102 63.5493 76.9413 63.4074 76.9733C63.2873 75.8364 63.6474 75.2238 64.2702 74.2891C64.3593 74.1512 64.4484 74.0133 64.5401 73.8712C64.8165 73.4462 65.0972 73.0244 65.3795 72.6032C65.4629 72.478 65.5463 72.3528 65.6322 72.2238C67.4013 69.5785 69.2931 67.0296 71.3558 64.6031C71.573 64.3457 71.7863 64.0858 71.9983 63.8242C73.0527 62.5407 74.2255 61.3724 75.4007 60.1993C75.527 60.0727 75.527 60.0727 75.6558 59.9435C76.7305 58.868 77.8333 57.8718 79.0319 56.9311C79.2195 56.7778 79.4067 56.6239 79.593 56.469C79.8242 56.2772 80.0554 56.0854 80.2866 55.8936C80.4752 55.7372 80.6637 55.5807 80.8522 55.4242C79.8907 55.7134 79.0088 56.0776 78.1217 56.545C77.9976 56.6104 77.8735 56.6758 77.7456 56.7431C75.5995 57.9019 73.7145 59.3837 71.9023 60.9998C71.7781 61.1092 71.7781 61.1092 71.6515 61.2208C70.8154 61.9579 70.0045 62.6995 69.2856 63.5528C68.9749 63.9158 68.6467 64.2596 68.3185 64.6071C67.4083 65.5987 66.607 66.6661 65.7948 67.7372C65.3462 68.3246 64.8884 68.9048 64.4314 69.4858C63.0807 71.187 63.0807 71.187 61.8087 72.9458C61.4848 73.3261 61.1601 73.314 60.6769 73.3567C60.6041 72.5532 60.7984 72.1553 61.2458 71.4919C61.3067 71.4013 61.3675 71.3108 61.4302 71.2175C62.713 69.3341 64.1391 67.5524 65.5994 65.8031C65.815 65.5441 66.0282 65.2833 66.241 65.0221C67.2292 63.8271 68.312 62.7265 69.4088 61.6309C69.4821 61.5573 69.5554 61.4837 69.6309 61.4079C70.6384 60.3985 71.6892 59.47 72.8124 58.5888C72.9769 58.456 73.1412 58.3232 73.3054 58.1902C75.9359 56.1302 80.0198 53.095 83.5827 53.3145C83.5827 53.215 83.5827 53.1156 83.5827 53.0131C83.4736 52.9729 83.3645 52.9327 83.2521 52.8913C76.3393 49.9903 71.9521 40.9124 69.3079 34.4722C68.7724 33.1511 68.2861 31.8142 67.8255 30.4656C67.7919 30.3687 67.7583 30.2717 67.7237 30.1718C67.6295 29.898 67.5384 29.6232 67.4475 29.3484C67.3957 29.1927 67.3439 29.037 67.2905 28.8765C67.1927 28.4167 67.2069 28.1417 67.3515 27.6967C67.4516 27.5972 67.5517 27.4977 67.6549 27.3953C68.3634 28.0009 68.6397 28.5815 68.949 29.4479C68.9965 29.5751 69.0439 29.7023 69.0928 29.8334C69.1944 30.1061 69.2952 30.3791 69.3951 30.6524C69.6587 31.3718 69.9299 32.0883 70.2011 32.8049C70.2551 32.9481 70.3092 33.0913 70.3649 33.2388C72.8267 39.7249 76.1075 46.1472 81.7624 50.4513C81.5495 50.0054 81.3043 49.6049 81.0235 49.1981C80.9372 49.072 80.8509 48.9459 80.762 48.816C80.6697 48.6812 80.5775 48.5464 80.4825 48.4075C79.4723 46.9152 78.5433 45.3936 77.6666 43.8208C77.605 43.712 77.5434 43.6031 77.4798 43.491C74.7127 38.5848 70.5692 30.8073 70.8404 25.1349C70.9155 24.9111 70.9155 24.9111 70.9921 24.6828C71.5822 24.9051 71.7636 25.1915 72.054 25.7376C72.1501 26.0263 72.235 26.3189 72.3106 26.6135C72.356 26.7858 72.4014 26.958 72.4482 27.1354C72.4964 27.3206 72.5447 27.5058 72.5944 27.6967C74.3799 34.3515 77.19 43.498 82.2175 48.4923C82.1772 48.402 82.137 48.3118 82.0956 48.2187C79.398 42.1226 77.3718 35.7952 75.6946 29.3543C75.6615 29.2275 75.6283 29.1008 75.5941 28.9702C75.3931 28.2014 75.195 27.4318 75.0008 26.6613C74.9394 26.4185 74.8773 26.176 74.8146 25.9336C74.7275 25.5962 74.6433 25.2583 74.5599 24.92C74.5115 24.7282 74.4632 24.5364 74.4134 24.3388C74.3169 23.6953 74.3726 23.2116 74.4811 22.5731ZM82.3691 48.7937C82.5208 49.0951 82.5208 49.0951 82.5208 49.0951L82.3691 48.7937Z" fill="#244B94"/>
+<path d="M40.9669 13.9363C41.1357 13.9631 41.3045 13.9899 41.4785 14.0175C42.5329 14.1873 43.5838 14.3742 44.6343 14.5661C51.2376 15.7702 57.9735 16.3267 64.6844 16.4251C64.8272 16.4274 64.97 16.4298 65.1171 16.4322C65.8098 16.4434 66.5023 16.4516 67.1951 16.454C67.4454 16.4572 67.6956 16.4605 67.9459 16.4639C68.1159 16.4628 68.1159 16.4628 68.2893 16.4616C69.0294 16.4757 69.4046 16.6325 69.9309 17.1479C69.4657 17.6085 69.0708 17.6535 68.4274 17.6589C68.3086 17.6575 68.1898 17.6562 68.0673 17.6547C67.9412 17.655 67.8151 17.6552 67.6852 17.6554C67.2676 17.6552 66.8501 17.6513 66.4325 17.6471C66.1382 17.6454 65.8439 17.6437 65.5496 17.6419C57.7542 17.5798 49.9864 16.9381 42.3227 15.4903C49.4708 18.2528 56.8605 19.8197 64.5268 20.2348C64.6314 20.2407 64.7359 20.2466 64.8436 20.2527C65.347 20.281 65.8501 20.3063 66.354 20.3261C66.6231 20.3401 66.6231 20.3401 66.8976 20.3543C67.0554 20.3609 67.2131 20.3675 67.3756 20.3742C67.904 20.4831 68.1728 20.707 68.5657 21.0659C68.118 21.4959 67.7672 21.5723 67.1514 21.5732C67.0424 21.5706 66.9334 21.5679 66.8212 21.5651C66.6432 21.5624 66.6432 21.5624 66.4617 21.5596C57.7347 21.3644 49.052 19.6337 40.9574 16.3945C46.0328 21.5597 54.8168 22.8592 61.6162 23.8067C62.1683 23.8839 62.7204 23.9614 63.2723 24.0402C63.6115 24.0885 63.9509 24.1361 64.2903 24.1826C64.4425 24.2043 64.5947 24.2259 64.7515 24.2483C64.8844 24.2667 65.0172 24.2852 65.1541 24.3043C65.8381 24.4436 66.1982 24.5454 66.5937 25.1347C66.4408 25.3613 66.4408 25.3613 66.1386 25.5867C65.7236 25.6126 65.3559 25.608 64.944 25.5773C64.8188 25.5691 64.6936 25.5609 64.5647 25.5524C56.1683 24.9257 46.4655 22.8661 39.8956 17.2986C39.7125 17.1445 39.7125 17.1445 39.5258 16.9872C38.8734 16.4254 38.3153 15.8541 37.7719 15.1889C37.7666 15.2773 37.7614 15.3658 37.756 15.4569C37.1242 25.4812 30.9411 34.0575 24.1728 41.1393C23.7486 41.4606 23.4314 41.5143 22.9059 41.5602C22.9544 40.6096 23.2481 40.1729 23.8919 39.4882C24.0593 39.3025 24.2266 39.1167 24.3938 38.9307C24.5178 38.7946 24.5178 38.7946 24.6444 38.6556C24.9648 38.2989 25.2678 37.9295 25.57 37.5574C25.9778 37.0574 26.3924 36.5651 26.8164 36.0786C30.8268 31.4564 36.1032 24.4653 36.1032 18.0521C36.0429 18.1767 36.0429 18.1767 35.9813 18.3038C32.6999 25.0428 28.2653 31.0175 23.0627 36.4177C22.8399 36.649 22.6179 36.8811 22.3965 37.1137C22.0158 37.5122 21.6317 37.9071 21.2467 38.3015C21.0663 38.4912 21.0663 38.4912 20.8822 38.6848C19.9165 39.6618 19.9165 39.6618 19.2552 39.7578C19.1083 39.7558 18.9614 39.7539 18.8101 39.7519C18.8431 38.7396 19.2108 38.3277 19.9348 37.6475C20.0331 37.5515 20.1314 37.4555 20.2326 37.3566C20.5464 37.0509 20.8632 36.7484 21.1804 36.4461C21.4936 36.1436 21.8061 35.8406 22.1183 35.5371C22.3123 35.3491 22.507 35.1616 22.7024 34.975C23.3653 34.3379 23.9748 33.6665 24.5745 32.9707C24.7185 32.8075 24.8626 32.6444 25.0071 32.4815C26.1905 31.1338 27.2916 29.7332 28.3668 28.2992C28.4484 28.1912 28.53 28.0832 28.614 27.9719C30.3435 25.675 31.8592 23.2631 33.259 20.7551C33.365 20.5655 33.365 20.5655 33.4732 20.372C33.5702 20.1954 33.5702 20.1954 33.669 20.0152C33.7256 19.9122 33.7821 19.8093 33.8404 19.7032C33.9806 19.406 34.0626 19.1258 34.1312 18.8055C34.0786 18.8699 34.026 18.9343 33.9718 19.0006C33.4513 19.6375 32.9304 20.2742 32.4094 20.9108C32.2021 21.1642 31.9951 21.4179 31.7882 21.6717C30.3883 23.3831 28.9397 25.0438 27.4227 26.6537C27.2175 26.874 27.0142 27.0962 26.8119 27.3191C25.6945 28.5459 24.5308 29.722 23.3515 30.89C23.0275 31.2111 22.7043 31.533 22.3812 31.8549C22.1716 32.0631 21.9619 32.2711 21.7522 32.4792C21.6575 32.5735 21.5628 32.6679 21.4653 32.7651C20.8918 33.3318 20.2999 33.8688 19.688 34.3942C19.3741 34.6653 19.0713 34.9459 18.7716 35.2323C18.664 35.3343 18.5563 35.4362 18.4454 35.5413C18.2263 35.7498 18.0074 35.9585 17.7889 36.1676C16.0699 37.7929 16.0699 37.7929 15.1695 37.7929C15.1841 37.0829 15.275 36.7191 15.7858 36.2106C15.9822 36.0319 16.1814 35.8561 16.383 35.6832C16.4689 35.6084 16.5547 35.5336 16.6432 35.4566C16.8318 35.2929 17.0209 35.1297 17.2103 34.9669C19.048 33.3564 20.7829 31.6376 22.5129 29.9148C22.909 29.5205 23.3059 29.127 23.7029 28.7336C23.9587 28.4794 24.2145 28.2251 24.4702 27.9708C24.587 27.855 24.7038 27.7393 24.8241 27.6201C25.4477 26.998 26.0471 26.3636 26.6229 25.6975C26.9604 25.3089 27.3131 24.9357 27.6653 24.5601C28.3171 23.8592 28.9345 23.1379 29.5365 22.3939C29.8373 22.0268 30.1455 21.6676 30.4574 21.3098C31.2498 20.398 31.9854 19.4518 32.7091 18.4853C36.6544 13.2185 36.6544 13.2185 40.9669 13.9363Z" fill="#244B94"/>
+<path d="M21.9954 44.7248C22.7633 45.0055 23.0499 45.3064 23.3861 46.0121C23.4371 46.1281 23.4882 46.2441 23.5408 46.3636C23.5975 46.4878 23.6542 46.612 23.7126 46.74C27.4792 55.1736 30.7162 65.4232 27.7597 74.562C27.898 74.4872 28.0362 74.4124 28.1787 74.3354C36.1519 70.1341 46.0333 71.0327 54.5811 72.7631C54.7637 72.8001 54.9464 72.837 55.1346 72.8751C57.6164 73.399 57.6164 73.399 58.0226 73.9875C58.0477 74.0776 58.0727 74.1678 58.0985 74.2606C57.5798 74.6042 57.4724 74.5882 56.8779 74.5219C56.729 74.5053 56.58 74.4887 56.4266 74.4717C55.7536 74.3818 55.0865 74.271 54.4187 74.1488C54.1257 74.0966 53.8326 74.0444 53.5395 73.9923C53.389 73.9653 53.2385 73.9383 53.0834 73.9104C45.6418 72.5811 38.003 71.6812 30.7936 74.562C30.969 74.5511 31.1444 74.5403 31.3251 74.5291C39.7908 74.0444 48.1361 75.0564 56.2971 77.3122C56.56 77.3838 56.56 77.3838 56.8283 77.4569C57.0681 77.5263 57.0681 77.5263 57.3127 77.5971C57.4508 77.6368 57.5889 77.6764 57.7312 77.7173C58.1617 77.9048 58.4053 78.123 58.7052 78.48C58.7052 78.5795 58.7052 78.679 58.7052 78.7814C57.4954 79.1821 56.421 78.7422 55.2447 78.3953C47.9796 76.3326 40.1742 75.1385 32.6139 75.7676C32.9081 76.0598 33.4361 76.0313 33.8387 76.0884C34.0709 76.1227 34.303 76.157 34.5351 76.1915C34.659 76.2098 34.7828 76.228 34.9104 76.2468C41.6285 77.2471 48.1703 78.8918 54.6569 80.8817C54.8971 80.9547 54.8971 80.9547 55.1422 81.0292C55.5967 81.1679 56.0504 81.3089 56.5039 81.4509C56.639 81.492 56.7742 81.5331 56.9134 81.5754C57.6241 81.8017 58.1505 82.0297 58.7052 82.5488C58.6552 82.6979 58.6051 82.8471 58.5536 83.0008C57.7801 83.1944 57.2259 83.076 56.4909 82.8237C56.3796 82.7874 56.2683 82.7512 56.1536 82.7138C55.913 82.6354 55.6727 82.5562 55.4326 82.4763C54.7835 82.2608 54.1318 82.0534 53.4801 81.8459C53.3463 81.8033 53.2125 81.7606 53.0746 81.7167C46.5323 79.6452 39.7206 78.132 32.9179 77.2139C32.7944 77.1972 32.6709 77.1805 32.5436 77.1633C31.9585 77.0851 31.3733 77.0096 30.7873 76.9388C27.4484 76.5245 27.4484 76.5245 26.5997 75.6598C25.4967 74.2257 24.952 72.3365 24.3796 70.6439C22.998 66.5742 21.3403 62.6265 19.4849 58.7477C19.2655 58.2884 19.0488 57.8278 18.8323 57.3671C18.0069 55.6217 17.1341 53.9046 16.2215 52.2029C16.17 52.1068 16.1185 52.0107 16.0655 51.9117C15.5593 50.9697 15.0456 50.0341 14.4919 49.1184C14.4134 48.9883 14.3349 48.8583 14.254 48.7242C14.1115 48.4912 13.9666 48.2595 13.8187 48.0298C13.3637 47.2909 13.2786 46.7962 13.3488 45.9303C13.8665 46.0586 14.1817 46.1383 14.526 46.5544C14.5976 46.6876 14.6693 46.8208 14.7431 46.9581C14.8259 47.1085 14.9086 47.2589 14.9939 47.4139C15.0799 47.577 15.1659 47.7401 15.2545 47.9082C15.3463 48.0767 15.438 48.2453 15.5326 48.419C15.7239 48.771 15.9142 49.1233 16.1029 49.4768C16.3656 49.967 16.6321 50.4549 16.9006 50.942C17.3123 51.6895 17.7199 52.4391 18.125 53.1901C18.2732 53.4646 18.4218 53.7389 18.5708 54.013C21.3876 59.1984 23.6347 64.6517 25.636 70.1919C24.7162 62.3076 21.9519 53.975 17.8142 47.1461C17.4114 46.4515 17.3956 45.9563 17.4446 45.1769C18.0357 45.2607 18.2719 45.4858 18.6581 45.9303C18.9327 46.3666 19.1702 46.8198 19.4071 47.2771C19.4789 47.415 19.5506 47.5528 19.6246 47.6948C23.4432 55.1384 25.9329 62.9917 27.153 71.2468C28.3265 65.7386 27.1161 60.0657 25.3326 54.8212C25.2876 54.6879 25.2425 54.5547 25.1961 54.4173C24.6949 52.9544 24.1283 51.5202 23.5366 50.0915C23.485 49.9665 23.4334 49.8415 23.3802 49.7128C23.1196 49.0821 22.857 48.4523 22.5912 47.8238C22.4936 47.5898 22.3962 47.3558 22.2988 47.1217C22.2528 47.015 22.2069 46.9082 22.1596 46.7982C21.9061 46.1841 21.7802 45.6898 21.8437 45.0262C21.8937 44.9267 21.9438 44.8272 21.9954 44.7248Z" fill="#244B94"/>
+<path d="M40.1982 23.0249C40.6323 23.0614 40.8768 23.0847 41.1693 23.4174C41.6851 24.4217 42.0933 25.4551 42.4926 26.5097C44.0795 30.6001 45.9967 34.2325 49.0036 37.4703C49.2436 37.7316 49.4681 37.9958 49.6886 38.2732C50.0767 38.7181 50.4885 39.0872 50.9394 39.4675C51.1573 39.6539 51.3713 39.845 51.5806 40.0409C57.7837 45.8335 65.7724 48.7799 73.8693 50.841C74.5292 51.0091 75.1881 51.1804 75.8462 51.3552C76.078 51.4162 76.078 51.4162 76.3144 51.4785C76.69 51.5877 76.69 51.5877 77.2115 51.8073C77.3199 52.1224 77.3199 52.1224 77.3632 52.4101C75.4179 53.3097 72.7411 52.5465 70.6999 52.2553C63.5478 51.251 56.3437 52.8773 49.9066 56.0267C49.7617 56.0966 49.6167 56.1664 49.4674 56.2384C44.6016 58.5995 40.2995 61.7356 36.4948 65.5517C36.1953 65.8521 35.8945 66.1512 35.5935 66.4501C34.3194 67.7151 34.3194 67.7151 33.1305 69.0583C32.8764 69.3312 32.6279 69.5427 32.3101 69.7398C31.893 69.6173 31.893 69.6173 31.5517 69.4384C31.7466 68.0711 32.8691 67.0363 33.7779 66.0584C34.2622 65.5264 34.712 64.9691 35.1651 64.4108C35.4634 64.0522 35.7734 63.7128 36.093 63.373C40.0466 58.9711 41.7501 52.8336 42.6253 47.1358C42.6433 47.0235 42.6613 46.9111 42.6798 46.7953C43.7162 40.0224 42.5209 33.2747 40.5892 26.7858C40.5403 26.6217 40.4915 26.4575 40.4412 26.2883C40.3979 26.1451 40.3546 26.0018 40.31 25.8542C40.128 25.1732 40.0251 24.5111 40.0276 23.8066C40.027 23.6327 40.027 23.6327 40.0264 23.4552C40.0465 23.1756 40.0465 23.1756 40.1982 23.0249ZM42.3219 29.0526C42.4736 29.354 42.4736 29.354 42.4736 29.354L42.3219 29.0526ZM42.4736 29.354C42.5743 30.4315 42.7707 31.4698 42.9951 32.528C44.9536 42.0236 43.9646 52.8927 38.833 61.301C38.5881 61.6593 38.3337 62.0074 38.0745 62.3558C38.1246 62.4553 38.1746 62.5547 38.2262 62.6572C38.3461 62.5511 38.4659 62.4451 38.5894 62.3358C46.7624 55.191 57.4405 50.6441 68.4132 51.0538C68.814 51.0864 69.2129 51.1266 69.6124 51.1713C69.9789 51.2096 70.3393 51.2198 70.7076 51.2139C70.9986 51.2093 70.9986 51.2093 71.2954 51.2045C70.8231 50.8917 70.4558 50.7733 69.9124 50.6194C69.725 50.5655 69.5375 50.5115 69.3444 50.456C69.2452 50.4276 69.1459 50.3992 69.0436 50.37C62.1737 48.3963 55.8917 45.2037 50.5857 40.3929C50.331 40.1626 50.0741 39.9347 49.8154 39.7089C49.0203 39.0133 48.3027 38.3047 47.6312 37.4914C47.5667 37.4158 47.5022 37.3401 47.4358 37.2622C45.3813 34.85 43.9337 32.225 42.6253 29.354C42.5753 29.354 42.5252 29.354 42.4736 29.354Z" fill="#244B94"/>
+<path d="M39.8949 18.052C40.4967 18.1158 40.8637 18.4492 41.3265 18.8149C41.5028 18.9524 41.6792 19.0897 41.8556 19.227C41.9533 19.3034 42.051 19.3799 42.1517 19.4586C47.2101 23.4028 52.6211 26.9854 58.7223 29.1382C59.3539 29.3687 59.7804 29.578 60.2218 30.1075C60.1718 30.2567 60.1217 30.4059 60.0701 30.5596C59.4 30.7107 58.9999 30.7108 58.3642 30.4536C58.2139 30.3937 58.0637 30.3338 57.9088 30.272C57.7492 30.2053 57.5895 30.1386 57.425 30.0698C57.258 30.0015 57.091 29.9333 56.9189 29.8629C52.4577 28.0145 48.0519 25.7735 44.294 22.7235C44.2156 22.6609 44.1372 22.5983 44.0564 22.5338C43.0117 21.6981 42.0327 20.8077 41.08 19.8698C40.9325 19.7253 40.9325 19.7253 40.782 19.578C40.6905 19.4864 40.5989 19.3949 40.5046 19.3006C40.3828 19.1791 40.3828 19.1791 40.2586 19.0551C40.0309 18.787 39.8882 18.5215 39.7432 18.2027C39.7933 18.153 39.8433 18.1033 39.8949 18.052Z" fill="#244B94"/>
+<path d="M63.7108 34.7791C64.4526 34.9665 64.7656 35.1661 65.1898 35.7963C65.2922 35.9445 65.3947 36.0927 65.5003 36.2454C65.6657 36.4893 65.6657 36.4893 65.8345 36.7381C66.0851 37.0945 66.3387 37.4486 66.593 37.8024C66.6575 37.8925 66.7221 37.9825 66.7887 38.0753C67.3531 38.8584 67.9458 39.6135 68.565 40.3547C68.6911 40.5063 68.8172 40.6578 68.9472 40.8139C70.7446 42.957 72.6295 45.0576 74.8271 46.8022C75.2296 47.128 75.6146 47.4663 75.998 47.8141C76.6395 48.3942 77.3017 48.9419 77.9759 49.484C78.7926 50.1466 79.5939 50.8274 80.3971 51.506C80.322 51.7298 80.322 51.7298 80.2454 51.9581C78.2681 51.222 76.5733 49.9369 74.9361 48.6429C74.8502 48.5754 74.7643 48.508 74.6758 48.4385C73.4057 47.4299 72.2488 46.3049 71.0964 45.1675C70.9569 45.0304 70.8175 44.8933 70.6738 44.752C69.7546 43.8345 68.9212 42.8738 68.1099 41.8617C67.9435 41.6615 67.7767 41.4617 67.6092 41.2624C66.5076 39.9406 65.4792 38.5804 64.5063 37.1622C64.3298 36.9066 64.1476 36.655 63.965 36.4038C63.6028 35.8067 63.6635 35.4602 63.7108 34.7791Z" fill="#244B94"/>
+<path d="M79.7907 53.465C79.8407 53.6142 79.8908 53.7634 79.9423 53.9171C79.8236 53.9677 79.7048 54.0184 79.5824 54.0706C72.7693 56.9801 66.2089 60.0104 60.6215 64.9606C60.1338 65.2762 59.735 65.3242 59.1603 65.3698C59.1883 64.7095 59.2428 64.3926 59.6901 63.8905C59.8585 63.7495 60.0298 63.6117 60.2032 63.4767C60.297 63.4005 60.3909 63.3243 60.4876 63.2459C60.8004 62.9951 61.1172 62.7502 61.4357 62.5066C61.5459 62.4219 61.6561 62.3373 61.7696 62.2501C66.2374 58.8453 73.8329 53.0951 79.7907 53.465Z" fill="#244B94"/>
+<path d="M37.7719 18.6547C37.9721 18.7045 38.1723 18.7542 38.3786 18.8054C38.6504 25.9138 36.2102 34.888 32.1592 40.8066C31.7603 41.1666 31.6457 41.2587 31.0973 41.2587C31.0417 40.3469 31.1665 39.7631 31.6188 38.9606C31.7315 38.748 31.8436 38.5351 31.9553 38.322C32.014 38.2109 32.0727 38.0999 32.1331 37.9855C35.2664 31.9327 36.5924 25.2983 37.7719 18.6547Z" fill="#244B94"/>
+<path d="M51.8032 66.6977C52.0032 66.695 52.0032 66.695 52.2073 66.6922C52.3352 66.6919 52.4631 66.6916 52.5949 66.6913C52.709 66.6906 52.8231 66.69 52.9406 66.6894C53.2443 66.726 53.2443 66.726 53.6994 67.0274C53.4339 67.6113 53.4339 67.6113 53.0926 67.7809C52.7535 67.8182 52.4136 67.8476 52.0734 67.8733C51.8598 67.8901 51.6463 67.907 51.4327 67.924C51.32 67.9329 51.2074 67.9417 51.0913 67.9508C44.7694 68.4542 38.923 69.938 32.9748 72.055C32.8321 72.1056 32.6894 72.1562 32.5423 72.2083C32.2897 72.2986 32.0375 72.3903 31.7861 72.4838C30.9947 72.7701 30.9947 72.7701 30.4902 72.603C30.7435 71.8484 31.4831 71.6533 32.1684 71.3033C32.3246 71.2232 32.4808 71.1432 32.6418 71.0607C38.4058 68.1745 45.3544 66.7026 51.8032 66.6977Z" fill="#244B94"/>
+<path d="M29.7317 47.5879C30.0973 47.7332 30.2984 47.8224 30.503 48.1638C30.6403 48.4883 30.7092 48.7634 30.7604 49.1108C30.7784 49.2319 30.7965 49.353 30.815 49.4779C30.9141 50.2036 31.0096 50.9294 31.097 51.6566C31.1135 51.7928 31.13 51.9289 31.147 52.0692C31.78 57.5885 32.4538 66.0823 29.58 71.0961C29.2663 71.1894 29.2663 71.1894 28.9733 71.2468C28.9839 71.1595 28.9945 71.0722 29.0054 70.9822C29.0999 70.204 29.1939 69.4257 29.2873 68.6473C29.3727 67.9375 29.4594 67.2279 29.5475 66.5184C29.9854 63.0154 29.9854 63.0154 30.1868 59.4927C30.1929 59.3136 30.1989 59.1345 30.2052 58.95C30.2586 56.0353 30.0479 53.0297 29.5615 50.1555C29.4285 49.3287 29.4059 48.5634 29.58 47.7386C29.6301 47.6889 29.6802 47.6392 29.7317 47.5879Z" fill="#244B94"/>
+</svg>
diff --git a/frontend/src/components/AppBar/AppBar.jsx b/frontend/src/components/AppBar/AppBar.jsx
index afec2805..11ec72cf 100644
--- a/frontend/src/components/AppBar/AppBar.jsx
+++ b/frontend/src/components/AppBar/AppBar.jsx
@@ -1,4 +1,4 @@
-import Logo from "../../../../assets/flow-leaflets-logo.svg";
+import Logo from "../../assets/flow-leaflets-logo.svg";
 import {
   AdjustmentsHorizontalIcon,
   BellIcon,
diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index 5eb2386e..cccec681 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -6,11 +6,11 @@ import App from "./App.jsx";
 import Login from "./pages/login/Login.jsx";
 import SignUp from "./pages/sign_up/SignUp.jsx";
 import NotFound from "./pages/not_found/NotFound.jsx";
-import Home from "./pages/Homepage.jsx";
-import NewLog from "./pages/NewLog.jsx";
-import LogHistory from "./pages/LogHistory.jsx";
-import UploadPhotos from "./pages/UploadPhoto.jsx";
-import ManualEdit from "./pages/ManualEdit.jsx";
+import Home from "./pages/home/Home.jsx";
+import NewLog from "./pages/new_log/NewLog.jsx";
+import LogHistory from "./pages/log_history/LogHistory.jsx";
+import UploadPhotos from "./pages/upload_photo/UploadPhoto.jsx";
+import ManualEntry from "./pages/manual_entry/ManualEntry.jsx";
 import "./index.css";
 
 createRoot(document.getElementById("root")).render(
@@ -25,7 +25,7 @@ createRoot(document.getElementById("root")).render(
           <Route path="/homepage" element={<Home />} />
           <Route path="/logHistory" element={<LogHistory />} />
           <Route path="/uploadPhotos" element={<UploadPhotos />} />
-          <Route path="/manualEdit" element={<ManualEdit />} />
+          <Route path="/manualEntry" element={<ManualEntry />} />
         </Route>
         <Route path="*" element={<NotFound />} />
       </Routes>
diff --git a/frontend/src/pages/Homepage.jsx b/frontend/src/pages/Homepage.jsx
deleted file mode 100644
index a9ab4817..00000000
--- a/frontend/src/pages/Homepage.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { NavContentWrapper } from "../components/NavContentWrapper/NavContentWrapper";
-import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButtons";
-import { useNavigate } from "react-router-dom";
-import "./styles/Homepage.css";
-
-export default function Home() {
-  return (
-    <NavContentWrapper>
-      <MainContent />
-    </NavContentWrapper>
-  );
-}
-
-function MainContent() {
-  return (
-    <div className="main-content">
-      <p>
-        Convert handwritten clinical logs to a <br />
-        standardized Excel template with just a click of a button!
-      </p>
-      <div className="main-content-buttons">
-        <Buttons />
-      </div>
-    </div>
-  );
-}
-
-function Buttons() {
-  const navigate = useNavigate();
-
-  const handleCreateNewLog = () => {
-    navigate("/newLog");
-  };
-
-  const handleAddLogbook = () => {
-    navigate("/uploadPhotos")
-  }
-
-  const handleViewHistory = () => {
-    navigate("/logHistory");
-  };
-
-  return (
-    <div className="buttons-container">
-      <CLButtonPrimary onClick={handleCreateNewLog} width={"330px"}>
-        Create New Log
-      </CLButtonPrimary>
-      <CLButtonSecondary onClick={handleAddLogbook} width={"330px"}>
-        Add Logbook
-      </CLButtonSecondary>
-      <CLButtonSecondary onClick={handleViewHistory} width={"330px"}>
-        View Log History
-      </CLButtonSecondary>
-    </div>
-  );
-}
diff --git a/frontend/src/pages/styles/Homepage.css b/frontend/src/pages/home/Home.css
similarity index 100%
rename from frontend/src/pages/styles/Homepage.css
rename to frontend/src/pages/home/Home.css
diff --git a/frontend/src/pages/home/Home.jsx b/frontend/src/pages/home/Home.jsx
index e69de29b..08316051 100644
--- a/frontend/src/pages/home/Home.jsx
+++ b/frontend/src/pages/home/Home.jsx
@@ -0,0 +1,56 @@
+import { NavContentWrapper } from "../../components/NavContentWrapper/NavContentWrapper";
+import { CLButtonPrimary, CLButtonSecondary } from "../../components/Buttons/CLButtons";
+import { useNavigate } from "react-router-dom";
+import "./Home.css";
+
+export default function Home() {
+  return (
+    <NavContentWrapper>
+      <MainContent />
+    </NavContentWrapper>
+  );
+}
+
+function MainContent() {
+  return (
+    <div className="main-content">
+      <p>
+        Convert handwritten clinical logs to a <br />
+        standardized Excel template with just a click of a button!
+      </p>
+      <div className="main-content-buttons">
+        <Buttons />
+      </div>
+    </div>
+  );
+}
+
+function Buttons() {
+  const navigate = useNavigate();
+
+  const handleCreateNewLog = () => {
+    navigate("/newLog");
+  };
+
+  const handleAddLogbook = () => {
+    navigate("/uploadPhotos")
+  }
+
+  const handleViewHistory = () => {
+    navigate("/logHistory");
+  };
+
+  return (
+    <div className="buttons-container">
+      <CLButtonPrimary onClick={handleCreateNewLog} width={"330px"}>
+        Create New Log
+      </CLButtonPrimary>
+      <CLButtonSecondary onClick={handleAddLogbook} width={"330px"}>
+        Add Logbook
+      </CLButtonSecondary>
+      <CLButtonSecondary onClick={handleViewHistory} width={"330px"}>
+        View Log History
+      </CLButtonSecondary>
+    </div>
+  );
+}
diff --git a/frontend/src/pages/styles/LogHistory.css b/frontend/src/pages/log_history/LogHistory.css
similarity index 100%
rename from frontend/src/pages/styles/LogHistory.css
rename to frontend/src/pages/log_history/LogHistory.css
diff --git a/frontend/src/pages/LogHistory.jsx b/frontend/src/pages/log_history/LogHistory.jsx
similarity index 93%
rename from frontend/src/pages/LogHistory.jsx
rename to frontend/src/pages/log_history/LogHistory.jsx
index 20b86370..39c229af 100644
--- a/frontend/src/pages/LogHistory.jsx
+++ b/frontend/src/pages/log_history/LogHistory.jsx
@@ -1,9 +1,9 @@
 import { useState } from "react";
-import { NavContentWrapper } from "../components/NavContentWrapper/NavContentWrapper";
-import SearchFilterSort from "../components/LogHistory/SearchFilterSort";
-import LogTable from "../components/LogHistory/LogTable";
-import Pagination from "../components/LogHistory/Pagination";
-import "./styles/LogHistory.css";
+import { NavContentWrapper } from "../../components/NavContentWrapper/NavContentWrapper";
+import SearchFilterSort from "../../components/LogHistory/SearchFilterSort";
+import LogTable from "../../components/LogHistory/LogTable";
+import Pagination from "../../components/LogHistory/Pagination";
+import "./LogHistory.css";
 
 const LogHistory = () => {
   const initialLogs = [
diff --git a/frontend/src/pages/log_history/__tests__/LogHistory.test.js b/frontend/src/pages/log_history/__tests__/LogHistory.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/log_history/__tests__/LogHistory.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+  expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/pages/ManualEdit.jsx b/frontend/src/pages/manual_entry/ManualEntry.jsx
similarity index 100%
rename from frontend/src/pages/ManualEdit.jsx
rename to frontend/src/pages/manual_entry/ManualEntry.jsx
diff --git a/frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js b/frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+  expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/pages/styles/NewLog.css b/frontend/src/pages/new_log/NewLog.css
similarity index 100%
rename from frontend/src/pages/styles/NewLog.css
rename to frontend/src/pages/new_log/NewLog.css
diff --git a/frontend/src/pages/NewLog.jsx b/frontend/src/pages/new_log/NewLog.jsx
similarity index 79%
rename from frontend/src/pages/NewLog.jsx
rename to frontend/src/pages/new_log/NewLog.jsx
index 47cf65eb..1f07f767 100644
--- a/frontend/src/pages/NewLog.jsx
+++ b/frontend/src/pages/new_log/NewLog.jsx
@@ -1,19 +1,19 @@
 import { useNavigate } from "react-router-dom";
-import { NavContentWrapper } from "../components/NavContentWrapper/NavContentWrapper";
+import { NavContentWrapper } from "../../components/NavContentWrapper/NavContentWrapper";
 import ImageIcon from "@mui/icons-material/Image";
 import ModeIcon from "@mui/icons-material/Mode";
-import { CLButtonPrimary, CLButtonSecondary } from "../components/Buttons/CLButtons";
-import "./styles/NewLog.css";
+import { CLButtonPrimary, CLButtonSecondary } from "../../components/Buttons/CLButtons";
+import "./NewLog.css";
 
 export default function NewLog() {
   return (
     <NavContentWrapper>
-      <CTASection />
+      <MainContent />
     </NavContentWrapper>
   );
 }
 
-function CTASection() {
+function MainContent() {
   const navigate = useNavigate();
 
   const handleUploadPhoto = () => {
diff --git a/frontend/src/pages/new_log/__tests__/NewLog.test.js b/frontend/src/pages/new_log/__tests__/NewLog.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/new_log/__tests__/NewLog.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+  expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/pages/styles/UploadPhoto.css b/frontend/src/pages/upload_photo/UploadPhoto.css
similarity index 100%
rename from frontend/src/pages/styles/UploadPhoto.css
rename to frontend/src/pages/upload_photo/UploadPhoto.css
diff --git a/frontend/src/pages/UploadPhoto.jsx b/frontend/src/pages/upload_photo/UploadPhoto.jsx
similarity index 91%
rename from frontend/src/pages/UploadPhoto.jsx
rename to frontend/src/pages/upload_photo/UploadPhoto.jsx
index 57cefc46..c3c0b2ca 100644
--- a/frontend/src/pages/UploadPhoto.jsx
+++ b/frontend/src/pages/upload_photo/UploadPhoto.jsx
@@ -1,11 +1,11 @@
 import { useState } from "react";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import { useNavigate } from "react-router-dom";
-import UploadArea from "../components/UploadPhoto/UploadArea";
-import PreviewSection from "../components/UploadPhoto/PreviewSection";
+import UploadArea from "../../components/UploadPhoto/UploadArea";
+import PreviewSection from "../../components/UploadPhoto/PreviewSection";
 import ArrowForwardIosIcon from "@mui/icons-material/ArrowForwardIos";
 import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
-import "./styles/UploadPhoto.css";
+import "./UploadPhoto.css";
 
 export default function UploadPhotos() {
   const [imageFiles, setImageFiles] = useState([]);
diff --git a/frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js b/frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+  expect(true).toBe(true)
+})
\ No newline at end of file