From 934acffec85ba19130e485fc4f8e3016d99e91bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Witkowski?= <contact@lukaszwitkowski.com>
Date: Thu, 1 Aug 2024 12:34:31 +0200
Subject: [PATCH] UI: glider type filter greatly improved

Also:
Removed unused npm dependencies
Simplify and configure cache for GET /api/models endpoint
---
 README.md                        |  33 +-
 backend/Dockerfile               |   4 +-
 backend/api/flask_app.py         |  42 +-
 backend/api/uwsgi.ini            |  10 -
 backend/api/wsgi.py              |   8 -
 backend/classifier/classifier.py |  15 -
 backend/requirements.txt         |   1 +
 backend/start_api.sh             |   3 +-
 ui/package-lock.json             | 740 +++----------------------------
 ui/package.json                  |   8 +-
 ui/public/message_icon.png       | Bin 3145 -> 0 bytes
 ui/src/App.vue                   |  55 +--
 ui/src/main.js                   |   7 -
 ui/src/router/index.js           |  12 +-
 ui/src/views/Offers.vue          |  86 +++-
 15 files changed, 162 insertions(+), 862 deletions(-)
 delete mode 100644 backend/api/uwsgi.ini
 delete mode 100644 backend/api/wsgi.py
 delete mode 100644 ui/public/message_icon.png

diff --git a/README.md b/README.md
index 88a332e..d846b1c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Aero-offers
 
-This project aims at reviving www.aero-offers.com - invaluable source of price trends for gliders and other aircrafts, originally developed and maintained by @rthaenert
+This project aims at reviving [aero-offers.com](aero-offers.com) - invaluable source of price trends for gliders and other aircrafts, originally developed and maintained by @rthaenert
 
 ## Development
 
@@ -26,14 +26,20 @@ Currently, the project is being onboarded to Azure Cloud (still WIP).
 - [x] use Azure secrets for db credentials
 - [x] setup cron triggers for crawlers, reclassifier and FX rates updater
 - [x] human readable domain (aero-offers.pl)
+- [x] fix aircraft type dropdown
 - [ ] infra as code (biceps or terraform)
 - [ ] document infra and env topology
 - [ ] fix other spiders/crawlers
 - [ ] redirect from aero-offers.com
-- [ ] fix aircraft type dropdown
 - [ ] fix & polish CSS in UI
 - [ ] update/simplify legal subpage
+- [ ] cookies info
 - [ ] use https://github.com/weglide/GliderList  
+- [ ] crawler for Facebook Marketplace - do they have nice api?
+- [ ] crawler for https://www.aircraft24.de
+- [ ] crawler for http://www.airplanemart.com
+- [ ] crawler for http://www.aeronave.de/1-luftfahrzeuge/listings.html
+- [ ] crawler for https://plane-sale.com
 
 ### Running locally without Python nor NodeJS
 `docker compose up --build` - starts postgres, python backend and UI apps (http://localhost:8080/)
@@ -70,29 +76,10 @@ Start UI (vue app):
 cd ui
 npm run dev
 ```
+UI has own, detailed README.md file.
 
 Run crawlers/spiders & reclassifier:
 ```
 cd backend
 ./run_spiders.sh && ./run_classifier.sh
-```
-
-## Further development / bug fixing (from Ralf)
-
-- Model information
-- Scale axes correctly (!)
-- Euro on y-axis
-- Top 10 aircraft offered per category
-- Add more spiders
-   - Facebook Marketplace?
-   - https://www.aircraft24.de
-   - http://www.airplanemart.com
-   - http://www.aeronave.de/1-luftfahrzeuge/listings.html
-   - https://plane-sale.com
-
-### Legal (from Ralf)
-- Opt-out option / banner, pop-up due to analytics cookies
-- Imprint generator: https://www.e-recht24.de/impressum-generator.html
-- Data protection declaration generator: https://datenschutz-generator.de
-
-Imprint and data protection declaration must be listed separately, but may refer to the same page (if desired).
+```
\ No newline at end of file
diff --git a/backend/Dockerfile b/backend/Dockerfile
index ac2dd6a..a3583a9 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -12,10 +12,8 @@ RUN \
  python3 -m pip install -r requirements.txt --no-cache-dir && \
  apk --purge del .build-deps
 
-ENV FLASK_APP=./api/flask_app.py
-
 COPY . .
 
 EXPOSE 80
 
-CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0", "--port=80"]
\ No newline at end of file
+CMD [ "python3", "-m" , "flask", "--app=./api/flask_app.py", "run", "--host=0.0.0.0", "--port=80"]
\ No newline at end of file
diff --git a/backend/api/flask_app.py b/backend/api/flask_app.py
index 0bd579b..d1372b2 100644
--- a/backend/api/flask_app.py
+++ b/backend/api/flask_app.py
@@ -1,27 +1,18 @@
-import datetime
-
 from flask import Flask, jsonify, request, abort
+from flask_headers import headers
 from flask_cors import CORS
 from classifier import classifier
-
 import db
-from my_logging import *
 
 app = Flask(__name__)
-# TODO verify security risks with this
 CORS(app, resources={r"/*": {"origins": "*"}})
-app.config['JSON_AS_ASCII'] = False
-
-logger = logging.getLogger("api")
-
 
 @app.route('/api/offers')
 def offers():
-    logger.debug("Received request {0}".format(request))
-    return jsonify(db.get_offers_dict(limit=request.args.get('limit'),
-                                      order_by=request.args.get('orderBy'),
+    return jsonify(db.get_offers_dict(aircraft_type=request.args.get('aircraft_type'),
                                       offset=request.args.get('offset'),
-                                      aircraft_type=request.args.get('aircraft_type')))
+                                      limit=request.args.get('limit'),
+                                      order_by='creation_datetime'))
 
 @app.route("/api/model/<manufacturer>/<model>")
 def model_information(manufacturer, model):
@@ -36,31 +27,10 @@ def model_information(manufacturer, model):
     manufacturer_info["offers"] = db.get_offers_for_model(manufacturer, model)
     return jsonify(manufacturer_info)
 
-
 @app.route("/api/models")
+@headers({'Cache-Control':'public, max-age=360'})
 def aircraft_models():
-    """
-    Returns list of matching models in the format:
-    [{
-        "manufacturer": "Alexander Schleicher",
-        "model": "K8b"
-    }]
-    :param search_str: manufacturer/model to look for
-    :return: list of matching models
-    """
-    search_str = request.args.get('search')
-    logger.info("Search request: {0}".format(search_str))
-    all_models = classifier.get_all_models()
-    matching_models = []
-    for manufacturer in all_models:
-        for aircraft_type in all_models[manufacturer]["models"]:
-            for model in all_models[manufacturer]["models"][aircraft_type]:
-                if search_str in manufacturer + " " + model:
-                    matching_models.append({
-                        "manufacturer": manufacturer,
-                        "model": model})
-    return jsonify(matching_models)
-
+    return jsonify(classifier.get_all_models())
 
 if __name__ == '__main__':
     app.run(host='127.0.0.1', port=8080, debug=True)
diff --git a/backend/api/uwsgi.ini b/backend/api/uwsgi.ini
deleted file mode 100644
index 535144f..0000000
--- a/backend/api/uwsgi.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[uwsgi]
-module = wsgi
-
-master = true
-processes = 2
-
-socket = /run/aero-offers/api.sock
-vacuum = true
-
-chmod-socket = 660
\ No newline at end of file
diff --git a/backend/api/wsgi.py b/backend/api/wsgi.py
deleted file mode 100644
index 100a96e..0000000
--- a/backend/api/wsgi.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import sys
-import os
-# make sure upper folders are reachable (classifier, ...)
-sys.path.insert(1, os.path.dirname(os.path.realpath(__file__)) + '/..')
-
-import flask_app
-
-application = flask_app.app
diff --git a/backend/classifier/classifier.py b/backend/classifier/classifier.py
index fc36640..bd00905 100644
--- a/backend/classifier/classifier.py
+++ b/backend/classifier/classifier.py
@@ -20,21 +20,6 @@ def get_all_models():
         manufacturers = json.load(json_file)
     return manufacturers
 
-def get_actual_and_predicted(test_data):
-    model_classifier = ModelClassifier()
-    y_actual = []
-    y_predicted = []
-    for item in test_data:
-        expect_manufacturer = "expect_manufacturer" in item and item["expect_manufacturer"] is True
-        detail_text = "" if "detail_text" not in item else item["detail_text"]
-        # actual vs predicted ("" marks None or unknown model)
-        predicted_class = model_classifier.classify(item["input"], expect_manufacturer, detail_text)
-        predicted_class = "" if predicted_class[0] is None else predicted_class[0] + " " + predicted_class[1]
-        actual_class = "" if item["manufacturer"] is None else item["manufacturer"] + " " + item["model"]
-        y_actual.append(actual_class)
-        y_predicted.append(predicted_class)
-    return y_actual, y_predicted
-
 
 class ModelClassifier:
     manufacturers = {}
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 6d072e6..4e15f51 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -6,6 +6,7 @@ Scrapy==2.11.2
 nltk==3.8.1
 Flask==3.0.3
 Flask-Cors==4.0.1
+Flask-Headers==1.0
 uWSGI==2.0.26
 defusedxml==0.7.1
 requests==2.32.3
diff --git a/backend/start_api.sh b/backend/start_api.sh
index 10c966e..7818895 100755
--- a/backend/start_api.sh
+++ b/backend/start_api.sh
@@ -1,4 +1,3 @@
 export PYTHONPATH=$PYTHONPATH':./'
-export FLASK_APP=./api/flask_app.py
 
-flask run --port=8081
\ No newline at end of file
+flask --app=./api/flask_app.py --debug run --port=8081
\ No newline at end of file
diff --git a/ui/package-lock.json b/ui/package-lock.json
index d11af6a..f11fa17 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -12,14 +12,10 @@
         "chartist-plugin-tooltips-updated": "^0.1.4",
         "core-js": "^3.37.1",
         "moment": "^2.29.1",
-        "primeicons": "^7.0.0",
-        "primevue": "^4.0.3",
-        "sweetalert2": "^11.12.3",
         "vue": "^3.4.35",
         "vue-chartist": "^3.0.0",
-        "vue-router": "^4.4.0",
-        "vue-select": "4.0.0-beta.2",
-        "webpack": "^5.93.0"
+        "vue-multiselect": "^3.0.0",
+        "vue-router": "^4.4.0"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^5.0.5",
@@ -683,6 +679,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
@@ -697,6 +694,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -706,6 +704,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -715,7 +714,10 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -731,6 +733,7 @@
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -806,56 +809,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@primeuix/styled": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.0.5.tgz",
-      "integrity": "sha512-pVoGn/uPkVm/DyF3TR3EmH/pL/dP4nR42FcYbVduFq9VfO3KVeOEqvcCULHXos66RZO9MCbCFUoLy6ctf9GUGQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@primeuix/utils": "^0.0.5"
-      },
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
-    "node_modules/@primeuix/utils": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.0.5.tgz",
-      "integrity": "sha512-ntUiUgtRtkF8KuaxHffzhYxQxoXk6LAPHm7CVlFjdqS8Rx8xRkLkZVyo84E+pO2hcNFkOGVP/GxHhQ2s94O8zA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
-    "node_modules/@primevue/core": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.0.3.tgz",
-      "integrity": "sha512-pKdXsYHRMtJfw1tjPJ2u3bC+QLUDIftdHgR7DRfZ4ZV0/9qOGpFZIBYTv3Px+NGQnV+qAyp3Yeh/pS9UO83wHQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@primeuix/styled": "^0.0.5",
-        "@primeuix/utils": "^0.0.5"
-      },
-      "engines": {
-        "node": ">=12.11.0"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.0"
-      }
-    },
-    "node_modules/@primevue/icons": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.0.3.tgz",
-      "integrity": "sha512-eamWkgXhAt/3nC0HJLYmkpXf6DP9QDQ/ecaqT9onNlHXHXL+QDd25OG/wKHPKB94jh3AO/9rD1aMW+YtXtkKbQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@primeuix/utils": "^0.0.5",
-        "@primevue/core": "4.0.3"
-      },
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.19.1",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.1.tgz",
@@ -1084,39 +1037,39 @@
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz",
       "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "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==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/@types/node": {
       "version": "22.0.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.1.tgz",
       "integrity": "sha512-RVKWL+s4ax6syie/ev3FXFIs38mke4ZsCDPBcLF2Gu6MbQXKe9Fo9iU0EPUxDB1mDVvC0vCgkV3lKa2f6xIuHg==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.11.1"
       }
@@ -1360,164 +1313,6 @@
         "vue-component-type-helpers": "^2.0.0"
       }
     },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
-      "license": "MIT",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "license": "Apache-2.0"
-    },
     "node_modules/abbrev": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
@@ -1532,6 +1327,7 @@
       "version": "8.12.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -1540,15 +1336,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==",
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -1576,6 +1363,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -1588,15 +1376,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -1725,43 +1504,14 @@
         "node": ">=8"
       }
     },
-    "node_modules/browserslist": {
-      "version": "4.23.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
-      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001640",
-        "electron-to-chromium": "^1.4.820",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.1.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/cac": {
       "version": "6.7.14",
@@ -1781,26 +1531,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001645",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001645.tgz",
-      "integrity": "sha512-GFtY2+qt91kzyMk6j48dJcwJVq5uTkk71XxE3RtScx7XWRLsO7bU44LOFkOZYR8w9YMS0UhPSYpN/6rAMImmLw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "CC-BY-4.0"
-    },
     "node_modules/chai": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
@@ -1907,15 +1637,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2156,12 +1877,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
-      "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
-      "license": "ISC"
-    },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -2169,19 +1884,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -2194,12 +1896,6 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
-      "license": "MIT"
-    },
     "node_modules/esbuild": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
@@ -2239,15 +1935,6 @@
         "@esbuild/win32-x64": "0.21.5"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -2489,6 +2176,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
@@ -2501,6 +2189,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -2524,15 +2213,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
     "node_modules/execa": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
@@ -2561,6 +2241,7 @@
       "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==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-diff": {
@@ -2574,6 +2255,7 @@
       "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==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
@@ -2778,12 +2460,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "license": "BSD-2-Clause"
-    },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -2826,16 +2502,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "license": "ISC"
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -3069,35 +2740,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
     "node_modules/js-beautify": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz",
@@ -3199,16 +2841,11 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "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==",
-      "license": "MIT"
-    },
     "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==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
@@ -3241,15 +2878,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -3308,6 +2936,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/mime-db": {
@@ -3407,18 +3036,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "license": "MIT"
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "license": "MIT"
-    },
     "node_modules/nopt": {
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
@@ -3749,27 +3366,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/primeicons": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-7.0.0.tgz",
-      "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==",
-      "license": "MIT"
-    },
-    "node_modules/primevue": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.0.3.tgz",
-      "integrity": "sha512-f/41JMb7pMP++zKuiymXYmDMk/4oFRlJKXQzgrAy5Q3esU29hS59MBaP2CsHdPoJasQSzVAgOT+36S4/WXLajg==",
-      "license": "MIT",
-      "dependencies": {
-        "@primeuix/styled": "^0.0.5",
-        "@primeuix/utils": "^0.0.5",
-        "@primevue/core": "4.0.3",
-        "@primevue/icons": "4.0.3"
-      },
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
     "node_modules/proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -3794,6 +3390,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -3827,15 +3424,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -3945,26 +3533,6 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -4005,24 +3573,6 @@
         "node": ">=v12.22.7"
       }
     },
-    "node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/semver": {
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -4036,15 +3586,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -4101,7 +3642,10 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -4111,7 +3655,10 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4265,16 +3812,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/sweetalert2": {
-      "version": "11.12.3",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.12.3.tgz",
-      "integrity": "sha512-tgGJSgfSV/xK113JEvhjwqKAuBYLXsZf0z+tGlHKQNnsLMi4eSNuzn9tt5hUdvjOVTLSPDgo0Lc+tnjy9Uj7Og==",
-      "license": "MIT",
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/sponsors/limonte"
-      }
-    },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -4299,20 +3836,14 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/terser": {
       "version": "5.31.3",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz",
       "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
+      "dev": true,
       "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -4326,45 +3857,14 @@
         "node": ">=10"
       }
     },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -4497,7 +3997,10 @@
       "version": "6.11.1",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz",
       "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/universalify": {
       "version": "0.2.0",
@@ -4509,40 +4012,11 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
@@ -4770,6 +4244,16 @@
         "eslint": ">=6.0.0"
       }
     },
+    "node_modules/vue-multiselect": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-3.0.0.tgz",
+      "integrity": "sha512-uupKdINgz7j83lQToCL7KkgQQxvG43el++hsR39YT9pCe1DwzUGmKzPxjVP6rqskXed5P6DtUASYAlCliW740Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.1",
+        "npm": ">= 6.14.15"
+      }
+    },
     "node_modules/vue-router": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.1.tgz",
@@ -4785,15 +4269,6 @@
         "vue": "^3.2.0"
       }
     },
-    "node_modules/vue-select": {
-      "version": "4.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-4.0.0-beta.2.tgz",
-      "integrity": "sha512-uR7Jn6dkfaFbvbXfKKp6s//ArkbP+U4mK432D6rbsQKk6NfG9J7Nwe0jonzQdttfHPuBPCiw0PV8nnWmpY5jtg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "vue": "3.x"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -4817,19 +4292,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
-      "license": "MIT",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -4840,84 +4302,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/webpack": {
-      "version": "5.93.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz",
-      "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.5",
-        "@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",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.0",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/whatwg-encoding": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
diff --git a/ui/package.json b/ui/package.json
index 28bc0d3..4e9cb99 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -16,14 +16,10 @@
     "chartist-plugin-tooltips-updated": "^0.1.4",
     "core-js": "^3.37.1",
     "moment": "^2.29.1",
-    "primeicons": "^7.0.0",
-    "primevue": "^4.0.3",
-    "sweetalert2": "^11.12.3",
     "vue": "^3.4.35",
     "vue-chartist": "^3.0.0",
-    "vue-router": "^4.4.0",
-    "vue-select": "4.0.0-beta.2",
-    "webpack": "^5.93.0"
+    "vue-multiselect": "^3.0.0",
+    "vue-router": "^4.4.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.5",
diff --git a/ui/public/message_icon.png b/ui/public/message_icon.png
deleted file mode 100644
index dc0e89c2381d14db141fbe3374f95eece4aadaa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3145
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
QzX1q+$=1B;qEFI)0W1~eHUIzs

diff --git a/ui/src/App.vue b/ui/src/App.vue
index 2bc8d81..4d02b24 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -21,20 +21,8 @@
           <router-link to="/airplane"> Airplanes </router-link>
         </div>
       </div>
-      <div>
-        <v-select
-          v-model="selected"
-          class="style-chooser"
-          :options="options"
-          placeholder="choose aircraft model"
-          @search="fetchOptions"
-        >
-          <template #no-options> no model found </template>
-        </v-select>
-      </div>
     </div>
     <div id="body">
-      <Toast />
       <router-view :key="$route.path" />
     </div>
     <div id="footer">
@@ -47,53 +35,17 @@
 /*global __COMMIT_HASH__*/
 /*global __BUILD_TIMESTAMP__*/
 
-import axios from 'axios'
-import Toast from 'primevue/toast'
-
 export default {
-  components: {
-    Toast
-  },
+  components: {},
   data() {
     return {
-      options: [],
-      selected: '',
       buildInfo: 'Build: ' + __COMMIT_HASH__ + ', ' + __BUILD_TIMESTAMP__
     }
-  },
-
-  watch: {
-    selected(val) {
-      if (val !== null) {
-        this.$router.push({
-          name: 'ModelInformation',
-          params: { manufacturer: val.manufacturer, model: val.model }
-        })
-      }
-    }
-  },
-
-  methods: {
-    fetchOptions(search, loading) {
-      loading(true)
-      this.options = []
-      axios.get(`/models?search=${search}`).then((response) => {
-        const options = response.data
-        // add labels for displaying the data
-        for (let i = 0; i < options.length; i += 1) {
-          options[i].label = `${options[i].manufacturer} ${options[i].model}`
-        }
-        this.options = options
-      })
-      loading(false)
-    }
   }
 }
 </script>
 
 <style lang="scss">
-@import 'vue-select/src/scss/vue-select.scss';
-
 * {
   box-sizing: border-box;
   margin: 0px;
@@ -203,11 +155,6 @@ export default {
   text-decoration: none;
 }
 
-#feedback-button {
-  align-content: right;
-  text-align: right;
-}
-
 #body {
   background: #fdfffc;
   margin-bottom: 10px;
diff --git a/ui/src/main.js b/ui/src/main.js
index 71237cb..3e42b34 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -1,10 +1,6 @@
 import { createApp, h } from 'vue'
 import axios from 'axios'
-import vSelect from 'vue-select'
-import ToastService from 'primevue/toastservice'
 import vueChartist from 'vue-chartist'
-import PrimeVue from 'primevue/config'
-import 'primeicons/primeicons.css'
 
 import App from './App.vue'
 import router from './router'
@@ -15,9 +11,6 @@ const app = createApp({
   render: () => h(App)
 })
 
-app.component('VSelect', vSelect)
 app.use(router)
 app.use(vueChartist)
-app.use(PrimeVue)
-app.use(ToastService)
 app.mount('#app')
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 4f27359..073862a 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -15,9 +15,7 @@ const router = createRouter({
         description:
           'Aircraft Offers from various marketplaces. Ranging from Gliders like ASK21 to Cessna and much more (Gliders, TMG, Ultralight, Airplanes)'
       },
-      props: {
-        filter: ''
-      }
+      props: {}
     },
     {
       path: '/gliders',
@@ -28,7 +26,7 @@ const router = createRouter({
         description: 'Glider Offers from various marketplaces with prices in EUR.'
       },
       props: {
-        filter: 'aircraft_type=glider'
+        aircraftType: 'glider'
       }
     },
     {
@@ -41,7 +39,7 @@ const router = createRouter({
           'Touring Motor Glider (like Super Dimona, Stemme) offers from various marketplaces with prices in EUR.'
       },
       props: {
-        filter: 'aircraft_type=tmg'
+        aircraftType: 'tmg'
       }
     },
     {
@@ -53,7 +51,7 @@ const router = createRouter({
         description: 'Ultralight (like C42) offers from various marketplaces with prices in EUR.'
       },
       props: {
-        filter: 'aircraft_type=ultralight'
+        aircraftType: 'ultralight'
       }
     },
     {
@@ -65,7 +63,7 @@ const router = createRouter({
         description: 'Small Airplane (like Cessna) offers from various marketplaces with prices in EUR.'
       },
       props: {
-        filter: 'aircraft_type=airplane'
+        aircraftType: 'airplane'
       }
     },
     {
diff --git a/ui/src/views/Offers.vue b/ui/src/views/Offers.vue
index dc60da7..003a448 100644
--- a/ui/src/views/Offers.vue
+++ b/ui/src/views/Offers.vue
@@ -1,8 +1,21 @@
 <template>
   <div id="offers-content">
-    <div id="explanation">
-      aero-offers.com gathers data from various aircraft marketplaces and makes them available for insights.
+    <div id="aircraft-type-filter">
+      <multiselect
+        v-model="selected"
+        :options="available_aircraft_types"
+        group-values="models"
+        group-label="manufacturer"
+        :group-select="false"
+        label="model"
+        :placeholder="'Filter ' + (aircraft_type ? aircraft_type + ' ' : 'aircraft ') + 'type'"
+      >
+        <template #noResult>
+          <span>Oops! Aircraft type not found. Try different phrase.</span>
+        </template>
+      </multiselect>
     </div>
+
     <div id="offers-div">
       <OfferComponent v-for="offer in offers" :key="offer.id" :offer="offer" />
       <button class="click-button" @click="fetchData">Load more Offers</button>
@@ -13,15 +26,17 @@
 <script>
 import axios from 'axios'
 import OfferComponent from '../components/OfferComponent.vue'
+import Multiselect from 'vue-multiselect'
 
 export default {
   name: 'Offers',
 
   components: {
-    OfferComponent
+    OfferComponent,
+    Multiselect
   },
   props: {
-    filter: {
+    aircraftType: {
       type: String,
       default: null
     }
@@ -30,37 +45,82 @@ export default {
     return {
       offers: [],
       offset: 0,
-      limit: 30
+      limit: 30,
+
+      available_aircraft_types: [],
+      selected: ''
+    }
+  },
+
+  watch: {
+    selected(val) {
+      if (val !== null) {
+        this.$router.push({
+          name: 'ModelInformation',
+          params: { manufacturer: val.manufacturer, model: val.model }
+        })
+      }
     }
   },
 
   created() {
     this.fetchData()
+    this.fetchAircraftTypes()
   },
 
   methods: {
     fetchData() {
       axios
-        .get(`/offers?${this.filter}&limit=${this.limit}&orderBy=creation_datetime&offset=${this.offset}`)
+        .get(`/offers`, {
+          params: {
+            aircraft_type: this.aircraftType,
+            limit: this.limit,
+            offset: this.offset
+          }
+        })
         .then((response) => {
           this.offers = this.offers.concat(response.data)
         })
       this.offset += this.limit
+    },
+    fetchAircraftTypes() {
+      axios.get(`/models`).then((response) => {
+        this.available_aircraft_types = []
+        for (const manufacturer in response.data) {
+          const modelsToDisplay = []
+
+          const modelsByAircraftType = response.data[manufacturer].models
+          for (const type in modelsByAircraftType) {
+            if (this.aircraft_type == type || this.aircraft_type == null) {
+              for (const model in modelsByAircraftType[type]) {
+                modelsToDisplay.push({
+                  manufacturer: manufacturer,
+                  model: modelsByAircraftType[type][model]
+                })
+              }
+            }
+          }
+
+          this.available_aircraft_types.push({
+            manufacturer: manufacturer,
+            models: modelsToDisplay
+          })
+        }
+      })
     }
   }
 }
 </script>
 
 <style lang="css">
-#explanation {
-  box-shadow:
-    0 2px 3px rgba(10, 10, 10, 0.1),
-    0 0 0 1px rgba(10, 10, 10, 0.1);
-  background-color: #ffffff;
-  color: #373737;
-}
+@import 'vue-multiselect/dist/vue-multiselect.css';
 
 #offers-div {
   padding: 10px;
 }
+
+#aircraft-type-filter {
+  padding: 5px;
+  width: 400px;
+}
 </style>