diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..fdddb29
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>
diff --git a/package-lock.json b/package-lock.json
index 97fedac..8be77cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,28 +10,25 @@
       "license": "ISC",
       "dependencies": {
         "axios": "^1.7.9",
-        "body-parser": "^2.2.0",
         "cheerio": "^1.0.0",
         "express": "^5.1.0",
         "leaflet": "^1.9.4",
-        "md5": "^2.3.0",
         "vue-router": "^4.5.0",
         "ws": "^8.18.1"
       },
       "devDependencies": {
         "bulma": "^1.0.2",
         "css-loader": "^7.1.2",
-        "html-webpack-plugin": "^5.6.2",
+        "html-webpack-plugin": "^5.6.3",
         "nodemon": "^3.1.9",
-        "sass": "^1.80.3",
-        "sass-loader": "^16.0.2",
-        "simple-nunjucks-loader": "^3.2.0",
+        "sass": "^1.80.6",
+        "sass-loader": "^16.0.3",
         "style-loader": "^4.0.0",
         "surge": "^0.24.6",
         "vue": "^3.5.13",
         "vue-loader": "^17.4.2",
         "vue-template-compiler": "^2.7.16",
-        "webpack": "^5.95.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^5.1.0"
       }
@@ -55,12 +52,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
-      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.0"
+        "@babel/types": "^7.26.3"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -70,9 +67,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
-      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
@@ -220,11 +217,13 @@
       "license": "MIT"
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
-      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -239,24 +238,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.4.1",
-        "@parcel/watcher-darwin-arm64": "2.4.1",
-        "@parcel/watcher-darwin-x64": "2.4.1",
-        "@parcel/watcher-freebsd-x64": "2.4.1",
-        "@parcel/watcher-linux-arm-glibc": "2.4.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
-        "@parcel/watcher-linux-arm64-musl": "2.4.1",
-        "@parcel/watcher-linux-x64-glibc": "2.4.1",
-        "@parcel/watcher-linux-x64-musl": "2.4.1",
-        "@parcel/watcher-win32-arm64": "2.4.1",
-        "@parcel/watcher-win32-ia32": "2.4.1",
-        "@parcel/watcher-win32-x64": "2.4.1"
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
-      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
       "cpu": [
         "arm64"
       ],
@@ -275,9 +275,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
-      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
       "cpu": [
         "arm64"
       ],
@@ -296,9 +296,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
-      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
       "cpu": [
         "x64"
       ],
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
-      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
       "cpu": [
         "x64"
       ],
@@ -338,9 +338,30 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
-      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
       "cpu": [
         "arm"
       ],
@@ -359,9 +380,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
-      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
       "cpu": [
         "arm64"
       ],
@@ -380,9 +401,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
-      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
       "cpu": [
         "arm64"
       ],
@@ -401,9 +422,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
-      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
       "cpu": [
         "x64"
       ],
@@ -422,9 +443,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
-      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
       "cpu": [
         "x64"
       ],
@@ -443,9 +464,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
-      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
       "cpu": [
         "arm64"
       ],
@@ -464,9 +485,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
-      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
       "cpu": [
         "ia32"
       ],
@@ -485,9 +506,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
-      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
       "cpu": [
         "x64"
       ],
@@ -547,6 +568,28 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -568,9 +611,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz",
-      "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
+      "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -632,13 +675,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.19.8"
       }
     },
     "node_modules/@types/node-forge": {
@@ -716,9 +759,9 @@
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.12",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
-      "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+      "version": "8.5.13",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+      "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1065,14 +1108,6 @@
       "dev": true,
       "license": "Apache-2.0"
     },
-    "node_modules/a-sync-waterfall": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
-      "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -1087,10 +1122,20 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -1100,16 +1145,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -1239,14 +1274,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -1349,16 +1376,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -1405,15 +1422,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -1479,9 +1487,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "dev": true,
       "funding": [
         {
@@ -1499,10 +1507,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
         "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1542,10 +1550,9 @@
       }
     },
     "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -1592,9 +1599,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001668",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
-      "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
+      "version": "1.0.30001673",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001673.tgz",
+      "integrity": "sha512-WTrjUCSMp3LYX0nE12ECkV0a+e6LC85E0Auz75555/qr78Oc8YWhEPNfDd6SHdtlCMSzqtuXY0uyEMNRcsKpKw==",
       "dev": true,
       "funding": [
         {
@@ -1649,15 +1656,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/charenc": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/cheerio": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
@@ -1994,31 +1992,24 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2075,18 +2066,6 @@
         "node": ">=6.6.0"
       }
     },
-    "node_modules/core-js": {
-      "version": "3.39.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
-      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -2109,15 +2088,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/css-loader": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
@@ -2310,6 +2280,7 @@
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true,
       "license": "Apache-2.0",
+      "optional": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -2448,9 +2419,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.36",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz",
-      "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==",
+      "version": "1.5.47",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz",
+      "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -2461,16 +2432,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/encodeurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -3338,9 +3299,9 @@
       }
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.2.tgz",
-      "integrity": "sha512-q7xp/FO9RGBVoTKNItkdX1jKLscLFkgn/dLVFNYbHVbfHLBk6DYW5nsQ8kCzIWcgKP/kUBocetjvav6lD8YfCQ==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
+      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3603,12 +3564,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "license": "MIT"
-    },
     "node_modules/is-core-module": {
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
@@ -3859,19 +3814,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -3935,21 +3877,6 @@
         "node": ">=6.11.5"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -3998,17 +3925,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
-      }
-    },
     "node_modules/media-typer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
@@ -4211,9 +4127,9 @@
       }
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4250,7 +4166,8 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
@@ -4299,9 +4216,9 @@
       }
     },
     "node_modules/nodemon/node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4368,44 +4285,6 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/nunjucks": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
-      "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "peer": true,
-      "dependencies": {
-        "a-sync-waterfall": "^1.0.0",
-        "asap": "^2.0.3",
-        "commander": "^5.1.0"
-      },
-      "bin": {
-        "nunjucks-precompile": "bin/precompile"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.3.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/nunjucks/node_modules/commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -4905,13 +4784,16 @@
       "license": "MIT"
     },
     "node_modules/psl": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz",
-      "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
       }
     },
     "node_modules/pstree.remy": {
@@ -4980,15 +4862,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/read": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
@@ -5282,13 +5155,12 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.80.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.3.tgz",
-      "integrity": "sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==",
+      "version": "1.80.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz",
+      "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@parcel/watcher": "^2.4.1",
         "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
@@ -5298,12 +5170,15 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.2.tgz",
-      "integrity": "sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.3.tgz",
+      "integrity": "sha512-gosNorT1RCkuCMyihv6FBRR7BMV06oKRAs+l4UMp1mlcVg9rWN6KMmUj3igjQwmYys4mDP3etEYJgiHRbgHCHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5708,27 +5583,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/simple-nunjucks-loader": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/simple-nunjucks-loader/-/simple-nunjucks-loader-3.2.0.tgz",
-      "integrity": "sha512-DOZ956kg3SlCVZ3nFP7cLLzuF4rLiDw2zIA80RZ1whTkTMmRODQIMbVSeOhE4GKqoHa5yq5bnG9Zm+JD8ZvcmQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-js": "^3.15.2",
-        "loader-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "optionalDependencies": {
-        "glob": "^7.1.6"
-      },
-      "peerDependencies": {
-        "nunjucks": "^3.0.0",
-        "webpack": "^5.0.0"
-      }
-    },
     "node_modules/simple-update-notifier": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
@@ -6190,9 +6044,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.34.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.1.tgz",
-      "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==",
+      "version": "5.36.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+      "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -6334,9 +6188,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
       "license": "0BSD"
     },
@@ -6635,19 +6489,19 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.95.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.5",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -6937,16 +6791,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
diff --git a/package.json b/package.json
index d9a816f..6e25f79 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,14 @@
   "name": "learnnode",
   "version": "1.0.0",
   "description": "",
+  "main": "index.js",
   "type": "module",
   "scripts": {
-    "dev": "webpack --mode development",
-    "build": "webpack --mode production",
-    "start": "webpack serve --mode development",
-    "deploy": "npm run build && surge ./dist kaspariscool.surge.sh",
-    "express": "nodemon server.js"
+    "dev": "webpack --mode=development",
+    "build": "webpack --mode=production",
+    "start": "webpack server --mode=development",
+    "deploy": "npm run build && surge ./dist neighborly-curve.surge.sh",
+    "server": "nodemon bin/server.js -w bin/server.js"
   },
   "keywords": [],
   "author": "",
@@ -16,27 +17,24 @@
   "devDependencies": {
     "bulma": "^1.0.2",
     "css-loader": "^7.1.2",
-    "html-webpack-plugin": "^5.6.2",
+    "html-webpack-plugin": "^5.6.3",
     "nodemon": "^3.1.9",
-    "sass": "^1.80.3",
-    "sass-loader": "^16.0.2",
-    "simple-nunjucks-loader": "^3.2.0",
+    "sass": "^1.80.6",
+    "sass-loader": "^16.0.3",
     "style-loader": "^4.0.0",
     "surge": "^0.24.6",
     "vue": "^3.5.13",
     "vue-loader": "^17.4.2",
     "vue-template-compiler": "^2.7.16",
-    "webpack": "^5.95.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.1.0"
   },
   "dependencies": {
     "axios": "^1.7.9",
-    "body-parser": "^2.2.0",
     "cheerio": "^1.0.0",
     "express": "^5.1.0",
     "leaflet": "^1.9.4",
-    "md5": "^2.3.0",
     "vue-router": "^4.5.0",
     "ws": "^8.18.1"
   }
diff --git a/readme.md b/readme.md
index 26b962e..0781288 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,3 @@
-# learnnode
+# ta23alearnnode
 
-NODE_OPTIONS=--disable-warning=ExperimentalWarning --disable-warning=DeprecationWarning
\ No newline at end of file
+`NODE_OPTIONS=--disable-warning=ExperimentalWarning --disable-warning=DeprecationWarning`
diff --git a/src/App.vue b/src/App.vue
index b921fd2..3c9c01c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,13 @@
 <script setup>
 import { ref } from 'vue';
-import RouterTabs from './components/RouterTabs.vue';
+import Tabs from './components/Tabs.vue';
 
 
 </script>
+
 <template>
-    <RouterTabs></RouterTabs>
-    <div class="container" v-if="$route.meta.container === undefined">
+    <Tabs></Tabs>
+    <div class="container" v-if="$route.meta.container !== false">
         <section class="section">
             <Suspense>
                 <RouterView></RouterView>
@@ -16,4 +17,7 @@ import RouterTabs from './components/RouterTabs.vue';
     <Suspense v-else>
         <RouterView></RouterView>
     </Suspense>
-</template>
\ No newline at end of file
+</template>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/CharacterCard.vue b/src/components/CharacterCard.vue
index 27d1d03..e90f141 100644
--- a/src/components/CharacterCard.vue
+++ b/src/components/CharacterCard.vue
@@ -1,7 +1,6 @@
 <script setup>
-    defineProps(['character']);
+defineProps(['character']);
 </script>
-
 <template>
     <div class="card">
         <header class="card-header">
@@ -16,14 +15,14 @@
             <div class="content">
                 <table>
                     <tbody>
-                        <tr>
-                            <th>Gender</th>
-                            <td>{{ character.gender }}</td>
-                        </tr>
                         <tr>
                             <th>Status</th>
                             <td>{{ character.status }}</td>
                         </tr>
+                        <tr>
+                            <th>Gender</th>
+                            <td>{{ character.gender }}</td>
+                        </tr>
                         <tr>
                             <th>Species</th>
                             <td>{{ character.species }}</td>
@@ -46,10 +45,8 @@
         </div>
     </div>
 </template>
-
-
 <style scoped>
- .card {
+.card {
     min-height: 100%;
- }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/ItemList.vue b/src/components/ItemList.vue
index c9876cb..f1dad18 100644
--- a/src/components/ItemList.vue
+++ b/src/components/ItemList.vue
@@ -3,7 +3,7 @@ defineProps(['items', 'title']);
 </script>
 
 <template>
-    <h1>{{ title }}</h1>
+    <h3>{{ title }}</h3>
     <ul>
         <li v-for="item in items" :key="item.id">
             {{ item.name }}
diff --git a/src/components/LeafletMap.vue b/src/components/LeafletMap.vue
index 1b14ba2..28e4f1c 100644
--- a/src/components/LeafletMap.vue
+++ b/src/components/LeafletMap.vue
@@ -1,36 +1,37 @@
 <script setup>
+//import * as L from 'leaflet';
 import L from 'leaflet';
 import 'leaflet/dist/leaflet.css';
+import 'leaflet/dist/images/marker-icon-2x.png';
+import 'leaflet/dist/images/marker-icon.png';
+import 'leaflet/dist/images/marker-shadow.png';
 import { onMounted, useId, watch } from 'vue';
 
-let { center, zoom } = defineProps(['center', 'zoom']);
-
-let id = 'map-' + useId();
+const {center, zoom} = defineProps(['center', 'zoom']);
+const id = 'map-' + useId();
 let map;
 onMounted(() => {
-    console.log(document.getElementById(id));
-
     map = L.map(id).setView(center, zoom);
     L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
         maxZoom: 19,
         attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
     }).addTo(map);
+    var marker = L.marker([59.4269, 24.7434]).addTo(map);
 });
-
-watch(() => center, (newCenter, oldCenter) => {
-    console.log(newCenter, oldCenter);
-    map.panTo(newCenter);
+watch(() => center, (center, oldCenter) => {
+    console.log(center, oldCenter);
+    map.panTo(center);
 });
-watch(() => zoom, newZoom => {
-    map.setZoom(newZoom);
+
+watch(() => zoom, (zoom) => {
+    map.setZoom(zoom);
 });
 </script>
 <template>
      <div :id="id"></div>
 </template>
-
 <style scoped>
 div { 
-    height: 40vh;
+    height: 90vh;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index c7057ee..9fcc19e 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -1,5 +1,13 @@
 <script setup>
-    defineProps(['active', 'url']);
+    defineProps(['active']);
+
+    const emit = defineEmits(['close']);
+
+    document.body.addEventListener('keydown', event => {
+        if(event.key === 'Escape'){
+            emit('close');
+        }
+    });
 </script>
 
 <template>
@@ -8,6 +16,6 @@
         <div class="modal-content">
             <slot></slot>
         </div>
-        <button class="modal-close is-large" aria-label="close" @click="$emit('close')"></button>
+        <button class="modal-close is-large" @click="$emit('close')" aria-label="close"></button>
     </div>
 </template>
\ No newline at end of file
diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
new file mode 100644
index 0000000..8a57d8a
--- /dev/null
+++ b/src/components/Pagination.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { computed } from 'vue';
+
+let {info, current } = defineProps(['info', 'current']);
+
+let pageNumbers = computed(()=>{
+    let pages = [];
+    for(let i = 1; i<=3 && i<=info.pages; i++){
+        pages[i] = i;
+    }
+    if(current > 2){
+        pages.push('...');
+    }
+    if(current > 2 && current < info.pages-1) {
+        for(let i = current-1; i<=current+1; i++){
+            pages[i] = i;
+        }
+    }
+    if(current < info.pages-2){
+        pages.push('...');
+    }
+    for(let i = info.pages-2; i<=info.pages; i++){
+        pages[i] = i;
+    }
+    return pages.filter(p => p);
+});
+
+console.log(pageNumbers.value);
+</script>
+<template>
+    <nav class="pagination is-centered" role="navigation" aria-label="pagination">
+        <button @click="$emit('prev')" :disabled="!info.prev" class="pagination-previous">Previous</button>
+        <button @click="$emit('next')" :disabled="!info.next" class="pagination-next">Next page</button>
+        <ul class="pagination-list">
+            <li v-for="page in pageNumbers">
+                <span class="pagination-ellipsis" v-if="page === '...'">&hellip;</span>
+                
+                <a class="pagination-link is-current"
+                    :aria-label="`Page ${page}`"
+                    aria-current="page"
+                    v-else-if="page === current">{{ page }}</a>
+
+                <a @click="$emit('page', page)"
+                    class="pagination-link"
+                    :aria-label="`Goto page ${page}`"
+                    v-else>{{ page }}</a>
+            </li>
+        </ul>
+    </nav>
+</template>
\ No newline at end of file
diff --git a/src/components/SimplePagination.vue b/src/components/SimplePagination.vue
index f7fdba3..c407dc1 100644
--- a/src/components/SimplePagination.vue
+++ b/src/components/SimplePagination.vue
@@ -1,10 +1,9 @@
 <script setup>
-defineProps(['pagination']);
+    defineProps(['info']);
 </script>
-
 <template>
     <div class="buttons">
-        <button class="button is-primary" @click="$emit('prev')" :disabled="!pagination.prev">Previous</button>
-        <button class="button is-primary" @click="$emit('next')" :disabled="!pagination.next">Next</button>
+        <button class="button is-primary" @click="$emit('prev')" :disabled="!info.prev">Prev</button>
+        <button class="button is-primary" @click="$emit('next')" :disabled="!info.next">Next</button>
     </div>
 </template>
\ No newline at end of file
diff --git a/src/components/Tabs.vue b/src/components/Tabs.vue
index ddddf51..a2c6523 100644
--- a/src/components/Tabs.vue
+++ b/src/components/Tabs.vue
@@ -1,21 +1,18 @@
 <script setup>
-import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
-defineProps(['items']);
-let emit = defineEmits(['change']);
-let active = ref(0);
+const router = useRouter();
+const route = useRoute();
+
+console.log(router.getRoutes(), route);
 
-function setActive(key){
-    active.value = key;
-    emit('change', key);
-}
 
 </script>
 <template>
     <div class="tabs is-centered">
         <ul>
-            <li :class="{'is-active': active === key}" v-for="(item,key) in items" @click="setActive(key)">
-                <a>{{ item }}</a>
+            <li v-for="(item,key) in $router.getRoutes()" :class="{'is-active': item.path === $route.path}" >
+                <RouterLink :to="item.path">{{ item.name }}</RouterLink>
             </li>
         </ul>
     </div>
diff --git a/src/index.js b/src/index.js
index f0c6041..fe31f2d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,29 +1,30 @@
 import './style.scss';
-
 import { createApp } from 'vue';
 import { createWebHashHistory, createWebHistory, createMemoryHistory, createRouter } from 'vue-router';
 
+
 import App from './App.vue';
 
-import ToDo from './pages/ToDo.vue';
 import Modals from './pages/Modals.vue';
-import ChuckNorris from './pages/ChuckNorris.vue';
+import ToDo from './pages/ToDo.vue';
+import Chuck from './pages/Chuck.vue';
 import RickAndMorty from './pages/RickAndMorty.vue';
 import CookieClicker from './pages/CookieClicker.vue';
-import Vibration from './pages/Vibration.vue';
-import Chat from './pages/Chat.vue';
+import WebApis from './pages/WebApis.vue';
 import Leaflet from './pages/Leaflet.vue';
+import Chat from './pages/Chat.vue';
+
 
 const routes = [
   { path: '/', component: ToDo, name: 'ToDo' },
   { path: '/modals', component: Modals, name: 'Modals' },
-  { path: '/chuck', component: ChuckNorris, name: 'Chuck Norris' },
+  { path: '/chuck', component: Chuck, name: 'Chuck Norris' },
   { path: '/rickandmorty', component: RickAndMorty, name: 'Rick And Morty' },
   { path: '/cookieclicker', component: CookieClicker, name: 'Cookie Clicker', meta: { container: false } },
-  { path: '/vibration', component: Vibration, name: 'Vibration' },
+  { path: '/webapis', component: WebApis, name: 'WebApis' },
+  { path: '/leaflet', component: Leaflet, name: 'Leaflet', meta: { container: false } },
   { path: '/chat', component: Chat, name: 'Chat' },
-  { path: '/leaflet', component: Leaflet, name: 'Leaflet' },
-];
+]
 
 const router = createRouter({
   history: createWebHistory(),
diff --git a/src/pages/Chat.vue b/src/pages/Chat.vue
index e1197f9..4a81e51 100644
--- a/src/pages/Chat.vue
+++ b/src/pages/Chat.vue
@@ -2,12 +2,8 @@
 import axios from 'axios';
 import { ref } from 'vue';
 
-let message = ref('');
 let messages = ref([]);
-
-
-// let res = await axios.get('http://localhost:3000/messages');
-// messages.value.push(...res.data);
+let input = ref(''); 
 
 // Create WebSocket connection.
 const socket = new WebSocket("ws://localhost:8080");
@@ -19,35 +15,33 @@ socket.addEventListener("open", (event) => {
 
 // Listen for messages
 socket.addEventListener("message", (event) => {
-  
+  console.log("Message from server ", event.data);
   let data = JSON.parse(event.data);
-  console.log(data);
-  if(data.type === 'messages') {
-    messages.value.push(...data.messages);
-  }
-  if(data.type === 'message') {
+  if(data.type === 'messages'){
+    messages.value = data.messages;
+  } else if (data.type === 'message') {
     messages.value.push(data);
   }
 });
 
-
-
-async function send() {
-    socket.send(JSON.stringify({type: 'message', message: message.value}));
-    message.value = '';
+async function send(){
+  socket.send(JSON.stringify({type:'message', message: input.value}));
+  input.value = '';
 }
 </script>
 
 <template>
     <div class="field has-addons">
         <div class="control is-expanded">
-            <input class="input" type="text" v-model="message" @keypress.enter="send">
+            <input class="input" type="text" v-model="input" @keypress.enter="send">
         </div>
         <div class="control">
-            <button class="button is-primary" @click="send">Send</button>
+            <button class="button is-info" @click="send">
+                Send
+            </button>
         </div>
     </div>
-    <div class="notification is-primary" v-for="msg in messages">
-        {{ msg.message }}        
+    <div v-for="message in messages" class="notification is-primary">
+        {{ message.message }}
     </div>
 </template>
\ No newline at end of file
diff --git a/src/pages/Chuck.vue b/src/pages/Chuck.vue
new file mode 100644
index 0000000..b94612e
--- /dev/null
+++ b/src/pages/Chuck.vue
@@ -0,0 +1,24 @@
+<script setup>
+import { ref } from 'vue';
+import axios from 'axios';
+
+let joke = ref('');
+
+
+// axios.get('https://api.chucknorris.io/jokes/random').then(res => {
+//     joke.value = res.data.value;
+// }).catch(err => {
+//     console.log(err);
+// });
+
+try {
+    let response = await axios.get('https://api.chucknorris.io/jokes/random');
+    joke.value = response.data.value;
+} catch (err) {
+    console.log(err);
+}
+</script>
+
+<template>
+    {{ joke }}
+</template>
\ No newline at end of file
diff --git a/src/pages/CookieClicker.vue b/src/pages/CookieClicker.vue
index 0727f08..28df9f5 100644
--- a/src/pages/CookieClicker.vue
+++ b/src/pages/CookieClicker.vue
@@ -1,49 +1,153 @@
 <script setup>
-import { computed, ref } from 'vue';
-
-const cookies = ref(0);
-const buildings = ref([
-    { name: 'Cursor', price: 15, cps: 0.1, count: 0},
-    { name: 'Grandma', price: 100, cps: 1, count: 0},
-    { name: 'Farm', price: 1000, cps: 10, count: 0},
-    { name: 'Factory', price: 10_000, cps: 100, count: 0},
+import { computed, onUnmounted, ref } from 'vue';
+
+document.title = '🍪 Cookie Clicker';
+
+let cookies = ref(0);
+let totalClicks = ref(0);
+let startTime = Date.now();
+let hacked = ref(false);
+
+let buildings = ref([
+    { name: 'Cursor', price: 15, count: 0, cps: 0.1 },
+    { name: 'Grandma', price: 100, count: 0, cps: 1 },
+    { name: 'Farm', price: 1000, count: 0, cps: 8 },
+    { name: 'Lab', price: 8000, count: 0, cps: 60 },
+    { name: 'Factory', price: 40000, count: 0, cps: 400 },
+    { name: 'Mine', price: 200000, count: 0, cps: 2000 },
+    { name: 'Shipment', price: 1000000, count: 0, cps: 10000 },
+]);
+
+let cps = computed(() =>
+    buildings.value.reduce((total, b) => total + b.cps * b.count, 0)
+);
+
+const cpsInterval = setInterval(() => {
+    cookies.value += cps.value;
+}, 1000);
+
+function clickCookie() {
+    totalClicks.value++;
+    cookies.value += hacked.value ? 1_000_000 : 1;
+}
+
+function buyBuilding(building) {
+    if (cookies.value >= building.price) {
+        cookies.value -= building.price;
+        building.price += Math.ceil(building.price * 0.15);
+        building.count++;
+    }
+}
+
+function getBuildingCount(name) {
+    return buildings.value.find(b => b.name === name)?.count || 0;
+}
+
+const achievements = computed(() => [
+    { label: '👆 Just Getting Started - Click the cookie once', achieved: totalClicks.value >= 1 },
+    { label: '🍪 Crumbs Collector - Earn 100 cookies total', achieved: cookies.value >= 100 },
+    { label: '🥠 Sweet Success - Earn 1,000 cookies', achieved: cookies.value >= 1000 },
+    { label: '🏭 Small Business - Earn 10,000 cookies', achieved: cookies.value >= 10000 },
+    { label: '💰 Cookie Tycoon - Earn 100,000 cookies', achieved: cookies.value >= 100000 },
+    { label: '🤑 Millionaire Muncher - Reach 1,000,000 cookies', achieved: cookies.value >= 1000000 },
+    { label: '💼 Billionaire Baker - Reach 1,000,000,000 cookies', achieved: cookies.value >= 1000000000 },
+    { label: '👛 Trillionaire Treats - Reach 1,000,000,000,000 cookies', achieved: cookies.value >= 1000000000000 },
+    { label: '👵 Grandma’s Pride - Own 10 Grandmas', achieved: getBuildingCount('Grandma') >= 10 },
+    { label: '🌾 Farmville - Own 10 Farms', achieved: getBuildingCount('Farm') >= 10 },
+    { label: '🚀 Out of This World - Buy a Shipment', achieved: getBuildingCount('Shipment') >= 1 },
+    { label: '🧪 Mad Scientist - Buy a Lab', achieved: getBuildingCount('Lab') >= 1 },
+    { label: '🎮 Afk King - Play for 1 hour', achieved: (Date.now() - startTime) >= 3600000 },
 ]);
 
-function buyBuilding(building){
-    cookies.value -= building.price;
-    building.price += Math.ceil(building.price / 100 * 15);
-    building.count++;
-}
-let cps = computed(() => {
-    let cps = 0;
-    buildings.value.forEach(building => {
-       cps+=building.cps*building.count;
-    });
-    return cps;
+onUnmounted(() => {
+    clearInterval(cpsInterval);
 });
-setInterval(()=>{
-   cookies.value+=cps.value;
 
-   document.title ='🍪' + +cookies.value.toFixed(1) + ' Cookies!';
-},1000);
+const activeTab = ref('Stats');
+function setTab(tab) {
+    activeTab.value = tab;
+}
+
+function enableHacks() {
+    hacked.value = true;
+}
 
+function resetGame() {
+    location.reload();
+}
 </script>
+
 <template>
     <div class="columns">
-        <div class="column is-4 has-background-primary has-text-centered">
-            <h1 class="is-size-1">{{ +cookies.toFixed(1) }} cookies</h1>
-            <h3 class="is-size-3">{{ +cps.toFixed(1) }} cps</h3>
-            <figure class="image is-square" @click="cookies++">
-                <img src="https://sweetlorens.com/cdn/shop/products/Copy-of-Chocolate-Chunk-Full-Cookie-transparent-background.png?v=1687811511" />
+        <div class="column is-3 has-background-primary has-text-centered">
+            <h1 class="is-size-1"><b>Cookie</b></h1>
+            <figure class="image is-square m-5">
+                <img @click="clickCookie" class="is-rounded"
+                    src="https://pngimg.com/uploads/cookie/cookie_PNG13656.png" />
             </figure>
         </div>
-        <div class="column is-6 has-background-link">
-            asdas
-        </div>
-        <div class="column is-2 has-background-warning">
-            <button v-for="building in buildings" :disabled="cookies<building.price" @click="buyBuilding(building)" class="button is-primary is-large is-fullwidth">
-                {{ building.name }} 🍪{{ building.price }} #{{ building.count }}
+
+        <div class="column is-9 has-background-info">
+            <button class="tab_button button is-primary" :class="{ 'is-active': activeTab === 'Stats' }">
+                <a @click="setTab('Stats')">📊Stats</a>
             </button>
+            <button class="tab_button button is-primary" :class="{ 'is-active': activeTab === 'Achievements' }">
+                <a @click="setTab('Achievements')">🥇Achievements</a>
+            </button>
+            <button class="tab_button button is-primary" :class="{ 'is-active': activeTab === 'Store' }">
+                <a @click="setTab('Store')">🛒Store</a>
+            </button>
+            <button class="tab_button button is-primary" :class="{ 'is-active': activeTab === 'Settings' }">
+                <a @click="setTab('Settings')">🤖Settings</a>
+            </button>
+
+            <div v-if="activeTab === 'Stats'">
+                <h2 class="is-size-3">Stats</h2>
+                <p>Total Cookies: {{ +cookies.toFixed(1) }}🍪</p>
+                <p>Total CPS: {{ +cps.toFixed(1) }}</p>
+                <ul>
+                    <li v-for="b in buildings" :key="b.name">{{ b.name }}s: {{ b.count }}</li>
+                </ul>
+            </div>
+
+            <div v-else-if="activeTab === 'Achievements'">
+                <h2 class="is-size-3">Achievements</h2>
+                <ul>
+                    <li v-for="(a, i) in achievements" :key="i">
+                        <input type="checkbox" disabled :checked="a.achieved" /> <b>{{ a.label }}</b>
+                    </li>
+                </ul>
+            </div>
+
+            <div v-else-if="activeTab === 'Store'">
+                <h2 class="is-size-3">Store</h2>
+                <p>Wallet: {{ +cookies.toFixed(1) }}🍪</p>
+                <button class="button is-large is-fullwidth is-primary mb-2"
+                    v-for="building in buildings"
+                    :key="building.name"
+                    :disabled="cookies < building.price"
+                    @click="buyBuilding(building)">
+                    {{ building.name }} - {{ building.price }}🍪
+                </button>
+            </div>
+
+            <div v-else-if="activeTab === 'Settings'">
+                <h2 class="is-size-3">Settings</h2>
+                <button class="button is-warning mb-2" @click="enableHacks">Enable Hacks</button><br>
+                <button class="button is-danger" @click="resetGame">Reset Game</button>
+            </div>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>
+
+<style scoped>
+.columns {
+    height: 100vh;
+}
+.tab_button {
+    margin-right: 10px;
+}
+img:hover {
+    cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/Leaflet.vue b/src/pages/Leaflet.vue
index 41827d3..97d37ec 100644
--- a/src/pages/Leaflet.vue
+++ b/src/pages/Leaflet.vue
@@ -2,12 +2,12 @@
 import { ref } from 'vue';
 import LeafletMap from '../components/LeafletMap.vue';
 
-let coords = ref([59.42691, 24.74344]);
+let center = ref([59.4269, 24.7434]);
 let zoom = ref(19);
 </script>
 <template>
-    <button class="button is-primary" @click="coords=[58.378003935892494, 26.727245723399832]">Go to Tartu</button>
-    <input type="range" min="1" max="19" step="1" v-model="zoom">
-    <LeafletMap :center="coords" :zoom="zoom"></LeafletMap>
-    <LeafletMap :center="[59.4332429007378, 24.75129553356808]" :zoom="10"></LeafletMap>
-</template>
\ No newline at end of file
+        <button class="button is-primary" @click="center=[59.41071145958258, 24.60537846324927]">Go To Home</button>
+     <input type="range" min="1" max="19" v-model="zoom">
+        <LeafletMap :center="center" :zoom="zoom"></LeafletMap>
+     <LeafletMap :center="[24.4269, 59.7434]" :zoom="19"></LeafletMap>
+</template>
diff --git a/src/pages/Modals.vue b/src/pages/Modals.vue
index 32674d1..044f8e0 100644
--- a/src/pages/Modals.vue
+++ b/src/pages/Modals.vue
@@ -2,30 +2,34 @@
 import { ref } from 'vue';
 import Modal from '../components/Modal.vue';
 import ImgModal from '../components/ImgModal.vue';
+
 let modalActive = ref(false);
 let modalActive2 = ref(false);
+let modalActive3 = ref(false);
 
 </script>
+
 <template>
 
     <div class="buttons">
-        <button class="button is-primary" @click="modalActive = true">Open Modal</button>
-        <button class="button is-warning" @click="modalActive2 = true">Open Modal 2</button>
+        <button class="button is-primary" @click="modalActive = true">Modal Activate</button>
+        <button class="button is-warning is-outlined" @click="modalActive2 = true">Modal 2 Activate</button>
+        <button class="button is-danger is-rounded" @click="modalActive3 = true">Modal 3 Activate</button>
     </div>
 
-    <ImgModal :active="modalActive" @close="modalActive = false" url="https://picsum.photos/seed/kaspar/1280/960">
-
+    <ImgModal :active="modalActive" @close="modalActive = false" url="https://picsum.photos/seed/kaspar/200/300">
     </ImgModal>
-
-    <Modal :active="modalActive2" @close="modalActive2 = false">
-        <div class="notification is-link">
-            <button class="delete"></button>
+    <ImgModal :active="modalActive2" @close="modalActive2 = false" url="https://picsum.photos/seed/martin/200/300">
+    </ImgModal>
+    <Modal :active="modalActive3" @close="modalActive3 = false">
+        <div class="notification is-primary">
+            <button @click="modalActive3 = false" class="delete"></button>
             Primar lorem ipsum dolor sit amet, consectetur adipiscing elit lorem ipsum
             dolor. <strong>Pellentesque risus mi</strong>, tempus quis placerat ut, porta
             nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus
             diam, et dictum <a>felis venenatis</a> efficitur.
         </div>
     </Modal>
-
 </template>
+
 <style></style>
\ No newline at end of file
diff --git a/src/pages/RickAndMorty.vue b/src/pages/RickAndMorty.vue
index 103da58..febbd4a 100644
--- a/src/pages/RickAndMorty.vue
+++ b/src/pages/RickAndMorty.vue
@@ -1,25 +1,38 @@
 <script setup>
+
 import axios from 'axios';
 import { onMounted, ref } from 'vue';
 import CharacterCard from '../components/CharacterCard.vue';
-import PagedPagination from '../components/PagedPagination.vue';
+import SimplePagination from '../components/SimplePagination.vue';
+import Pagination from '../components/Pagination.vue';
 
-let characters = ref([]);
-let pagination = ref({});
-let currentPage = ref(1);
-let searchValue = ref('');
+const characters = ref([]);
+const info = ref({});
+const currentPage = ref(1);
+const searchValue = ref('');
+const error = ref('');
 let searchTimeout = null;
-await page(currentPage.value);
+
+
+await getCharacters('https://rickandmortyapi.com/api/character');
+
 
 async function getCharacters() {
-    let response = await axios.get('https://rickandmortyapi.com/api/character',{
-        params: {
-            page: currentPage.value,
-            name: searchValue.value
-        }
-    });
-    characters.value = response.data.results;
-    pagination.value = response.data.info;
+    try {
+        let response = await axios.get('https://rickandmortyapi.com/api/character', {
+            params: {
+                page: currentPage.value,
+                name: searchValue.value,
+            }
+        });
+        console.log(response.data);
+        characters.value.push(...response.data.results);
+        info.value = response.data.info;
+    } catch(err) {
+        console.log(err);
+        error.value = 'No results found';
+        info.value = null;
+    }
 }
 
 async function next() {
@@ -40,27 +53,41 @@ async function page(page) {
 async function search(){
     clearTimeout(searchTimeout);
     searchTimeout = setTimeout(async () => {
+        error.value='';
+        currentPage.value = 1;
+        characters.value = [];
         await getCharacters();
-    }, 750);
+    }, 1000);
+
 }
 
-</script>
+onMounted(() => {
+    document.addEventListener('scroll', () => {
+        if(window.scrollY + window.innerHeight > document.body.clientHeight - 300 ) {
+            next();
+        }
+    })
+    
+});
 
+</script>
 <template>
     <div class="field has-addons">
         <div class="control is-expanded">
-            <input class="input" type="text" placeholder="Search..." @input="search" v-model="searchValue">
+            <input @input="search" v-model="searchValue" class="input" type="text" placeholder="Find character">
         </div>
         <div class="control">
-            <button class="button is-info" @click="search">
+            <button @click="search" class="button is-info">
                 Search
             </button>
         </div>
     </div>
-    <PagedPagination :current="currentPage" :pagination="pagination" @next="next" @prev="prev" @page="page"></PagedPagination>
+
+   
     <div class="columns is-multiline">
-        <div class="column is-one-quarter" v-for="character in characters">
+        <div v-for="character in characters" class="column is-one-quarter">
             <CharacterCard :character="character"></CharacterCard>
         </div>
     </div>
+    <h1 v-if="error" class="is-size-1">{{ error }}</h1>
 </template>
diff --git a/src/pages/ToDo.vue b/src/pages/ToDo.vue
index 2f11346..d2425b0 100644
--- a/src/pages/ToDo.vue
+++ b/src/pages/ToDo.vue
@@ -1,46 +1,45 @@
 <script setup>
+
 import { computed, ref } from 'vue';
 import ItemList from '../components/ItemList.vue';
-let id = 1;
+
+let message = ref('');
+let i = 1;
 let items = ref([
-    { id: id++, name: 'Milk', isDone: true },
-    { id: id++, name: 'Bread', isDone: false },
-    { id: id++, name: 'Vodka', isDone: true },
-    { id: id++, name: 'Beer', isDone: false },
-    { id: id++, name: 'Chips', isDone: false },
+    { id: i++, name: 'Piim', isDone: true },
+    { id: i++, name: 'Viin', isDone: false },
+    { id: i++, name: 'Õlu', isDone: false },
+    { id: i++, name: 'Krõpsud', isDone: true },
 ]);
-let newItem = ref('');
 
-function add() {
-    if (newItem.value.trim() !== '') {
-        items.value.push({ id: id++, name: newItem.value, isDone: false });
+function addItem() {
+    if (message.value.trim() !== '') {
+        items.value.push({ id: i++, name: message.value.trim(), isDone: false });
     }
-    newItem.value = '';
+    message.value = '';
 }
 
 let doneItems = computed(() => items.value.filter(item => item.isDone));
 let toDoItems = computed(() => items.value.filter(item => !item.isDone));
 
 </script>
-<template>
 
-    <div class="content">
-
-        <div class="field has-addons">
-            <div class="control is-expanded">
-                <input class="input" type="text" v-model="newItem" @keypress.enter="add">
-            </div>
-            <div class="control">
-                <button class="button is-primary" @click="add">Add</button>
-            </div>
+<template>
+    <div class="field has-addons">
+        <div class="control">
+            <input class="input" type="text" v-model="message" @keypress.enter="addItem">
         </div>
-
-
+        <div class="control">
+            <button class="button is-info" @click="addItem">
+                Add Item
+            </button>
+        </div>
+    </div>
+    <div class="content">
         <ItemList :items="items" title="All Items"></ItemList>
         <ItemList :items="doneItems" title="Done Items"></ItemList>
-        <ItemList :items="toDoItems" title="Todo Items"></ItemList>
-
+        <ItemList :items="toDoItems" title="ToDo Items"></ItemList>
     </div>
-
 </template>
+
 <style></style>
\ No newline at end of file
diff --git a/src/pages/Vibration.vue b/src/pages/Vibration.vue
deleted file mode 100644
index 9d348cd..0000000
--- a/src/pages/Vibration.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<script setup>
-function vibrate() {
-    if (navigator.vibrate) {
-        navigator.vibrate(200);
-    }
-}
-function starwars() {
-    if (navigator.vibrate) {
-        navigator.vibrate([
-            500, 110, 500, 110, 450, 110, 200, 110, 170, 40, 450, 110, 200, 110, 170, 40,
-            500,
-        ])
-    }
-}
-
-</script>
-<template>
-    <button class="button is-primary" @click="vibrate">Vibrate</button>
-    <button class="button is-primary" @click="starwars">StarWars tune</button>
-</template>
\ No newline at end of file
diff --git a/src/pages/WebApis.vue b/src/pages/WebApis.vue
new file mode 100644
index 0000000..b7ba995
--- /dev/null
+++ b/src/pages/WebApis.vue
@@ -0,0 +1,27 @@
+<script setup>
+
+function vibrate(){
+    if(navigator.vibrate){
+        navigator.vibrate(200);
+    }
+    
+}
+
+function starwars() {
+    navigator.vibrate([500,110,500,110,450,110,200,110,170,40,450,110,200,110,170,40,500]);
+}
+
+function location() {
+    navigator.geolocation.getCurrentPosition((event) => {
+        console.log(event);
+    }, (error) => {
+        console.log('error', error);
+    });
+}
+
+</script>
+<template>
+    <button @click="vibrate" class="button is-primary">Vibrate</button>
+    <button @click="starwars" class="button is-primary">Starwars</button>
+    <button @click="location" class="button is-warning">Locate</button>
+</template>
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index dc5e268..084fe8d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,25 +1,21 @@
 import path from "path";
 import HtmlWebpackPlugin from "html-webpack-plugin";
 import { VueLoaderPlugin } from 'vue-loader';
-import webpack from 'webpack';
-
-const __filename = import.meta.filename;
-const __dirname = import.meta.dirname;
-
 export default {
   entry: "./src/index.js",
   output: {
     filename: "main.js",
-    path: path.resolve(__dirname, "dist"),
+    path: path.resolve(import.meta.dirname, "dist"),
+    assetModuleFilename: '[name][ext][query]',
   },
   devServer: {
     static: {
-      directory: path.join(__dirname, "public"),
+      directory: path.join(import.meta.dirname, "public"),
     },
     compress: true,
     port: 9000,
     historyApiFallback: true,
-    allowedHosts: "all"
+    allowedHosts: "all",
   },
   module: {
     rules: [
@@ -45,18 +41,17 @@ export default {
       {
         test: /\.vue$/,
         loader: 'vue-loader'
-      }
+      },
+      {
+        test: /\.(png|svg|jpg|jpeg|gif)$/i,
+        type: 'asset/resource',
+      },
     ],
   },
   plugins: [
     new HtmlWebpackPlugin({
       template: "./src/index.html",
     }),
-    new VueLoaderPlugin(),
-    new webpack.DefinePlugin({
-      __VUE_OPTIONS_API__: 'true',
-      __VUE_PROD_DEVTOOLS__: 'false',
-      __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false'
-    })
+    new VueLoaderPlugin()
   ],
 };