From 6edbbd05c41dc8508a00061a1014c8020e37735a Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sat, 7 Sep 2024 19:57:35 +0900
Subject: [PATCH 01/36] =?UTF-8?q?#43=20=E9=80=9A=E7=9F=A5=E3=83=9A?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AE=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/templates/home.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index ba5af19..f10713a 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -28,9 +28,8 @@ <h5 class="card-title">Warning card title</h5>
                             <div class="card mb-2">
                                 <div class="card-body">
                                     <h6 class="card-subtitle mb-2 text-body-secondary">
-                                        <span class="badge bg-secondary">{{ notice.start_at }}
-                                            {% if notice.end_at != None %}
-                                                <span class="badge bg-secondary">公開終了日: {{ notice.end_at }}</span>{% endif %}
+                                        <span class="badge bg-secondary">{{ notice.start_at }}~{% if notice.end_at != None %}
+                                            {{ notice.end_at }}{% else %}無期限{% endif %}
                                           </span>
                                         {% if notice.is_info %}
                                             <span class="badge text-bg-primary">情報</span>

From 0975a7f4d603bfeffa8fb959e5dd1e8d73537164 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sat, 7 Sep 2024 21:58:29 +0900
Subject: [PATCH 02/36] =?UTF-8?q?#43=20=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E6=95=B4=E5=BD=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/pull_request_template.md              |   3 +
 Pipfile                                       |   3 +-
 Pipfile.lock                                  | 105 ++-
 README.md                                     |   2 +
 custom_admin/consumers.py                     |  54 +-
 custom_admin/routing.py                       |   3 +-
 custom_admin/urls.py                          |   2 +-
 custom_admin/views.py                         |  18 +-
 custom_auth/admin.py                          | 105 ++-
 custom_auth/apps.py                           |   8 +-
 custom_auth/form.py                           | 149 ++--
 custom_auth/group_urls.py                     |   3 +-
 custom_auth/migrations/0001_initial.py        | 232 ++++--
 .../migrations/0002_user_display_name.py      |   9 +-
 ...ervice_group_allow_service_add_and_more.py |  25 +-
 .../0004_group_users_alter_user_groups.py     |  19 +-
 custom_auth/models.py                         |  99 +--
 custom_auth/signals.py                        |  39 +-
 custom_auth/tool.py                           |   2 +-
 custom_auth/urls.py                           |   2 +-
 custom_auth/views.py                          | 164 ++--
 dsbd/asgi.py                                  |  18 +-
 dsbd/form.py                                  |  30 +-
 dsbd/models.py                                |   1 -
 dsbd/notify.py                                |  33 +-
 dsbd/settings.py                              | 199 +++--
 dsbd/templates/activate.html                  |   2 +-
 dsbd/templates/admin/base.html                | 261 +++---
 dsbd/templates/base1.html                     |  98 ++-
 dsbd/templates/base2.html                     |  82 +-
 dsbd/templates/custom_admin/index.html        |  51 +-
 dsbd/templates/custom_admin/ticket/chat.html  | 771 +++++++++---------
 dsbd/templates/custom_admin/ticket/index.html | 295 +++----
 dsbd/templates/done.html                      |  19 +-
 dsbd/templates/feedback.html                  |  72 +-
 dsbd/templates/forget.html                    | 103 +--
 dsbd/templates/forget_complete.html           |  10 +-
 dsbd/templates/forget_confirm.html            |  28 +-
 dsbd/templates/forget_done.html               |   8 +-
 dsbd/templates/group/add.html                 | 256 +++---
 dsbd/templates/group/edit.html                |  72 +-
 dsbd/templates/group/edit_permission.html     | 214 ++---
 dsbd/templates/group/index.html               | 318 ++++----
 dsbd/templates/group/payment.html             | 103 +--
 dsbd/templates/home.html                      | 374 +++++----
 dsbd/templates/menu.html                      | 295 ++++---
 dsbd/templates/navbar1.html                   |   3 +-
 dsbd/templates/navbar2.html                   | 354 ++++----
 dsbd/templates/no_auth.html                   |   8 +-
 dsbd/templates/payment.html                   |  85 +-
 dsbd/templates/service/index.html             | 580 +++++++------
 dsbd/templates/sign_in.html                   | 185 +++--
 dsbd/templates/sign_out.html                  |   2 +-
 dsbd/templates/sign_up.html                   |  93 +--
 dsbd/templates/sign_up_success.html           |  54 +-
 dsbd/templates/svg.html                       | 299 ++++---
 dsbd/templates/ticket/add.html                |  49 +-
 dsbd/templates/ticket/chat.html               | 735 +++++++++--------
 dsbd/templates/ticket/chat_error.html         |   6 +-
 dsbd/templates/ticket/index.html              | 311 +++----
 dsbd/templates/user/change_email.html         |  57 +-
 dsbd/templates/user/change_password.html      |  79 +-
 dsbd/templates/user/edit_profile.html         |  56 +-
 dsbd/templates/user/profile.html              |  96 ++-
 dsbd/templates/user/two_auth/add.html         |  69 +-
 dsbd/templates/user/two_auth/list.html        |  89 +-
 dsbd/templatetags/extra.py                    |   6 +-
 dsbd/urls.py                                  |  25 +-
 dsbd/views.py                                 | 197 ++---
 dsbd/wsgi.py                                  |   5 +-
 ip/admin.py                                   |  84 +-
 ip/migrations/0001_initial.py                 | 124 +--
 ip/migrations/0002_initial.py                 |  55 +-
 ...p_ip_address_alter_ip_use_case_and_more.py |  35 +-
 ip/models.py                                  |  24 +-
 manage.py                                     |   5 +-
 noc/admin.py                                  |  31 +-
 noc/migrations/0001_initial.py                |  31 +-
 notice/admin.py                               |  17 +-
 notice/migrations/0001_initial.py             |  43 +-
 notice/models.py                              |   4 +-
 pyproject.toml                                |  15 +
 requirements.txt                              |  42 -
 router/admin.py                               |  42 +-
 router/migrations/0001_initial.py             |  53 +-
 router/models.py                              |   2 +-
 service/admin.py                              |  92 ++-
 service/migrations/0001_initial.py            | 237 ++++--
 ...remove_connection_ipv4_comment_and_more.py | 131 ++-
 service/models.py                             |  36 +-
 service/urls.py                               |   2 +-
 service/views.py                              |   6 +-
 ticket/admin.py                               |  22 +-
 ticket/apps.py                                |   2 +-
 ticket/consumers.py                           |  54 +-
 ticket/form.py                                |  14 +-
 ticket/migrations/0001_initial.py             |  66 +-
 ticket/models.py                              |  15 +-
 ticket/routing.py                             |   3 +-
 ticket/signals.py                             |  77 +-
 ticket/urls.py                                |   5 +-
 ticket/views.py                               |  36 +-
 web/.eslintrc.cjs                             |   4 +-
 web/README.md                                 |  19 +-
 web/public/vite.svg                           |  22 +-
 web/src/add_connection/App.css                |  44 +-
 web/src/add_connection/App.tsx                |   4 +-
 web/src/add_connection/index.css              |  89 +-
 web/src/add_connection/index.html             |  20 +-
 web/src/add_connection/main.tsx               |   2 +-
 web/src/add_service/App.css                   |  44 +-
 web/src/add_service/App.tsx                   |   4 +-
 web/src/add_service/index.css                 |  89 +-
 web/src/add_service/index.html                |  20 +-
 web/src/add_service/main.tsx                  |   2 +-
 web/src/assets/react.svg                      |   7 +-
 web/tsconfig.json                             |  18 +-
 web/tsconfig.node.json                        |   4 +-
 118 files changed, 5477 insertions(+), 4522 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100644 requirements.txt

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 368cce4..852af3f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,10 +1,13 @@
 ## 変更内容
+
 - なにか
 
 ## 変更理由
+
 - なにか
 
 ## 動作確認
+
 1. hogehoge1
 2. hogehoge2
 3. hogehoge3
diff --git a/Pipfile b/Pipfile
index be3fa1c..ddc8332 100644
--- a/Pipfile
+++ b/Pipfile
@@ -48,7 +48,8 @@ urllib3 = "==2.*"
 "zope.interface" = "==7.*"
 
 [dev-packages]
-black = "*"
+ruff = "*"
+ruff-lsp = "*"
 
 [requires]
 python_version = "3.12"
diff --git a/Pipfile.lock b/Pipfile.lock
index 4bf5ae4..9c9d8b8 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "ae33caba7cd8bedb3d1003d2cf74b40c15f74028333cd98900c0fa8264715a96"
+            "sha256": "7268eae3a6ab10ff57be98f2fb8273737f997fd5acc8c6b872880ceba7309862"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -616,50 +616,30 @@
         }
     },
     "develop": {
-        "black": {
-            "hashes": [
-                "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6",
-                "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e",
-                "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f",
-                "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018",
-                "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e",
-                "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd",
-                "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4",
-                "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed",
-                "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2",
-                "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42",
-                "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af",
-                "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb",
-                "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368",
-                "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb",
-                "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af",
-                "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed",
-                "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47",
-                "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2",
-                "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a",
-                "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c",
-                "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920",
-                "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"
+        "attrs": {
+            "hashes": [
+                "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
+                "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==24.8.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==24.2.0"
         },
-        "click": {
+        "cattrs": {
             "hashes": [
-                "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28",
-                "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"
+                "sha256:043bb8af72596432a7df63abcff0055ac0f198a4d2e95af8db5a936a7074a761",
+                "sha256:8274f18b253bf7674a43da851e3096370d67088165d23138b04a1c04c8eaf48e"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==8.1.7"
+            "markers": "python_version >= '3.8'",
+            "version": "==24.1.0"
         },
-        "mypy-extensions": {
+        "lsprotocol": {
             "hashes": [
-                "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
-                "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"
+                "sha256:c75223c9e4af2f24272b14c6375787438279369236cd568f596d4951052a60f2",
+                "sha256:cc5c15130d2403c18b734304339e51242d3018a05c4f7d0f198ad6e0cd21861d"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==1.0.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==2023.0.1"
         },
         "packaging": {
             "hashes": [
@@ -669,21 +649,56 @@
             "markers": "python_version >= '3.8'",
             "version": "==24.1"
         },
-        "pathspec": {
+        "pygls": {
             "hashes": [
-                "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08",
-                "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"
+                "sha256:140edceefa0da0e9b3c533547c892a42a7d2fd9217ae848c330c53d266a55018",
+                "sha256:6e00f11efc56321bdeb6eac04f6d86131f654c7d49124344a9ebb968da3dd91e"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.12.1"
+            "version": "==1.3.1"
+        },
+        "ruff": {
+            "hashes": [
+                "sha256:0308610470fcc82969082fc83c76c0d362f562e2f0cdab0586516f03a4e06ec6",
+                "sha256:0b52387d3289ccd227b62102c24714ed75fbba0b16ecc69a923a37e3b5e0aaaa",
+                "sha256:0ea086601b22dc5e7693a78f3fcfc460cceabfdf3bdc36dc898792aba48fbad6",
+                "sha256:34d5efad480193c046c86608dbba2bccdc1c5fd11950fb271f8086e0c763a5d1",
+                "sha256:50e30b437cebef547bd5c3edf9ce81343e5dd7c737cb36ccb4fe83573f3d392e",
+                "sha256:549daccee5227282289390b0222d0fbee0275d1db6d514550d65420053021a58",
+                "sha256:66dbfea86b663baab8fcae56c59f190caba9398df1488164e2df53e216248baa",
+                "sha256:7862f42fc1a4aca1ea3ffe8a11f67819d183a5693b228f0bb3a531f5e40336fc",
+                "sha256:803b96dea21795a6c9d5bfa9e96127cc9c31a1987802ca68f35e5c95aed3fc0d",
+                "sha256:932063a03bac394866683e15710c25b8690ccdca1cf192b9a98260332ca93408",
+                "sha256:ac3b5bfbee99973f80aa1b7cbd1c9cbce200883bdd067300c22a6cc1c7fba212",
+                "sha256:ac4b75e898ed189b3708c9ab3fc70b79a433219e1e87193b4f2b77251d058d14",
+                "sha256:bedff9e4f004dad5f7f76a9d39c4ca98af526c9b1695068198b3bda8c085ef60",
+                "sha256:c44536df7b93a587de690e124b89bd47306fddd59398a0fb12afd6133c7b3818",
+                "sha256:c4b153fc152af51855458e79e835fb6b933032921756cec9af7d0ba2aa01a258",
+                "sha256:d02a4127a86de23002e694d7ff19f905c51e338c72d8e09b56bfb60e1681724f",
+                "sha256:eebe4ff1967c838a1a9618a5a59a3b0a00406f8d7eefee97c70411fefc353617",
+                "sha256:f0f8968feea5ce3777c0d8365653d5e91c40c31a81d95824ba61d871a11b8523"
+            ],
+            "index": "pypi",
+            "markers": "python_version >= '3.7'",
+            "version": "==0.6.4"
+        },
+        "ruff-lsp": {
+            "hashes": [
+                "sha256:5d2622d22032944d54b0a0e84e16048d081d3c8716bf2bac5a155227ffe1d78a",
+                "sha256:96b2bea6e3cae75ad40bf470041cbeb06c0125a228e05d3aef47b8622a38b900"
+            ],
+            "index": "pypi",
+            "markers": "python_version >= '3.7'",
+            "version": "==0.0.56"
         },
-        "platformdirs": {
+        "typing-extensions": {
             "hashes": [
-                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
-                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
+                "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+                "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
             ],
+            "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.2.2"
+            "version": "==4.12.2"
         }
     }
 }
diff --git a/README.md b/README.md
index 30f0887..a383b42 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 # dsbd
+
 Home NOC Dashboard
 
 [![Publish Docker image(dev)](https://github.com/homenoc/dsbd/actions/workflows/build-dev.yaml/badge.svg)](https://github.com/homenoc/dsbd/actions/workflows/build-dev.yaml)
 [![Publish Docker image(prod)](https://github.com/homenoc/dsbd/actions/workflows/build-prod.yaml/badge.svg)](https://github.com/homenoc/dsbd/actions/workflows/build-prod.yaml)
+
 ### develop environment
 
 ```
diff --git a/custom_admin/consumers.py b/custom_admin/consumers.py
index 5ca45a0..d70c378 100644
--- a/custom_admin/consumers.py
+++ b/custom_admin/consumers.py
@@ -2,13 +2,11 @@
 import json
 
 from asgiref.sync import sync_to_async
-from channels.generic.websocket import AsyncWebsocketConsumer
 from django.conf import settings
 from django.utils import timezone
-from pytz import timezone
 
 from ticket.consumers import ChatConsumer
-from ticket.models import Ticket, Chat
+from ticket.models import Chat, Ticket
 
 
 @sync_to_async()
@@ -44,18 +42,24 @@ async def receive(self, text_data=None, bytes_data=None):
         await self.add_chat(message)
 
         time_format = "%Y/%m/%d %H:%M:%S"
-        time = datetime.datetime.now(tz=datetime.timezone.utc if settings.USE_TZ else None).astimezone(
-            timezone(settings.TIME_ZONE)).strftime(time_format)
-
-        await self.channel_layer.group_send(self.chat_group_name, {
-            "type": "broadcast_message",
-            "time": time,
-            "user_id": self.user.id,
-            "username": self.user.username,
-            "group": 0,
-            "message": message,
-            "is_admin": True
-        })
+        time = (
+            datetime.datetime.now(tz=datetime.timezone.utc if settings.USE_TZ else None)
+            .astimezone(timezone(settings.TIME_ZONE))
+            .strftime(time_format)
+        )
+
+        await self.channel_layer.group_send(
+            self.chat_group_name,
+            {
+                "type": "broadcast_message",
+                "time": time,
+                "user_id": self.user.id,
+                "username": self.user.username,
+                "group": 0,
+                "message": message,
+                "is_admin": True,
+            },
+        )
 
     async def broadcast_message(self, event):
         time = event["time"]
@@ -65,11 +69,15 @@ async def broadcast_message(self, event):
         message = event["message"]
         is_admin = event["is_admin"]
 
-        await self.send(text_data=json.dumps({
-            "time": time,
-            "user_id": user_id,
-            "username": username,
-            "group": group,
-            "message": message,
-            "is_admin": is_admin
-        }))
+        await self.send(
+            text_data=json.dumps(
+                {
+                    "time": time,
+                    "user_id": user_id,
+                    "username": username,
+                    "group": group,
+                    "message": message,
+                    "is_admin": is_admin,
+                }
+            )
+        )
diff --git a/custom_admin/routing.py b/custom_admin/routing.py
index 7103c25..601c240 100644
--- a/custom_admin/routing.py
+++ b/custom_admin/routing.py
@@ -1,6 +1,7 @@
 from django.urls import path
+
 from . import consumers
 
 urlpatterns = [
-    path('ws/admin/custom/ticket/<int:ticket_id>/chat', consumers.AdminChatConsumer.as_asgi()),
+    path("ws/admin/custom/ticket/<int:ticket_id>/chat", consumers.AdminChatConsumer.as_asgi()),
 ]
diff --git a/custom_admin/urls.py b/custom_admin/urls.py
index 353b834..020eb72 100644
--- a/custom_admin/urls.py
+++ b/custom_admin/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path
 
 from . import views
 
diff --git a/custom_admin/views.py b/custom_admin/views.py
index a91e6d8..3d13253 100644
--- a/custom_admin/views.py
+++ b/custom_admin/views.py
@@ -1,9 +1,7 @@
-import json
-
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import EmptyPage, InvalidPage, Paginator
-from django.shortcuts import render, redirect
+from django.shortcuts import redirect, render
 
 from ticket.models import Ticket
 
@@ -11,17 +9,15 @@
 @login_required
 @staff_member_required
 def index(request):
-    context = {
-        "tickets": Ticket.objects.all()
-    }
+    context = {"tickets": Ticket.objects.all()}
     return render(request, "custom_admin/index.html", context)
 
 
 @login_required
 @staff_member_required
 def ticket_list(request):
-    if request.method == 'POST':
-        id = request.POST.get('id', 0)
+    if request.method == "POST":
+        id = request.POST.get("id", 0)
         ticket = Ticket.objects.get(id=int(id))
         if "no_solved" in request.POST:
             ticket.is_solved = False
@@ -29,9 +25,9 @@ def ticket_list(request):
         elif "solved" in request.POST:
             ticket.is_solved = True
             ticket.save()
-        return redirect('/admin/custom/ticket')
+        return redirect("/admin/custom/ticket")
 
-    is_solved = request.GET.get('is_solved', "false")
+    is_solved = request.GET.get("is_solved", "false")
     ticket_objects = Ticket.objects.filter(is_solved=True if is_solved == "true" else False)
 
     paginator = Paginator(ticket_objects, int(request.GET.get("per_page", "5")))
@@ -53,5 +49,5 @@ def chat(request, ticket_id):
     ticket = Ticket.objects.get(id=ticket_id)
     if not ticket:
         return render(request, "ticket/chat_error.html", {})
-    context = {"ticket": ticket, "chats": ticket.chat_set.order_by('created_at').all()}
+    context = {"ticket": ticket, "chats": ticket.chat_set.order_by("created_at").all()}
     return render(request, "custom_admin/ticket/chat.html", context)
diff --git a/custom_auth/admin.py b/custom_auth/admin.py
index 1f33386..78c5559 100644
--- a/custom_auth/admin.py
+++ b/custom_auth/admin.py
@@ -1,5 +1,6 @@
 from django.contrib import admin
-from custom_auth.models import User, Group, UserActivateToken, TOTPDevice
+
+from custom_auth.models import Group, TOTPDevice, User, UserActivateToken
 
 
 class TermInlineUserAdmin(admin.TabularInline):
@@ -15,15 +16,27 @@ class TermInlineGroupAdmin(admin.TabularInline):
 @admin.register(User)
 class User(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ('username', 'username_jp', 'password')}),
-        ('Personal info', {'fields': ('email',)}),
-        ('Flags', {'fields': ('is_active', 'is_staff', 'allow_group_add')}),
-        ('Important dates', {'fields': ('last_login', 'created_at', 'updated_at')}),
+        (None, {"fields": ("username", "username_jp", "password")}),
+        ("Personal info", {"fields": ("email",)}),
+        ("Flags", {"fields": ("is_active", "is_staff", "allow_group_add")}),
+        ("Important dates", {"fields": ("last_login", "created_at", "updated_at")}),
+    )
+    list_display = (
+        "username",
+        "username_jp",
+        "is_active",
+        "is_staff",
+    )
+    list_filter = (
+        "is_staff",
+        "is_active",
+    )
+    search_fields = ("username", "username_jp", "email")
+    readonly_fields = (
+        "last_login",
+        "created_at",
+        "updated_at",
     )
-    list_display = ('username', 'username_jp', 'is_active', 'is_staff',)
-    list_filter = ('is_staff', 'is_active',)
-    search_fields = ('username', 'username_jp', 'email')
-    readonly_fields = ('last_login', 'created_at', 'updated_at',)
 
     inlines = (TermInlineUserAdmin,)
 
@@ -34,16 +47,43 @@ def get_groups(self, obj):
 @admin.register(Group)
 class Group(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ('name', 'name_jp', 'allow_service_add', 'is_pass', 'comment')}),
-        ('Membership', {'fields': ('membership_type', 'membership_expired_at')}),
-        ('Question', {'fields': ('agree', 'question')}),
-        ('Stripe', {'fields': ('stripe_customer_id', 'stripe_subscription_id')}),
-        ('Personal info', {'fields': ('postcode', 'address', 'address_jp', 'phone', 'country', 'contract_type',)}),
+        (None, {"fields": ("name", "name_jp", "allow_service_add", "is_pass", "comment")}),
+        ("Membership", {"fields": ("membership_type", "membership_expired_at")}),
+        ("Question", {"fields": ("agree", "question")}),
+        ("Stripe", {"fields": ("stripe_customer_id", "stripe_subscription_id")}),
+        (
+            "Personal info",
+            {
+                "fields": (
+                    "postcode",
+                    "address",
+                    "address_jp",
+                    "phone",
+                    "country",
+                    "contract_type",
+                )
+            },
+        ),
+    )
+    list_display = (
+        "name",
+        "name_jp",
+        "membership_type",
+        "membership_expired_at",
+    )
+    list_filter = (
+        "membership_type",
+        "is_pass",
+        "allow_service_add",
+    )
+    search_fields = (
+        "name",
+        "name_jp",
+    )
+    readonly_fields = (
+        "created_at",
+        "updated_at",
     )
-    list_display = ('name', 'name_jp', 'membership_type', 'membership_expired_at',)
-    list_filter = ('membership_type', 'is_pass', 'allow_service_add',)
-    search_fields = ('name', 'name_jp',)
-    readonly_fields = ('created_at', 'updated_at',)
 
     inlines = (TermInlineGroupAdmin,)
 
@@ -51,20 +91,29 @@ class Group(admin.ModelAdmin):
 @admin.register(UserActivateToken)
 class UserActivateToken(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ('user', 'token', 'expired_at', 'is_used')}),
-        ('Important dates', {'fields': ('created_at',)}),
+        (None, {"fields": ("user", "token", "expired_at", "is_used")}),
+        ("Important dates", {"fields": ("created_at",)}),
     )
-    list_display = ('user', 'token', 'expired_at', 'is_used')
-    list_filter = ('is_used',)
-    search_fields = ('user', 'token', 'expired_at', 'is_used')
+    list_display = ("user", "token", "expired_at", "is_used")
+    list_filter = ("is_used",)
+    search_fields = ("user", "token", "expired_at", "is_used")
 
 
 @admin.register(TOTPDevice)
 class TOTPDevice(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ('title', 'is_active', 'user', 'secret')}),
-        ('Important dates', {'fields': ('created_at',)}),
+        (None, {"fields": ("title", "is_active", "user", "secret")}),
+        ("Important dates", {"fields": ("created_at",)}),
+    )
+    list_display = (
+        "id",
+        "is_active",
+        "title",
+        "user",
+    )
+    list_filter = ("is_active",)
+    search_fields = (
+        "id",
+        "is_active",
+        "title",
     )
-    list_display = ('id', 'is_active', 'title', 'user',)
-    list_filter = ('is_active',)
-    search_fields = ('id', 'is_active', 'title',)
diff --git a/custom_auth/apps.py b/custom_auth/apps.py
index f54bf44..94d8af9 100644
--- a/custom_auth/apps.py
+++ b/custom_auth/apps.py
@@ -2,9 +2,9 @@
 
 
 class CustomAuth(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'custom_auth'
-    verbose_name = 'カスタムユーザ'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "custom_auth"
+    verbose_name = "カスタムユーザ"
 
     def ready(self):
-        from . import signals
+        pass
diff --git a/custom_auth/form.py b/custom_auth/form.py
index 9807698..9e96193 100644
--- a/custom_auth/form.py
+++ b/custom_auth/form.py
@@ -1,23 +1,35 @@
 from django import forms
-
-from custom_auth.models import User, UserGroup, Group
 from django.contrib.auth.forms import PasswordChangeForm
 from django_countries.fields import CountryField
 
+from custom_auth.models import Group, User, UserGroup
+
 
 class GroupAddForm(forms.Form):
-    agree = forms.ChoiceField(label="1.1. 各規約に同意する", required=True,
-                              choices=((False, "同意しない"), (True, "同意する")))
-    question1 = forms.CharField(label="1.2.1. どこで当団体のことを知りましたか？", min_length=10, required=True,
-                                widget=forms.Textarea())
-    question2 = forms.CharField(label="1.2.2. どのような用途で当団体のネットワークに接続しますか？", min_length=10,
-                                required=True, widget=forms.Textarea())
-    question3 = forms.CharField(label="1.2.3. アドレスを当団体から割り当てる必要はありますか？", min_length=10,
-                                required=True,
-                                widget=forms.Textarea())
+    agree = forms.ChoiceField(
+        label="1.1. 各規約に同意する", required=True, choices=((False, "同意しない"), (True, "同意する"))
+    )
+    question1 = forms.CharField(
+        label="1.2.1. どこで当団体のことを知りましたか？", min_length=10, required=True, widget=forms.Textarea()
+    )
+    question2 = forms.CharField(
+        label="1.2.2. どのような用途で当団体のネットワークに接続しますか？",
+        min_length=10,
+        required=True,
+        widget=forms.Textarea(),
+    )
+    question3 = forms.CharField(
+        label="1.2.3. アドレスを当団体から割り当てる必要はありますか？",
+        min_length=10,
+        required=True,
+        widget=forms.Textarea(),
+    )
     question4 = forms.CharField(
         label="1.2.4. 情報発信しているSNS(Twitter,Facebook)やWebサイト、GitHub、成果物などがありましたら教えてください",
-        min_length=10, required=True, widget=forms.Textarea())
+        min_length=10,
+        required=True,
+        widget=forms.Textarea(),
+    )
     name = forms.CharField(label="2.1. グループ名", max_length=150, required=True)
     name_jp = forms.CharField(label="2.2.グループ名(Japanese)", max_length=150, required=True)
     postcode = forms.CharField(label="2.3.郵便番号", max_length=10, required=True)
@@ -25,31 +37,35 @@ class GroupAddForm(forms.Form):
     address_jp = forms.CharField(label="2.5. 住所(Japanese)", max_length=250, required=True)
     phone = forms.CharField(label="2.6. phone", max_length=30, required=True)
     country = CountryField().formfield(label="2.7. 居住国", required=True)
-    contract = forms.ChoiceField(label="3. 契約書", required=True,
-                                 choices=(("E-Mail", "電子交付を希望する"), ("AirMail", "書面の郵送を希望する")))
+    contract = forms.ChoiceField(
+        label="3. 契約書",
+        required=True,
+        choices=(("E-Mail", "電子交付を希望する"), ("AirMail", "書面の郵送を希望する")),
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
     def clean(self):
-        agree = self.cleaned_data.get('agree')
+        agree = self.cleaned_data.get("agree")
         if not agree:
             raise forms.ValidationError("規約に同意されていません")
 
     def create_group(self, user_id):
-        question1 = self.cleaned_data.get('question1')
-        question2 = self.cleaned_data.get('question2')
-        question3 = self.cleaned_data.get('question3')
-        question4 = self.cleaned_data.get('question4')
+        question1 = self.cleaned_data.get("question1")
+        question2 = self.cleaned_data.get("question2")
+        question3 = self.cleaned_data.get("question3")
+        question4 = self.cleaned_data.get("question4")
         question = (
             f"1. どこで当団体のことを知りましたか？\n{question1}\n\n"
             f"2. どのような用途で当団体のネットワークに接続しますか？\n{question2}\n\n"
             f"3. アドレスを当団体から割り当てる必要はありますか？\n{question3}\n\n"
-            f"4. 情報発信しているSNS(Twitter,Facebook)やWebサイト、GitHub、成果物などがありましたら教えてください\n{question4}"
+            f"4. 情報発信しているSNS(Twitter,Facebook)やWebサイト、GitHub、成果物などがありましたら教えてください\n"
+            f"{question4}"
         )
         try:
             group = Group.objects.create_group(
@@ -61,34 +77,40 @@ def create_group(self, user_id):
                 address_jp=self.cleaned_data["address_jp"],
                 phone=self.cleaned_data["phone"],
                 country=self.cleaned_data["country"],
-                contract_type=self.cleaned_data["contract"]
+                contract_type=self.cleaned_data["contract"],
             )
-        except:
+        except Exception:
             raise ValueError("グループの登録に失敗しました(名前が被っている可能性があります)")
 
         try:
             user = User.objects.get(id=user_id)
             user.allow_group_add = False
             user.save()
-        except:
+        except Exception:
             raise ValueError("ユーザ情報の変更に失敗しました")
 
         try:
             UserGroup.objects.create(user=user, group=group, is_admin=True)
-        except:
+        except Exception:
             raise ValueError("ユーザとグループの紐づけに失敗しました")
 
 
 class StudentEditForm(forms.Form):
-    membership_expired_at = forms.DateField(label="有効期限", required=True, )
-    file = forms.FileField(label="学生証明", required=True, )
+    membership_expired_at = forms.DateField(
+        label="有効期限",
+        required=True,
+    )
+    file = forms.FileField(
+        label="学生証明",
+        required=True,
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
     def create_group(self, user_id):
         try:
@@ -99,21 +121,21 @@ def create_group(self, user_id):
                 address_en=self.cleaned_data["address_en"],
                 email=self.cleaned_data["email"],
                 phone=self.cleaned_data["phone"],
-                country=self.cleaned_data["country"]
+                country=self.cleaned_data["country"],
             )
-        except:
+        except Exception:
             raise ValueError("グループの登録に失敗しました(名前が被っている可能性があります。)")
 
         try:
             user = User.objects.get(id=user_id)
             user.group_add = False
             user.save()
-        except:
+        except Exception:
             raise ValueError("ユーザ情報の変更に失敗しました")
 
         try:
             UserGroup.objects.create(user=user, group=group, is_admin=True)
-        except:
+        except Exception:
             raise ValueError("ユーザとグループの紐づけに失敗しました")
 
 
@@ -128,23 +150,24 @@ class GroupForm(forms.Form):
     def __init__(self, edit=False, disable=False, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if edit:
-            self.fields['name'].widget.attrs['readonly'] = True
+            self.fields["name"].widget.attrs["readonly"] = True
             if disable:
-                self.fields['postcode'].widget.attrs['disabled'] = True
-                self.fields['address'].widget.attrs['disabled'] = True
-                self.fields['address_en'].widget.attrs['disabled'] = True
-                self.fields['phone'].widget.attrs['disabled'] = True
-                self.fields['country'].widget.attrs['disabled'] = True
-        self.fields['name'].widget.attrs['class'] = 'form-control'
-        self.fields['postcode'].widget.attrs['class'] = 'form-control p-postal-code'
-        self.fields['address'].widget.attrs[
-            'class'] = 'form-control p-region p-locality p-street-address p-extended-address'
-        self.fields['address_en'].widget.attrs['class'] = 'form-control'
-        self.fields['phone'].widget.attrs['class'] = 'form-control'
-        self.fields['country'].widget.attrs['class'] = 'form-control p-country-name'
+                self.fields["postcode"].widget.attrs["disabled"] = True
+                self.fields["address"].widget.attrs["disabled"] = True
+                self.fields["address_en"].widget.attrs["disabled"] = True
+                self.fields["phone"].widget.attrs["disabled"] = True
+                self.fields["country"].widget.attrs["disabled"] = True
+        self.fields["name"].widget.attrs["class"] = "form-control"
+        self.fields["postcode"].widget.attrs["class"] = "form-control p-postal-code"
+        self.fields["address"].widget.attrs["class"] = (
+            "form-control p-region p-locality p-street-address p-extended-address"
+        )
+        self.fields["address_en"].widget.attrs["class"] = "form-control"
+        self.fields["phone"].widget.attrs["class"] = "form-control"
+        self.fields["country"].widget.attrs["class"] = "form-control p-country-name"
 
         for field in self.fields.values():
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["placeholder"] = field.label
 
     def update_group(self, group_id):
         try:
@@ -156,9 +179,9 @@ def update_group(self, group_id):
                 address_en=self.cleaned_data["address_en"],
                 email=self.cleaned_data["email"],
                 phone=self.cleaned_data["phone"],
-                country=self.cleaned_data["country"]
+                country=self.cleaned_data["country"],
             )
-        except:
+        except Exception:
             raise ValueError("グループの更新に失敗しました")
 
 
@@ -170,18 +193,18 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
 
 class MyPasswordChangeForm(PasswordChangeForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['old_password'].widget.attrs['class'] = 'form-control'
-        self.fields['new_password1'].widget.attrs['class'] = 'form-control'
-        self.fields['new_password2'].widget.attrs['class'] = 'form-control'
-        self.fields['new_password1'].widget.attrs['placeholder'] = '半角英数字８文字以上'
-        self.fields['new_password2'].widget.attrs['placeholder'] = 'パスワード確認用'
+        self.fields["old_password"].widget.attrs["class"] = "form-control"
+        self.fields["new_password1"].widget.attrs["class"] = "form-control"
+        self.fields["new_password2"].widget.attrs["class"] = "form-control"
+        self.fields["new_password1"].widget.attrs["placeholder"] = "半角英数字８文字以上"
+        self.fields["new_password2"].widget.attrs["placeholder"] = "パスワード確認用"
 
 
 class EmailChangeForm(forms.Form):
@@ -191,13 +214,13 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
     def save(self, user):
         try:
             User.objects.change_email(user=user, email=self.cleaned_data["email"])
-        except:
+        except Exception:
             raise ValueError("更新に失敗しました")
 
 
@@ -210,8 +233,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
     def save(self, user):
         try:
@@ -221,5 +244,5 @@ def save(self, user):
                 name_jp=self.cleaned_data["username_jp"],
                 display_name=self.cleaned_data["display_name"],
             )
-        except:
+        except Exception:
             raise ValueError("更新に失敗しました")
diff --git a/custom_auth/group_urls.py b/custom_auth/group_urls.py
index d8a7c60..27a13ff 100644
--- a/custom_auth/group_urls.py
+++ b/custom_auth/group_urls.py
@@ -1,7 +1,6 @@
-from django.urls import path, include
+from django.urls import path
 
 from . import views
-from django.contrib.auth import views as auth_views
 
 app_name = "custom_auth_group"
 urlpatterns = [
diff --git a/custom_auth/migrations/0001_initial.py b/custom_auth/migrations/0001_initial.py
index 5610db9..d4e05e8 100644
--- a/custom_auth/migrations/0001_initial.py
+++ b/custom_auth/migrations/0001_initial.py
@@ -1,136 +1,200 @@
 # Generated by Django 4.2.7 on 2023-11-26 12:06
 
-import custom_auth.models
-from django.conf import settings
+import uuid
+
 import django.contrib.auth.validators
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+import custom_auth.models
 import dsbd.models
-import uuid
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='User',
+            name="User",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('username', models.CharField(max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('username_jp', models.CharField(max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username(japanese)')),
-                ('email', models.EmailField(max_length=254, unique=True, verbose_name='email')),
-                ('is_staff', models.BooleanField(default=False, verbose_name='管理者ステータス')),
-                ('is_active', models.BooleanField(default=False, verbose_name='有効')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                ("last_login", models.DateTimeField(blank=True, null=True, verbose_name="last login")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                (
+                    "username",
+                    models.CharField(
+                        max_length=150,
+                        unique=True,
+                        validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "username_jp",
+                    models.CharField(
+                        max_length=150,
+                        unique=True,
+                        validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
+                        verbose_name="username(japanese)",
+                    ),
+                ),
+                ("email", models.EmailField(max_length=254, unique=True, verbose_name="email")),
+                ("is_staff", models.BooleanField(default=False, verbose_name="管理者ステータス")),
+                ("is_active", models.BooleanField(default=False, verbose_name="有効")),
             ],
             options={
-                'verbose_name': 'ユーザ',
-                'verbose_name_plural': 'ユーザ',
+                "verbose_name": "ユーザ",
+                "verbose_name_plural": "ユーザ",
             },
         ),
         migrations.CreateModel(
-            name='Group',
+            name="Group",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('name', models.CharField(max_length=150, unique=True, verbose_name='name')),
-                ('name_jp', models.CharField(max_length=150, unique=True, verbose_name='name(japanese)')),
-                ('comment', models.CharField(blank=True, default='', max_length=250, verbose_name='comment')),
-                ('status', models.IntegerField(choices=[(1, '有効'), (10, 'ユーザより廃止'), (11, '運営委員より廃止'), (12, '審査落ち')], default=0, verbose_name='ステータス')),
-                ('add_service', models.BooleanField(default=False, verbose_name='サービス追加許可')),
-                ('membership_type', models.IntegerField(choices=[(1, '一般会員'), (40, '運営委員(優勝)'), (70, '学生委員'), (90, '運営委員(無償)'), (99, 'その他')], default=1, verbose_name='会員種別')),
-                ('membership_expired_at', models.DateTimeField(blank=True, null=True, verbose_name='有効期限')),
-                ('agree', models.BooleanField(default=False, verbose_name='規約確認済み')),
-                ('question', dsbd.models.MediumTextField(default='', verbose_name='質問内容')),
-                ('is_pass', models.BooleanField(default=False, verbose_name='審査OK')),
-                ('stripe_customer_id', models.CharField(blank=True, max_length=200, null=True, verbose_name='Stripe(CusID)')),
-                ('stripe_subscription_id', models.CharField(blank=True, max_length=200, null=True, verbose_name='Stripe(SubID)')),
-                ('postcode', models.CharField(default='', max_length=20, verbose_name='郵便番号')),
-                ('address', models.CharField(default='', max_length=250, verbose_name='住所')),
-                ('address_en', models.CharField(default='', max_length=250, verbose_name='住所(English)')),
-                ('phone', models.CharField(default='', max_length=30, verbose_name='phone')),
-                ('country', models.CharField(default='Japan', max_length=100, verbose_name='居住国')),
-                ('contract_type', models.CharField(choices=[('E-Mail', 'E-Mail'), ('AirMail', 'AirMail)')], default='E-Mail', max_length=100, verbose_name='契約種別')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("name", models.CharField(max_length=150, unique=True, verbose_name="name")),
+                ("name_jp", models.CharField(max_length=150, unique=True, verbose_name="name(japanese)")),
+                ("comment", models.CharField(blank=True, default="", max_length=250, verbose_name="comment")),
+                (
+                    "status",
+                    models.IntegerField(
+                        choices=[(1, "有効"), (10, "ユーザより廃止"), (11, "運営委員より廃止"), (12, "審査落ち")],
+                        default=0,
+                        verbose_name="ステータス",
+                    ),
+                ),
+                ("add_service", models.BooleanField(default=False, verbose_name="サービス追加許可")),
+                (
+                    "membership_type",
+                    models.IntegerField(
+                        choices=[
+                            (1, "一般会員"),
+                            (40, "運営委員(優勝)"),
+                            (70, "学生委員"),
+                            (90, "運営委員(無償)"),
+                            (99, "その他"),
+                        ],
+                        default=1,
+                        verbose_name="会員種別",
+                    ),
+                ),
+                ("membership_expired_at", models.DateTimeField(blank=True, null=True, verbose_name="有効期限")),
+                ("agree", models.BooleanField(default=False, verbose_name="規約確認済み")),
+                ("question", dsbd.models.MediumTextField(default="", verbose_name="質問内容")),
+                ("is_pass", models.BooleanField(default=False, verbose_name="審査OK")),
+                (
+                    "stripe_customer_id",
+                    models.CharField(blank=True, max_length=200, null=True, verbose_name="Stripe(CusID)"),
+                ),
+                (
+                    "stripe_subscription_id",
+                    models.CharField(blank=True, max_length=200, null=True, verbose_name="Stripe(SubID)"),
+                ),
+                ("postcode", models.CharField(default="", max_length=20, verbose_name="郵便番号")),
+                ("address", models.CharField(default="", max_length=250, verbose_name="住所")),
+                ("address_en", models.CharField(default="", max_length=250, verbose_name="住所(English)")),
+                ("phone", models.CharField(default="", max_length=30, verbose_name="phone")),
+                ("country", models.CharField(default="Japan", max_length=100, verbose_name="居住国")),
+                (
+                    "contract_type",
+                    models.CharField(
+                        choices=[("E-Mail", "E-Mail"), ("AirMail", "AirMail)")],
+                        default="E-Mail",
+                        max_length=100,
+                        verbose_name="契約種別",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'グループ',
-                'verbose_name_plural': 'グループ',
+                "verbose_name": "グループ",
+                "verbose_name_plural": "グループ",
             },
         ),
         migrations.CreateModel(
-            name='UserGroup',
+            name="UserGroup",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('is_admin', models.BooleanField(default=False, verbose_name='管理者')),
-                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='custom_auth.group')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("is_admin", models.BooleanField(default=False, verbose_name="管理者")),
+                ("group", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="custom_auth.group")),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'ユーザ・グループ',
-                'verbose_name_plural': 'ユーザ・グループ',
-                'unique_together': {('user', 'group')},
+                "verbose_name": "ユーザ・グループ",
+                "verbose_name_plural": "ユーザ・グループ",
+                "unique_together": {("user", "group")},
             },
         ),
         migrations.CreateModel(
-            name='UserEmailVerify',
+            name="UserEmailVerify",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('token', models.CharField(max_length=100, verbose_name='token')),
-                ('expired_at', models.DateTimeField(default=custom_auth.models.email_verify_expire_date, verbose_name='有効期限')),
-                ('is_used', models.BooleanField(default=False, verbose_name='使用済み')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("token", models.CharField(max_length=100, verbose_name="token")),
+                (
+                    "expired_at",
+                    models.DateTimeField(default=custom_auth.models.email_verify_expire_date, verbose_name="有効期限"),
+                ),
+                ("is_used", models.BooleanField(default=False, verbose_name="使用済み")),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'E-Mail用のVerify',
-                'verbose_name_plural': 'E-Mail用のVerify',
+                "verbose_name": "E-Mail用のVerify",
+                "verbose_name_plural": "E-Mail用のVerify",
             },
         ),
         migrations.CreateModel(
-            name='UserActivateToken',
+            name="UserActivateToken",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('token', models.UUIDField(default=uuid.uuid4, verbose_name='Active token')),
-                ('expired_at', models.DateTimeField(default=custom_auth.models.user_activate_expire_date, verbose_name='有効期限')),
-                ('is_used', models.BooleanField(default=False, verbose_name='使用済み')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("token", models.UUIDField(default=uuid.uuid4, verbose_name="Active token")),
+                (
+                    "expired_at",
+                    models.DateTimeField(default=custom_auth.models.user_activate_expire_date, verbose_name="有効期限"),
+                ),
+                ("is_used", models.BooleanField(default=False, verbose_name="使用済み")),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'Activate用のToken',
-                'verbose_name_plural': 'Activate用のToken',
+                "verbose_name": "Activate用のToken",
+                "verbose_name_plural": "Activate用のToken",
             },
         ),
         migrations.CreateModel(
-            name='TOTPDevice',
+            name="TOTPDevice",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('title', models.CharField(max_length=100, verbose_name='title')),
-                ('secret', models.CharField(max_length=100, verbose_name='secret')),
-                ('is_active', models.BooleanField(default=False, verbose_name='有効')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("title", models.CharField(max_length=100, verbose_name="title")),
+                ("secret", models.CharField(max_length=100, verbose_name="secret")),
+                ("is_active", models.BooleanField(default=False, verbose_name="有効")),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'TOTP Device',
-                'verbose_name_plural': 'TOTP Device',
+                "verbose_name": "TOTP Device",
+                "verbose_name_plural": "TOTP Device",
             },
         ),
         migrations.AddField(
-            model_name='user',
-            name='groups',
-            field=models.ManyToManyField(blank=True, help_text='Specific Groups for this user.', related_name='user_set', related_query_name='user', through='custom_auth.UserGroup', to='custom_auth.group', verbose_name='groups'),
+            model_name="user",
+            name="groups",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Specific Groups for this user.",
+                related_name="user_set",
+                related_query_name="user",
+                through="custom_auth.UserGroup",
+                to="custom_auth.group",
+                verbose_name="groups",
+            ),
         ),
     ]
diff --git a/custom_auth/migrations/0002_user_display_name.py b/custom_auth/migrations/0002_user_display_name.py
index 9470716..76ebaa7 100644
--- a/custom_auth/migrations/0002_user_display_name.py
+++ b/custom_auth/migrations/0002_user_display_name.py
@@ -4,15 +4,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('custom_auth', '0001_initial'),
+        ("custom_auth", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='display_name',
-            field=models.CharField(blank=True, default='', max_length=150, verbose_name='display_name'),
+            model_name="user",
+            name="display_name",
+            field=models.CharField(blank=True, default="", max_length=150, verbose_name="display_name"),
         ),
     ]
diff --git a/custom_auth/migrations/0003_rename_add_service_group_allow_service_add_and_more.py b/custom_auth/migrations/0003_rename_add_service_group_allow_service_add_and_more.py
index cc83fc9..cd5a5a6 100644
--- a/custom_auth/migrations/0003_rename_add_service_group_allow_service_add_and_more.py
+++ b/custom_auth/migrations/0003_rename_add_service_group_allow_service_add_and_more.py
@@ -4,29 +4,28 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('custom_auth', '0002_user_display_name'),
+        ("custom_auth", "0002_user_display_name"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='group',
-            old_name='add_service',
-            new_name='allow_service_add',
+            model_name="group",
+            old_name="add_service",
+            new_name="allow_service_add",
         ),
         migrations.RemoveField(
-            model_name='group',
-            name='address_en',
+            model_name="group",
+            name="address_en",
         ),
         migrations.AddField(
-            model_name='group',
-            name='address_jp',
-            field=models.CharField(default='', max_length=250, verbose_name='住所(Japanese)'),
+            model_name="group",
+            name="address_jp",
+            field=models.CharField(default="", max_length=250, verbose_name="住所(Japanese)"),
         ),
         migrations.AddField(
-            model_name='user',
-            name='allow_group_add',
-            field=models.BooleanField(default=True, verbose_name='グループ追加許可'),
+            model_name="user",
+            name="allow_group_add",
+            field=models.BooleanField(default=True, verbose_name="グループ追加許可"),
         ),
     ]
diff --git a/custom_auth/migrations/0004_group_users_alter_user_groups.py b/custom_auth/migrations/0004_group_users_alter_user_groups.py
index ab49162..d482c78 100644
--- a/custom_auth/migrations/0004_group_users_alter_user_groups.py
+++ b/custom_auth/migrations/0004_group_users_alter_user_groups.py
@@ -5,20 +5,23 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('custom_auth', '0003_rename_add_service_group_allow_service_add_and_more'),
+        ("custom_auth", "0003_rename_add_service_group_allow_service_add_and_more"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='group',
-            name='users',
-            field=models.ManyToManyField(blank=True, related_name='group_users_set', through='custom_auth.UserGroup', to=settings.AUTH_USER_MODEL),
+            model_name="group",
+            name="users",
+            field=models.ManyToManyField(
+                blank=True, related_name="group_users_set", through="custom_auth.UserGroup", to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='groups',
-            field=models.ManyToManyField(blank=True, related_name='user_set', through='custom_auth.UserGroup', to='custom_auth.group'),
+            model_name="user",
+            name="groups",
+            field=models.ManyToManyField(
+                blank=True, related_name="user_set", through="custom_auth.UserGroup", to="custom_auth.group"
+            ),
         ),
     ]
diff --git a/custom_auth/models.py b/custom_auth/models.py
index d94f94a..e99803b 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -1,19 +1,18 @@
 import uuid
 
 import pyotp
+from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
 from django.contrib.auth.hashers import make_password
+from django.contrib.auth.models import Group
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.core.mail import send_mail
 from django.db import models
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.contrib.auth.models import Group, GroupManager
 
 from custom_auth.tool import random_string
-from django.apps import apps
-
 from dsbd.models import MediumTextField
 
 
@@ -21,8 +20,9 @@ class GroupManager(models.Manager):
     def active_filter(self):
         return self.filter(is_active=True)
 
-    def create_group(self, question, name, name_jp, postcode, address, address_jp, phone, country, contract_type,
-                     **extra_fields):
+    def create_group(
+        self, question, name, name_jp, postcode, address, address_jp, phone, country, contract_type, **extra_fields
+    ):
         extra_fields.setdefault("is_pass", False)
         return self.create(
             agree=True,
@@ -35,7 +35,7 @@ def create_group(self, question, name, name_jp, postcode, address, address_jp, p
             phone=phone,
             country=country,
             contract_type=contract_type,
-            **extra_fields
+            **extra_fields,
         )
 
     def update_group(self, group_id, postcode, address, address_en, email, phone, country):
@@ -74,7 +74,7 @@ def update_group(self, group_id, postcode, address, address_en, email, phone, co
 )
 
 
-class Group(models.Model):
+class Group(models.Model):  # noqa: F811
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
     name = models.CharField("name", max_length=150, unique=True)
@@ -104,8 +104,8 @@ class Group(models.Model):
     users = models.ManyToManyField(
         "User",
         blank=True,
-        through='UserGroup',
-        through_fields=('group', 'user'),
+        through="UserGroup",
+        through_fields=("group", "user"),
         related_name="group_users_set",
     )
 
@@ -124,9 +124,7 @@ def _create_user(self, username, username_jp, email, password, **extra_fields):
         if not username:
             raise ValueError("The given username must be set")
         email = self.normalize_email(email)
-        GlobalUserModel = apps.get_model(
-            self.model._meta.app_label, self.model._meta.object_name
-        )
+        GlobalUserModel = apps.get_model(self.model._meta.app_label, self.model._meta.object_name)
         username = GlobalUserModel.normalize_username(username)
         user = self.model(username=username, username_jp=username_jp, email=email, **extra_fields)
         user.password = make_password(password)
@@ -138,13 +136,16 @@ def create_user(self, username, username_jp, email, password, **extra_fields):
         extra_fields.setdefault("is_staff", False)
         extra_fields.setdefault("is_active", False)
         user = self._create_user(username, username_jp, email, password, **extra_fields)
-        user_activate_token = UserActivateToken.objects.create(
-            user=user
+        user_activate_token = UserActivateToken.objects.create(user=user)
+        subject = "Please Activate Your Account"
+        message = (
+            f"URLにアクセスしてアカウントを有効化してください。\n "
+            f"{settings.DOMAIN_URL}/activate/{user_activate_token.token}/"
         )
-        subject = 'Please Activate Your Account'
-        message = f'URLにアクセスしてアカウントを有効化してください。\n {settings.DOMAIN_URL}/activate/{user_activate_token.token}/'
         from_email = settings.DEFAULT_FROM_EMAIL
-        recipient_list = [user.email, ]
+        recipient_list = [
+            user.email,
+        ]
         send_mail(subject, message, from_email, recipient_list)
 
         return user
@@ -158,25 +159,28 @@ def create_superuser(self, username, email=None, password=None, **extra_fields):
 
         return self._create_user(username, email, password, **extra_fields)
 
-    def change_email(self, user=None, email=''):
+    def change_email(self, user=None, email=""):
         if not user:
             raise ValueError("user_id is not found......")
         if not email:
             raise ValueError("email is not found......")
         user.email = email
         user.is_active = False
-        user_activate_token = UserActivateToken.objects.create(
-            user=user
+        user_activate_token = UserActivateToken.objects.create(user=user)
+        subject = "Please Activate Your Changed Email"
+        message = (
+            f"メールアドレスが変更されたので、URLにアクセスしてアカウントを有効化してください。\n"
+            f" {settings.DOMAIN_URL}/activate/{user_activate_token.token}/"
         )
-        subject = 'Please Activate Your Changed Email'
-        message = f'メールアドレスが変更されたので、URLにアクセスしてアカウントを有効化してください。\n {settings.DOMAIN_URL}/activate/{user_activate_token.token}/'
         from_email = settings.DEFAULT_FROM_EMAIL
-        recipient_list = [email, ]
+        recipient_list = [
+            email,
+        ]
         send_mail(subject, message, from_email, recipient_list)
 
         user.save()
 
-    def update_user(self, user=None, name='', name_jp='', display_name=''):
+    def update_user(self, user=None, name="", name_jp="", display_name=""):
         if not user:
             raise ValueError("user_id is not found......")
         if not name:
@@ -206,16 +210,16 @@ class User(AbstractBaseUser):
     groups = models.ManyToManyField(
         "Group",
         blank=True,
-        through='UserGroup',
-        through_fields=('user', 'group'),
+        through="UserGroup",
+        through_fields=("user", "group"),
         related_name="user_set",
     )
 
     objects = UserManager()
 
-    EMAIL_FIELD = 'email'
-    USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = ['email']
+    EMAIL_FIELD = "email"
+    USERNAME_FIELD = "username"
+    REQUIRED_FIELDS = ["email"]
 
     class Meta:
         verbose_name = "ユーザ"
@@ -272,8 +276,8 @@ def activate_user_by_token(self, activate_token):
         if user_activate_token.is_used:
             raise ValueError("this token was used...")
         if user_activate_token.user.is_active:
-            raise ValueError('アカウントはすでに有効済みです')
-        if hasattr(user_activate_token, 'user'):
+            raise ValueError("アカウントはすでに有効済みです")
+        if hasattr(user_activate_token, "user"):
             user = user_activate_token.user
             user.is_active = True
             user.save()
@@ -291,7 +295,7 @@ class UserActivateToken(models.Model):
     objects = UserActivateTokensManager()
 
     class Meta:
-        verbose_name = 'Activate用のToken'
+        verbose_name = "Activate用のToken"
         verbose_name_plural = "Activate用のToken"
 
     def __str__(self):
@@ -310,9 +314,9 @@ class UserGroup(models.Model):
     is_admin = models.BooleanField("管理者", default=False)
 
     class Meta:
-        verbose_name = 'ユーザ・グループ'
+        verbose_name = "ユーザ・グループ"
         verbose_name_plural = "ユーザ・グループ"
-        unique_together = ('user', 'group')
+        unique_together = ("user", "group")
 
     def __str__(self):
         return "%s-%s" % (self.user.username, self.group.name)
@@ -325,18 +329,18 @@ def create_token(self, user=None):
         code = random_string(10)
         self.create(user_id=user.id, token=code)
         subject = "認証コード"
-        message = render_to_string("mail/account/two_auth.txt", {
-            "code": code,
-            "expired_time": settings.USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES
-        })
+        message = render_to_string(
+            "mail/account/two_auth.txt",
+            {"code": code, "expired_time": settings.USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES},
+        )
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email], fail_silently=False)
 
-    def check_token(self, user_id=None, token=''):
+    def check_token(self, user_id=None, token=""):
         if not user_id:
             raise ValueError("user_id is not found......")
         try:
             sign_up_key = self.filter(token=token, expired_at__gt=timezone.now(), is_used=False).first()
-        except:
+        except Exception:
             return False
         # keyがない時
         if not sign_up_key:
@@ -355,11 +359,14 @@ class UserEmailVerify(models.Model):
     objects = UserEmailVerifyManager()
 
     class Meta:
-        verbose_name = 'E-Mail用のVerify'
+        verbose_name = "E-Mail用のVerify"
         verbose_name_plural = "E-Mail用のVerify"
 
     def __str__(self):
-        return "%d[%s]" % (self.id, self.user.username,)
+        return "%d[%s]" % (
+            self.id,
+            self.user.username,
+        )
 
 
 class TOTPDeviceManager(models.Manager):
@@ -372,15 +379,15 @@ def generate_secret(self, email=""):
         otp_secret = pyotp.random_base32()
         return {
             "secret": otp_secret,
-            "url": pyotp.totp.TOTP(otp_secret).provisioning_uri(name=email, issuer_name=settings.APP_NAME)
+            "url": pyotp.totp.TOTP(otp_secret).provisioning_uri(name=email, issuer_name=settings.APP_NAME),
         }
 
-    def create_secret(self, user=None, title='', otp_secret=''):
+    def create_secret(self, user=None, title="", otp_secret=""):
         if not user:
             raise ValueError("user_id is not found......")
         self.create(title=title, user=user, secret=otp_secret, is_active=True)
 
-    def check_totp(self, user=None, code=''):
+    def check_totp(self, user=None, code=""):
         if not user:
             raise ValueError("user_id is not found......")
         totp_array = self.filter(user=user)
@@ -413,7 +420,7 @@ class TOTPDevice(models.Model):
     objects = TOTPDeviceManager()
 
     class Meta:
-        verbose_name = 'TOTP Device'
+        verbose_name = "TOTP Device"
         verbose_name_plural = "TOTP Device"
 
     def __str__(self):
diff --git a/custom_auth/signals.py b/custom_auth/signals.py
index c9de311..ebee9de 100644
--- a/custom_auth/signals.py
+++ b/custom_auth/signals.py
@@ -30,39 +30,44 @@ def delete_user(sender, instance, **kwargs):
 
 
 def get_create_user(short, instance):
-    text = '--%d[%s]--\n' % (instance.id, instance.username,)
-    return text if not short else text + '有効: %r\nE-Mail: %s\n' % (
-        instance.is_active, instance.email)
+    text = "--%d[%s]--\n" % (
+        instance.id,
+        instance.username,
+    )
+    return text if not short else text + "有効: %r\nE-Mail: %s\n" % (instance.is_active, instance.email)
 
 
 def get_update_user(before, after):
-    text = '%s----更新状況----\n' % (get_create_user(True, before),)
+    text = "%s----更新状況----\n" % (get_create_user(True, before),)
     if before.username != after.username:
-        text += 'username: %s => %s\n' % (before.username, after.username)
+        text += "username: %s => %s\n" % (before.username, after.username)
     if before.username_jp != after.username_jp:
-        text += 'username(jp): %s => %s\n' % (before.username, after.username)
+        text += "username(jp): %s => %s\n" % (before.username, after.username)
     if before.email != after.email:
-        text += 'E-Mail: %s => %s\n' % (before.email, after.email)
+        text += "E-Mail: %s => %s\n" % (before.email, after.email)
     if before.is_active != after.is_active:
-        text += '有効: %r => %r\n' % (before.is_active, after.is_active)
-    text += '------------\n'
+        text += "有効: %r => %r\n" % (before.is_active, after.is_active)
+    text += "------------\n"
     return text
 
 
 def get_create_signup_key(short, instance):
-    text = '--%d[%s]--\n' % (instance.id, instance.key,)
-    return text if not short else text + '利用済み: %r\n有効期限: %s\n' % (instance.is_used, instance.expired_at)
+    text = "--%d[%s]--\n" % (
+        instance.id,
+        instance.key,
+    )
+    return text if not short else text + "利用済み: %r\n有効期限: %s\n" % (instance.is_used, instance.expired_at)
 
 
 def get_update_signup_key(before, after):
-    text = '%s----更新状況----\n' % (get_create_signup_key(True, before),)
+    text = "%s----更新状況----\n" % (get_create_signup_key(True, before),)
     if before.key != after.key:
-        text += 'key: %s => %s\n' % (before.key, after.key)
+        text += "key: %s => %s\n" % (before.key, after.key)
     if before.is_used != after.is_used:
-        text += '使用済み: %r => %r\n' % (before.is_used, after.is_used)
+        text += "使用済み: %r => %r\n" % (before.is_used, after.is_used)
     if before.expired_at != after.expired_at:
-        text += '有効期限: %s => %s\n' % (before.expired_at, after.expired_at)
+        text += "有効期限: %s => %s\n" % (before.expired_at, after.expired_at)
     if before.comment != after.comment:
-        text += 'comment: %r => %r\n' % (before.comment, after.comment)
-    text += '------------\n'
+        text += "comment: %r => %r\n" % (before.comment, after.comment)
+    text += "------------\n"
     return text
diff --git a/custom_auth/tool.py b/custom_auth/tool.py
index ebd5d94..0b85aeb 100644
--- a/custom_auth/tool.py
+++ b/custom_auth/tool.py
@@ -4,4 +4,4 @@
 
 def random_string(num):
     random_list = [random.choice(string.ascii_letters + string.digits) for i in range(num)]
-    return ''.join(random_list)
\ No newline at end of file
+    return "".join(random_list)
diff --git a/custom_auth/urls.py b/custom_auth/urls.py
index ae0b80b..4ba0db8 100644
--- a/custom_auth/urls.py
+++ b/custom_auth/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path
 
 from . import views
 
diff --git a/custom_auth/views.py b/custom_auth/views.py
index 8cf8e6b..50d2f3c 100644
--- a/custom_auth/views.py
+++ b/custom_auth/views.py
@@ -5,13 +5,19 @@
 import pyotp
 import qrcode
 import stripe
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render, redirect
-
-from custom_auth.form import TwoAuthForm, GroupForm, MyPasswordChangeForm, EmailChangeForm, ProfileEditForm, \
-    GroupAddForm
+from django.shortcuts import redirect, render
+
+from custom_auth.form import (
+    EmailChangeForm,
+    GroupAddForm,
+    GroupForm,
+    MyPasswordChangeForm,
+    ProfileEditForm,
+    TwoAuthForm,
+)
 from custom_auth.models import TOTPDevice, UserGroup
-from django.conf import settings
 
 
 @login_required
@@ -23,22 +29,22 @@ def index(request):
 @login_required
 def password_change(request):
     form = MyPasswordChangeForm(user=request.user, data=request.POST or None)
-    if request.method == 'POST':
+    if request.method == "POST":
         if form.is_valid():
             form.save()
-            return render(request, "done.html", {'text': "パスワードの変更を行いました"})
-    context = {'form': form}
+            return render(request, "done.html", {"text": "パスワードの変更を行いました"})
+    context = {"form": form}
     return render(request, "user/change_password.html", context)
 
 
 @login_required
 def change_email(request):
     form = EmailChangeForm(data=request.POST or None)
-    if request.method == 'POST':
+    if request.method == "POST":
         if form.is_valid():
             form.save(user=request.user)
-            return render(request, "done.html", {'text': "メールアドレスの変更を行いました"})
-    return render(request, "user/change_email.html", {'form': form})
+            return render(request, "done.html", {"text": "メールアドレスの変更を行いました"})
+    return render(request, "user/change_email.html", {"form": form})
 
 
 @login_required
@@ -49,14 +55,14 @@ def edit_profile(request):
         "username_jp": request.user.username_jp,
         "display_name": request.user.display_name,
     }
-    if request.method == 'POST':
+    if request.method == "POST":
         if form.is_valid():
             form.save(user=request.user)
-            return render(request, "done.html", {'text': "プロフィールの変更を行いました"})
+            return render(request, "done.html", {"text": "プロフィールの変更を行いました"})
     else:
         form = ProfileEditForm(initial=userdata)
 
-    return render(request, "user/edit_profile.html", {'form': form})
+    return render(request, "user/edit_profile.html", {"form": form})
 
 
 @login_required
@@ -66,21 +72,19 @@ def add_two_auth(request):
     secret = TOTPDevice.objects.generate_secret()
     form = TwoAuthForm()
     buffer = BytesIO()
-    qrcode.make(secret.get('url')).save(buffer)
+    qrcode.make(secret.get("url")).save(buffer)
     qr = base64.b64encode(buffer.getvalue()).decode().replace("'", "")
-    if request.method == 'POST':
-        id = request.POST.get('id', 0)
-        if id == 'submit' and initial_check:
+    if request.method == "POST":
+        id = request.POST.get("id", 0)
+        if id == "submit" and initial_check:
             form = TwoAuthForm(request.POST)
             otp_secret = request.POST.get("secret")
             if form.is_valid():
-                code = form.cleaned_data['code']
+                code = form.cleaned_data["code"]
                 verify_code = pyotp.TOTP(otp_secret).verify(code)
                 if verify_code:
                     TOTPDevice.objects.create_secret(
-                        user=request.user,
-                        title=form.cleaned_data['title'],
-                        otp_secret=otp_secret
+                        user=request.user, title=form.cleaned_data["title"], otp_secret=otp_secret
                     )
                     return redirect("custom_auth:list_two_auth")
                 else:
@@ -91,12 +95,12 @@ def add_two_auth(request):
             error = "request error"
 
     context = {
-        'initial_check': initial_check,
-        'secret': secret.get('secret'),
-        'url': secret.get('url'),
-        'qr': qr,
-        'form': form,
-        'error': error
+        "initial_check": initial_check,
+        "secret": secret.get("secret"),
+        "url": secret.get("url"),
+        "qr": qr,
+        "form": form,
+        "error": error,
     }
 
     return render(request, "user/two_auth/add.html", context)
@@ -104,12 +108,12 @@ def add_two_auth(request):
 
 @login_required
 def list_two_auth(request):
-    if request.method == 'POST':
-        id = request.POST.get('id', 0)
-        device_id = int(request.POST.get('device_id', 0))
-        if id == 'delete':
+    if request.method == "POST":
+        id = request.POST.get("id", 0)
+        device_id = int(request.POST.get("device_id", 0))
+        if id == "delete":
             TOTPDevice.objects.remove(id=device_id, user=request.user)
-    context = {'devices': TOTPDevice.objects.list(user=request.user)}
+    context = {"devices": TOTPDevice.objects.list(user=request.user)}
     return render(request, "user/two_auth/list.html", context)
 
 
@@ -117,10 +121,9 @@ def list_two_auth(request):
 def list_groups(request):
     data = []
     for group in request.user.groups.all():
-        data.append({
-            "group": group,
-            "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-        })
+        data.append(
+            {"group": group, "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()}
+        )
 
     if request.method == "POST":
         stripe.api_key = settings.STRIPE_SECRET_KEY
@@ -129,16 +132,19 @@ def list_groups(request):
         group = request.user.groups.get(id=group_id)
         administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
         if administrator and id == "create_stripe_customer":
-            name = "[GROUP] %d: %s" % (int(group_id), group.name,)
+            name = "[GROUP] %d: %s" % (
+                int(group_id),
+                group.name,
+            )
             if not group.stripe_customer_id:
                 cus = stripe.Customer.create(
                     name=name,
                     description="doornoc_service",  # TODO: change description
                     metadata={
-                        'id': "doornoc_service",  # TODO: change description
-                        'user_id': request.user.id,
-                        'group_id': group_id
-                    }
+                        "id": "doornoc_service",  # TODO: change description
+                        "user_id": request.user.id,
+                        "group_id": group_id,
+                    },
                 )
                 group.stripe_customer_id = cus.id
                 group.save()
@@ -147,14 +153,11 @@ def list_groups(request):
         elif administrator and id == "getting_portal":
             if group.stripe_customer_id:
                 session = stripe.billing_portal.Session.create(
-                    customer=group.stripe_customer_id,
-                    return_url=settings.DOMAIN_URL + "/group"
+                    customer=group.stripe_customer_id, return_url=settings.DOMAIN_URL + "/group"
                 )
                 return redirect(session.url, code=303)
 
-    context = {
-        "data": data
-    }
+    context = {"data": data}
     return render(request, "group/index.html", context)
 
 
@@ -164,17 +167,14 @@ def add_group(request):
     form = GroupAddForm(data=request.POST or None)
     if not request.user.allow_group_add:
         error = "グループの新規登録が申請不可能です"
-    elif request.method == 'POST':
+    elif request.method == "POST":
         if form.is_valid():
             try:
                 form.create_group(user_id=request.user.id)
-                return render(request, "done.html", {'text': "登録・変更が完了しました"})
+                return render(request, "done.html", {"text": "登録・変更が完了しました"})
             except ValueError as err:
                 error = err
-    context = {
-        "form": form,
-        "error": error
-    }
+    context = {"form": form, "error": error}
     return render(request, "group/add.html", context)
 
 
@@ -193,26 +193,21 @@ def edit_group(request, group_id):
             "country": group.country,
         }
         administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-        if request.method == 'POST' and administrator and group.is_pass:
+        if request.method == "POST" and administrator and group.is_pass:
             form = GroupForm(data=request.POST)
             if form.is_valid():
                 try:
                     form.update_group(group_id=group.id)
-                    return render(request, "done.html", {'text': "登録・変更が完了しました"})
+                    return render(request, "done.html", {"text": "登録・変更が完了しました"})
                 except ValueError as err:
                     error = err
         else:
             form = GroupForm(initial=group_data, edit=True, disable=not group.is_pass)
-    except:
+    except Exception:
         group = None
         form = None
 
-    context = {
-        "form": form,
-        "group": group,
-        "administrator": administrator,
-        "error": error
-    }
+    context = {"form": form, "group": group, "administrator": administrator, "error": error}
     return render(request, "group/edit.html", context)
 
 
@@ -225,8 +220,8 @@ def group_permission(request, group_id):
         group = request.user.groups.get(id=group_id)
         permission_all = group.usergroup_set.all()
         administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-        if request.method == 'POST' and administrator and group.is_active:
-            id = request.POST.get('id', 0)
+        if request.method == "POST" and administrator and group.is_active:
+            id = request.POST.get("id", 0)
             is_exists = False
             for permission_user in permission_all:
                 if permission_user.id == int(id):
@@ -243,18 +238,13 @@ def group_permission(request, group_id):
                     elif "admin" in request.POST:
                         user_group.is_admin = True
                         user_group.save()
-                    return redirect('/group/permission/%d' % group_id)
-                except:
+                    return redirect("/group/permission/%d" % group_id)
+                except Exception:
                     error = "アップデート処理でエラーが発生しました"
-    except:
+    except Exception:
         group = None
 
-    context = {
-        "group": group,
-        "permission": permission_all,
-        "administrator": administrator,
-        "error": error
-    }
+    context = {"group": group, "permission": permission_all, "administrator": administrator, "error": error}
     return render(request, "group/edit_permission.html", context)
 
 
@@ -281,12 +271,14 @@ def group_payment(request, group_id):
                 tmp_prices = []
                 idx_prices = 0
                 for price in prices:
-                    tmp_price = [{
-                        "id": price.id,
-                        "interval": price.recurring.interval,
-                        "amount": price.unit_amount,
-                        "description": price.nickname
-                    }]
+                    tmp_price = [
+                        {
+                            "id": price.id,
+                            "interval": price.recurring.interval,
+                            "amount": price.unit_amount,
+                            "description": price.nickname,
+                        }
+                    ]
                     if idx_prices == 0:
                         tmp_prices = tmp_price
                     else:
@@ -295,13 +287,9 @@ def group_payment(request, group_id):
                         elif price.recurring.interval == "month":
                             tmp_prices = tmp_price + tmp_prices
                     idx_prices += 1
-                data.append({
-                    "name": product.name,
-                    "prices": tmp_prices,
-                    "number": int(product.metadata.tag)
-                })
-            data.sort(key=lambda x: x['number'])
-    except:
+                data.append({"name": product.name, "prices": tmp_prices, "number": int(product.metadata.tag)})
+            data.sort(key=lambda x: x["number"])
+    except Exception:
         group = None
     if administrator and request.method == "POST":
         id = request.POST.get("price_id", "")
@@ -331,7 +319,7 @@ def group_payment(request, group_id):
                         "group_id": group_id,
                         "log": "[" + str(group.id) + "] " + group.name,
                     }
-                }
+                },
             )
             return redirect(session.url, code=303)
 
@@ -340,6 +328,6 @@ def group_payment(request, group_id):
         "group": group,
         "permission": permission_all,
         "administrator": administrator,
-        "error": error
+        "error": error,
     }
     return render(request, "group/payment.html", context)
diff --git a/dsbd/asgi.py b/dsbd/asgi.py
index f1564dc..b6b8b7f 100644
--- a/dsbd/asgi.py
+++ b/dsbd/asgi.py
@@ -1,5 +1,4 @@
-"""
-ASGI config for dsbd project.
+"""ASGI config for dsbd project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -24,20 +23,15 @@ def __init__(self):
 
 django_asgi_app = get_asgi_application()
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dsbd.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dsbd.settings")
 
-from ticket import routing
 from custom_admin import routing as custom_admin_routing
+from ticket import routing
 
 url = []
 url += routing.urlpatterns
 url += custom_admin_routing.urlpatterns
 
-application = ProtocolTypeRouter({
-    'http': django_asgi_app,
-    'websocket': AllowedHostsOriginValidator(
-        AuthMiddlewareStack(
-            URLRouter(url)
-        )
-    )
-})
+application = ProtocolTypeRouter(
+    {"http": django_asgi_app, "websocket": AllowedHostsOriginValidator(AuthMiddlewareStack(URLRouter(url)))}
+)
diff --git a/dsbd/form.py b/dsbd/form.py
index 77bb67c..7de83ae 100644
--- a/dsbd/form.py
+++ b/dsbd/form.py
@@ -1,5 +1,5 @@
-from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm, SetPasswordForm
 from django import forms
+from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm, SetPasswordForm
 
 from custom_auth.models import User
 
@@ -11,8 +11,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
 
 class OTPForm(forms.Form):
@@ -22,8 +22,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
 
 class AuthTOTP(forms.Form):
@@ -33,8 +33,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
 
 class ForgetForm(PasswordResetForm):
@@ -42,8 +42,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
 
 class NewSetPasswordForm(SetPasswordForm):
@@ -51,8 +51,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
 
 class SignUpForm(forms.Form):
@@ -67,12 +67,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
     def clean(self):
-        password1 = self.cleaned_data.get('password1')
-        password2 = self.cleaned_data.get('password2')
+        password1 = self.cleaned_data.get("password1")
+        password2 = self.cleaned_data.get("password2")
         if password1 != password2:
             raise forms.ValidationError("パスワードが一致しません")
 
diff --git a/dsbd/models.py b/dsbd/models.py
index 441d8fd..935fffe 100644
--- a/dsbd/models.py
+++ b/dsbd/models.py
@@ -7,4 +7,3 @@ def db_type(self, connection):
             return "mediumtext"
         else:
             return super(MediumTextField, self).db_type(connection=connection)
-
diff --git a/dsbd/notify.py b/dsbd/notify.py
index 3be9d6d..79ed4e9 100644
--- a/dsbd/notify.py
+++ b/dsbd/notify.py
@@ -13,39 +13,24 @@ def notify_db_save(table_name="", type=0, data=""):
     client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
     client.send(
         text="[%s(%s)]" % (table_name, event_name),
-        attachments=[
-            {
-                "color": color,
-                "title": "[%s(%s)]" % (table_name, event_name),
-                "text": "%s" % (data,)
-            }
-        ])
+        attachments=[{"color": color, "title": "[%s(%s)]" % (table_name, event_name), "text": "%s" % (data,)}],
+    )
 
 
 def notice_payment(metadata_type="", event_type="", data=None):
     client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
     client.send(
-        text="[%s(%s)] %s-%s [%d円(/%s)]" % (
-            metadata_type,
-            event_type,
-            data['id'],
-            data['name'],
-            data['plan_amount'],
-            data['plan_interval']
-        ),
+        text="[%s(%s)] %s-%s [%d円(/%s)]"
+        % (metadata_type, event_type, data["id"], data["name"], data["plan_amount"], data["plan_interval"]),
         attachments=[
             {
                 "color": get_color(event_type),
-                "title": "[%s(%s)] %s-%s" % (metadata_type, event_type, data['id'], data['name']),
-                "text": "%s-%s\namount: %d(%s)\nstatus: %s" % (
-                    data['start'],
-                    data['end'],
-                    data['plan_amount'],
-                    data['plan_interval'],
-                    data['status']
-                )
+                "title": "[%s(%s)] %s-%s" % (metadata_type, event_type, data["id"], data["name"]),
+                "text": "%s-%s\namount: %d(%s)\nstatus: %s"
+                % (data["start"], data["end"], data["plan_amount"], data["plan_interval"], data["status"]),
             }
-        ])
+        ],
+    )
 
 
 def get_color(status):
diff --git a/dsbd/settings.py b/dsbd/settings.py
index 3086283..0b181d2 100644
--- a/dsbd/settings.py
+++ b/dsbd/settings.py
@@ -1,5 +1,4 @@
-"""
-Django settings for dsbd project.
+"""Django settings for dsbd project.
 
 Generated by 'django-admin startproject' using Django 4.2.2.
 
@@ -9,19 +8,21 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.2/ref/settings/
 """
+
 import os
 from importlib import import_module
 from pathlib import Path
+
 import ldap
-from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
 from django.contrib.messages import constants as messages
+from django_auth_ldap.config import LDAPSearch
 
 
 def _import_ldap_group_type(group_type_name):
-    mod = import_module('django_auth_ldap.config')
+    mod = import_module("django_auth_ldap.config")
     try:
         return getattr(mod, group_type_name)()
-    except:
+    except Exception:
         return None
 
 
@@ -32,82 +33,82 @@ def _import_ldap_group_type(group_type_name):
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('SECRET_KEY', 'django-insecure-b5+e4te%74(m1y#kijgd4406u6)5_&=x^p85+0pwp^rs^8^s7x')
+SECRET_KEY = os.environ.get("SECRET_KEY", "django-insecure-b5+e4te%74(m1y#kijgd4406u6)5_&=x^p85+0pwp^rs^8^s7x")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = os.environ.get('DEBUG', 'false').lower() == 'true'
+DEBUG = os.environ.get("DEBUG", "false").lower() == "true"
 
-ADMIN_MODE = os.environ.get('ADMIN_MODE', 'false').lower() == 'true'
+ADMIN_MODE = os.environ.get("ADMIN_MODE", "false").lower() == "true"
 
-ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '*').split(' ')
-CSRF_TRUSTED_ORIGINS = os.environ.get('CSRF_TRUSTED_ORIGINS', 'http://localhost:8000').split(' ')
+ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "*").split(" ")
+CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS", "http://localhost:8000").split(" ")
 
-APP_NAME = 'HomeNOC User Dashboard'
-SITE_TITLE = os.environ.get('SITE_TITLE', 'HomeNOC User Dashboard')
-SITE_HEADER = os.environ.get('SITE_HEADER', 'HomeNOC User Dashboard')
+APP_NAME = "HomeNOC User Dashboard"
+SITE_TITLE = os.environ.get("SITE_TITLE", "HomeNOC User Dashboard")
+SITE_HEADER = os.environ.get("SITE_HEADER", "HomeNOC User Dashboard")
 
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'dsbd',
-    'daphne',
-    'django.contrib.staticfiles',
-    'widget_tweaks',
-    'django_countries',
-    'debug_toolbar',
-    'custom_auth',
-    'custom_admin',
-    'notice',
-    'ticket',
-    'noc',
-    'router',
-    'ip',
-    'service',
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "dsbd",
+    "daphne",
+    "django.contrib.staticfiles",
+    "widget_tweaks",
+    "django_countries",
+    "debug_toolbar",
+    "custom_auth",
+    "custom_admin",
+    "notice",
+    "ticket",
+    "noc",
+    "router",
+    "ip",
+    "service",
 ]
 
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
 AUTHENTICATION_BACKENDS = [
-    'django.contrib.auth.backends.ModelBackend',
-    'django_auth_ldap.backend.LDAPBackend',
+    "django.contrib.auth.backends.ModelBackend",
+    "django_auth_ldap.backend.LDAPBackend",
 ]
 
-ROOT_URLCONF = 'dsbd.urls'
+ROOT_URLCONF = "dsbd.urls"
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [BASE_DIR / 'dsbd/templates'],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [BASE_DIR / "dsbd/templates"],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
             ],
-            'builtins': ['dsbd.templatetags.extra'],
+            "builtins": ["dsbd.templatetags.extra"],
         },
     },
 ]
 
-WSGI_APPLICATION = 'dsbd.wsgi.application'
+WSGI_APPLICATION = "dsbd.wsgi.application"
 
 # Channels
-ASGI_APPLICATION = 'dsbd.asgi.application'
+ASGI_APPLICATION = "dsbd.asgi.application"
 
 # Database
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
@@ -115,11 +116,11 @@ def _import_ldap_group_type(group_type_name):
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
-        "NAME": os.environ.get('DATABASE_NAME', 'dsbd'),
-        "USER": os.environ.get('DATABASE_USER', 'dsbd'),
-        "PASSWORD": os.environ.get('DATABASE_PASSWORD', ''),
-        "HOST": os.environ.get('DATABASE_HOST', 'localhost'),
-        "PORT": os.environ.get('DATABASE_PORT', 3306),
+        "NAME": os.environ.get("DATABASE_NAME", "dsbd"),
+        "USER": os.environ.get("DATABASE_USER", "dsbd"),
+        "PASSWORD": os.environ.get("DATABASE_PASSWORD", ""),
+        "HOST": os.environ.get("DATABASE_HOST", "localhost"),
+        "PORT": os.environ.get("DATABASE_PORT", 3306),
         "OPTIONS": {
             "charset": "utf8mb4",
         },
@@ -135,32 +136,28 @@ def _import_ldap_group_type(group_type_name):
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
     },
 ]
 
 # Channel
-CHANNEL_LAYERS = {
-    "default": {
-        "BACKEND": "channels.layers.InMemoryChannelLayer"
-    }
-}
+CHANNEL_LAYERS = {"default": {"BACKEND": "channels.layers.InMemoryChannelLayer"}}
 
 # Internationalization
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
-LANGUAGE_CODE = 'ja'
+LANGUAGE_CODE = "ja"
 
-TIME_ZONE = 'Asia/Tokyo'
+TIME_ZONE = "Asia/Tokyo"
 
 USE_I18N = True
 
@@ -168,34 +165,36 @@ def _import_ldap_group_type(group_type_name):
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'dsbd/static')]
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATIC_URL = 'static/'
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "dsbd/static")]
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_URL = "static/"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 # AUTH_USER_MODEL
-AUTH_USER_MODEL = 'custom_auth.User'
+AUTH_USER_MODEL = "custom_auth.User"
 
 # Debug
 if DEBUG:
     import socket
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-    INTERNAL_IPS = [ip[: ip.rfind(".")] + ".1" for ip in ips] + ["127.0.0.1", ]
-    MIDDLEWARE.append('debug_toolbar.middleware.DebugToolbarMiddleware')
+    INTERNAL_IPS = [ip[: ip.rfind(".")] + ".1" for ip in ips] + [
+        "127.0.0.1",
+    ]
+    MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware")
 
 LOGIN_URL = "sign_in"
 LOGIN_REDIRECT_URL = "/"
 
-DOMAIN_URL = os.environ.get('DOMAIN_URL', 'http://localhost:8000')
+DOMAIN_URL = os.environ.get("DOMAIN_URL", "http://localhost:8000")
 
-USER_LOGIN_VERIFY_EMAIL_EXPIRED_HOURS = os.environ.get('USER_LOGIN_VERIFY_EMAIL_EXPIRED_HOURS', 1)
-USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES = os.environ.get('USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES', 10)
-USER_ACTIVATE_EXPIRED_DAYS = os.environ.get('USER_ACTIVATE_EXPIRED_DAYS', 7)
+USER_LOGIN_VERIFY_EMAIL_EXPIRED_HOURS = os.environ.get("USER_LOGIN_VERIFY_EMAIL_EXPIRED_HOURS", 1)
+USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES = os.environ.get("USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES", 10)
+USER_ACTIVATE_EXPIRED_DAYS = os.environ.get("USER_ACTIVATE_EXPIRED_DAYS", 7)
 
 # Custom URL
 USAGE_URL = "https://www.homenoc.ad.jp/usage/"
@@ -203,41 +202,39 @@ def _import_ldap_group_type(group_type_name):
 FEE_URL = "https://www.homenoc.ad.jp/about/membership/"
 
 # Stripe
-STRIPE_PRIVATE_KEY = os.environ.get('STRIPE_PRIVATE_KEY', '')
-STRIPE_SECRET_KEY = os.environ.get('STRIPE_SECRET_KEY', '')
-STRIPE_WEBHOOK_SECRET_KEY = os.environ.get('STRIPE_WEBHOOK_SECRET_KEY', '')
+STRIPE_PRIVATE_KEY = os.environ.get("STRIPE_PRIVATE_KEY", "")
+STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "")
+STRIPE_WEBHOOK_SECRET_KEY = os.environ.get("STRIPE_WEBHOOK_SECRET_KEY", "")
 
 # Slack
-SLACK_WEBHOOK_LOG = os.environ.get('SLACK_WEBHOOK_LOG', '')
+SLACK_WEBHOOK_LOG = os.environ.get("SLACK_WEBHOOK_LOG", "")
 
 # LDAP
-AUTH_LDAP_SERVER_URI = os.environ.get('AUTH_LDAP_SERVER_URI', '')
-AUTH_LDAP_BIND_DN = os.environ.get('AUTH_LDAP_BIND_DN', '')
-AUTH_LDAP_BIND_PASSWORD = os.environ.get('AUTH_LDAP_BIND_PASSWORD', '')
-AUTH_LDAP_USER_SEARCH_ATTR = os.environ.get('AUTH_LDAP_USER_SEARCH_ATTR', 'sAMAccountName')
+AUTH_LDAP_SERVER_URI = os.environ.get("AUTH_LDAP_SERVER_URI", "")
+AUTH_LDAP_BIND_DN = os.environ.get("AUTH_LDAP_BIND_DN", "")
+AUTH_LDAP_BIND_PASSWORD = os.environ.get("AUTH_LDAP_BIND_PASSWORD", "")
+AUTH_LDAP_USER_SEARCH_ATTR = os.environ.get("AUTH_LDAP_USER_SEARCH_ATTR", "sAMAccountName")
 AUTH_LDAP_USER_SEARCH = LDAPSearch(
-    os.environ.get('AUTH_LDAP_USER_SEARCH_BASE_DN', ''),
-    ldap.SCOPE_SUBTREE,
-    f'({AUTH_LDAP_USER_SEARCH_ATTR}=%(user)s)'
+    os.environ.get("AUTH_LDAP_USER_SEARCH_BASE_DN", ""), ldap.SCOPE_SUBTREE, f"({AUTH_LDAP_USER_SEARCH_ATTR}=%(user)s)"
 )
 AUTH_LDAP_USER_ATTR_MAP = {
-    "first_name": os.environ.get('AUTH_LDAP_ATTR_FIRSTNAME', 'givenName'),
-    "last_name": os.environ.get('AUTH_LDAP_ATTR_LASTNAME', 'sn'),
-    "email": os.environ.get('AUTH_LDAP_ATTR_MAIL', 'mail'),
+    "first_name": os.environ.get("AUTH_LDAP_ATTR_FIRSTNAME", "givenName"),
+    "last_name": os.environ.get("AUTH_LDAP_ATTR_LASTNAME", "sn"),
+    "email": os.environ.get("AUTH_LDAP_ATTR_MAIL", "mail"),
 }
-AUTH_LDAP_GROUP_TYPE = _import_ldap_group_type(os.environ.get('AUTH_LDAP_GROUP_TYPE', 'GroupOfNamesType'))
-AUTH_LDAP_REQUIRE_GROUP = os.environ.get('AUTH_LDAP_REQUIRE_GROUP_DN')
+AUTH_LDAP_GROUP_TYPE = _import_ldap_group_type(os.environ.get("AUTH_LDAP_GROUP_TYPE", "GroupOfNamesType"))
+AUTH_LDAP_REQUIRE_GROUP = os.environ.get("AUTH_LDAP_REQUIRE_GROUP_DN")
 AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
-    os.environ.get('AUTH_LDAP_GROUP_SEARCH_BASE_DN', ''),
+    os.environ.get("AUTH_LDAP_GROUP_SEARCH_BASE_DN", ""),
     ldap.SCOPE_SUBTREE,
     "(objectClass=group)",
 )
 AUTH_LDAP_FIND_GROUP_PERMS = True
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
-    "is_active": os.environ.get('AUTH_LDAP_REQUIRE_GROUP_DN', ''),
-    "is_staff": os.environ.get('AUTH_LDAP_IS_ADMIN_DN', ''),
+    "is_active": os.environ.get("AUTH_LDAP_REQUIRE_GROUP_DN", ""),
+    "is_staff": os.environ.get("AUTH_LDAP_IS_ADMIN_DN", ""),
 }
 
 MESSAGE_TAGS = {
-    messages.ERROR: 'danger',
+    messages.ERROR: "danger",
 }
diff --git a/dsbd/templates/activate.html b/dsbd/templates/activate.html
index 53c5961..9f79758 100644
--- a/dsbd/templates/activate.html
+++ b/dsbd/templates/activate.html
@@ -2,7 +2,7 @@
 {% load widget_tweaks %}
 {% load static %}
 {% block content %}
-    <h2>{{ message }}</h2>
+  <h2>{{ message }}</h2>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/admin/base.html b/dsbd/templates/admin/base.html
index f408a10..d8ac8c0 100644
--- a/dsbd/templates/admin/base.html
+++ b/dsbd/templates/admin/base.html
@@ -1,145 +1,168 @@
 {% load i18n static %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
-<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" dir="{{ LANGUAGE_BIDI|yesno:'rtl,ltr,auto' }}">
+<html lang="{{ LANGUAGE_CODE|default:"en-us" }}"
+      dir="{{ LANGUAGE_BIDI|yesno:'rtl,ltr,auto' }}">
 <head>
-    <title>{% block title %}{% endblock %}</title>
-    <link rel="stylesheet" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
-    {% block dark-mode-vars %}
-        <link rel="stylesheet" href="{% static "admin/css/dark_mode.css" %}">
-        <script src="{% static "admin/js/theme.js" %}" defer></script>
-    {% endblock %}
-    {% if not is_popup and is_nav_sidebar_enabled %}
-        <link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}">
-        <script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script>
-    {% endif %}
-    {% block extrastyle %}{% endblock %}
+  <title>{% block title %}{% endblock %}</title>
+  <link rel="stylesheet"
+        href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
+  {% block dark-mode-vars %}
+    <link rel="stylesheet" href="{% static "admin/css/dark_mode.css" %}">
+    <script src="{% static "admin/js/theme.js" %}" defer></script>
+  {% endblock %}
+  {% if not is_popup and is_nav_sidebar_enabled %}
+    <link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}">
+    <script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script>
+  {% endif %}
+  {% block extrastyle %}{% endblock %}
+  {% if LANGUAGE_BIDI %}
+    <link rel="stylesheet"
+          href="
+
+
+
+
+
+
+              {% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %}
+  {% block extrahead %}{% endblock %}
+  {% block responsive %}
+    <meta name="viewport"
+          content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <link rel="stylesheet" href="{% static "admin/css/responsive.css" %}">
     {% if LANGUAGE_BIDI %}
-        <link rel="stylesheet"
-              href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %}
-    {% block extrahead %}{% endblock %}
-    {% block responsive %}
-        <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
-        <link rel="stylesheet" href="{% static "admin/css/responsive.css" %}">
-        {% if LANGUAGE_BIDI %}
-            <link rel="stylesheet" href="{% static "admin/css/responsive_rtl.css" %}">{% endif %}
-    {% endblock %}
-    {% block blockbots %}
-        <meta name="robots" content="NONE,NOARCHIVE">{% endblock %}
+      <link rel="stylesheet" href="{% static "admin/css/responsive_rtl.css" %}">
+    {% endif %}
+  {% endblock %}
+  {% block blockbots %}
+    <meta name="robots" content="NONE,NOARCHIVE">{% endblock %}
 </head>
 
 <body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}"
       data-admin-utc-offset="{% now "Z" %}">
-<a href="#content-start" class="skip-to-content-link">{% translate 'Skip to main content' %}</a>
+<a href="#content-start"
+   class="skip-to-content-link">{% translate 'Skip to main content' %}</a>
 <!-- Container -->
 <div id="container">
 
-    {% if not is_popup %}
-        <!-- Header -->
-        {% block header %}
-            <div id="header">
-                <div id="branding">
-                    {% block branding %}{% endblock %}
-                </div>
-                {% block usertools %}
-                    {% if has_permission %}
-                        <div id="user-tools">
-                            {% block welcome-msg %}
-                                {% translate 'Welcome,' %}
-                                <strong>{% firstof  user.get_username %}</strong>.
-                            {% endblock %}
-                            {% block userlinks %}
-                                {% if user.is_active and user.is_staff %}
-                                    <a href="{% url 'custom_admin:index' %}">{% translate 'カスタム管理ページ' %}</a> /
-                                {% endif %}
-                                {% if site_url %}
-                                    <a href="{{ site_url }}">{% translate 'View site' %}</a> /
-                                {% endif %}
-                                {% if user.is_active and user.is_staff %}
-                                    {% url 'django-admindocs-docroot' as docsroot %}
-                                    {% if docsroot %}
-                                        <a href="{{ docsroot }}">{% translate 'Documentation' %}</a> /
-                                    {% endif %}
-                                {% endif %}
-                                {% if user.has_usable_password %}
-                                    <a href="{% url 'admin:password_change' %}">{% translate 'Change password' %}</a> /
-                                {% endif %}
-                                <form id="logout-form" method="post" action="{% url 'admin:logout' %}">
-                                    {% csrf_token %}
-                                    <button type="submit">{% translate 'Log out' %}</button>
-                                </form>
-                                {% include "admin/color_theme_toggle.html" %}
-                            {% endblock %}
-                        </div>
-                    {% endif %}
-                {% endblock %}
-                {% block nav-global %}{% endblock %}
+  {% if not is_popup %}
+    <!-- Header -->
+    {% block header %}
+      <div id="header">
+        <div id="branding">
+          {% block branding %}{% endblock %}
+        </div>
+        {% block usertools %}
+          {% if has_permission %}
+            <div id="user-tools">
+              {% block welcome-msg %}
+                {% translate 'Welcome,' %}
+                <strong>{% firstof  user.get_username %}</strong>.
+              {% endblock %}
+              {% block userlinks %}
+                {% if user.is_active and user.is_staff %}
+                  <a href="{% url 'custom_admin:index' %}">{% translate 'カスタム管理ページ' %}</a>
+                  /
+                {% endif %}
+                {% if site_url %}
+                  <a href="{{ site_url }}">{% translate 'View site' %}</a>
+                  /
+                {% endif %}
+                {% if user.is_active and user.is_staff %}
+                  {% url 'django-admindocs-docroot' as docsroot %}
+                  {% if docsroot %}
+                    <a href="{{ docsroot }}">{% translate 'Documentation' %}</a>
+                    /
+                  {% endif %}
+                {% endif %}
+                {% if user.has_usable_password %}
+                  <a href="{% url 'admin:password_change' %}">{% translate 'Change password' %}</a>
+                  /
+                {% endif %}
+                <form id="logout-form" method="post"
+                      action="{% url 'admin:logout' %}">
+                  {% csrf_token %}
+                  <button type="submit">{% translate 'Log out' %}</button>
+                </form>
+                {% include "admin/color_theme_toggle.html" %}
+              {% endblock %}
             </div>
+          {% endif %}
         {% endblock %}
-        <!-- END Header -->
-        {% block nav-breadcrumbs %}
-            <nav aria-label="{% translate 'Breadcrumbs' %}">
-                {% block breadcrumbs %}
-                    <div class="breadcrumbs">
-                        <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
-                        {% if title %} &rsaquo; {{ title }}{% endif %}
-                    </div>
-                {% endblock %}
-            </nav>
+        {% block nav-global %}{% endblock %}
+      </div>
+    {% endblock %}
+    <!-- END Header -->
+    {% block nav-breadcrumbs %}
+      <nav aria-label="{% translate 'Breadcrumbs' %}">
+        {% block breadcrumbs %}
+          <div class="breadcrumbs">
+            <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+            {% if title %} &rsaquo; {{ title }}{% endif %}
+          </div>
         {% endblock %}
-    {% endif %}
+      </nav>
+    {% endblock %}
+  {% endif %}
 
-    <div class="main" id="main">
+  <div class="main" id="main">
 
-        {% if not is_popup and is_nav_sidebar_enabled %}
-            {% block nav-sidebar %}
-                {% include "admin/nav_sidebar.html" %}
-            {% endblock %}
+    {% if not is_popup and is_nav_sidebar_enabled %}
+      {% block nav-sidebar %}
+        {% include "admin/nav_sidebar.html" %}
+      {% endblock %}
+    {% endif %}
+    <div id="content-start" class="content" tabindex="-1">
+      {% if user.is_active and user.is_staff %}
+        カスタム管理ページは<a href="{% url 'custom_admin:index' %}">こちら</a>
+      {% endif %}
+      {% block messages %}
+        {% if messages %}
+          <ul class="messagelist">{% for message in messages %}
+            <li{% if message.tags %}
+              class="{{ message.tags }}"{% endif %}>{{ message|capfirst }}</li>
+          {% endfor %}</ul>
         {% endif %}
-        <div id="content-start" class="content" tabindex="-1">
-            {% if user.is_active and user.is_staff %}
-                カスタム管理ページは<a href="{% url 'custom_admin:index' %}">こちら</a>
-            {% endif %}
-            {% block messages %}
-                {% if messages %}
-                    <ul class="messagelist">{% for message in messages %}
-                        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message|capfirst }}</li>
-                    {% endfor %}</ul>
-                {% endif %}
-            {% endblock messages %}
-            <!-- Content -->
-            <div id="content" class="{% block coltype %}colM{% endblock %}">
-                {% block pretitle %}{% endblock %}
-                {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
-                {% block content_subtitle %}{% if subtitle %}<h2>{{ subtitle }}</h2>{% endif %}{% endblock %}
-                {% block content %}
-                    {% block object-tools %}{% endblock %}
-                    {{ content }}
-                {% endblock %}
-                {% block sidebar %}{% endblock %}
-                <br class="clear">
-            </div>
-            <!-- END Content -->
-            {% block footer %}
-                <div id="footer"></div>{% endblock %}
-        </div>
+      {% endblock messages %}
+      <!-- Content -->
+      <div id="content" class="{% block coltype %}colM{% endblock %}">
+        {% block pretitle %}{% endblock %}
+        {% block content_title %}{% if title %}<h1>{{ title }}</h1>
+        {% endif %}{% endblock %}
+        {% block content_subtitle %}{% if subtitle %}<h2>{{ subtitle }}</h2>
+        {% endif %}{% endblock %}
+        {% block content %}
+          {% block object-tools %}{% endblock %}
+          {{ content }}
+        {% endblock %}
+        {% block sidebar %}{% endblock %}
+        <br class="clear">
+      </div>
+      <!-- END Content -->
+      {% block footer %}
+        <div id="footer"></div>{% endblock %}
     </div>
+  </div>
 </div>
 <!-- END Container -->
 
 <!-- SVGs -->
 <svg xmlns="http://www.w3.org/2000/svg" class="base-svgs">
-    <symbol viewBox="0 0 24 24" width="1rem" height="1rem" id="icon-auto">
-        <path d="M0 0h24v24H0z" fill="currentColor"/>
-        <path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2V4a8 8 0 1 0 0 16z"/>
-    </symbol>
-    <symbol viewBox="0 0 24 24" width="1rem" height="1rem" id="icon-moon">
-        <path d="M0 0h24v24H0z" fill="currentColor"/>
-        <path d="M10 7a7 7 0 0 0 12 4.9v.1c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2h.1A6.979 6.979 0 0 0 10 7zm-6 5a8 8 0 0 0 15.062 3.762A9 9 0 0 1 8.238 4.938 7.999 7.999 0 0 0 4 12z"/>
-    </symbol>
-    <symbol viewBox="0 0 24 24" width="1rem" height="1rem" id="icon-sun">
-        <path d="M0 0h24v24H0z" fill="currentColor"/>
-        <path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zm0-2a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/>
-    </symbol>
+  <symbol viewBox="0 0 24 24" width="1rem" height="1rem" id="icon-auto">
+    <path d="M0 0h24v24H0z" fill="currentColor"/>
+    <path
+        d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2V4a8 8 0 1 0 0 16z"/>
+  </symbol>
+  <symbol viewBox="0 0 24 24" width="1rem" height="1rem" id="icon-moon">
+    <path d="M0 0h24v24H0z" fill="currentColor"/>
+    <path
+        d="M10 7a7 7 0 0 0 12 4.9v.1c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2h.1A6.979 6.979 0 0 0 10 7zm-6 5a8 8 0 0 0 15.062 3.762A9 9 0 0 1 8.238 4.938 7.999 7.999 0 0 0 4 12z"/>
+  </symbol>
+  <symbol viewBox="0 0 24 24" width="1rem" height="1rem" id="icon-sun">
+    <path d="M0 0h24v24H0z" fill="currentColor"/>
+    <path
+        d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zm0-2a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/>
+  </symbol>
 </svg>
 <!-- END SVGs -->
 </body>
diff --git a/dsbd/templates/base1.html b/dsbd/templates/base1.html
index 2c5df5b..48c28b1 100644
--- a/dsbd/templates/base1.html
+++ b/dsbd/templates/base1.html
@@ -1,57 +1,69 @@
 <!doctype html>
 <html lang="ja">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="yoneyan">
-    <title>doornoc dashboard</title>
-    {% load static %}
-    <link rel="icon" href="{% static 'icon/icon.png' %}">
-    <link rel="canonical" href="https://getbootstrap.com/docs/4.2/examples/starter-template/">
+  <meta charset="utf-8">
+  <meta name="viewport"
+        content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="description" content="">
+  <meta name="author" content="yoneyan">
+  <title>doornoc dashboard</title>
+  {% load static %}
+  <link rel="icon" href="{% static 'icon/icon.png' %}">
+  <link rel="canonical"
+        href="https://getbootstrap.com/docs/4.2/examples/starter-template/">
 
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/fontawesome.min.css" rel="stylesheet">
-    <!-- Bootstrap core CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
-    <style>
-        body {
-            padding-top: 5rem;
-        }
+  <link
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/fontawesome.min.css"
+      rel="stylesheet">
+  <!-- Bootstrap core CSS -->
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css"
+        rel="stylesheet"
+        integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx"
+        crossorigin="anonymous">
+  <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
+  <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
+  <style>
+      body {
+          padding-top: 5rem;
+      }
 
-        {% block style %}
-        {% endblock style %}
-    </style>
-    {% block extrahead %}{% endblock %}
+      {% block style %}
+      {% endblock style %}
+  </style>
+  {% block extrahead %}{% endblock %}
 </head>
 <body>
 <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="{% url 'index' %}">HomeNOC Service Online</a>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarsExampleDefault"
-                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    
-        <div class="collapse navbar-collapse" id="navbarsExampleDefault">
-            <ul class="navbar-nav mr-auto">
-                {% include 'navbar1.html' %}
-            </ul>
-        </div>
+  <div class="container-fluid">
+    <a class="navbar-brand" href="{% url 'index' %}">HomeNOC Service Online</a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
+            data-bs-target="#navbarsExampleDefault"
+            aria-controls="navbarsExampleDefault" aria-expanded="false"
+            aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+      <ul class="navbar-nav mr-auto">
+        {% include 'navbar1.html' %}
+      </ul>
     </div>
+  </div>
 </nav>
 
 <main role="main" class="container">
-    {% block content %}
-    {% endblock content %}
+  {% block content %}
+  {% endblock content %}
 </main><!-- /.container -->
-<script src="https://code.jquery.com/jquery-3.6.3.js" integrity="sha256-nQLuAZGRRcILA+6dMBOvcRh5Pe310sBpanc6+QBmyVM="
-        crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
-        integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
+<script src="https://code.jquery.com/jquery-3.6.3.js"
+        integrity="sha256-nQLuAZGRRcILA+6dMBOvcRh5Pe310sBpanc6+QBmyVM="
         crossorigin="anonymous"></script>
+<script
+    src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
+    crossorigin="anonymous"></script>
 </body>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.27.0/moment.min.js"
         integrity="sha512-rmZcZsyhe0/MAjquhTgiUcb4d9knaFc7b5xAfju483gbEXTkeJRUMIPk6s3ySZMYUHEcjKbjLjyddGWMrNEvZg=="
@@ -60,8 +72,10 @@
         integrity="sha512-rElveAU5iG1CzHqi7KbG1T4DQIUCqhitISZ9nqJ2Z4TP0z4Aba64xYhwcBhHQMddRq27/OKbzEFZLOJarNStLg=="
         crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
-<script src='https://cdn.jsdelivr.net/npm/fullcalendar@6.1.5/index.global.min.js'></script>
-<script src="https://yubinbango.github.io/yubinbango/yubinbango.js" charset="UTF-8"></script>
+<script
+    src='https://cdn.jsdelivr.net/npm/fullcalendar@6.1.5/index.global.min.js'></script>
+<script src="https://yubinbango.github.io/yubinbango/yubinbango.js"
+        charset="UTF-8"></script>
 
 {% block javascript %}
 {% endblock javascript %}
diff --git a/dsbd/templates/base2.html b/dsbd/templates/base2.html
index 747335e..4702e3f 100644
--- a/dsbd/templates/base2.html
+++ b/dsbd/templates/base2.html
@@ -1,50 +1,58 @@
 <!doctype html>
 <html lang="ja">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="yoneyan">
-    <title>HomeNOC dashboard</title>
-    {% load static %}
-    <link rel="icon" href="{% static 'icon/icon.png' %}">
-    <link rel="canonical" href="https://getbootstrap.com/docs/4.2/examples/starter-template/">
+  <meta charset="utf-8">
+  <meta name="viewport"
+        content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="description" content="">
+  <meta name="author" content="yoneyan">
+  <title>HomeNOC dashboard</title>
+  {% load static %}
+  <link rel="icon" href="{% static 'icon/icon.png' %}">
+  <link rel="canonical"
+        href="https://getbootstrap.com/docs/4.2/examples/starter-template/">
 
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/fontawesome.min.css" rel="stylesheet">
-    <!-- Bootstrap core CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
+  <link
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/fontawesome.min.css"
+      rel="stylesheet">
+  <!-- Bootstrap core CSS -->
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css"
+        rel="stylesheet"
+        integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx"
+        crossorigin="anonymous">
+  <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
+  <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
 
-    <style>
-        #parent {
-            display: flex;
-        }
+  <style>
+      #parent {
+          display: flex;
+      }
 
-        #sidebar{
-            position: sticky;
-            top: 0;
-            height: 0
-        }
+      #sidebar {
+          position: sticky;
+          top: 0;
+          height: 0
+      }
 
-        #content {
-            margin: 10px 5px 5px 10px;
-            flex-grow: 1
-        }
-    </style>
-    {% block style %}{% endblock style %}
-    {% block extrahead %}{% endblock %}
+      #content {
+          margin: 10px 5px 5px 10px;
+          flex-grow: 1
+      }
+  </style>
+  {% block style %}{% endblock style %}
+  {% block extrahead %}{% endblock %}
 </head>
 <body>
 <div id="parent">
-    <div id="sidebar">
-        {% include 'navbar2.html' %}
-    </div>
-    <div id="content">
-        {% block content %}
-        {% endblock content %}
-    </div>
+  <div id="sidebar">
+    {% include 'navbar2.html' %}
+  </div>
+  <div id="content">
+    {% block content %}
+    {% endblock content %}
+  </div>
 </div>
 {% block javascript %}
 {% endblock javascript %}
diff --git a/dsbd/templates/custom_admin/index.html b/dsbd/templates/custom_admin/index.html
index 1c9ba29..95438d8 100644
--- a/dsbd/templates/custom_admin/index.html
+++ b/dsbd/templates/custom_admin/index.html
@@ -1,28 +1,33 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">カスタム管理ページ</h2>
-                    <br/>
-                    <a class="btn btn-primary" href="{% url 'admin:index' %}" role="button"
-                       aria-expanded="false">管理ページ(DB)</a>
-                    <a class="btn btn-primary" href="/admin/custom_auth/user" role="button"
-                       aria-expanded="false">ユーザ一覧</a>
-                    <a class="btn btn-primary" href="/admin/custom_auth/group" role="button"
-                       aria-expanded="false">グループ一覧</a>
-                    <a class="btn btn-primary" href="/admin/notice/notice" role="button"
-                       aria-expanded="false">通知(お知らせ)一覧</a>
-                    <a class="btn btn-primary" href="{% url 'custom_admin:ticket_list' %}" role="button"
-                       aria-expanded="false">チケット一覧</a>
-                    <br/>
-                    <br/>
-                    <a class="btn btn-primary" href="/admin/service/service" role="button"
-                       aria-expanded="false">サービス一覧</a>
-                    <br/>
-                </div>
-            </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">カスタム管理ページ</h2>
+          <br/>
+          <a class="btn btn-primary" href="{% url 'admin:index' %}"
+             role="button"
+             aria-expanded="false">管理ページ(DB)</a>
+          <a class="btn btn-primary" href="/admin/custom_auth/user"
+             role="button"
+             aria-expanded="false">ユーザ一覧</a>
+          <a class="btn btn-primary" href="/admin/custom_auth/group"
+             role="button"
+             aria-expanded="false">グループ一覧</a>
+          <a class="btn btn-primary" href="/admin/notice/notice" role="button"
+             aria-expanded="false">通知(お知らせ)一覧</a>
+          <a class="btn btn-primary"
+             href="{% url 'custom_admin:ticket_list' %}" role="button"
+             aria-expanded="false">チケット一覧</a>
+          <br/>
+          <br/>
+          <a class="btn btn-primary" href="/admin/service/service"
+             role="button"
+             aria-expanded="false">サービス一覧</a>
+          <br/>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/custom_admin/ticket/chat.html b/dsbd/templates/custom_admin/ticket/chat.html
index e8db7d9..93722fd 100644
--- a/dsbd/templates/custom_admin/ticket/chat.html
+++ b/dsbd/templates/custom_admin/ticket/chat.html
@@ -1,396 +1,411 @@
 {% extends 'base2.html' %}
 {% block extrahead %}
-    <style>
-        .chat-card {
-            background: #fff;
-            transition: .5s;
-            border: 0;
-            margin-bottom: 30px;
-            border-radius: .55rem;
-            position: relative;
-            width: 100%;
-            box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
-        }
-
-        .chat-app .people-list {
-            width: 280px;
-            position: absolute;
-            left: 0;
-            top: 0;
-            padding: 20px;
-            z-index: 7
-        }
-
-
-        .chat .chat-header {
-            padding: 15px 20px;
-            border-bottom: 2px solid #f4f7f6
-        }
-
-        .chat .chat-header img {
-            float: left;
-            border-radius: 40px;
-            width: 40px
-        }
-
-        .chat .chat-header .chat-about {
-            float: left;
-            padding-left: 10px
-        }
-
-        .chat .chat-history {
-            padding: 20px;
-            border-bottom: 2px solid #fff
-        }
-
-        .chat .chat-history ul {
-            padding: 0
-        }
-
-        .chat .chat-history ul li {
-            list-style: none;
-            margin-bottom: 30px
-        }
-
-        .chat .chat-history ul li:last-child {
-            margin-bottom: 0px
-        }
-
-        .chat .chat-history .message-data {
-            margin-bottom: 15px
-        }
-
-        .chat .chat-history .message-data img {
-            border-radius: 40px;
-            width: 40px
-        }
-
-        .chat .chat-history .message-data-time {
-            color: #434651;
-            padding-left: 6px
-        }
-
-        .chat .chat-history .message {
-            color: #444;
-            padding: 10px 20px;
-            line-height: 20px;
-            font-size: 16px;
-            border-radius: 7px;
-            display: inline-block;
-            position: relative
-        }
-
-        .chat .chat-history .message:after {
-            bottom: 100%;
-            left: 7%;
-            border: solid transparent;
-            content: " ";
-            height: 0;
-            width: 0;
-            position: absolute;
-            pointer-events: none;
-            border-bottom-color: #fff;
-            border-width: 10px;
-            margin-left: -10px
-        }
-
-        .chat .chat-history .my-message {
-            background: #efefef
-        }
-
-        .chat .chat-history .my-message:after {
-            bottom: 100%;
-            left: 30px;
-            border: solid transparent;
-            content: " ";
-            height: 0;
-            width: 0;
-            position: absolute;
-            pointer-events: none;
-            border-bottom-color: #efefef;
-            border-width: 10px;
-            margin-left: -10px
-        }
-
-        .chat .chat-history .other-message {
-            background: #e8f1f3;
-            text-align: right
-        }
-
-        .chat .chat-history .other-message:after {
-            border-bottom-color: #e8f1f3;
-            left: 93%
-        }
-
-        .chat .chat-message {
-            padding: 20px
-        }
-
-        .float-right {
-            float: right
-        }
-
-        .clearfix:after {
-            visibility: hidden;
-            display: block;
-            font-size: 0;
-            content: " ";
-            clear: both;
-            height: 0
-        }
-
-        @media only screen and (max-width: 767px) {
-            .chat-app .people-list {
-                height: 465px;
-                width: 100%;
-                overflow-x: auto;
-                background: #fff;
-                left: -400px;
-                display: none
-            }
-
-            .chat-app .people-list.open {
-                left: 0
-            }
-
-            .chat-app .chat {
-                margin: 0
-            }
-
-            .chat-app .chat .chat-header {
-                border-radius: 0.55rem 0.55rem 0 0
-            }
-
-            .chat-app .chat-history {
-                height: 300px;
-                overflow-x: auto
-            }
-        }
-
-        @media only screen and (min-width: 768px) and (max-width: 992px) {
-            .chat-app .chat-list {
-                height: 650px;
-                overflow-x: auto
-            }
-
-            .chat-app .chat-history {
-                height: 600px;
-                overflow-x: auto
-            }
-        }
-
-        @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 1) {
-            .chat-app .chat-list {
-                height: 480px;
-                overflow-x: auto
-            }
-
-            .chat-app .chat-history {
-                height: calc(100vh - 350px);
-                overflow-x: auto
-            }
-        }
-    </style>
+  <style>
+      .chat-card {
+          background: #fff;
+          transition: .5s;
+          border: 0;
+          margin-bottom: 30px;
+          border-radius: .55rem;
+          position: relative;
+          width: 100%;
+          box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
+      }
+
+      .chat-app .people-list {
+          width: 280px;
+          position: absolute;
+          left: 0;
+          top: 0;
+          padding: 20px;
+          z-index: 7
+      }
+
+
+      .chat .chat-header {
+          padding: 15px 20px;
+          border-bottom: 2px solid #f4f7f6
+      }
+
+      .chat .chat-header img {
+          float: left;
+          border-radius: 40px;
+          width: 40px
+      }
+
+      .chat .chat-header .chat-about {
+          float: left;
+          padding-left: 10px
+      }
+
+      .chat .chat-history {
+          padding: 20px;
+          border-bottom: 2px solid #fff
+      }
+
+      .chat .chat-history ul {
+          padding: 0
+      }
+
+      .chat .chat-history ul li {
+          list-style: none;
+          margin-bottom: 30px
+      }
+
+      .chat .chat-history ul li:last-child {
+          margin-bottom: 0px
+      }
+
+      .chat .chat-history .message-data {
+          margin-bottom: 15px
+      }
+
+      .chat .chat-history .message-data img {
+          border-radius: 40px;
+          width: 40px
+      }
+
+      .chat .chat-history .message-data-time {
+          color: #434651;
+          padding-left: 6px
+      }
+
+      .chat .chat-history .message {
+          color: #444;
+          padding: 10px 20px;
+          line-height: 20px;
+          font-size: 16px;
+          border-radius: 7px;
+          display: inline-block;
+          position: relative
+      }
+
+      .chat .chat-history .message:after {
+          bottom: 100%;
+          left: 7%;
+          border: solid transparent;
+          content: " ";
+          height: 0;
+          width: 0;
+          position: absolute;
+          pointer-events: none;
+          border-bottom-color: #fff;
+          border-width: 10px;
+          margin-left: -10px
+      }
+
+      .chat .chat-history .my-message {
+          background: #efefef
+      }
+
+      .chat .chat-history .my-message:after {
+          bottom: 100%;
+          left: 30px;
+          border: solid transparent;
+          content: " ";
+          height: 0;
+          width: 0;
+          position: absolute;
+          pointer-events: none;
+          border-bottom-color: #efefef;
+          border-width: 10px;
+          margin-left: -10px
+      }
+
+      .chat .chat-history .other-message {
+          background: #e8f1f3;
+          text-align: right
+      }
+
+      .chat .chat-history .other-message:after {
+          border-bottom-color: #e8f1f3;
+          left: 93%
+      }
+
+      .chat .chat-message {
+          padding: 20px
+      }
+
+      .float-right {
+          float: right
+      }
+
+      .clearfix:after {
+          visibility: hidden;
+          display: block;
+          font-size: 0;
+          content: " ";
+          clear: both;
+          height: 0
+      }
+
+      @media only screen and (max-width: 767px) {
+          .chat-app .people-list {
+              height: 465px;
+              width: 100%;
+              overflow-x: auto;
+              background: #fff;
+              left: -400px;
+              display: none
+          }
+
+          .chat-app .people-list.open {
+              left: 0
+          }
+
+          .chat-app .chat {
+              margin: 0
+          }
+
+          .chat-app .chat .chat-header {
+              border-radius: 0.55rem 0.55rem 0 0
+          }
+
+          .chat-app .chat-history {
+              height: 300px;
+              overflow-x: auto
+          }
+      }
+
+      @media only screen and (min-width: 768px) and (max-width: 992px) {
+          .chat-app .chat-list {
+              height: 650px;
+              overflow-x: auto
+          }
+
+          .chat-app .chat-history {
+              height: 600px;
+              overflow-x: auto
+          }
+      }
+
+      @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 1) {
+          .chat-app .chat-list {
+              height: 480px;
+              overflow-x: auto
+          }
+
+          .chat-app .chat-history {
+              height: calc(100vh - 350px);
+              overflow-x: auto
+          }
+      }
+  </style>
 {% endblock extrahead %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">チャット(管理者側)</h2>
-                    <br/>
-                    <div class="card" style="max-width: 50rem">
-                        <div class="card-header">
-                            <div class="row g-0">
-                                <div class="col-sm-6 col-md-10"> ID: {{ ticket.id }}
-                                    作成日: {{ ticket.created_at }} 　　
-                                </div>
-                                <div class="col-6 col-md-2">
-                                    {% if ticket.group %}
-                                        <span class="badge bg-secondary">グループチャット ({{ ticket.group.id }}: {{ ticket.group.name }})</span> {% else %}
-                                        <span class="badge bg-secondary">ユーザチャット</span>
-                                    {% endif %}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="card-body">
-                            <h5 class="card-title">{{ ticket.title }}</h5>
-                            {% autoescape off %}
-                                {{ ticket.body | linebreaks }}
-                            {% endautoescape %}
-                            {% if ticket.is_solved %}
-                                <form method="post">
-                                    {% csrf_token %}
-                                    <button type="submit" class="btn btn-danger btn-sm" name="no_solved">未解決</button>
-                                </form>
-                            {% else %}
-                                <form method="post">
-                                    {% csrf_token %}
-                                    <button type="submit" class="btn btn-primary btn-sm" name="solved">解決済み</button>
-                                </form>
-                            {% endif %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">チャット(管理者側)</h2>
+          <br/>
+          <div class="card" style="max-width: 50rem">
+            <div class="card-header">
+              <div class="row g-0">
+                <div class="col-sm-6 col-md-10"> ID: {{ ticket.id }}
+                  作成日: {{ ticket.created_at }} 　　
+                </div>
+                <div class="col-6 col-md-2">
+                  {% if ticket.group %}
+                    <span
+                        class="badge bg-secondary">グループチャット ({{ ticket.group.id }}: {{ ticket.group.name }})</span> {% else %}
+                    <span class="badge bg-secondary">ユーザチャット</span>
+                  {% endif %}
+                </div>
+              </div>
+            </div>
+            <div class="card-body">
+              <h5 class="card-title">{{ ticket.title }}</h5>
+              {% autoescape off %}
+                {{ ticket.body | linebreaks }}
+              {% endautoescape %}
+              {% if ticket.is_solved %}
+                <form method="post">
+                  {% csrf_token %}
+                  <button type="submit" class="btn btn-danger btn-sm"
+                          name="no_solved">未解決
+                  </button>
+                </form>
+              {% else %}
+                <form method="post">
+                  {% csrf_token %}
+                  <button type="submit" class="btn btn-primary btn-sm"
+                          name="solved">解決済み
+                  </button>
+                </form>
+              {% endif %}
+            </div>
+            <div class="card-footer">
+              {% if ticket.is_solved %}
+                <span class="badge bg-primary">解決済み</span>
+              {% else %}
+                <span class="badge bg-danger">未解決</span>{% endif %}
+              {% if ticket.is_approve %}
+                <span class="badge bg-success">承認済み</span>{% endif %}
+              {% if ticket.is_reject %}
+                <span class="badge bg-warning">拒否済み</span>{% endif %}
+            </div>
+          </div>
+          <br/>
+          <div class="container">
+            <div class="row clearfix">
+              <div class="chat-card chat-app">
+                <div class="chat">
+                  <div class="chat-header clearfix">
+                    <div class="row">
+                      <div class="col-lg-6">
+                        <div class="chat-about">
+                          <h6 class="m-b-0">{{ user.username }}</h6>
                         </div>
-                        <div class="card-footer">
-                            {% if ticket.is_solved %}<span class="badge bg-primary">解決済み</span>
-                            {% else %}<span class="badge bg-danger">未解決</span>{% endif %}
-                            {% if ticket.is_approve %}<span class="badge bg-success">承認済み</span>{% endif %}
-                            {% if ticket.is_reject %}<span class="badge bg-warning">拒否済み</span>{% endif %}
+                        <div class="text-end">
+                          <div id="status"><span
+                              class="badge bg-danger">WebSocket切断済み</span>
+                          </div>
                         </div>
+                      </div>
+
                     </div>
-                    <br/>
-                    <div class="container">
-                        <div class="row clearfix">
-                            <div class="chat-card chat-app">
-                                <div class="chat">
-                                    <div class="chat-header clearfix">
-                                        <div class="row">
-                                            <div class="col-lg-6">
-                                                <div class="chat-about">
-                                                    <h6 class="m-b-0">{{ user.username }}</h6>
-                                                </div>
-                                                <div class="text-end">
-                                                    <div id="status"><span
-                                                            class="badge bg-danger">WebSocket切断済み</span></div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                    <div class="chat-history">
-                                        <ul class="m-b-0">
-                                            {% for chat in chats %}
-                                                <li class="clearfix">
-                                                    {% if request.user == chat.user and request.user.is_staff %}
-                                                        <div class="message-data text-end">
-                                                            <span class="message-data-time">({% time_to_str chat.created_at %})</span>
-                                                            {% if chat.is_admin %}
-                                                                <span class="badge bg-primary">管理者(あなた)</span>
-                                                            {% else %}
-                                                                あなた
-                                                            {% endif %}
-                                                        </div>
-                                                        <div class="message other-message float-right"> {{ chat.body | linebreaks }}</div>
-                                                    {% else %}
-                                                        <div class="message-data">
-                                                            {% if chat.is_admin %}
-                                                                <span class="badge bg-primary">管理者(
-                                                                    {% if request.user == chat.user %}
-                                                                        あなた
-                                                                    {% else %}
-                                                                        {{ chat.user.username }}
-                                                                    {% endif %})</span>
-                                                            {% else %}
-                                                                {% if request.user == chat.user %}
-                                                                    あなた
-                                                                {% else %}
-                                                                    {{ chat.user.username }}
-                                                                {% endif %}
-                                                            {% endif %}
-                                                            <span class="message-data-time">({% time_to_str chat.created_at %})</span>
-                                                        </div>
-                                                        <div class="message my-message">{{ chat.body | linebreaks }}</div>
-                                                    {% endif %}
-                                                </li>
-                                            {% endfor %}
-                                            <div id="chat_websocket"></div>
-                                        </ul>
-                                    </div>
-                                    <div class="chat-message clearfix">
-                                        <div class="input-group mb-0">
-                                            <div class="col-12">
-                                <textarea id="text" name="text" class="form-control" rows="5"
-                                          placeholder="Enter text here..."></textarea>
-                                                <button type="submit"
-                                                        class="btn btn-primary btn-block"
-                                                        form="message-form"
-                                                        onclick="send()"
-                                                >Send
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                  </div>
+                  <div class="chat-history">
+                    <ul class="m-b-0">
+                      {% for chat in chats %}
+                        <li class="clearfix">
+                          {% if request.user == chat.user and request.user.is_staff %}
+                            <div class="message-data text-end">
+                              <span
+                                  class="message-data-time">({% time_to_str chat.created_at %})</span>
+                              {% if chat.is_admin %}
+                                <span class="badge bg-primary">管理者(あなた)</span>
+                              {% else %}
+                                あなた
+                              {% endif %}
                             </div>
-                        </div>
+                            <div
+                                class="message other-message float-right"> {{ chat.body | linebreaks }}</div>
+                          {% else %}
+                            <div class="message-data">
+                              {% if chat.is_admin %}
+                                <span class="badge bg-primary">管理者(
+                                  {% if request.user == chat.user %}
+                                    あなた
+                                  {% else %}
+                                    {{ chat.user.username }}
+                                  {% endif %})</span>
+                              {% else %}
+                                {% if request.user == chat.user %}
+                                  あなた
+                                {% else %}
+                                  {{ chat.user.username }}
+                                {% endif %}
+                              {% endif %}
+                              <span
+                                  class="message-data-time">({% time_to_str chat.created_at %})</span>
+                            </div>
+                            <div
+                                class="message my-message">{{ chat.body | linebreaks }}</div>
+                          {% endif %}
+                        </li>
+                      {% endfor %}
+                      <div id="chat_websocket"></div>
+                    </ul>
+                  </div>
+                  <div class="chat-message clearfix">
+                    <div class="input-group mb-0">
+                      <div class="col-12">
+                                <textarea id="text" name="text" class="form-control"
+                                          rows="5"
+                                          placeholder="Enter text here..."></textarea>
+                        <button type="submit"
+                                class="btn btn-primary btn-block"
+                                form="message-form"
+                                onclick="send()"
+                        >Send
+                        </button>
+                      </div>
                     </div>
+                  </div>
                 </div>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
 
 {% block javascript %}
-    <script>
-        let chatSocket = undefined;
-
-        function send() {
-            const message = document.getElementById("text").value;
-            console.log(message)
-            if (chatSocket && message) {
-                chatSocket.send(JSON.stringify({
-                    message: message
-                }))
-                document.getElementById("text").textContent = ""
-            }
+  <script>
+    let chatSocket = undefined;
+
+    function send() {
+      const message = document.getElementById("text").value;
+      console.log(message)
+      if (chatSocket && message) {
+        chatSocket.send(JSON.stringify({
+          message: message
+        }))
+        document.getElementById("text").textContent = ""
+      }
+    }
+
+    function connect() {
+      const wsScheme = (window.location.protocol === 'https:' ? 'wss' : 'ws');
+      const hostname = window.location.host;
+      const url = `${wsScheme}://${hostname}/ws/admin/custom/ticket/{{ticket.id}}/chat`;
+      chatSocket = new WebSocket(url)
+
+      chatSocket.onmessage = function (e) {
+        const data = JSON.parse(e.data);
+        console.log(data);
+        let element = document.getElementById('chat_websocket');
+
+        let message = data.message.replace(/\n/, '<br>');
+        let html = '<li class="clearfix">';
+        if (data.username === '{{ request.user.username }}' && data.is_admin) {
+          html += '<div class="message-data text-end">';
+          html += '<span class="message-data-time">(' + data.time + ')</span> '
+          if (data.is_admin) {
+            html += '<span class="badge bg-primary">管理者(あなた)</span>';
+          } else {
+            html += 'あなた';
+          }
+          html += '</div>';
+          html += '<div class="message other-message float-right">' + message + '</div>'
+        } else {
+          html += '<div class="message-data">';
+          let tmp_username = 'あなた';
+          if (data.username !== '{{ request.user.username }}') {
+            tmp_username = data.username;
+          }
+          if (data.is_admin) {
+            html += '<span class="badge bg-primary">' + tmp_username + '</span>';
+          } else {
+            html += tmp_username;
+          }
+          html += '<span class="message-data-time">(' + data.time + ')</span>';
+          html += '</div>';
+          html += '<div class="message my-message">' + message + '</div>';
         }
-
-        function connect() {
-            const wsScheme = (window.location.protocol === 'https:' ? 'wss' : 'ws');
-            const hostname = window.location.host;
-            const url = `${wsScheme}://${hostname}/ws/admin/custom/ticket/{{ticket.id}}/chat`;
-            chatSocket = new WebSocket(url)
-
-            chatSocket.onmessage = function (e) {
-                const data = JSON.parse(e.data);
-                console.log(data);
-                let element = document.getElementById('chat_websocket');
-
-                let message = data.message.replace(/\n/, '<br>');
-                let html = '<li class="clearfix">';
-                if (data.username === '{{ request.user.username }}' && data.is_admin) {
-                    html += '<div class="message-data text-end">';
-                    html += '<span class="message-data-time">(' + data.time + ')</span> '
-                    if (data.is_admin) {
-                        html += '<span class="badge bg-primary">管理者(あなた)</span>';
-                    } else {
-                        html += 'あなた';
-                    }
-                    html += '</div>';
-                    html += '<div class="message other-message float-right">' + message + '</div>'
-                } else {
-                    html += '<div class="message-data">';
-                    let tmp_username = 'あなた';
-                    if (data.username !== '{{ request.user.username }}') {
-                        tmp_username = data.username;
-                    }
-                    if (data.is_admin) {
-                        html += '<span class="badge bg-primary">' + tmp_username + '</span>';
-                    } else {
-                        html += tmp_username;
-                    }
-                    html += '<span class="message-data-time">(' + data.time + ')</span>';
-                    html += '</div>';
-                    html += '<div class="message my-message">' + message + '</div>';
-                }
-                html += '</li>';
-                element.insertAdjacentHTML('beforebegin', html);
-            };
-
-            chatSocket.onopen = function (e) {
-                console.log("open")
-                document.getElementById('status').innerHTML = '<span class="badge bg-success">WebSocket接続中</span>'
-            }
-
-            chatSocket.onclose = function (e) {
-                document.getElementById('status').innerHTML = '<span class="badge bg-danger">WebSocket切断済み</span>'
-                console.error('Chat socket closed unexpectedly');
-                setTimeout(() => {
-                    connect();
-                }, 3000);
-            };
-        };
-        connect()
-
-
-    </script>
+        html += '</li>';
+        element.insertAdjacentHTML('beforebegin', html);
+      };
+
+      chatSocket.onopen = function (e) {
+        console.log("open")
+        document.getElementById('status').innerHTML = '<span class="badge bg-success">WebSocket接続中</span>'
+      }
+
+      chatSocket.onclose = function (e) {
+        document.getElementById('status').innerHTML = '<span class="badge bg-danger">WebSocket切断済み</span>'
+        console.error('Chat socket closed unexpectedly');
+        setTimeout(() => {
+          connect();
+        }, 3000);
+      };
+    };
+    connect()
+
+
+  </script>
 {% endblock javascript %}
\ No newline at end of file
diff --git a/dsbd/templates/custom_admin/ticket/index.html b/dsbd/templates/custom_admin/ticket/index.html
index 58f3798..1d22b54 100644
--- a/dsbd/templates/custom_admin/ticket/index.html
+++ b/dsbd/templates/custom_admin/ticket/index.html
@@ -1,146 +1,163 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">チケット一覧(管理者側)</h2>
-                    <a class="btn btn-primary btn-sm disabled" href="{% url 'ticket:add' %}" role="button"
-                       aria-expanded="false">チケット追加</a>
-                    <div class="btn-group" role="group" aria-label="Basic mixed styles example">
-                        <a type="button"
-                           class="btn btn{% if is_solved == "false" %}-outline{% endif %}-danger btn-sm {% if is_solved == "false" %}disabled{% endif %}"
-                           href="?is_solved=false">未解決のみ</a>
-                        <a type="button"
-                           class="btn btn{% if is_solved == "true" %}-outline{% endif %}-success btn-sm {% if is_solved == "true" %}disabled{% endif %}"
-                           href="?is_solved=true">解決済のみ</a>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">チケット一覧(管理者側)</h2>
+          <a class="btn btn-primary btn-sm disabled"
+             href="{% url 'ticket:add' %}" role="button"
+             aria-expanded="false">チケット追加</a>
+          <div class="btn-group" role="group"
+               aria-label="Basic mixed styles example">
+            <a type="button"
+               class="btn btn{% if is_solved == "false" %}-outline{% endif %}-danger btn-sm {% if is_solved == "false" %}disabled{% endif %}"
+               href="?is_solved=false">未解決のみ</a>
+            <a type="button"
+               class="btn btn{% if is_solved == "true" %}-outline{% endif %}-success btn-sm {% if is_solved == "true" %}disabled{% endif %}"
+               href="?is_solved=true">解決済のみ</a>
+          </div>
+          <br/>
+          <hr/>
+          {% if tickets %}
+            {% for e in tickets %}
+              <div class="card">
+                <div class="card-header">
+                  ID: {{ e.id }} 作成日: {{ e.created_at }} 　　
+                  {% if e.group %}
+                    <span
+                        class="badge bg-secondary">グループチャット ({{ e.group.id }}: {{ e.group.name }})</span> {% else %}
+                    <span class="badge bg-secondary">ユーザチャット</span>{% endif %}
+                </div>
+                <div class="card-body">
+                  <h5 class="card-title">{{ e.title }}</h5>
+                  {% autoescape off %}
+                    {{ e.body | linebreaks }}
+                  {% endautoescape %}
+                  <div class="container">
+                    <div class="row">
+                      <form method="post">
+                        {% csrf_token %}
+                        <a class="btn btn-primary btn-sm"
+                           href="{% url 'custom_admin:chat' e.id %}">チャット</a>
+                        <input type="text"
+                               value={{ e.id }} name="id"
+                               hidden>
+                        {% if e.is_solved %}
+                          <button type="submit"
+                                  class="btn btn-danger btn-sm"
+                                  name="no_solved">
+                            未解決
+                          </button>
+                        {% else %}
+                          <button type="submit"
+                                  class="btn btn-primary btn-sm"
+                                  name="solved">
+                            解決済み
+                          </button>
+                        {% endif %}
+                      </form>
                     </div>
-                    <br/>
-                    <hr/>
-                    {% if tickets %}
-                        {% for e in tickets %}
-                            <div class="card">
-                                <div class="card-header">
-                                    ID: {{ e.id }} 作成日: {{ e.created_at }} 　　{% if e.group %}
-                                    <span class="badge bg-secondary">グループチャット ({{ e.group.id }}: {{ e.group.name }})</span> {% else %}
-                                    <span class="badge bg-secondary">ユーザチャット</span>{% endif %}
-                                </div>
-                                <div class="card-body">
-                                    <h5 class="card-title">{{ e.title }}</h5>
-                                    {% autoescape off %}
-                                        {{ e.body | linebreaks }}
-                                    {% endautoescape %}
-                                    <div class="container">
-                                        <div class="row">
-                                            <form method="post">
-                                                {% csrf_token %}
-                                                <a class="btn btn-primary btn-sm"
-                                                   href="{% url 'custom_admin:chat' e.id %}">チャット</a>
-                                                <input type="text" value={{ e.id }} name="id" hidden>
-                                                {% if e.is_solved %}
-                                                    <button type="submit" class="btn btn-danger btn-sm"
-                                                            name="no_solved">
-                                                        未解決
-                                                    </button>
-                                                {% else %}
-                                                    <button type="submit" class="btn btn-primary btn-sm" name="solved">
-                                                        解決済み
-                                                    </button>
-                                                {% endif %}
-                                            </form>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-footer">
-                                    {% if e.is_solved %}<span class="badge bg-primary">解決済み</span>
-                                    {% else %}<span class="badge bg-danger">未解決</span>{% endif %}
-                                    {% if e.is_approve %}<span class="badge bg-success">承認済み</span>{% endif %}
-                                    {% if e.is_reject %}<span class="badge bg-warning">拒否済み</span>{% endif %}
-                                </div>
-                            </div>
-                            <br/>
-                        {% endfor %}
-                        <nav aria-label="...">
-                            <ul class="pagination">
-                                {% if tickets.has_previous %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">前へ</span>
-                                    </li>
-                                {% endif %}
-                                {% if tickets.paginator.num_pages > 10 %}
-                                    {% if tickets.number < 6 %}
-                                        {#    先頭 9 ページの表示      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 < 9 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
-                                        {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% else %}
-                                        {#   最後 9 ページの表示   #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% endif %}
-                                {% else %}
-                                    {% for pg in tickets.paginator.page_range %}
-                                        {% if tickets.number == pg %}
-                                            <li class="page-item active">
-                                                {% else %}
-                                            <li class="page-item">
-                                        {% endif %}
-                                    <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                    </li>
-                                    {% endfor %}
-                                {% endif %}
-                                {% if tickets.has_next %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">次へ</span>
-                                    </li>
-                                {% endif %}
-                            </ul>
-                        </nav>
-                    {% else %}
-                        <p>チケットがありません</p>
-                    {% endif %}
+                  </div>
                 </div>
-            </div>
+                <div class="card-footer">
+                  {% if e.is_solved %}
+                    <span class="badge bg-primary">解決済み</span>
+                  {% else %}
+                    <span class="badge bg-danger">未解決</span>{% endif %}
+                  {% if e.is_approve %}
+                    <span class="badge bg-success">承認済み</span>{% endif %}
+                  {% if e.is_reject %}
+                    <span class="badge bg-warning">拒否済み</span>{% endif %}
+                </div>
+              </div>
+              <br/>
+            {% endfor %}
+            <nav aria-label="...">
+              <ul class="pagination">
+                {% if tickets.has_previous %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">前へ</span>
+                  </li>
+                {% endif %}
+                {% if tickets.paginator.num_pages > 10 %}
+                  {% if tickets.number < 6 %}
+                    {#    先頭 9 ページの表示      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 < 9 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
+                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% else %}
+                    {#   最後 9 ページの表示   #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% endif %}
+                {% else %}
+                  {% for pg in tickets.paginator.page_range %}
+                    {% if tickets.number == pg %}
+                      <li class="page-item active">
+                        {% else %}
+                      <li class="page-item">
+                    {% endif %}
+                  <a class="page-link"
+                     href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                  </li>
+                  {% endfor %}
+                {% endif %}
+                {% if tickets.has_next %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">次へ</span>
+                  </li>
+                {% endif %}
+              </ul>
+            </nav>
+          {% else %}
+            <p>チケットがありません</p>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/done.html b/dsbd/templates/done.html
index 4964eda..76ce084 100644
--- a/dsbd/templates/done.html
+++ b/dsbd/templates/done.html
@@ -1,14 +1,15 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2>{{ text }}</h2>
-                    <a class="btn btn-primary btn-sm" href="{% url 'custom_auth:index' %}" role="button"
-                       aria-expanded="false">Profileに戻る</a>
-                </div>
-            </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>{{ text }}</h2>
+          <a class="btn btn-primary btn-sm"
+             href="{% url 'custom_auth:index' %}" role="button"
+             aria-expanded="false">Profileに戻る</a>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/feedback.html b/dsbd/templates/feedback.html
index 5d12b17..045610d 100644
--- a/dsbd/templates/feedback.html
+++ b/dsbd/templates/feedback.html
@@ -1,44 +1,46 @@
 {% extends 'base2.html' %}
 {% block style %}
-    <style>
-        .nav-scroller .nav {
-            display: flex;
-            flex-wrap: nowrap;
-            padding-bottom: 1rem;
-            margin-top: -1px;
-            overflow-x: auto;
-            text-align: center;
-            white-space: nowrap;
-            -webkit-overflow-scrolling: touch;
-        }
-    </style>
+  <style>
+      .nav-scroller .nav {
+          display: flex;
+          flex-wrap: nowrap;
+          padding-bottom: 1rem;
+          margin-top: -1px;
+          overflow-x: auto;
+          text-align: center;
+          white-space: nowrap;
+          -webkit-overflow-scrolling: touch;
+      }
+  </style>
 
 {% endblock style %}
 
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2>Feedback</h2>
-                    <div class="p-2 mb-4 bg-body-tertiary rounded-3 text-bg">
-                        <h3 class=" fw-bold">本ダッシュボードのバグなどのお問い合わせはこちらから</h3>
-                        <p class="fs-5">
-                            FeedbackはGitHubのIssueで管理しておりますので、下記ボタンより登録のほどお願いします。</p>
-                        <p class="fs-5">また、修正にはかなり時間がかかりますがご了承ください</p>
-                        <button class="btn btn-primary"
-                                onclick="window.open('https://github.com/homenoc/dsbd','_blank')"
-                                type="button">
-                            GitHubはこちら
-                        </button>
-                        <button class="btn btn-primary"
-                                onclick="window.open('https://github.com/homenoc/dsbd/issues/new','_blank')"
-                                type="button">
-                            Issue登録はこちらから
-                        </button>
-                    </div>
-                </div>
-            </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>Feedback</h2>
+          <div class="p-2 mb-4 bg-body-tertiary rounded-3 text-bg">
+            <h3 class=" fw-bold">
+              本ダッシュボードのバグなどのお問い合わせはこちらから</h3>
+            <p class="fs-5">
+              FeedbackはGitHubのIssueで管理しておりますので、下記ボタンより登録のほどお願いします。</p>
+            <p class="fs-5">
+              また、修正にはかなり時間がかかりますがご了承ください</p>
+            <button class="btn btn-primary"
+                    onclick="window.open('https://github.com/homenoc/dsbd','_blank')"
+                    type="button">
+              GitHubはこちら
+            </button>
+            <button class="btn btn-primary"
+                    onclick="window.open('https://github.com/homenoc/dsbd/issues/new','_blank')"
+                    type="button">
+              Issue登録はこちらから
+            </button>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/forget.html b/dsbd/templates/forget.html
index 95ff628..416c6c1 100644
--- a/dsbd/templates/forget.html
+++ b/dsbd/templates/forget.html
@@ -1,65 +1,66 @@
 {% extends 'base1.html' %}
 {% load static %}
 {% block style %}
-    html,
-    body {
-    height: 100%;
-    }
+  html,
+  body {
+  height: 100%;
+  }
 
-    body {
-    display: flex;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    background-color: #f5f5f5;
-    }
+  body {
+  display: flex;
+  align-items: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  background-color: #f5f5f5;
+  }
 
-    .form-signin {
-    width: 100%;
-    max-width: 330px;
-    padding: 15px;
-    margin: auto;
-    }
+  .form-signin {
+  width: 100%;
+  max-width: 330px;
+  padding: 15px;
+  margin: auto;
+  }
 
-    .form-signin .checkbox {
-    font-weight: 400;
-    }
+  .form-signin .checkbox {
+  font-weight: 400;
+  }
 
-    .form-signin .form-floating:focus-within {
-    z-index: 2;
-    }
+  .form-signin .form-floating:focus-within {
+  z-index: 2;
+  }
 
-    .form-signin input[type="email"] {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    }
+  .form-signin input[type="email"] {
+  margin-bottom: -1px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+  }
 
-    .form-signin input[type="password"] {
-    margin-bottom: 10px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    }
-    .logo {
-    text-align: center;
-    }
+  .form-signin input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  }
+  .logo {
+  text-align: center;
+  }
 {% endblock %}
 {% block content %}
-    <main class="form-signin">
-        <form method="post" class="needs-validation" novalidate>
-            {% csrf_token %}
-            <div class="logo">
-                <img class="mb-4" src="{% static 'icon/icon.png' %}" alt="" width="72" height="72">
-                <h1 class="h3 mb-3 fw-normal">Forgot password</h1>
-            </div>
-            <div class="form-floating">
-                {{ form.email }}
-                <label for="floatingInput">{{ form.email.label }}</label>
-            </div>
-            <br/>
-            <button class="w-100 btn btn-lg btn-primary" type="submit">Submit</button>
-        </form>
-    </main>
+  <main class="form-signin">
+    <form method="post" class="needs-validation" novalidate>
+      {% csrf_token %}
+      <div class="logo">
+        <img class="mb-4" src="{% static 'icon/icon.png' %}" alt="" width="72"
+             height="72">
+        <h1 class="h3 mb-3 fw-normal">Forgot password</h1>
+      </div>
+      <div class="form-floating">
+        {{ form.email }}
+        <label for="floatingInput">{{ form.email.label }}</label>
+      </div>
+      <br/>
+      <button class="w-100 btn btn-lg btn-primary" type="submit">Submit</button>
+    </form>
+  </main>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/forget_complete.html b/dsbd/templates/forget_complete.html
index 366764f..c840b40 100644
--- a/dsbd/templates/forget_complete.html
+++ b/dsbd/templates/forget_complete.html
@@ -1,11 +1,11 @@
 {% extends 'base1.html' %}
 {% load static %}
 {% block content %}
-    <h2>Your password reset Email has been sent.</h2>
-    <p>
-        パスワード再設定を完了しました。<br>
-        <a class="btn btn-primary btn-lg" href="{% url 'sign_in' %}">ログイン</a>
-    </p>
+  <h2>Your password reset Email has been sent.</h2>
+  <p>
+    パスワード再設定を完了しました。<br>
+    <a class="btn btn-primary btn-lg" href="{% url 'sign_in' %}">ログイン</a>
+  </p>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/forget_confirm.html b/dsbd/templates/forget_confirm.html
index 9d19a0c..3acfc1d 100644
--- a/dsbd/templates/forget_confirm.html
+++ b/dsbd/templates/forget_confirm.html
@@ -1,20 +1,20 @@
 {% extends 'base1.html' %}
 {% load static %}
 {% block content %}
-    <h2>パスワード再設定フォーム</h2>
-    <form action="" method="POST">
-        {{ form.non_field_errors }}
-        {% for field in form %}
-            <div class="form-group">
-                <label for="{{ field.id_for_label }}">{{ field.label_tag }}</label>
-                {{ field }}
-                {{ field.errors }}
-            </div>
-        {% endfor %}
-        {% csrf_token %}
-        <br/>
-        <button type="submit" class="btn btn-primary btn-lg">送信</button>
-    </form>
+  <h2>パスワード再設定フォーム</h2>
+  <form action="" method="POST">
+    {{ form.non_field_errors }}
+    {% for field in form %}
+      <div class="form-group">
+        <label for="{{ field.id_for_label }}">{{ field.label_tag }}</label>
+        {{ field }}
+        {{ field.errors }}
+      </div>
+    {% endfor %}
+    {% csrf_token %}
+    <br/>
+    <button type="submit" class="btn btn-primary btn-lg">送信</button>
+  </form>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/forget_done.html b/dsbd/templates/forget_done.html
index 4ddf508..91a19f2 100644
--- a/dsbd/templates/forget_done.html
+++ b/dsbd/templates/forget_done.html
@@ -1,10 +1,10 @@
 {% extends 'base1.html' %}
 {% load static %}
 {% block content %}
-        <p>
-            パスワード再設定用のメールを送信しました。<br>
-            メールに記載されているリンクから再設定を行ってください。
-        </p>
+  <p>
+    パスワード再設定用のメールを送信しました。<br>
+    メールに記載されているリンクから再設定を行ってください。
+  </p>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/group/add.html b/dsbd/templates/group/add.html
index 13f3685..8a88539 100644
--- a/dsbd/templates/group/add.html
+++ b/dsbd/templates/group/add.html
@@ -1,131 +1,139 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">Group新規申請</h2>
-                    <br/>
-                    {% if error %}
-                        <div class="alert alert-danger" role="alert">
-                            {{ error }}
-                        </div>
-                        <br/>
-                    {% endif %}
-                    {% if request.user.allow_group_add %}
-                        <form method="post" class="h-adr">
-                            {% csrf_token %}
-                            <a href="{% url 'custom_auth_group:index' %}" class="nav-link text-white"
-                               aria-current="page">
-                            </a>
-                            <h4>1. 申請内容</h4>
-                            <h5>{{ form.agree.label }}</h5>
-                            <a class="btn btn-primary btn-sm" onclick href="{% get_fee_url %}"
-                               target="_self">会費について</a>
-                            <a class="btn btn-primary btn-sm" onclick href="{% get_usage_url %}" target="_self">実験ネットワーク利用規約</a>
-                            <a class="btn btn-primary btn-sm" onclick ref="{% get_privacy_policy_url %}"
-                               target="_self">プライバシーポリシー</a>
-                            <br/>
-                            <br/>
-                            {{ form.agree }}
-                            {% if form.agree.error_messages %}
-                                <p class="link-danger">{{ form.agree.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.question1.label }}</h5>
-                            <p>当団体の運営委員より紹介を受けた方は紹介者の名前を記入してください</p>
-                            {{ form.question1 }}
-                            {% if form.question1.error_messages %}
-                                <p class="link-danger">{{ form.question1.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.question2.label }}</h5>
-                            <p>例) 研究目的、勉強、自宅サーバ用途（商用利用は不可）[10文字以上]</p>
-                            {{ form.question2 }}
-                            {% if form.question2.error_messages %}
-                                <p class="link-danger">{{ form.question2.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.question3.label }}</h5>
-                            <p>PIアドレスやAS番号をお持ちの方は、それらをご利用いただくことも可能です</p>
-                            {{ form.question3 }}
-                            {% if form.question3.error_messages %}
-                                <p class="link-danger">{{ form.question3.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.question4.label }}</h5>
-                            <p>GitHub、成果物などがありましたら教えてください<br/>(発信しているコンテンツなどがなければ、「なし」とお答えください)
-                            </p>
-                            {{ form.question4 }}
-                            {% if form.question4.error_messages %}
-                                <p class="link-danger">{{ form.question4.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <br/>
-                            <h4>2. 組織情報</h4>
-                            <h5>{{ form.name.label }}</h5>
-                            {{ form.name }}
-                            {% if form.name.error_messages %}
-                                <p class="link-danger">{{ form.name.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.name_jp.label }}</h5>
-                            {{ form.name_jp }}
-                            {% if form.name_jp.error_messages %}
-                                <p class="link-danger">{{ form.name_jp.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.postcode.label }}</h5>
-                            {{ form.postcode }}
-                            {% if form.postcode.error_messages %}
-                                <p class="link-danger">{{ form.postcode.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.address.label }}</h5>
-                            {{ form.address }}
-                            {% if form.address.error_messages %}
-                                <p class="link-danger">{{ form.address.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.address_jp.label }}</h5>
-                            {{ form.address_jp }}
-                            {% if form.address_jp.error_messages %}
-                                <p class="link-danger">{{ form.address_jp.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.phone.label }}</h5>
-                            {{ form.phone }}
-                            {% if form.phone.error_messages %}
-                                <p class="link-danger">{{ form.phone.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h5>{{ form.country.label }}</h5>
-                            {{ form.country }}
-                            {% if form.country.error_messages %}
-                                <p class="link-danger">{{ form.country.error_messages | striptags }}</p>
-                            {% endif %}
-                            <br/>
-                            <h4>{{ form.contract.label }}</h4>
-                            <p> 当団体は電気通信事業者として届出を行っておりますため、利用開始時に電気通信事業法<br/>
-                                第26条2（書面の交付義務）に基づき、<br/>
-                                ご利用内容をお知らせいたしますので、ご希望の交付方法をお知らせください。
-                            </p>
-                            {{ form.contract }}
-                            {% if form.contract.error_messages %}
-                                <p class="link-danger">{{ form.contract.error_messages | striptags }}</p>
-                            {% endif %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Group新規申請</h2>
+          <br/>
+          {% if error %}
+            <div class="alert alert-danger" role="alert">
+              {{ error }}
+            </div>
+            <br/>
+          {% endif %}
+          {% if request.user.allow_group_add %}
+            <form method="post" class="h-adr">
+              {% csrf_token %}
+              <a href="{% url 'custom_auth_group:index' %}"
+                 class="nav-link text-white"
+                 aria-current="page">
+              </a>
+              <h4>1. 申請内容</h4>
+              <h5>{{ form.agree.label }}</h5>
+              <a class="btn btn-primary btn-sm" onclick
+                 href="{% get_fee_url %}"
+                 target="_self">会費について</a>
+              <a class="btn btn-primary btn-sm" onclick
+                 href="{% get_usage_url %}"
+                 target="_self">実験ネットワーク利用規約</a>
+              <a class="btn btn-primary btn-sm" onclick
+                 ref="{% get_privacy_policy_url %}"
+                 target="_self">プライバシーポリシー</a>
+              <br/>
+              <br/>
+              {{ form.agree }}
+              {% if form.agree.error_messages %}
+                <p class="link-danger">{{ form.agree.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.question1.label }}</h5>
+              <p>
+                当団体の運営委員より紹介を受けた方は紹介者の名前を記入してください</p>
+              {{ form.question1 }}
+              {% if form.question1.error_messages %}
+                <p class="link-danger">{{ form.question1.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.question2.label }}</h5>
+              <p>例)
+                研究目的、勉強、自宅サーバ用途（商用利用は不可）[10文字以上]</p>
+              {{ form.question2 }}
+              {% if form.question2.error_messages %}
+                <p class="link-danger">{{ form.question2.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.question3.label }}</h5>
+              <p>
+                PIアドレスやAS番号をお持ちの方は、それらをご利用いただくことも可能です</p>
+              {{ form.question3 }}
+              {% if form.question3.error_messages %}
+                <p class="link-danger">{{ form.question3.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.question4.label }}</h5>
+              <p>GitHub、成果物などがありましたら教えてください<br/>(発信しているコンテンツなどがなければ、「なし」とお答えください)
+              </p>
+              {{ form.question4 }}
+              {% if form.question4.error_messages %}
+                <p class="link-danger">{{ form.question4.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <br/>
+              <h4>2. 組織情報</h4>
+              <h5>{{ form.name.label }}</h5>
+              {{ form.name }}
+              {% if form.name.error_messages %}
+                <p class="link-danger">{{ form.name.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.name_jp.label }}</h5>
+              {{ form.name_jp }}
+              {% if form.name_jp.error_messages %}
+                <p class="link-danger">{{ form.name_jp.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.postcode.label }}</h5>
+              {{ form.postcode }}
+              {% if form.postcode.error_messages %}
+                <p class="link-danger">{{ form.postcode.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.address.label }}</h5>
+              {{ form.address }}
+              {% if form.address.error_messages %}
+                <p class="link-danger">{{ form.address.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.address_jp.label }}</h5>
+              {{ form.address_jp }}
+              {% if form.address_jp.error_messages %}
+                <p class="link-danger">{{ form.address_jp.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.phone.label }}</h5>
+              {{ form.phone }}
+              {% if form.phone.error_messages %}
+                <p class="link-danger">{{ form.phone.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.country.label }}</h5>
+              {{ form.country }}
+              {% if form.country.error_messages %}
+                <p class="link-danger">{{ form.country.error_messages | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h4>{{ form.contract.label }}</h4>
+              <p> 当団体は電気通信事業者として届出を行っておりますため、利用開始時に電気通信事業法<br/>
+                第26条2（書面の交付義務）に基づき、<br/>
+                ご利用内容をお知らせいたしますので、ご希望の交付方法をお知らせください。
+              </p>
+              {{ form.contract }}
+              {% if form.contract.error_messages %}
+                <p class="link-danger">{{ form.contract.error_messages | striptags }}</p>
+              {% endif %}
 
 
-                            <br/>
-                            <button type="submit" class="btn btn-primary">登録</button>
-                        </form>
-                    {% else %}
-                        <p>
-                            <b>新規にグループを登録したい又は既存の登録グループを紐づけたい方は、チケットページよりお問い合わせください</b>
-                        </p>
-                    {% endif %}
-                </div>
-            </div>
+              <br/>
+              <button type="submit" class="btn btn-primary">登録</button>
+            </form>
+          {% else %}
+            <p>
+              <b>新規にグループを登録したい又は既存の登録グループを紐づけたい方は、チケットページよりお問い合わせください</b>
+            </p>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/group/edit.html b/dsbd/templates/group/edit.html
index 6bcbdbf..ae7de76 100644
--- a/dsbd/templates/group/edit.html
+++ b/dsbd/templates/group/edit.html
@@ -1,41 +1,43 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">Group情報閲覧・修正</h2>
-                    <br/>
-                    {% if error %}
-                        <div class="alert alert-danger" role="alert">
-                            {{ error }}
-                        </div>
-                        <br/>
-                    {% endif %}
-                    {% if group %}
-                        <div class="card">
-                            <div class="card-header">
-                                ID: {{ group.id }} 作成日: {{ group.created_at }}
-                            </div>
-                        </div>
-                        <br/>
-                        <br/>
-                        <form method="post" class="h-adr">
-                            {% csrf_token %}
-                            {{ form }}
-                            <br/>
-                            {% if group.is_active and administrator %}
-                                <button type="submit" class="btn btn-primary">変更</button>{% endif %}
-                        </form>
-                    {% else %}
-                        <p><b>本グループIDは閲覧できません</b></p>
-                    {% endif %}
-                    <br/>
-                    <br/>
-                    <a class="btn btn-primary" href="{% url 'custom_auth_group:index' %}" role="button"
-                       aria-expanded="false">グループ一覧に戻る</a>
-                </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Group情報閲覧・修正</h2>
+          <br/>
+          {% if error %}
+            <div class="alert alert-danger" role="alert">
+              {{ error }}
             </div>
+            <br/>
+          {% endif %}
+          {% if group %}
+            <div class="card">
+              <div class="card-header">
+                ID: {{ group.id }} 作成日: {{ group.created_at }}
+              </div>
+            </div>
+            <br/>
+            <br/>
+            <form method="post" class="h-adr">
+              {% csrf_token %}
+              {{ form }}
+              <br/>
+              {% if group.is_active and administrator %}
+                <button type="submit" class="btn btn-primary">変更
+                </button>{% endif %}
+            </form>
+          {% else %}
+            <p><b>本グループIDは閲覧できません</b></p>
+          {% endif %}
+          <br/>
+          <br/>
+          <a class="btn btn-primary"
+             href="{% url 'custom_auth_group:index' %}" role="button"
+             aria-expanded="false">グループ一覧に戻る</a>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/group/edit_permission.html b/dsbd/templates/group/edit_permission.html
index f766cc4..979cc29 100644
--- a/dsbd/templates/group/edit_permission.html
+++ b/dsbd/templates/group/edit_permission.html
@@ -1,109 +1,119 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">Group権限設定</h2>
-                    <br/>
-                    {% if error %}
-                        <div class="alert alert-danger" role="alert">
-                            {{ error }}
-                        </div>
-                        <br/>
-                    {% endif %}
-                    {% if group %}
-                        <div class="card">
-                            <div class="card-header">
-                                ID: {{ group.id }} 作成日: {{ group.created_at }}
-                            </div>
-                            <div class="card-body">
-                                <h5 class="card-title">{{ group.name }}</h5>
-                                <br/>
-                                <div class="container">
-                                    <div>
-                                        <a class="btn btn-primary btn-sm" href="{% url 'custom_auth_group:permission' group.id %}">権限設定</a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="card-footer">
-                                {% if group.is_active %}<span class="badge bg-primary">有効</span>
-                                {% else %}<span class="badge bg-danger">無効</span>{% endif %}
-                                {% if administrator %}<span class="badge bg-success">管理者権限</span>{% endif %}
-                                <span class="badge bg-secondary">Service: {{ group.service_set.count }}</span>
-                            </div>
-                        </div>
-                        <br/>
-                        <br/>
-                        {% if permission %}
-                            <table class="table table-striped">
-                                <thead>
-                                <tr>
-                                    <th scope="col">ID</th>
-                                    <th scope="col">作成日</th>
-                                    <th scope="col">User</th>
-                                    <th scope="col">Group</th>
-                                    <th scope="col">Option</th>
-                                    <th scope="col">Action</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                {% for e in permission %}
-                                    <tr>
-                                        <th scope="row">{{ e.id }}</th>
-                                        <td>{{ e.created_at }}</td>
-                                        <td>{{ e.user.id }}: {{ e.user.username }}</td>
-                                        <td>{{ e.group.id }}: {{ e.group.name }}</td>
-                                        <td>
-                                            {% if e.is_admin %}
-                                                <span class="badge bg-success">管理者権限</span>
-                                            {% else %}
-                                                <span class="badge bg-primary">ユーザ権限</span>
-                                            {% endif %}
-                                            {% if e.enable_ldap %}
-                                                <span class="badge bg-success">LDAP有効</span>
-                                            {% elif e.ldap_register %}
-                                                <span class="badge bg-danger">LDAP無効</span>
-                                            {% endif %}
-                                        </td>
-                                        <td>
-                                            {% if administrator %}
-                                                <form method="post">
-                                                    {% csrf_token %}
-                                                    <input type="text" value={{ e.id }} name="id" hidden>
-                                                    {% if e.is_admin and e.user.id != request.user.id %}
-                                                        <button type="submit" class="btn btn-primary btn-sm"
-                                                                name="no_admin">ユーザ権限に変更
-                                                        </button>
-                                                    {% elif e.is_admin %}
-                                                        ユーザ権限に変更出来ません
-                                                    {% else %}
-                                                        <button type="submit" class="btn btn-primary btn-sm"
-                                                                name="admin">管理者権限に変更
-                                                        </button>
-                                                    {% endif %}
-                                                </form>
-                                            {% else %}
-                                                権限がありません
-                                            {% endif %}
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                                </tbody>
-                            </table>
-                        {% endif %}
-                        {% if not administrator %}
-                            <p>管理者権限がないため、権限設定を変更出来ません。</p>
-                        {% endif %}
-                    {% else %}
-                        <p><b>本グループIDは閲覧できません</b></p>
-                    {% endif %}
-                    <br/>
-                    <br/>
-                    <a class="btn btn-primary" href="{% url 'custom_auth_group:index' %}" role="button"
-                       aria-expanded="false">グループ一覧に戻る</a>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Group権限設定</h2>
+          <br/>
+          {% if error %}
+            <div class="alert alert-danger" role="alert">
+              {{ error }}
+            </div>
+            <br/>
+          {% endif %}
+          {% if group %}
+            <div class="card">
+              <div class="card-header">
+                ID: {{ group.id }} 作成日: {{ group.created_at }}
+              </div>
+              <div class="card-body">
+                <h5 class="card-title">{{ group.name }}</h5>
+                <br/>
+                <div class="container">
+                  <div>
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url 'custom_auth_group:permission' group.id %}">権限設定</a>
+                  </div>
                 </div>
+              </div>
+              <div class="card-footer">
+                {% if group.is_active %}
+                  <span class="badge bg-primary">有効</span>
+                {% else %}
+                  <span class="badge bg-danger">無効</span>{% endif %}
+                {% if administrator %}
+                  <span class="badge bg-success">管理者権限</span>{% endif %}
+                <span
+                    class="badge bg-secondary">Service: {{ group.service_set.count }}</span>
+              </div>
             </div>
+            <br/>
+            <br/>
+            {% if permission %}
+              <table class="table table-striped">
+                <thead>
+                <tr>
+                  <th scope="col">ID</th>
+                  <th scope="col">作成日</th>
+                  <th scope="col">User</th>
+                  <th scope="col">Group</th>
+                  <th scope="col">Option</th>
+                  <th scope="col">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                {% for e in permission %}
+                  <tr>
+                    <th scope="row">{{ e.id }}</th>
+                    <td>{{ e.created_at }}</td>
+                    <td>{{ e.user.id }}: {{ e.user.username }}</td>
+                    <td>{{ e.group.id }}: {{ e.group.name }}</td>
+                    <td>
+                      {% if e.is_admin %}
+                        <span class="badge bg-success">管理者権限</span>
+                      {% else %}
+                        <span class="badge bg-primary">ユーザ権限</span>
+                      {% endif %}
+                      {% if e.enable_ldap %}
+                        <span class="badge bg-success">LDAP有効</span>
+                      {% elif e.ldap_register %}
+                        <span class="badge bg-danger">LDAP無効</span>
+                      {% endif %}
+                    </td>
+                    <td>
+                      {% if administrator %}
+                        <form method="post">
+                          {% csrf_token %}
+                          <input type="text"
+                                 value={{ e.id }} name="id"
+                                 hidden>
+                          {% if e.is_admin and e.user.id != request.user.id %}
+                            <button type="submit"
+                                    class="btn btn-primary btn-sm"
+                                    name="no_admin">ユーザ権限に変更
+                            </button>
+                          {% elif e.is_admin %}
+                            ユーザ権限に変更出来ません
+                          {% else %}
+                            <button type="submit"
+                                    class="btn btn-primary btn-sm"
+                                    name="admin">管理者権限に変更
+                            </button>
+                          {% endif %}
+                        </form>
+                      {% else %}
+                        権限がありません
+                      {% endif %}
+                    </td>
+                  </tr>
+                {% endfor %}
+                </tbody>
+              </table>
+            {% endif %}
+            {% if not administrator %}
+              <p>管理者権限がないため、権限設定を変更出来ません。</p>
+            {% endif %}
+          {% else %}
+            <p><b>本グループIDは閲覧できません</b></p>
+          {% endif %}
+          <br/>
+          <br/>
+          <a class="btn btn-primary"
+             href="{% url 'custom_auth_group:index' %}" role="button"
+             aria-expanded="false">グループ一覧に戻る</a>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/group/index.html b/dsbd/templates/group/index.html
index 1aebf53..d5ec80a 100644
--- a/dsbd/templates/group/index.html
+++ b/dsbd/templates/group/index.html
@@ -1,155 +1,179 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">Group</h2>
-                    <br/>
-                    {% if request.user.allow_group_add %}
-                        <p><b>下記のより、新規申請してください。</b></p>
-                        <a class="btn btn-primary" href="{% url 'custom_auth_group:add' %}" role="button"
-                           aria-expanded="false">新規申請</a>
-                    {% else %}
-                        <p>
-                            <b>グループの追加申請は原則1つまでです</b>
-                        </p>
-                    {% endif %}
-                    <br/>
-                    <br/>
-                    {% if data %}
-                        {% for e in data %}
-                            <div class="card">
-                                <div class="card-header">
-                                    ID: {{ e.group.id }} 作成日: {{ e.group.created_at }}
-                                </div>
-                                <div class="card-body">
-                                    <h5 class="card-title">{{ e.group.name }}</h5>
-                                    {% if e.group.is_charge %}
-                                        {% if e.group.expired_at %}
-                                            <p class="card-text">課金情報: {{ e.group.expired_at }}まで</p>
-                                        {% else %}
-                                            <p class="card-text">課金情報: 会費未徴収</p>
-                                        {% endif %}
-                                    {% else %}
-                                        <p class="card-text">課金情報: 課金ステータス無効</p>
-                                    {% endif %}
-                                    <div class="container">
-                                        <div>
-                                            <a class="btn btn-primary btn-sm" href="{% url 'custom_auth_group:edit' e.group.id %}">情報閲覧・修正</a>
-                                            <a class="btn btn-primary btn-sm"
-                                               href="{% url 'custom_auth_group:permission' e.group.id %}">権限設定</a>
-                                            <br/>
-                                            <br/>
-                                            {% if e.administrator %}
-                                                <form method="post">
-                                                    {% csrf_token %}
-                                                    <input type="text" value={{ e.group.id }} name="group_id" hidden>
-                                                    {% if e.group.is_charge and e.group.stripe_customer_id and not e.group.stripe_subscription_id %}
-                                                        <a class="btn btn-primary btn-sm" href="{% url 'group_payment' e.group.id %}">会費のお支払いはこちらから</a>
-                                                    {% endif %}
-                                                    {% if not e.group.stripe_customer_id %}
-                                                        <button type="submit" name="id" value="create_stripe_customer" class="btn btn-primary btn-sm">会費のお支払いはこちらから
-                                                        </button>
-                                                    {% endif %}
-                                                    {% if e.group.is_charge and e.group.stripe_customer_id %}
-                                                        <button type="submit" name="id" value="getting_portal" class="btn btn-primary btn-sm">プランの変更・キャンセル</button>
-                                                    {% endif %}
-                                                </form>
-                                            {% endif %}
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-footer">
-                                    {% if e.group.is_pass %}<span class="badge bg-primary">審査済</span>
-                                    {% else %}<span class="badge bg-danger">未審査</span>{% endif %}
-                                    {% if e.administrator %}<span class="badge bg-success">管理者権限</span>{% endif %}
-                                    <span class="badge bg-secondary">Service: {{ e.group.service_set.count }}</span>
-                                </div>
-                            </div>
-                            <br/>
-                        {% endfor %}
-                        <nav aria-label="...">
-                            <ul class="pagination">
-                                {% if tickets.has_previous %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">前へ</span>
-                                    </li>
-                                {% endif %}
-                                {% if tickets.paginator.num_pages > 10 %}
-                                    {% if tickets.number < 6 %}
-                                        {#    先頭 9 ページの表示      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 < 9 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
-                                        {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% else %}
-                                        {#   最後 9 ページの表示   #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% endif %}
-                                {% else %}
-                                    {% for pg in tickets.paginator.page_range %}
-                                        {% if tickets.number == pg %}
-                                            <li class="page-item active">
-                                                {% else %}
-                                            <li class="page-item">
-                                        {% endif %}
-                                    <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                    </li>
-                                    {% endfor %}
-                                {% endif %}
-                                {% if tickets.has_next %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">次へ</span>
-                                    </li>
-                                {% endif %}
-                            </ul>
-                        </nav>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Group</h2>
+          <br/>
+          {% if request.user.allow_group_add %}
+            <p><b>下記のより、新規申請してください。</b></p>
+            <a class="btn btn-primary"
+               href="{% url 'custom_auth_group:add' %}" role="button"
+               aria-expanded="false">新規申請</a>
+          {% else %}
+            <p>
+              <b>グループの追加申請は原則1つまでです</b>
+            </p>
+          {% endif %}
+          <br/>
+          <br/>
+          {% if data %}
+            {% for e in data %}
+              <div class="card">
+                <div class="card-header">
+                  ID: {{ e.group.id }}
+                  作成日: {{ e.group.created_at }}
+                </div>
+                <div class="card-body">
+                  <h5 class="card-title">{{ e.group.name }}</h5>
+                  {% if e.group.is_charge %}
+                    {% if e.group.expired_at %}
+                      <p class="card-text">
+                        課金情報: {{ e.group.expired_at }}まで</p>
                     {% else %}
-                        <p>グループがありません</p>
+                      <p class="card-text">課金情報:
+                        会費未徴収</p>
                     {% endif %}
+                  {% else %}
+                    <p class="card-text">課金情報:
+                      課金ステータス無効</p>
+                  {% endif %}
+                  <div class="container">
+                    <div>
+                      <a class="btn btn-primary btn-sm"
+                         href="{% url 'custom_auth_group:edit' e.group.id %}">情報閲覧・修正</a>
+                      <a class="btn btn-primary btn-sm"
+                         href="{% url 'custom_auth_group:permission' e.group.id %}">権限設定</a>
+                      <br/>
+                      <br/>
+                      {% if e.administrator %}
+                        <form method="post">
+                          {% csrf_token %}
+                          <input type="text"
+                                 value={{ e.group.id }} name="group_id"
+                                 hidden>
+                          {% if e.group.is_charge and e.group.stripe_customer_id and not e.group.stripe_subscription_id %}
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url 'group_payment' e.group.id %}">会費のお支払いはこちらから</a>
+                          {% endif %}
+                          {% if not e.group.stripe_customer_id %}
+                            <button type="submit" name="id"
+                                    value="create_stripe_customer"
+                                    class="btn btn-primary btn-sm">
+                              会費のお支払いはこちらから
+                            </button>
+                          {% endif %}
+                          {% if e.group.is_charge and e.group.stripe_customer_id %}
+                            <button type="submit" name="id"
+                                    value="getting_portal"
+                                    class="btn btn-primary btn-sm">
+                              プランの変更・キャンセル
+                            </button>
+                          {% endif %}
+                        </form>
+                      {% endif %}
+                    </div>
+                  </div>
                 </div>
-            </div>
+                <div class="card-footer">
+                  {% if e.group.is_pass %}
+                    <span class="badge bg-primary">審査済</span>
+                  {% else %}
+                    <span class="badge bg-danger">未審査</span>{% endif %}
+                  {% if e.administrator %}
+                    <span class="badge bg-success">管理者権限</span>{% endif %}
+                  <span
+                      class="badge bg-secondary">Service: {{ e.group.service_set.count }}</span>
+                </div>
+              </div>
+              <br/>
+            {% endfor %}
+            <nav aria-label="...">
+              <ul class="pagination">
+                {% if tickets.has_previous %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">前へ</span>
+                  </li>
+                {% endif %}
+                {% if tickets.paginator.num_pages > 10 %}
+                  {% if tickets.number < 6 %}
+                    {#    先頭 9 ページの表示      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 < 9 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
+                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% else %}
+                    {#   最後 9 ページの表示   #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% endif %}
+                {% else %}
+                  {% for pg in tickets.paginator.page_range %}
+                    {% if tickets.number == pg %}
+                      <li class="page-item active">
+                        {% else %}
+                      <li class="page-item">
+                    {% endif %}
+                  <a class="page-link"
+                     href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                  </li>
+                  {% endfor %}
+                {% endif %}
+                {% if tickets.has_next %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">次へ</span>
+                  </li>
+                {% endif %}
+              </ul>
+            </nav>
+          {% else %}
+            <p>グループがありません</p>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/group/payment.html b/dsbd/templates/group/payment.html
index 11271fd..c50348a 100644
--- a/dsbd/templates/group/payment.html
+++ b/dsbd/templates/group/payment.html
@@ -1,57 +1,62 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">会費</h2>
-                    <br/>
-                    {% if administrator and group.is_charge and group.stripe_customer_id and not group.stripe_subscription_id %}
-                        {% for one_data in data %}
-                            <div class="card">
-                                <div class="card-body">
-                                    <h3 class="card-title">{{ one_data.name }}</h3>
-                                    <br/>
-                                    <form method="post">
-                                        {% csrf_token %}
-                                        <div class="row  mb-3 text-center">
-                                            {% for price in one_data.prices %}
-                                                <div class="col">
-                                                    <div class="card mb-4 rounded-3 shadow-sm">
-                                                        <div class="card-header py-3">
-                                                            <h4 class="my-0 fw-normal">{{ price.interval }}</h4>
-                                                        </div>
-                                                        <div class="card-body">
-                                                            <h1 class="card-title pricing-card-title">{{ price.amount }}円<small
-                                                                    class="text-muted fw-light">/{{ price.interval }}</small>
-                                                            </h1>
-                                                            <ul class="list-unstyled mt-3 mb-4">
-                                                                <li>{{ price.description }}</li>
-                                                            </ul>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">会費</h2>
+          <br/>
+          {% if administrator and group.is_charge and group.stripe_customer_id and not group.stripe_subscription_id %}
+            {% for one_data in data %}
+              <div class="card">
+                <div class="card-body">
+                  <h3 class="card-title">{{ one_data.name }}</h3>
+                  <br/>
+                  <form method="post">
+                    {% csrf_token %}
+                    <div class="row  mb-3 text-center">
+                      {% for price in one_data.prices %}
+                        <div class="col">
+                          <div class="card mb-4 rounded-3 shadow-sm">
+                            <div class="card-header py-3">
+                              <h4 class="my-0 fw-normal">{{ price.interval }}</h4>
+                            </div>
+                            <div class="card-body">
+                              <h1 class="card-title pricing-card-title">{{ price.amount }}円<small
+                                  class="text-muted fw-light">/{{ price.interval }}</small>
+                              </h1>
+                              <ul class="list-unstyled mt-3 mb-4">
+                                <li>{{ price.description }}</li>
+                              </ul>
 
-                                                            <button type="submit" name="price_id" value="{{ price.id }}"
-                                                                    class="w-100 btn btn-lg btn-outline-primary">会費支払い
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            {% endfor %}
-                                        </div>
-                                    </form>
-                                </div>
+                              <button type="submit"
+                                      name="price_id"
+                                      value="{{ price.id }}"
+                                      class="w-100 btn btn-lg btn-outline-primary">
+                                会費支払い
+                              </button>
                             </div>
-                            <br/>
-                        {% endfor %}
-                        <br/>
-                    {% else %}
-                        <p><b>寄付済み又はエラーです</b></p>
-                    {% endif %}
-                    <br/>
-                    <br/>
-                    <br/>
-                    <a class="btn btn-primary" href="{% url 'custom_auth_group:index' %}" role="button" aria-expanded="false">ホームへ戻る</a>
+                          </div>
+                        </div>
+                      {% endfor %}
+                    </div>
+                  </form>
                 </div>
-            </div>
+              </div>
+              <br/>
+            {% endfor %}
+            <br/>
+          {% else %}
+            <p><b>寄付済み又はエラーです</b></p>
+          {% endif %}
+          <br/>
+          <br/>
+          <br/>
+          <a class="btn btn-primary"
+             href="{% url 'custom_auth_group:index' %}" role="button"
+             aria-expanded="false">ホームへ戻る</a>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index f10713a..49a4c1c 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -1,195 +1,209 @@
 {% extends 'base2.html' %}
 {% block style %}
-    <style>
-        .description-text {
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-        }
-    </style>
+  <style>
+      .description-text {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+      }
+  </style>
 
 {% endblock style %}
 
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="col-sm-8">
-                <div class="container py-4 mb-auto">
-                    <div class="h-900 p-2 rounded-3">
-                        <h2>お知らせ</h2>
-                        <div class="card text-bg-warning mb-3">
-                            <div class="card-body">
-                                <h5 class="card-title">Warning card title</h5>
-                                <p class="card-text">Some quick example text to build on the card title and make up the
-                                    bulk of the card's content.</p>
-                            </div>
-                        </div>
-                        {% for notice in notices %}
-                            <div class="card mb-2">
-                                <div class="card-body">
-                                    <h6 class="card-subtitle mb-2 text-body-secondary">
-                                        <span class="badge bg-secondary">{{ notice.start_at }}~{% if notice.end_at != None %}
-                                            {{ notice.end_at }}{% else %}無期限{% endif %}
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-8">
+        <div class="container py-4 mb-auto">
+          <div class="h-900 p-2 rounded-3">
+            <h2>お知らせ</h2>
+            <div class="card text-bg-warning mb-3">
+              <div class="card-body">
+                <h5 class="card-title">Warning card title</h5>
+                <p class="card-text">Some quick example text to build on
+                  the card title and make up the
+                  bulk of the card's content.</p>
+              </div>
+            </div>
+            {% for notice in notices %}
+              <div class="card mb-2">
+                <div class="card-body">
+                  <h6 class="card-subtitle mb-2 text-body-secondary">
+                                        <span
+                                            class="badge bg-secondary">{{ notice.start_at }}~
+                                          {% if notice.end_at != None %}
+                                            {{ notice.end_at }}{% else %}
+                                            無期限{% endif %}
                                           </span>
-                                        {% if notice.is_info %}
-                                            <span class="badge text-bg-primary">情報</span>
-                                        {% endif %}
-                                        {% if notice.is_important %}
-                                            <span class="badge text-bg-warning">重要</span>
-                                        {% endif %}
-                                        {% if notice.is_fail %}
-                                            <span class="badge text-bg-danger">障害</span>
-                                        {% endif %}
-                                    </h6>
-                                    <h5 class="card-title">{{ notice.title }}</h5>
-                                    <p class="card-text description-text">{{ notice.body | linebreaksbr }}</p>
-                                    <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal"
-                                            data-bs-target="#detail">
-                                        詳しい内容はこちら
-                                    </button>
-                                    <div class="modal fade" id="detail" tabindex="-1"
-                                         aria-labelledby="detailLabel" aria-hidden="true">
-                                        <div class="modal-dialog modal-dialog-scrollable">
-                                            <div class="modal-content">
-                                                <div class="modal-header">
-                                                    <h1 class="modal-title fs-5"
-                                                        id="detailLabel">{{ notice.title }}</h1>
-                                                    <button type="button" class="btn-close" data-bs-dismiss="modal"
-                                                            aria-label="Close"></button>
-                                                </div>
-                                                <div class="modal-body">
-                                                    {{ notice.body | linebreaksbr }}
-                                                    <hr>
-                                                    <span class="badge bg-secondary">{{ notice.start_at }}
-                                                        {% if notice.end_at != None %}
-                                                            <span class="badge bg-secondary">公開終了日: {{ notice.end_at }}</span>{% endif %}
+                    {% if notice.is_info %}
+                      <span class="badge text-bg-primary">情報</span>
+                    {% endif %}
+                    {% if notice.is_important %}
+                      <span class="badge text-bg-warning">重要</span>
+                    {% endif %}
+                    {% if notice.is_fail %}
+                      <span class="badge text-bg-danger">障害</span>
+                    {% endif %}
+                  </h6>
+                  <h5 class="card-title">{{ notice.title }}</h5>
+                  <p class="card-text description-text">{{ notice.body | linebreaksbr }}</p>
+                  <button type="button" class="btn btn-sm btn-primary"
+                          data-bs-toggle="modal"
+                          data-bs-target="#detail">
+                    詳しい内容はこちら
+                  </button>
+                  <div class="modal fade" id="detail" tabindex="-1"
+                       aria-labelledby="detailLabel"
+                       aria-hidden="true">
+                    <div class="modal-dialog modal-dialog-scrollable">
+                      <div class="modal-content">
+                        <div class="modal-header">
+                          <h1 class="modal-title fs-5"
+                              id="detailLabel">{{ notice.title }}</h1>
+                          <button type="button"
+                                  class="btn-close"
+                                  data-bs-dismiss="modal"
+                                  aria-label="Close"></button>
+                        </div>
+                        <div class="modal-body">
+                          {{ notice.body | linebreaksbr }}
+                          <hr>
+                          <span class="badge bg-secondary">{{ notice.start_at }}
+                            {% if notice.end_at != None %}
+                              <span
+                                  class="badge bg-secondary">公開終了日: {{ notice.end_at }}</span>{% endif %}
                                                     </span>
-                                                    {% if notice.is_info %}
-                                                        <span class="badge text-bg-primary">情報</span>
-                                                    {% endif %}
-                                                    {% if notice.is_important %}
-                                                        <span class="badge text-bg-warning">重要</span>
-                                                    {% endif %}
-                                                    {% if notice.is_fail %}
-                                                        <span class="badge text-bg-danger">障害</span>
-                                                    {% endif %}
-                                                </div>
-                                                <div class="modal-footer">
-                                                    <button type="button" class="btn btn-secondary"
-                                                            data-bs-dismiss="modal">Close
-                                                    </button>
-                                                    {% if request.user.is_staff %}
-                                                        <a href="/admin/notice/notice/{{ notice.id }}/change"
-                                                           class="btn btn-primary">編集</a>
-                                                        <a href="/admin/notice/notice/{{ notice.id }}/delete"
-                                                           class="btn btn-danger">削除</a>
-                                                    {% endif %}
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                    <nav aria-label="...">
-                        <ul class="pagination">
-                            {% if notices.has_previous %}
-                                <li class="page-item">
-                                    <a class="page-link"
-                                       href="?{% url_replace request notice_page=notices.previous_page_number %}">前へ</a>
-                                </li>
-                            {% else %}
-                                <li class="page-item disabled">
-                                    <span class="page-link">前へ</span>
-                                </li>
-                            {% endif %}
-                            {% if notices.paginator.num_pages > 10 %}
-                                {% if notices.number < 6 %}
-                                    {#    先頭 9 ページの表示      #}
-                                    {% for pg in notices.paginator.page_range %}
-                                        {% if forloop.counter0 < 9 %}
-                                            {% if notices.number == pg %}
-                                                <li class="page-item active">
-                                                    {% else %}
-                                                <li class="page-item">
-                                            {% endif %}
-                                        <a class="page-link"
-                                           href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
-                                        </li>
-                                        {% endif %}
-                                    {% endfor %}
-                                {% elif notices.number < notices.paginator.num_pages|add:-4 %}
-                                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                                    {% for pg in notices.paginator.page_range %}
-                                        {% if notices.number|add:-5 < pg and pg < notices.number|add:5 %}
-                                            {% if notices.number == pg %}
-                                                <li class="page-item active">
-                                                    {% else %}
-                                                <li class="page-item">
-                                            {% endif %}
-                                        <a class="page-link"
-                                           href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
-                                        </li>
-                                        {% endif %}
-                                    {% endfor %}
-                                {% else %}
-                                    {#   最後 9 ページの表示   #}
-                                    {% for pg in notices.paginator.page_range %}
-                                        {% if forloop.counter0 > notices.paginator.num_pages|add:-10 %}
-                                            {% if notices.number == pg %}
-                                                <li class="page-item active">
-                                                    {% else %}
-                                                <li class="page-item">
-                                            {% endif %}
-                                        <a class="page-link"
-                                           href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
-                                        </li>
-                                        {% endif %}
-                                    {% endfor %}
-                                {% endif %}
-                            {% else %}
-                                {% for pg in notices.paginator.page_range %}
-                                    {% if notices.number == pg %}
-                                        <li class="page-item active">
-                                            {% else %}
-                                        <li class="page-item">
-                                    {% endif %}
-                                <a class="page-link" href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
-                                </li>
-                                {% endfor %}
-                            {% endif %}
-                            {% if notices.has_next %}
-                                <li class="page-item">
-                                    <a class="page-link"
-                                       href="?{% url_replace request notice_page=notices.next_page_number %}">次へ</a>
-                                </li>
-                            {% else %}
-                                <li class="page-item disabled">
-                                    <span class="page-link">次へ</span>
-                                </li>
-                            {% endif %}
-                        </ul>
-                    </nav>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="container py-4 mb-auto">
-                    <div class="h-900 p-2 rounded-3">
-                        <h2>Information</h2>
-                        <div class="card">
-                            <div class="card-body">
-                                <h5 class="card-title">会員情報</h5>
-                                <p class="card-text">This card has supporting text below as a natural lead-in to
-                                    additional
-                                    content.</p>
-                                <p class="card-text"><small class="text-body-secondary">Last updated 3 mins ago</small>
-                                </p>
-                            </div>
+                          {% if notice.is_info %}
+                            <span class="badge text-bg-primary">情報</span>
+                          {% endif %}
+                          {% if notice.is_important %}
+                            <span class="badge text-bg-warning">重要</span>
+                          {% endif %}
+                          {% if notice.is_fail %}
+                            <span class="badge text-bg-danger">障害</span>
+                          {% endif %}
                         </div>
+                        <div class="modal-footer">
+                          <button type="button"
+                                  class="btn btn-secondary"
+                                  data-bs-dismiss="modal">
+                            Close
+                          </button>
+                          {% if request.user.is_staff %}
+                            <a href="/admin/notice/notice/{{ notice.id }}/change"
+                               class="btn btn-primary">編集</a>
+                            <a href="/admin/notice/notice/{{ notice.id }}/delete"
+                               class="btn btn-danger">削除</a>
+                          {% endif %}
+                        </div>
+                      </div>
                     </div>
+                  </div>
                 </div>
+              </div>
+            {% endfor %}
+          </div>
+          <nav aria-label="...">
+            <ul class="pagination">
+              {% if notices.has_previous %}
+                <li class="page-item">
+                  <a class="page-link"
+                     href="?{% url_replace request notice_page=notices.previous_page_number %}">前へ</a>
+                </li>
+              {% else %}
+                <li class="page-item disabled">
+                  <span class="page-link">前へ</span>
+                </li>
+              {% endif %}
+              {% if notices.paginator.num_pages > 10 %}
+                {% if notices.number < 6 %}
+                  {#    先頭 9 ページの表示      #}
+                  {% for pg in notices.paginator.page_range %}
+                    {% if forloop.counter0 < 9 %}
+                      {% if notices.number == pg %}
+                        <li class="page-item active">
+                          {% else %}
+                        <li class="page-item">
+                      {% endif %}
+                    <a class="page-link"
+                       href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
+                    </li>
+                    {% endif %}
+                  {% endfor %}
+                {% elif notices.number < notices.paginator.num_pages|add:-4 %}
+                  {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
+                  {% for pg in notices.paginator.page_range %}
+                    {% if notices.number|add:-5 < pg and pg < notices.number|add:5 %}
+                      {% if notices.number == pg %}
+                        <li class="page-item active">
+                          {% else %}
+                        <li class="page-item">
+                      {% endif %}
+                    <a class="page-link"
+                       href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
+                    </li>
+                    {% endif %}
+                  {% endfor %}
+                {% else %}
+                  {#   最後 9 ページの表示   #}
+                  {% for pg in notices.paginator.page_range %}
+                    {% if forloop.counter0 > notices.paginator.num_pages|add:-10 %}
+                      {% if notices.number == pg %}
+                        <li class="page-item active">
+                          {% else %}
+                        <li class="page-item">
+                      {% endif %}
+                    <a class="page-link"
+                       href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
+                    </li>
+                    {% endif %}
+                  {% endfor %}
+                {% endif %}
+              {% else %}
+                {% for pg in notices.paginator.page_range %}
+                  {% if notices.number == pg %}
+                    <li class="page-item active">
+                      {% else %}
+                    <li class="page-item">
+                  {% endif %}
+                <a class="page-link"
+                   href="?{% url_replace request notice_page=pg %}">{{ pg }}</a>
+                </li>
+                {% endfor %}
+              {% endif %}
+              {% if notices.has_next %}
+                <li class="page-item">
+                  <a class="page-link"
+                     href="?{% url_replace request notice_page=notices.next_page_number %}">次へ</a>
+                </li>
+              {% else %}
+                <li class="page-item disabled">
+                  <span class="page-link">次へ</span>
+                </li>
+              {% endif %}
+            </ul>
+          </nav>
+        </div>
+      </div>
+      <div class="col-sm-4">
+        <div class="container py-4 mb-auto">
+          <div class="h-900 p-2 rounded-3">
+            <h2>Information</h2>
+            <div class="card">
+              <div class="card-body">
+                <h5 class="card-title">会員情報</h5>
+                <p class="card-text">This card has supporting text below
+                  as a natural lead-in to
+                  additional
+                  content.</p>
+                <p class="card-text"><small class="text-body-secondary">Last
+                  updated 3 mins ago</small>
+                </p>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/menu.html b/dsbd/templates/menu.html
index 333bc1d..f3fd801 100644
--- a/dsbd/templates/menu.html
+++ b/dsbd/templates/menu.html
@@ -1,141 +1,176 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <section class="py-5 text-center container">
-        <div class="row py-lg-5">
-            <div class="col-lg-6 col-md-8 mx-auto">
-                <h1 class="fw-light">Welcome</h1>
-                <p class="lead text-body-secondary">AS59105 Service Online</p>
-            </div>
-        </div>
-    </section>
+  <section class="py-5 text-center container">
+    <div class="row py-lg-5">
+      <div class="col-lg-6 col-md-8 mx-auto">
+        <h1 class="fw-light">Welcome</h1>
+        <p class="lead text-body-secondary">AS59105 Service Online</p>
+      </div>
+    </div>
+  </section>
 
-    <div class="album py-5 bg-body-tertiary">
-        <div class="container">
+  <div class="album py-5 bg-body-tertiary">
+  <div class="container">
 
-            <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <h4 class="card-text">サービス情報一覧</h4>
-                            <p class="card-text">サービス情報一覧はこちらから</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <a type="button" class="btn btn-sm btn-outline-secondary" href="/service">View</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <h4 class="card-text">チケットシステム</h4>
-                            <p class="card-text">チケット作成・返事などはこちらから</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <a type="button" class="btn btn-sm btn-outline-secondary" href="/ticket">View</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-sm btn-outline-secondary">View</button>
-                                    <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button>
-                                </div>
-                                <small class="text-body-secondary">9 mins</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+    <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <h4 class="card-text">サービス情報一覧</h4>
+            <p class="card-text">サービス情報一覧はこちらから</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="/service">View</a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <h4 class="card-text">チケットシステム</h4>
+            <p class="card-text">チケット作成・返事などはこちらから</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="/ticket">View</a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text">This is a wider card with supporting text
+              below as a natural lead-in to additional content. This
+              content is a little bit longer.</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <button type="button"
+                        class="btn btn-sm btn-outline-secondary">View
+                </button>
+                <button type="button"
+                        class="btn btn-sm btn-outline-secondary">Edit
+                </button>
+              </div>
+              <small class="text-body-secondary">9 mins</small>
+            </div>
+          </div>
+        </div>
+      </div>
 
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-sm btn-outline-secondary">View</button>
-                                    <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button>
-                                </div>
-                                <small class="text-body-secondary">9 mins</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <h4 class="card-text">グループ情報・関連設定</h4>
-                            <p class="card-text">グループ情報変更や権限変更などの各種グループ設定はこちらから</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <a type="button" class="btn btn-sm btn-outline-secondary" href="/group">View</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <h4 class="card-text">ユーザ情報・関連設定</h4>
-                            <p class="card-text">ユーザ関連設定や二段階認証・パスワード変更などはこちらから</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <a type="button" class="btn btn-sm btn-outline-secondary" href="/profile">View</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text">This is a wider card with supporting text
+              below as a natural lead-in to additional content. This
+              content is a little bit longer.</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <button type="button"
+                        class="btn btn-sm btn-outline-secondary">View
+                </button>
+                <button type="button"
+                        class="btn btn-sm btn-outline-secondary">Edit
+                </button>
+              </div>
+              <small class="text-body-secondary">9 mins</small>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <h4 class="card-text">グループ情報・関連設定</h4>
+            <p class="card-text">
+              グループ情報変更や権限変更などの各種グループ設定はこちらから</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="/group">View</a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <h4 class="card-text">ユーザ情報・関連設定</h4>
+            <p class="card-text">
+              ユーザ関連設定や二段階認証・パスワード変更などはこちらから</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="/profile">View</a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
 
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-sm btn-outline-secondary">View</button>
-                                    <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button>
-                                </div>
-                                <small class="text-body-secondary">9 mins</small>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <h4 class="card-text">Feedback</h4>
-                            <p class="card-text">本ダッシュボードシステムのフィードバックはこちらから</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <a type="button" class="btn btn-sm btn-outline-secondary" href="/feedback">View</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card shadow-sm">
-                        <div class="card-body">
-                            <h4 class="card-text">GitHub</h4>
-                            <p class="card-text">本ダッシュボードシステムのGitHub Repoはこちらから</p>
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div class="btn-group">
-                                    <a type="button" class="btn btn-sm btn-outline-secondary" href="https://github.com/homenoc/dsbd" target="_blank">View</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <p class="card-text">This is a wider card with supporting text
+              below as a natural lead-in to additional content. This
+              content is a little bit longer.</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <button type="button"
+                        class="btn btn-sm btn-outline-secondary">View
+                </button>
+                <button type="button"
+                        class="btn btn-sm btn-outline-secondary">Edit
+                </button>
+              </div>
+              <small class="text-body-secondary">9 mins</small>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <h4 class="card-text">Feedback</h4>
+            <p class="card-text">
+              本ダッシュボードシステムのフィードバックはこちらから</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="/feedback">View</a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card shadow-sm">
+          <div class="card-body">
+            <h4 class="card-text">GitHub</h4>
+            <p class="card-text">本ダッシュボードシステムのGitHub
+              Repoはこちらから</p>
+            <div class="d-flex justify-content-between align-items-center">
+              <div class="btn-group">
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="https://github.com/homenoc/dsbd"
+                   target="_blank">View</a>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 
 {% endblock content %}
diff --git a/dsbd/templates/navbar1.html b/dsbd/templates/navbar1.html
index 60aed6f..36ff4c6 100644
--- a/dsbd/templates/navbar1.html
+++ b/dsbd/templates/navbar1.html
@@ -4,4 +4,5 @@
 <li class="nav-item">
 </li>
 <a class="nav-link " href="{% url 'sign_in' %}" role="button" aria-expanded="false">サインイン</a>
-<a class="nav-link " href="{% url 'sign_up' %}" role="button" aria-expanded="false">新規登録</a>
+<a class="nav-link " href="{% url 'sign_up' %}" role="button"
+   aria-expanded="false">新規登録</a>
diff --git a/dsbd/templates/navbar2.html b/dsbd/templates/navbar2.html
index 7e0fcfe..057c418 100644
--- a/dsbd/templates/navbar2.html
+++ b/dsbd/templates/navbar2.html
@@ -50,185 +50,205 @@
 {% include 'svg.html' %}
 
 <main>
-    <div class="overflow-auto d-flex flex-column flex-shrink-0 p-3 text-white bg-dark" style="width: 280px;">
-        <a href="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-white text-decoration-none">
-            <image src="{% static 'icon/icon.png' %}" height="50px"></image>
-            &emsp;
-            <span class="fs-4">Dashboard{% if get_version != "develop" %}<br/>(しらんけど){% endif %}</span>
+  <div class="overflow-auto d-flex flex-column flex-shrink-0 p-3 text-white bg-dark"
+       style="width: 280px;">
+    <a href="/"
+       class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-white text-decoration-none">
+      <image src="{% static 'icon/icon.png' %}" height="50px"></image>
+      &emsp;
+      <span class="fs-4">Dashboard{% if get_version != "develop" %}<br/>
+        (しらんけど){% endif %}</span>
+    </a>
+    <hr>
+    <ul class="nav nav-pills flex-column mb-auto">
+      <li class="nav-item">
+        <a href="{% url 'index' %}" class="nav-link text-white"
+           aria-current="page">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#home"></use>
+          </svg>
+          Home
         </a>
-        <hr>
-        <ul class="nav nav-pills flex-column mb-auto">
-            <li class="nav-item">
-                <a href="{% url 'index' %}" class="nav-link text-white" aria-current="page">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#home"></use>
-                    </svg>
-                    Home
-                </a>
-            </li>
-{#            <li>#}
-{#                <a href="#" class="nav-link text-white">#}
-{#                    <svg class="bi me-2" width="16" height="16">#}
-{#                        <use xlink:href="#speedometer2"></use>#}
-{#                    </svg>#}
-{#                    Dashboard#}
-{#                </a>#}
-{#            </li>#}
-            <li class="nav-item">
-                <a href="{% url 'menu' %}" class="nav-link text-white">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#menu"></use>
-                    </svg>
-                    Menu
-                </a>
-            </li>
-            <li class="nav-item">
-                <a href="{% url 'custom_auth_group:index' %}" class="nav-link text-white" aria-current="page">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#group"></use>
-                    </svg>
-                    Groups
-                </a>
-            </li>
+      </li>
+      {#            <li>#}
+      {#                <a href="#" class="nav-link text-white">#}
+      {#                    <svg class="bi me-2" width="16" height="16">#}
+      {#                        <use xlink:href="#speedometer2"></use>#}
+      {#                    </svg>#}
+      {#                    Dashboard#}
+      {#                </a>#}
+      {#            </li>#}
+      <li class="nav-item">
+        <a href="{% url 'menu' %}" class="nav-link text-white">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#menu"></use>
+          </svg>
+          Menu
+        </a>
+      </li>
+      <li class="nav-item">
+        <a href="{% url 'custom_auth_group:index' %}"
+           class="nav-link text-white" aria-current="page">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#group"></use>
+          </svg>
+          Groups
+        </a>
+      </li>
+      <li>
+        <a href="{% url 'service:index' %}" class="nav-link text-white">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#grid"></use>
+          </svg>
+          Services
+        </a>
+      </li>
+      {#            <li>#}
+      {#                <a href="#" class="nav-link text-white">#}
+      {#                    <svg class="bi me-2" width="16" height="16">#}
+      {#                        <use xlink:href="#people-circle"></use>#}
+      {#                    </svg>#}
+      {#                    Customers#}
+      {#                </a>#}
+      {#            </li>#}
+      <li>
+        <a href="{% url 'ticket:index' %}" class="nav-link text-white"
+           aria-current="page">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#messages"></use>
+          </svg>
+          Ticket
+        </a>
+      </li>
+      <li class="mb-1">
+        <button class="btn text-white align-items-center rounded collapsed"
+                data-bs-toggle="collapse"
+                data-bs-target="#dashboard1-collapse" aria-expanded="false">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#grid"></use>
+          </svg>
+          Settings
+        </button>
+        <div class="collapse" id="dashboard1-collapse">
+          <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
             <li>
-                <a href="{% url 'service:index' %}" class="nav-link text-white">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#grid"></use>
-                    </svg>
-                    Services
-                </a>
+              <a href="#" class="nav-link text-white">
+                <svg class="bi me-2 submenu-logo" width="14"
+                     height="14">
+                  <use xlink:href="#email"/>
+                </svg>
+                Overview
+              </a>
             </li>
-            {#            <li>#}
-            {#                <a href="#" class="nav-link text-white">#}
-            {#                    <svg class="bi me-2" width="16" height="16">#}
-            {#                        <use xlink:href="#people-circle"></use>#}
-            {#                    </svg>#}
-            {#                    Customers#}
-            {#                </a>#}
-            {#            </li>#}
             <li>
-                <a href="{% url 'ticket:index' %}" class="nav-link text-white" aria-current="page">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#messages"></use>
-                    </svg>
-                    Ticket
-                </a>
+              <a href="#" class="nav-link text-white">
+                <svg class="bi me-2 submenu-logo" width="14"
+                     height="14">
+                  <use xlink:href="#people-circle"/>
+                </svg>
+                Overview2
+              </a>
             </li>
-            <li class="mb-1">
-                <button class="btn text-white align-items-center rounded collapsed" data-bs-toggle="collapse"
-                        data-bs-target="#dashboard1-collapse" aria-expanded="false">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#grid"></use>
-                    </svg>
-                    Settings
-                </button>
-                <div class="collapse" id="dashboard1-collapse">
-                    <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
-                        <li>
-                            <a href="#" class="nav-link text-white">
-                                <svg class="bi me-2 submenu-logo" width="14" height="14">
-                                    <use xlink:href="#email"/>
-                                </svg>
-                                Overview
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#" class="nav-link text-white">
-                                <svg class="bi me-2 submenu-logo" width="14" height="14">
-                                    <use xlink:href="#people-circle"/>
-                                </svg>
-                                Overview2
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#" class="nav-link text-white">
-                                <svg class="bi me-2 submenu-logo" width="14" height="14">
-                                    <use xlink:href="#people-circle"/>
-                                </svg>
-                                Overview3
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#" class="nav-link text-white">
-                                <svg class="bi me-2 submenu-logo" width="14" height="14">
-                                    <use xlink:href="#people-circle"/>
-                                </svg>
-                                Overview4
-                            </a>
-                        </li>
-                    </ul>
-                </div>
+            <li>
+              <a href="#" class="nav-link text-white">
+                <svg class="bi me-2 submenu-logo" width="14"
+                     height="14">
+                  <use xlink:href="#people-circle"/>
+                </svg>
+                Overview3
+              </a>
             </li>
-            {% is_admin_mode as is_admin_mode %}
-            {% if request.user.is_staff and is_admin_mode %}
-                <li>
-                    <button class="btn text-white align-items-center rounded collapsed" data-bs-toggle="collapse"
-                            data-bs-target="#admin-collapse" aria-expanded="false">
-                        <svg class="bi me-2" width="16" height="16">
-                            <use xlink:href="#administrator"/>
-                        </svg>
-                        Admin Page
-                    </button>
-                    <div class="collapse" id="admin-collapse">
-                        <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
-                            <li>
-                                <a href="{% url 'custom_admin:index' %}" class="nav-link text-white">
-                                    <svg class="bi me-2" width="16" height="16">
-                                        <use xlink:href="#setting"/>
-                                    </svg>
-                                    CustomPage
-                                </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'admin:index' %}" class="nav-link text-white">
-                                    <svg class="bi me-2" width="16" height="16">
-                                        <use xlink:href="#database"/>
-                                    </svg>
-                                    Admin(DB)
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-            {% endif %}
             <li>
-                <a href="{% url 'feedback' %}" class="btn text-white" aria-expanded="false">
-                    <svg class="bi me-2" width="16" height="16">
-                        <use xlink:href="#bug"/>
-                    </svg>
-                    Feedback
-                </a>
+              <a href="#" class="nav-link text-white">
+                <svg class="bi me-2 submenu-logo" width="14"
+                     height="14">
+                  <use xlink:href="#people-circle"/>
+                </svg>
+                Overview4
+              </a>
             </li>
-        </ul>
-        <h6><span class="badge bg-secondary">Version: {% get_version %}</span></h6>
-        <hr>
-        <div class="dropdown">
-            <a href="#" class="d-flex align-items-center text-white text-decoration-none dropdown-toggle"
-               id="dropdownUser1" data-bs-toggle="dropdown" aria-expanded="false">
-                {#                <img src="https://github.com/mdo.png" alt="" width="32" height="32" class="rounded-circle me-2">#}
-                <strong>{{ user.get_display_name }}</strong>
-            </a>
-            <ul class="dropdown-menu dropdown-menu-dark text-small shadow" aria-labelledby="dropdownUser1">
-                <li><a class="dropdown-item" href="{% url 'custom_auth:index' %}">Settings</a></li>
-                <li>
-                    <hr class="dropdown-divider">
-                </li>
-                <li><a class="dropdown-item" href="{% url 'sign_out' %}" role="button">Sign out</a></li>
-            </ul>
+          </ul>
         </div>
+      </li>
+      {% is_admin_mode as is_admin_mode %}
+      {% if request.user.is_staff and is_admin_mode %}
+        <li>
+          <button class="btn text-white align-items-center rounded collapsed"
+                  data-bs-toggle="collapse"
+                  data-bs-target="#admin-collapse" aria-expanded="false">
+            <svg class="bi me-2" width="16" height="16">
+              <use xlink:href="#administrator"/>
+            </svg>
+            Admin Page
+          </button>
+          <div class="collapse" id="admin-collapse">
+            <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
+              <li>
+                <a href="{% url 'custom_admin:index' %}"
+                   class="nav-link text-white">
+                  <svg class="bi me-2" width="16" height="16">
+                    <use xlink:href="#setting"/>
+                  </svg>
+                  CustomPage
+                </a>
+              </li>
+              <li>
+                <a href="{% url 'admin:index' %}"
+                   class="nav-link text-white">
+                  <svg class="bi me-2" width="16" height="16">
+                    <use xlink:href="#database"/>
+                  </svg>
+                  Admin(DB)
+                </a>
+              </li>
+            </ul>
+          </div>
+        </li>
+      {% endif %}
+      <li>
+        <a href="{% url 'feedback' %}" class="btn text-white"
+           aria-expanded="false">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#bug"/>
+          </svg>
+          Feedback
+        </a>
+      </li>
+    </ul>
+    <h6><span class="badge bg-secondary">Version: {% get_version %}</span></h6>
+    <hr>
+    <div class="dropdown">
+      <a href="#"
+         class="d-flex align-items-center text-white text-decoration-none dropdown-toggle"
+         id="dropdownUser1" data-bs-toggle="dropdown" aria-expanded="false">
+        {#                <img src="https://github.com/mdo.png" alt="" width="32" height="32" class="rounded-circle me-2">#}
+        <strong>{{ user.get_display_name }}</strong>
+      </a>
+      <ul class="dropdown-menu dropdown-menu-dark text-small shadow"
+          aria-labelledby="dropdownUser1">
+        <li><a class="dropdown-item" href="{% url 'custom_auth:index' %}">Settings</a>
+        </li>
+        <li>
+          <hr class="dropdown-divider">
+        </li>
+        <li><a class="dropdown-item" href="{% url 'sign_out' %}" role="button">Sign
+          out</a></li>
+      </ul>
     </div>
+  </div>
 </main>
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"
-        integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz"
-        crossorigin="anonymous"></script>
+<script
+    src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz"
+    crossorigin="anonymous"></script>
 
 <script>
-    (function () {
-        'use strict'
-        const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
-        tooltipTriggerList.forEach(function (tooltipTriggerEl) {
-            new bootstrap.Tooltip(tooltipTriggerEl)
-        })
-    })()
+  (function () {
+    'use strict'
+    const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+    tooltipTriggerList.forEach(function (tooltipTriggerEl) {
+      new bootstrap.Tooltip(tooltipTriggerEl)
+    })
+  })()
 </script>
\ No newline at end of file
diff --git a/dsbd/templates/no_auth.html b/dsbd/templates/no_auth.html
index c764cb7..ad62ed6 100644
--- a/dsbd/templates/no_auth.html
+++ b/dsbd/templates/no_auth.html
@@ -6,8 +6,8 @@
 {% block title %}Articles for {{ year }}{% endblock %}
 
 {% block content %}
-    <h2>{{ name }}</h2>
-    <br/>
-    <h3>この操作をする権限がありません</h3>
-    <br/>
+  <h2>{{ name }}</h2>
+  <br/>
+  <h3>この操作をする権限がありません</h3>
+  <br/>
 {% endblock %}
\ No newline at end of file
diff --git a/dsbd/templates/payment.html b/dsbd/templates/payment.html
index eedca7e..64ee362 100644
--- a/dsbd/templates/payment.html
+++ b/dsbd/templates/payment.html
@@ -1,48 +1,51 @@
 {% extends 'base1.html' %}
 {% block content %}
-    <h2 class="card-title">会費</h2>
-    <br/>
-    {% if request.user.is_charge and request.user.stripe_customer_id and not request.user.stripe_subscription_id. %}
-        <div class="card">
-            <div class="card-body">
-                <h3 class="card-title">{{ data.name }}</h3>
-                <br/>
+  <h2 class="card-title">会費</h2>
+  <br/>
+  {% if request.user.is_charge and request.user.stripe_customer_id and not request.user.stripe_subscription_id. %}
+    <div class="card">
+      <div class="card-body">
+        <h3 class="card-title">{{ data.name }}</h3>
+        <br/>
 
-                <form method="post">
-                    {% csrf_token %}
+        <form method="post">
+          {% csrf_token %}
 
-                    <div class="row  mb-3 text-center">
-                        {% for price in data.prices %}
-                            <div class="col">
-                                <div class="card mb-4 rounded-3 shadow-sm">
-                                    <div class="card-header py-3">
-                                        <h4 class="my-0 fw-normal">{{ price.interval }}</h4>
-                                    </div>
-                                    <div class="card-body">
-                                        <h1 class="card-title pricing-card-title">{{ price.amount }}円<small
-                                                class="text-muted fw-light">/{{ price.interval }}</small>
-                                        </h1>
-                                        <ul class="list-unstyled mt-3 mb-4">
-                                            <li>{{ price.description }}</li>
-                                        </ul>
+          <div class="row  mb-3 text-center">
+            {% for price in data.prices %}
+              <div class="col">
+                <div class="card mb-4 rounded-3 shadow-sm">
+                  <div class="card-header py-3">
+                    <h4 class="my-0 fw-normal">{{ price.interval }}</h4>
+                  </div>
+                  <div class="card-body">
+                    <h1 class="card-title pricing-card-title">{{ price.amount }}円<small
+                        class="text-muted fw-light">/{{ price.interval }}</small>
+                    </h1>
+                    <ul class="list-unstyled mt-3 mb-4">
+                      <li>{{ price.description }}</li>
+                    </ul>
 
-                                        <button type="submit" name="price_id" value="{{ price.id }}"
-                                                class="w-100 btn btn-lg btn-outline-primary">会費支払い
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                </form>
-            </div>
-        </div>
-        <br/>
-    {% else %}
-        <p><b>寄付済みです</b></p>
-    {% endif %}
-    <br/>
-    <br/>
+                    <button type="submit" name="price_id"
+                            value="{{ price.id }}"
+                            class="w-100 btn btn-lg btn-outline-primary">
+                      会費支払い
+                    </button>
+                  </div>
+                </div>
+              </div>
+            {% endfor %}
+          </div>
+        </form>
+      </div>
+    </div>
     <br/>
-    <a class="btn btn-primary" href="{% url 'index' %}" role="button" aria-expanded="false">ホームへ戻る</a>
+  {% else %}
+    <p><b>寄付済みです</b></p>
+  {% endif %}
+  <br/>
+  <br/>
+  <br/>
+  <a class="btn btn-primary" href="{% url 'index' %}" role="button"
+     aria-expanded="false">ホームへ戻る</a>
 {% endblock content %}
diff --git a/dsbd/templates/service/index.html b/dsbd/templates/service/index.html
index 77b9fc1..ec4a054 100644
--- a/dsbd/templates/service/index.html
+++ b/dsbd/templates/service/index.html
@@ -1,290 +1,336 @@
 {% extends 'base2.html' %}
 {% block style %}
-    <style>
-        table {
-            border-collapse: collapse;
-            margin: 0 auto;
-            width: 80%;
-        }
+  <style>
+      table {
+          border-collapse: collapse;
+          margin: 0 auto;
+          width: 80%;
+      }
 
-        td,
-        th {
-            border: 1px solid #ccc;
-            padding: 10px;
-            text-align: center;
-        }
+      td,
+      th {
+          border: 1px solid #ccc;
+          padding: 10px;
+          text-align: center;
+      }
 
-        th {
-            background: #e2e8ef;
-            white-space: pre-wrap;
-        }
+      th {
+          background: #e2e8ef;
+          white-space: pre-wrap;
+      }
 
-        tr:first-child th {
-            border-top: 5px solid #005ab3;
-        }
+      tr:first-child th {
+          border-top: 5px solid #005ab3;
+      }
 
-        tr:first-child td {
-            border-top: 5px solid #ccc;
-        }
+      tr:first-child td {
+          border-top: 5px solid #ccc;
+      }
 
-        p {
-            white-space: pre-wrap;
-        / / color: #000000;
-        }
+      p {
+          white-space: pre-wrap;
+      / / color: #000000;
+      }
 
-        button {
-            margin-left: 10px;
-        }
-    </style>
+      button {
+          margin-left: 10px;
+      }
+  </style>
 {% endblock %}
 
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">Service</h2>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Service</h2>
+          <br/>
+          {% if services %}
+            {% for service in services %}
+              <div class="card">
+                <div class="card-body">
+                  <div class="container">
+                    <table>
+                      <thead>
+                      <tr>
+                        <th colspan="2">サービス情報</th>
+                      </tr>
+                      <tr>
+                        <th>サービスコード</th>
+                        <td>{{ service.service_code }}</td>
+                      </tr>
+                      <tr>
+                        <th>サービス種別</th>
+                        <td>{{ service.get_service_type_display }}</td>
+                      </tr>
+                      <tr>
+                        <th>利用料金</th>
+                        <td>FREE</td>
+                      </tr>
+                      <tr>
+                        <th>利用サービス期間</th>
+                        <td>{{ service.start_at|default_if_none:"--" }}
+                          ~ {{ service.end_at|default_if_none:"未定" }}</td>
+                      </tr>
+                      </thead>
+                    </table>
                     <br/>
-                    {% if services %}
-                        {% for service in services %}
-                            <div class="card">
-                                <div class="card-body">
-                                    <div class="container">
-                                        <table>
-                                            <thead>
-                                            <tr>
-                                                <th colspan="2">サービス情報</th>
-                                            </tr>
-                                            <tr>
-                                                <th>サービスコード</th>
-                                                <td>{{ service.service_code }}</td>
-                                            </tr>
-                                            <tr>
-                                                <th>サービス種別</th>
-                                                <td>{{ service.get_service_type_display }}</td>
-                                            </tr>
-                                            <tr>
-                                                <th>利用料金</th>
-                                                <td>FREE</td>
-                                            </tr>
-                                            <tr>
-                                                <th>利用サービス期間</th>
-                                                <td>{{ service.start_at|default_if_none:"--" }} ~ {{ service.end_at|default_if_none:"未定" }}</td>
-                                            </tr>
-                                            </thead>
-                                        </table>
-                                        <br/>
-                                        {% if service.is_pass %}
-                                            <div class="card">
-                                                <div class="card-header">
-                                                    <b>IPアドレス情報</b>
-                                                </div>
-                                                <div class="card-body">
-                                                    <table>
-                                                        <thead>
-                                                        <tr>
-                                                            <th colspan="3">アドレス情報</th>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>IPアドレス</th>
-                                                            <th>アドレス割当元</th>
-                                                        </tr>
+                    {% if service.is_pass %}
+                      <div class="card">
+                        <div class="card-header">
+                          <b>IPアドレス情報</b>
+                        </div>
+                        <div class="card-body">
+                          <table>
+                            <thead>
+                            <tr>
+                              <th colspan="3">
+                                アドレス情報
+                              </th>
+                            </tr>
+                            <tr>
+                              <th>IPアドレス</th>
+                              <th>アドレス割当元</th>
+                            </tr>
+
+                            {% for ip in service.IPService.all %}
+                              <tr>
+                                <td>{{ ip.ip_address }}/{{ ip.subnet }}</td>
+                                <td>{{ ip.get_owner_display }}</td>
+                              </tr>
+                            {% endfor %}
+                            </thead>
+                          </table>
+                        </div>
+                      </div>
+                    {% endif %}
+                    <br/>
+                    {% for connection in service.ConnectionService.all %}
+                      <div class="card">
+                        <div class="card-header">
+                          <b>[Connection] {{ connection.service_code }}</b>
+                        </div>
+                        <div class="card-body">
+                          <table>
+                            <thead>
+                            <tr>
+                              <th colspan="3">接続情報
+                              </th>
+                            </tr>
+                            <tr>
+                              <th>サービス(接続)コード
+                              </th>
+                              <td colspan="2">{{ connection.service_code }}</td>
+                            </tr>
+                            <tr>
+                              <th>開通状況</th>
+                              <td colspan="2">
+                                {% if connection.is_pass %}
+                                  <span class="badge bg-success">開通済み</span>
+                                {% else %}
+                                  <span class="badge bg-danger">未開通</span>{% endif %}
+                              </td>
+                            </tr>
+                            <tr>
+                              <th>接続方式</th>
+                              <td colspan="2">{{ connection.get_connection_type_display }}</td>
+                            </tr>
+                            <tr>
+                              <th>接続NOC</th>
+                              <td colspan="2">{{ connection.tunnel_ip.tunnel_router.noc.name |default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>
+                                トンネル終端アドレス（貴団体側）
+                              </th>
+                              <td colspan="2">{{ connection.term_ip|default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>
+                                トンネル終端アドレス（HomeNOC側）
+                              </th>
+                              <td colspan="2">{{ connection.tunnel_ip.ip_address|default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>利用接続期間</th>
+                              <td colspan="2">{{ connection.start_at|default_if_none:"--" }}
+                                ~ {{ connection.end_at|default_if_none:"未定" }}</td>
+                            </tr>
+                            <tr>
+                              <th colspan="3">
+                                当団体との間の境界アドレス
+                              </th>
+                            </tr>
+                            <tr>
+                              <th></th>
+                              <th>IPv4アドレス</th>
+                              <th>IPv6アドレス</th>
+                            </tr>
+                            <tr>
+                              <th>HomeNOC側</th>
+                              <td>{{ connection.link_v4_our|default_if_none:"---" }}</td>
+                              <td>{{ connection.link_v6_our|default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>貴団体側</th>
+                              <td>{{ connection.link_v4_your |default_if_none:"---" }}</td>
+                              <td>{{ connection.link_v6_your |default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>広報経路</th>
+                              <td>
+                                                            <span
+                                                                class="badge text-bg-secondary"
+                                                                data-bs-toggle="tooltip"
+                                                                data-bs-placement="top"
+                                                                data-bs-title="{% if not connection.ipv4_route %}
+
+
+
+
+
+
 
-                                                        {% for ip in service.IPService.all %}
-                                                            <tr>
-                                                                <td>{{ ip.ip_address }}/{{ ip.subnet }}</td>
-                                                                <td>{{ ip.get_owner_display }}</td>
-                                                            </tr>
-                                                        {% endfor %}
-                                                        </thead>
-                                                    </table>
-                                                </div>
-                                            </div>
-                                        {% endif %}
-                                        <br/>
-                                        {% for connection in service.ConnectionService.all %}
-                                            <div class="card">
-                                                <div class="card-header">
-                                                    <b>[Connection] {{ connection.service_code }}</b>
-                                                </div>
-                                                <div class="card-body">
-                                                    <table>
-                                                        <thead>
-                                                        <tr>
-                                                            <th colspan="3">接続情報</th>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>サービス(接続)コード</th>
-                                                            <td colspan="2">{{ connection.service_code }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>開通状況</th>
-                                                            <td colspan="2">{% if connection.is_pass %}<span class="badge bg-success">開通済み</span>
-                                                            {% else %}<span class="badge bg-danger">未開通</span>{% endif %}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>接続方式</th>
-                                                            <td colspan="2">{{ connection.get_connection_type_display }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>接続NOC</th>
-                                                            <td colspan="2">{{ connection.tunnel_ip.tunnel_router.noc.name |default_if_none:"---" }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>トンネル終端アドレス（貴団体側）</th>
-                                                            <td colspan="2">{{ connection.term_ip|default_if_none:"---" }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>トンネル終端アドレス（HomeNOC側）</th>
-                                                            <td colspan="2">{{ connection.tunnel_ip.ip_address|default_if_none:"---" }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>利用接続期間</th>
-                                                            <td colspan="2">{{ connection.start_at|default_if_none:"--" }} ~ {{ connection.end_at|default_if_none:"未定" }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th colspan="3">当団体との間の境界アドレス</th>
-                                                        </tr>
-                                                        <tr>
-                                                            <th></th>
-                                                            <th>IPv4アドレス</th>
-                                                            <th>IPv6アドレス</th>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>HomeNOC側</th>
-                                                            <td>{{ connection.link_v4_our|default_if_none:"---" }}</td>
-                                                            <td>{{ connection.link_v6_our|default_if_none:"---" }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>貴団体側</th>
-                                                            <td>{{ connection.link_v4_your |default_if_none:"---" }}</td>
-                                                            <td>{{ connection.link_v6_your |default_if_none:"---" }}</td>
-                                                        </tr>
-                                                        <tr>
-                                                            <th>広報経路</th>
-                                                            <td>
-                                                            <span class="badge text-bg-secondary" data-bs-toggle="tooltip" data-bs-placement="top"
-                                                                  data-bs-title="{% if not connection.ipv4_route %}
                                                                   {{ connection.ipv4_route_comment }}{% else %}{{ connection.ipv4_route }}
-                                                                  {% endif %}">{{ connection.ipv4_route }}</span></td>
-                                                            <td>
-                                                        <span class="badge text-bg-secondary" data-bs-toggle="tooltip" data-bs-placement="top"
-                                                              data-bs-title="{% if not connection.ipv6_route %}
-                                                                  {{ connection.ipv6_route_comment }}{% else %}{{ connection.ipv6_route }}
+                                                                  {% endif %}">{{ connection.ipv4_route }}</span>
+                              </td>
+                              <td>
+                                                        <span
+                                                            class="badge text-bg-secondary"
+                                                            data-bs-toggle="tooltip"
+                                                            data-bs-placement="top"
+                                                            data-bs-title="{% if not connection.ipv6_route %}
+
+
+
+
+
+
+
+                                                              {{ connection.ipv6_route_comment }}{% else %}{{ connection.ipv6_route }}
                                                                   {% endif %}">{{ connection.ipv6_route }}</span>
-                                                            </td>
-                                                        </tr>
-                                                        </thead>
-                                                    </table>
-                                                    <br/>
-                                                    本ページは電気通信事業法 第26条2（書面の交付義務）に基づく書面となります。
-                                                    <br/>
-                                                    なお、郵送での書面交付をご希望頂いた方は、お送りします書面が正式書面となり本画面の表示は参考情報となります。
-                                                    <br/>
-                                                </div>
-                                            </div>
-                                            <br/>
-                                        {% endfor %}
-                                    </div>
-                                </div>
-                                <div class="card-footer">
-                                    {% if service.is_pass %}<span class="badge bg-success">審査OK</span>
-                                    {% else %}<span class="badge bg-danger">未審査</span>{% endif %}
-                                    {% if service.administrator %}<span class="badge bg-success">管理者権限</span>{% endif %}
-                                    <span class="badge bg-secondary">Group: {{ service.group.id }}({{ service.group.name }})</span>
-                                </div>
-                            </div>
-                            <br/>
-                        {% endfor %}
-                        <nav aria-label="...">
-                            <ul class="pagination">
-                                {% if tickets.has_previous %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">前へ</span>
-                                    </li>
-                                {% endif %}
-                                {% if tickets.paginator.num_pages > 10 %}
-                                    {% if tickets.number < 6 %}
-                                        {#    先頭 9 ページの表示      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 < 9 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
-                                        {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% else %}
-                                        {#   最後 9 ページの表示   #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% endif %}
-                                {% else %}
-                                    {% for pg in tickets.paginator.page_range %}
-                                        {% if tickets.number == pg %}
-                                            <li class="page-item active">
-                                                {% else %}
-                                            <li class="page-item">
-                                        {% endif %}
-                                    <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                    </li>
-                                    {% endfor %}
-                                {% endif %}
-                                {% if tickets.has_next %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">次へ</span>
-                                    </li>
-                                {% endif %}
-                            </ul>
-                        </nav>
-                    {% else %}
-                        <p>サービスがありません</p>
-                    {% endif %}
+                              </td>
+                            </tr>
+                            </thead>
+                          </table>
+                          <br/>
+                          本ページは電気通信事業法
+                          第26条2（書面の交付義務）に基づく書面となります。
+                          <br/>
+                          なお、郵送での書面交付をご希望頂いた方は、お送りします書面が正式書面となり本画面の表示は参考情報となります。
+                          <br/>
+                        </div>
+                      </div>
+                      <br/>
+                    {% endfor %}
+                  </div>
                 </div>
-            </div>
+                <div class="card-footer">
+                  {% if service.is_pass %}
+                    <span class="badge bg-success">審査OK</span>
+                  {% else %}
+                    <span class="badge bg-danger">未審査</span>{% endif %}
+                  {% if service.administrator %}
+                    <span class="badge bg-success">管理者権限</span>{% endif %}
+                  <span
+                      class="badge bg-secondary">Group: {{ service.group.id }}({{ service.group.name }})</span>
+                </div>
+              </div>
+              <br/>
+            {% endfor %}
+            <nav aria-label="...">
+              <ul class="pagination">
+                {% if tickets.has_previous %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">前へ</span>
+                  </li>
+                {% endif %}
+                {% if tickets.paginator.num_pages > 10 %}
+                  {% if tickets.number < 6 %}
+                    {#    先頭 9 ページの表示      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 < 9 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
+                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% else %}
+                    {#   最後 9 ページの表示   #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% endif %}
+                {% else %}
+                  {% for pg in tickets.paginator.page_range %}
+                    {% if tickets.number == pg %}
+                      <li class="page-item active">
+                        {% else %}
+                      <li class="page-item">
+                    {% endif %}
+                  <a class="page-link"
+                     href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                  </li>
+                  {% endfor %}
+                {% endif %}
+                {% if tickets.has_next %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">次へ</span>
+                  </li>
+                {% endif %}
+              </ul>
+            </nav>
+          {% else %}
+            <p>サービスがありません</p>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
 
 {% block javascript %}
 
-    <script>
-        const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
-        const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
-    </script>
+  <script>
+    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+    const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/dsbd/templates/sign_in.html b/dsbd/templates/sign_in.html
index 36473a2..bf5b8b2 100644
--- a/dsbd/templates/sign_in.html
+++ b/dsbd/templates/sign_in.html
@@ -1,104 +1,111 @@
 {% extends 'base1.html' %}
 {% load static %}
 {% block style %}
-    html,
-    body {
-    height: 100%;
-    }
+  html,
+  body {
+  height: 100%;
+  }
 
-    body {
-    display: flex;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    background-color: #f5f5f5;
-    }
+  body {
+  display: flex;
+  align-items: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  background-color: #f5f5f5;
+  }
 
-    .form-signin {
-    width: 100%;
-    max-width: 330px;
-    padding: 15px;
-    margin: auto;
-    }
+  .form-signin {
+  width: 100%;
+  max-width: 330px;
+  padding: 15px;
+  margin: auto;
+  }
 
-    .form-signin .checkbox {
-    font-weight: 400;
-    }
+  .form-signin .checkbox {
+  font-weight: 400;
+  }
 
-    .form-signin .form-floating:focus-within {
-    z-index: 2;
-    }
+  .form-signin .form-floating:focus-within {
+  z-index: 2;
+  }
 
-    .form-signin input[type="email"] {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    }
+  .form-signin input[type="email"] {
+  margin-bottom: -1px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+  }
 
-    .form-signin input[type="password"] {
-    margin-bottom: 10px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    }
-    .logo {
-    text-align: center;
-    }
+  .form-signin input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  }
+  .logo {
+  text-align: center;
+  }
 {% endblock %}
 {% block content %}
-    <main class="form-signin">
-        <form method="post" class="needs-validation" novalidate>
-            {% csrf_token %}
-            <div class="logo">
-                <img class="mb-4" src="{% static 'icon/icon.png' %}" alt="" width="72" height="72">
-                {% if type == "auth" %}
-                    <h1 class="h3 mb-3 fw-normal">Please sign in</h1>
-                {% elif type == "otp" %}
-                    <h1 class="h3 mb-3 fw-normal">二段階認証</h1>
-                {% endif %}
-            </div>
-            {% if type == "auth" %}
-                <input type="text" value='{{ type }}' name="id" hidden>
-                <div class="form-floating">
-                    {{ form.username }}
-                    <label for="floatingInput">{{ form.username.label }}</label>
-                </div>
-                <div class="form-floating">
-                    {{ form.password }}
-                    <label for="id_password">{{ form.password.label }}</label>
-                </div>
-                <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
-            {% elif type == "otp" %}
-                <input type="text" value='{{ type }}' name="id" hidden>
-                <div class="form-floating">
-                    <button type="submit" class="btn btn-primary btn-sm" name="otp_id" value="auth_otp_email">
-                        メール認証
-                    </button>
-                    <button type="submit" class="btn btn-primary btn-sm" name="otp_id" value="auth_totp">
-                        TOTP認証
-                    </button>
-                </div>
-            {% elif type == "auth_otp_email" or type == "auth_totp" %}
-                {% if invalid_code %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ invalid_code }}
-                    </div>
-                {% endif %}
-                <input type="text" value='{{ type }}' name="id" hidden>
-                <div class="form-floating">
-                    {{ form.token }}
-                    <label for="id_password">{{ form.token.label }}</label>
-                </div>
-                <br/>
-                <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
-            {% endif %}
-        </form>
-        <br/>
-        {% if type == 'auth' %}
-            <a class="nav-link " href="{% url 'password_reset' %}" role="button" aria-expanded="false">Forget password
-                ?</a>
-            <a class="nav-link " href="{% url 'sign_up' %}" role="button" aria-expanded="false">sign up</a>
+  <main class="form-signin">
+    <form method="post" class="needs-validation" novalidate>
+      {% csrf_token %}
+      <div class="logo">
+        <img class="mb-4" src="{% static 'icon/icon.png' %}" alt="" width="72"
+             height="72">
+        {% if type == "auth" %}
+          <h1 class="h3 mb-3 fw-normal">Please sign in</h1>
+        {% elif type == "otp" %}
+          <h1 class="h3 mb-3 fw-normal">二段階認証</h1>
+        {% endif %}
+      </div>
+      {% if type == "auth" %}
+        <input type="text" value='{{ type }}' name="id" hidden>
+        <div class="form-floating">
+          {{ form.username }}
+          <label for="floatingInput">{{ form.username.label }}</label>
+        </div>
+        <div class="form-floating">
+          {{ form.password }}
+          <label for="id_password">{{ form.password.label }}</label>
+        </div>
+        <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in
+        </button>
+      {% elif type == "otp" %}
+        <input type="text" value='{{ type }}' name="id" hidden>
+        <div class="form-floating">
+          <button type="submit" class="btn btn-primary btn-sm" name="otp_id"
+                  value="auth_otp_email">
+            メール認証
+          </button>
+          <button type="submit" class="btn btn-primary btn-sm" name="otp_id"
+                  value="auth_totp">
+            TOTP認証
+          </button>
+        </div>
+      {% elif type == "auth_otp_email" or type == "auth_totp" %}
+        {% if invalid_code %}
+          <div class="alert alert-danger" role="alert">
+            {{ invalid_code }}
+          </div>
         {% endif %}
-    </main>
+        <input type="text" value='{{ type }}' name="id" hidden>
+        <div class="form-floating">
+          {{ form.token }}
+          <label for="id_password">{{ form.token.label }}</label>
+        </div>
+        <br/>
+        <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in
+        </button>
+      {% endif %}
+    </form>
+    <br/>
+    {% if type == 'auth' %}
+      <a class="nav-link " href="{% url 'password_reset' %}" role="button"
+         aria-expanded="false">Forget password
+        ?</a>
+      <a class="nav-link " href="{% url 'sign_up' %}" role="button"
+         aria-expanded="false">sign up</a>
+    {% endif %}
+  </main>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/sign_out.html b/dsbd/templates/sign_out.html
index 3766481..186e4d9 100644
--- a/dsbd/templates/sign_out.html
+++ b/dsbd/templates/sign_out.html
@@ -1,7 +1,7 @@
 {% extends 'base1.html' %}
 
 {% block content %}
-    <h1>ログアウトしました</h1>
+  <h1>ログアウトしました</h1>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/sign_up.html b/dsbd/templates/sign_up.html
index 4edd6c1..a0c226a 100644
--- a/dsbd/templates/sign_up.html
+++ b/dsbd/templates/sign_up.html
@@ -2,59 +2,60 @@
 {% load widget_tweaks %}
 {% load static %}
 {% block style %}
-    <style>
-        html,
-        body {
-            height: 100%;
-        }
+  <style>
+      html,
+      body {
+          height: 100%;
+      }
 
-        body {
-            display: flex;
-            align-items: center;
-            padding-top: 40px;
-            padding-bottom: 40px;
-            background-color: #f5f5f5;
-        }
+      body {
+          display: flex;
+          align-items: center;
+          padding-top: 40px;
+          padding-bottom: 40px;
+          background-color: #f5f5f5;
+      }
 
-        .form-signup {
-            padding-top: 100px;
-            width: 100%;
-            max-width: 400px;
-            margin: auto;
-        }
+      .form-signup {
+          padding-top: 100px;
+          width: 100%;
+          max-width: 400px;
+          margin: auto;
+      }
 
-        .form-signup .form-floating:focus-within {
-            z-index: 2;
-        }
+      .form-signup .form-floating:focus-within {
+          z-index: 2;
+      }
 
-        .logo {
-            text-align: center;
-        }
+      .logo {
+          text-align: center;
+      }
 
-        .has-error .help-block {
-            color: red;
-        }
-    </style>
+      .has-error .help-block {
+          color: red;
+      }
+  </style>
 {% endblock %}
 {% block content %}
-    <main class="form-signup">
-        <form method="post" class="needs-validation" novalidate>
-            {% csrf_token %}
-            <div class="logo">
-                <img class="mb-4" src="{% static 'icon/icon.png' %}" alt="" width="72" height="72">
-                <h1 class="h3 mb-3 fw-normal">Sign up</h1>
-            </div>
-            {% if form.error %}
-                <div class="alert alert-danger" role="alert">
-                    {{ form.error }}
-                </div>
-            {% endif %}
-            {{ form.as_p }}
-            <button class="w-100 btn btn-lg btn-primary" type="submit">
-                {% if key and not key_error %}Sign up{% else %}Submit{% endif %}
-            </button>
-        </form>
-    </main>
+  <main class="form-signup">
+    <form method="post" class="needs-validation" novalidate>
+      {% csrf_token %}
+      <div class="logo">
+        <img class="mb-4" src="{% static 'icon/icon.png' %}" alt="" width="72"
+             height="72">
+        <h1 class="h3 mb-3 fw-normal">Sign up</h1>
+      </div>
+      {% if form.error %}
+        <div class="alert alert-danger" role="alert">
+          {{ form.error }}
+        </div>
+      {% endif %}
+      {{ form.as_p }}
+      <button class="w-100 btn btn-lg btn-primary" type="submit">
+        {% if key and not key_error %}Sign up{% else %}Submit{% endif %}
+      </button>
+    </form>
+  </main>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/sign_up_success.html b/dsbd/templates/sign_up_success.html
index a1fc9d8..1cce602 100644
--- a/dsbd/templates/sign_up_success.html
+++ b/dsbd/templates/sign_up_success.html
@@ -2,39 +2,39 @@
 {% load widget_tweaks %}
 {% load static %}
 {% block style %}
-    html,
-    body {
-    height: 100%;
-    }
+  html,
+  body {
+  height: 100%;
+  }
 
-    body {
-    display: flex;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    background-color: #f5f5f5;
-    }
+  body {
+  display: flex;
+  align-items: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  background-color: #f5f5f5;
+  }
 
-    .form-signup {
-    width: 100%;
-    max-width: 400px;
-    padding: 15px;
-    margin: auto;
-    }
+  .form-signup {
+  width: 100%;
+  max-width: 400px;
+  padding: 15px;
+  margin: auto;
+  }
 
-    .form-signup .form-floating:focus-within {
-    z-index: 2;
-    }
+  .form-signup .form-floating:focus-within {
+  z-index: 2;
+  }
 
-    .logo {
-    text-align: center;
-    }
+  .logo {
+  text-align: center;
+  }
 {% endblock %}
 {% block content %}
-    <main class="form-signup">
-        <h2>登録完了</h2>
-        <h4>メールアドレスによる本人認証後に利用できます。</h4>
-    </main>
+  <main class="form-signup">
+    <h2>登録完了</h2>
+    <h4>メールアドレスによる本人認証後に利用できます。</h4>
+  </main>
 {% endblock content %}
 
 {% block javascript %}
diff --git a/dsbd/templates/svg.html b/dsbd/templates/svg.html
index 7951d8b..690ea55 100644
--- a/dsbd/templates/svg.html
+++ b/dsbd/templates/svg.html
@@ -1,133 +1,172 @@
 {% load static %}
 <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
-    <symbol id="bootstrap" viewBox="0 0 118 94">
-        <title>Bootstrap</title>
-        <path fill-rule="evenodd" clip-rule="evenodd"
-              d="M24.509 0c-6.733 0-11.715 5.893-11.492 12.284.214 6.14-.064 14.092-2.066 20.577C8.943 39.365 5.547 43.485 0 44.014v5.972c5.547.529 8.943 4.649 10.951 11.153 2.002 6.485 2.28 14.437 2.066 20.577C12.794 88.106 17.776 94 24.51 94H93.5c6.733 0 11.714-5.893 11.491-12.284-.214-6.14.064-14.092 2.066-20.577 2.009-6.504 5.396-10.624 10.943-11.153v-5.972c-5.547-.529-8.934-4.649-10.943-11.153-2.002-6.484-2.28-14.437-2.066-20.577C105.214 5.894 100.233 0 93.5 0H24.508zM80 57.863C80 66.663 73.436 72 62.543 72H44a2 2 0 01-2-2V24a2 2 0 012-2h18.437c9.083 0 15.044 4.92 15.044 12.474 0 5.302-4.01 10.049-9.119 10.88v.277C75.317 46.394 80 51.21 80 57.863zM60.521 28.34H49.948v14.934h8.905c6.884 0 10.68-2.772 10.68-7.727 0-4.643-3.264-7.207-9.012-7.207zM49.948 49.2v16.458H60.91c7.167 0 10.964-2.876 10.964-8.281 0-5.406-3.903-8.178-11.425-8.178H49.948z"></path>
-    </symbol>
-    <symbol id="home" viewBox="0 0 16 16">
-        <path d="M8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4.5a.5.5 0 0 0 .5-.5v-4h2v4a.5.5 0 0 0 .5.5H14a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146zM2.5 14V7.707l5.5-5.5 5.5 5.5V14H10v-4a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0-.5.5v4H2.5z"></path>
-    </symbol>
-    <symbol id="speedometer2" viewBox="0 0 16 16">
-        <path d="M8 4a.5.5 0 0 1 .5.5V6a.5.5 0 0 1-1 0V4.5A.5.5 0 0 1 8 4zM3.732 5.732a.5.5 0 0 1 .707 0l.915.914a.5.5 0 1 1-.708.708l-.914-.915a.5.5 0 0 1 0-.707zM2 10a.5.5 0 0 1 .5-.5h1.586a.5.5 0 0 1 0 1H2.5A.5.5 0 0 1 2 10zm9.5 0a.5.5 0 0 1 .5-.5h1.5a.5.5 0 0 1 0 1H12a.5.5 0 0 1-.5-.5zm.754-4.246a.389.389 0 0 0-.527-.02L7.547 9.31a.91.91 0 1 0 1.302 1.258l3.434-4.297a.389.389 0 0 0-.029-.518z"></path>
-        <path fill-rule="evenodd"
-              d="M0 10a8 8 0 1 1 15.547 2.661c-.442 1.253-1.845 1.602-2.932 1.25C11.309 13.488 9.475 13 8 13c-1.474 0-3.31.488-4.615.911-1.087.352-2.49.003-2.932-1.25A7.988 7.988 0 0 1 0 10zm8-7a7 7 0 0 0-6.603 9.329c.203.575.923.876 1.68.63C4.397 12.533 6.358 12 8 12s3.604.532 4.923.96c.757.245 1.477-.056 1.68-.631A7 7 0 0 0 8 3z"></path>
-    </symbol>
-    <symbol id="table" viewBox="0 0 16 16">
-        <path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"></path>
-    </symbol>
-    <symbol id="people-circle" viewBox="0 0 16 16">
-        <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"></path>
-        <path fill-rule="evenodd"
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"></path>
-    </symbol>
-    <symbol id="grid" viewBox="0 0 16 16">
-        <path d="M1 2.5A1.5 1.5 0 0 1 2.5 1h3A1.5 1.5 0 0 1 7 2.5v3A1.5 1.5 0 0 1 5.5 7h-3A1.5 1.5 0 0 1 1 5.5v-3zM2.5 2a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zm6.5.5A1.5 1.5 0 0 1 10.5 1h3A1.5 1.5 0 0 1 15 2.5v3A1.5 1.5 0 0 1 13.5 7h-3A1.5 1.5 0 0 1 9 5.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zM1 10.5A1.5 1.5 0 0 1 2.5 9h3A1.5 1.5 0 0 1 7 10.5v3A1.5 1.5 0 0 1 5.5 15h-3A1.5 1.5 0 0 1 1 13.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zm6.5.5A1.5 1.5 0 0 1 10.5 9h3a1.5 1.5 0 0 1 1.5 1.5v3a1.5 1.5 0 0 1-1.5 1.5h-3A1.5 1.5 0 0 1 9 13.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3z"></path>
-    </symbol>
-    <symbol id="collection" viewBox="0 0 16 16">
-        <path d="M2.5 3.5a.5.5 0 0 1 0-1h11a.5.5 0 0 1 0 1h-11zm2-2a.5.5 0 0 1 0-1h7a.5.5 0 0 1 0 1h-7zM0 13a1.5 1.5 0 0 0 1.5 1.5h13A1.5 1.5 0 0 0 16 13V6a1.5 1.5 0 0 0-1.5-1.5h-13A1.5 1.5 0 0 0 0 6v7zm1.5.5A.5.5 0 0 1 1 13V6a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-13z"></path>
-    </symbol>
-    <symbol id="calendar3" viewBox="0 0 16 16">
-        <path d="M14 0H2a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM1 3.857C1 3.384 1.448 3 2 3h12c.552 0 1 .384 1 .857v10.286c0 .473-.448.857-1 .857H2c-.552 0-1-.384-1-.857V3.857z"></path>
-        <path d="M6.5 7a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm-9 3a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm-9 3a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"></path>
-    </symbol>
-    <symbol id="chat-quote-fill" viewBox="0 0 16 16">
-        <path d="M16 8c0 3.866-3.582 7-8 7a9.06 9.06 0 0 1-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7zM7.194 6.766a1.688 1.688 0 0 0-.227-.272 1.467 1.467 0 0 0-.469-.324l-.008-.004A1.785 1.785 0 0 0 5.734 6C4.776 6 4 6.746 4 7.667c0 .92.776 1.666 1.734 1.666.343 0 .662-.095.931-.26-.137.389-.39.804-.81 1.22a.405.405 0 0 0 .011.59c.173.16.447.155.614-.01 1.334-1.329 1.37-2.758.941-3.706a2.461 2.461 0 0 0-.227-.4zM11 9.073c-.136.389-.39.804-.81 1.22a.405.405 0 0 0 .012.59c.172.16.446.155.613-.01 1.334-1.329 1.37-2.758.942-3.706a2.466 2.466 0 0 0-.228-.4 1.686 1.686 0 0 0-.227-.273 1.466 1.466 0 0 0-.469-.324l-.008-.004A1.785 1.785 0 0 0 10.07 6c-.957 0-1.734.746-1.734 1.667 0 .92.777 1.666 1.734 1.666.343 0 .662-.095.931-.26z"/>
-    </symbol>
-    <symbol id="cpu-fill" viewBox="0 0 16 16">
-        <path d="M6.5 6a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3z"/>
-        <path d="M5.5.5a.5.5 0 0 0-1 0V2A2.5 2.5 0 0 0 2 4.5H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2A2.5 2.5 0 0 0 4.5 14v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14a2.5 2.5 0 0 0 2.5-2.5h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14A2.5 2.5 0 0 0 11.5 2V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1V.5zm1 4.5h3A1.5 1.5 0 0 1 11 6.5v3A1.5 1.5 0 0 1 9.5 11h-3A1.5 1.5 0 0 1 5 9.5v-3A1.5 1.5 0 0 1 6.5 5z"/>
-    </symbol>
-    <symbol id="gear-fill" viewBox="0 0 16 16">
-        <path d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 1 1 0-5.86 2.929 2.929 0 0 1 0 5.858z"/>
-    </symbol>
-    <symbol id="speedometer" viewBox="0 0 16 16">
-        <path d="M8 2a.5.5 0 0 1 .5.5V4a.5.5 0 0 1-1 0V2.5A.5.5 0 0 1 8 2zM3.732 3.732a.5.5 0 0 1 .707 0l.915.914a.5.5 0 1 1-.708.708l-.914-.915a.5.5 0 0 1 0-.707zM2 8a.5.5 0 0 1 .5-.5h1.586a.5.5 0 0 1 0 1H2.5A.5.5 0 0 1 2 8zm9.5 0a.5.5 0 0 1 .5-.5h1.5a.5.5 0 0 1 0 1H12a.5.5 0 0 1-.5-.5zm.754-4.246a.389.389 0 0 0-.527-.02L7.547 7.31A.91.91 0 1 0 8.85 8.569l3.434-4.297a.389.389 0 0 0-.029-.518z"/>
-        <path fill-rule="evenodd"
-              d="M6.664 15.889A8 8 0 1 1 9.336.11a8 8 0 0 1-2.672 15.78zm-4.665-4.283A11.945 11.945 0 0 1 8 10c2.186 0 4.236.585 6.001 1.606a7 7 0 1 0-12.002 0z"/>
-    </symbol>
-    <symbol id="toggles2" viewBox="0 0 16 16">
-        <path d="M9.465 10H12a2 2 0 1 1 0 4H9.465c.34-.588.535-1.271.535-2 0-.729-.195-1.412-.535-2z"></path>
-        <path d="M6 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm0 1a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm.535-10a3.975 3.975 0 0 1-.409-1H4a1 1 0 0 1 0-2h2.126c.091-.355.23-.69.41-1H4a2 2 0 1 0 0 4h2.535z"></path>
-        <path d="M14 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0z"></path>
-    </symbol>
-    <symbol id="tools" viewBox="0 0 16 16">
-        <path d="M1 0L0 1l2.2 3.081a1 1 0 0 0 .815.419h.07a1 1 0 0 1 .708.293l2.675 2.675-2.617 2.654A3.003 3.003 0 0 0 0 13a3 3 0 1 0 5.878-.851l2.654-2.617.968.968-.305.914a1 1 0 0 0 .242 1.023l3.356 3.356a1 1 0 0 0 1.414 0l1.586-1.586a1 1 0 0 0 0-1.414l-3.356-3.356a1 1 0 0 0-1.023-.242L10.5 9.5l-.96-.96 2.68-2.643A3.005 3.005 0 0 0 16 3c0-.269-.035-.53-.102-.777l-2.14 2.141L12 4l-.364-1.757L13.777.102a3 3 0 0 0-3.675 3.68L7.462 6.46 4.793 3.793a1 1 0 0 1-.293-.707v-.071a1 1 0 0 0-.419-.814L1 0zm9.646 10.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708zM3 11l.471.242.529.026.287.445.445.287.026.529L5 13l-.242.471-.026.529-.445.287-.287.445-.529.026L3 15l-.471-.242L2 14.732l-.287-.445L1.268 14l-.026-.529L1 13l.242-.471.026-.529.445-.287.287-.445.529-.026L3 11z"/>
-    </symbol>
-    <symbol id="chevron-right" viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
-    </symbol>
-    <symbol id="geo-fill" viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M4 4a4 4 0 1 1 4.5 3.969V13.5a.5.5 0 0 1-1 0V7.97A4 4 0 0 1 4 3.999zm2.493 8.574a.5.5 0 0 1-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 0 0-.37.265.301.301 0 0 0-.057.09V14l.002.008a.147.147 0 0 0 .016.033.617.617 0 0 0 .145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 0 0 .146-.15.148.148 0 0 0 .015-.033L12 14v-.004a.301.301 0 0 0-.057-.09 1.318 1.318 0 0 0-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 1 1 .164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 0 1 .575.411z"/>
-    </symbol>
-    <symbol id="geo-fill" viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M4 4a4 4 0 1 1 4.5 3.969V13.5a.5.5 0 0 1-1 0V7.97A4 4 0 0 1 4 3.999zm2.493 8.574a.5.5 0 0 1-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 0 0-.37.265.301.301 0 0 0-.057.09V14l.002.008a.147.147 0 0 0 .016.033.617.617 0 0 0 .145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 0 0 .146-.15.148.148 0 0 0 .015-.033L12 14v-.004a.301.301 0 0 0-.057-.09 1.318 1.318 0 0 0-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 1 1 .164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 0 1 .575.411z"></path>
-    </symbol>
-    <symbol id="bug" viewBox="0 0 24 24">
-        <path d="M19 15V11.9375C19 9.76288 17.2371 8 15.0625 8H8.9375C6.76288 8 5 9.76288 5 11.9375V15C5 18.866 8.13401 22 12 22C15.866 22 19 18.866 19 15Z"
-              stroke="#1C274C" stroke-width="1.5"></path>
-        <path d="M16.5 8.5V7.5C16.5 5.01472 14.4853 3 12 3C9.51472 3 7.5 5.01472 7.5 7.5V8.5" stroke="#1C274C"
-              stroke-width="1.5"></path>
-        <path opacity="0.5" d="M19 14H22" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"></path>
-        <path opacity="0.5" d="M5 14H2" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"></path>
-        <path opacity="0.5" d="M14.5 3.5L17 2" stroke="#1C274C" stroke-width="1.5"
-              stroke-linecap="round"></path>
-        <path opacity="0.5" d="M9.5 3.5L7 2" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"></path>
-        <path opacity="0.5" d="M20.5 20.0002L18.5 19.2002" stroke="#1C274C" stroke-width="1.5"
-              stroke-linecap="round"></path>
-        <path opacity="0.5" d="M20.5 7.9998L18.5 8.7998" stroke="#1C274C" stroke-width="1.5"
-              stroke-linecap="round"></path>
-        <path opacity="0.5" d="M3.5 20.0002L5.5 19.2002" stroke="#1C274C" stroke-width="1.5"
-              stroke-linecap="round"></path>
-        <path opacity="0.5" d="M3.5 7.9998L5.5 8.7998" stroke="#1C274C" stroke-width="1.5"
-              stroke-linecap="round"></path>
-        <path opacity="0.5" d="M12 21.5V15" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"></path>
-    </symbol>
-    <symbol id="administrator" viewBox="0 0 32 32">
-        <path d="M14.68,14.81a6.76,6.76,0,1,1,6.76-6.75A6.77,6.77,0,0,1,14.68,14.81Zm0-11.51a4.76,4.76,0,1,0,4.76,4.76A4.76,4.76,0,0,0,14.68,3.3Z"
-              class="clr-i-outline clr-i-outline-path-1"></path>
-        <path d="M16.42,31.68A2.14,2.14,0,0,1,15.8,30H4V24.22a14.81,14.81,0,0,1,11.09-4.68l.72,0a2.2,2.2,0,0,1,.62-1.85l.12-.11c-.47,0-1-.06-1.46-.06A16.47,16.47,0,0,0,2.2,23.26a1,1,0,0,0-.2.6V30a2,2,0,0,0,2,2H16.7Z"
-              class="clr-i-outline clr-i-outline-path-2"></path>
-        <path d="M26.87,16.29a.37.37,0,0,1,.15,0,.42.42,0,0,0-.15,0Z" class="clr-i-outline clr-i-outline-path-3"></path>
-        <path d="M33.68,23.32l-2-.61a7.21,7.21,0,0,0-.58-1.41l1-1.86A.38.38,0,0,0,32,19l-1.45-1.45a.36.36,0,0,0-.44-.07l-1.84,1a7.15,7.15,0,0,0-1.43-.61l-.61-2a.36.36,0,0,0-.36-.24H23.82a.36.36,0,0,0-.35.26l-.61,2a7,7,0,0,0-1.44.6l-1.82-1a.35.35,0,0,0-.43.07L17.69,19a.38.38,0,0,0-.06.44l1,1.82A6.77,6.77,0,0,0,18,22.69l-2,.6a.36.36,0,0,0-.26.35v2.05A.35.35,0,0,0,16,26l2,.61a7,7,0,0,0,.6,1.41l-1,1.91a.36.36,0,0,0,.06.43l1.45,1.45a.38.38,0,0,0,.44.07l1.87-1a7.09,7.09,0,0,0,1.4.57l.6,2a.38.38,0,0,0,.35.26h2.05a.37.37,0,0,0,.35-.26l.61-2.05a6.92,6.92,0,0,0,1.38-.57l1.89,1a.36.36,0,0,0,.43-.07L32,30.4A.35.35,0,0,0,32,30l-1-1.88a7,7,0,0,0,.58-1.39l2-.61a.36.36,0,0,0,.26-.35V23.67A.36.36,0,0,0,33.68,23.32ZM24.85,28a3.34,3.34,0,1,1,3.33-3.33A3.34,3.34,0,0,1,24.85,28Z"
-              class="clr-i-outline clr-i-outline-path-4"></path>
-    </symbol>
-    <symbol id="database" viewBox="0 0 24 24">
-        <path d="M4 18V6" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"></path>
-        <path d="M20 12L20 18" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"></path>
-        <path d="M12 10C16.4183 10 20 8.20914 20 6C20 3.79086 16.4183 2 12 2C7.58172 2 4 3.79086 4 6C4 8.20914 7.58172 10 12 10Z"
-              stroke="#1C274C" stroke-width="1.5"></path>
-        <path d="M20 12C20 14.2091 16.4183 16 12 16C7.58172 16 4 14.2091 4 12" stroke="#1C274C" stroke-width="1.5"
-              stroke-linecap="round"></path>
-        <path d="M20 18C20 20.2091 16.4183 22 12 22C7.58172 22 4 20.2091 4 18" stroke="#1C274C"
-              stroke-width="1.5"></path>
-    </symbol>
-    <symbol id="group" viewBox="0 0 24 24">
-        <path fill-rule="evenodd" clip-rule="evenodd"
-              d="M16 6C14.3432 6 13 7.34315 13 9C13 10.6569 14.3432 12 16 12C17.6569 12 19 10.6569 19 9C19 7.34315 17.6569 6 16 6ZM11 9C11 6.23858 13.2386 4 16 4C18.7614 4 21 6.23858 21 9C21 10.3193 20.489 11.5193 19.6542 12.4128C21.4951 13.0124 22.9176 14.1993 23.8264 15.5329C24.1374 15.9893 24.0195 16.6114 23.5631 16.9224C23.1068 17.2334 22.4846 17.1155 22.1736 16.6591C21.1979 15.2273 19.4178 14 17 14C13.166 14 11 17.0742 11 19C11 19.5523 10.5523 20 10 20C9.44773 20 9.00001 19.5523 9.00001 19C9.00001 18.308 9.15848 17.57 9.46082 16.8425C9.38379 16.7931 9.3123 16.7323 9.24889 16.6602C8.42804 15.7262 7.15417 15 5.50001 15C3.84585 15 2.57199 15.7262 1.75114 16.6602C1.38655 17.075 0.754692 17.1157 0.339855 16.7511C-0.0749807 16.3865 -0.115709 15.7547 0.248886 15.3398C0.809035 14.7025 1.51784 14.1364 2.35725 13.7207C1.51989 12.9035 1.00001 11.7625 1.00001 10.5C1.00001 8.01472 3.01473 6 5.50001 6C7.98529 6 10 8.01472 10 10.5C10 11.7625 9.48013 12.9035 8.64278 13.7207C9.36518 14.0785 9.99085 14.5476 10.5083 15.0777C11.152 14.2659 11.9886 13.5382 12.9922 12.9945C11.7822 12.0819 11 10.6323 11 9ZM3.00001 10.5C3.00001 9.11929 4.1193 8 5.50001 8C6.88072 8 8.00001 9.11929 8.00001 10.5C8.00001 11.8807 6.88072 13 5.50001 13C4.1193 13 3.00001 11.8807 3.00001 10.5Z"
-              fill="#ffffff"></path>
-    </symbol>
-    <symbol id="messages" viewBox="0 0 24 24">
-        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-        <path d="M21 14l-3 -3h-7a1 1 0 0 1 -1 -1v-6a1 1 0 0 1 1 -1h9a1 1 0 0 1 1 1v10"></path>
-        <path d="M14 15v2a1 1 0 0 1 -1 1h-7l-3 3v-10a1 1 0 0 1 1 -1h2"></path>
-    </symbol>
-    <symbol id="setting" viewBox="0 0 24 24">
-        <path opacity="0.5"
-              d="M13.7654 2.15224C13.3978 2 12.9319 2 12 2C11.0681 2 10.6022 2 10.2346 2.15224C9.74457 2.35523 9.35522 2.74458 9.15223 3.23463C9.05957 3.45834 9.0233 3.7185 9.00911 4.09799C8.98826 4.65568 8.70226 5.17189 8.21894 5.45093C7.73564 5.72996 7.14559 5.71954 6.65219 5.45876C6.31645 5.2813 6.07301 5.18262 5.83294 5.15102C5.30704 5.08178 4.77518 5.22429 4.35436 5.5472C4.03874 5.78938 3.80577 6.1929 3.33983 6.99993C2.87389 7.80697 2.64092 8.21048 2.58899 8.60491C2.51976 9.1308 2.66227 9.66266 2.98518 10.0835C3.13256 10.2756 3.3397 10.437 3.66119 10.639C4.1338 10.936 4.43789 11.4419 4.43786 12C4.43783 12.5581 4.13375 13.0639 3.66118 13.3608C3.33965 13.5629 3.13248 13.7244 2.98508 13.9165C2.66217 14.3373 2.51966 14.8691 2.5889 15.395C2.64082 15.7894 2.87379 16.193 3.33973 17C3.80568 17.807 4.03865 18.2106 4.35426 18.4527C4.77508 18.7756 5.30694 18.9181 5.83284 18.8489C6.07289 18.8173 6.31632 18.7186 6.65204 18.5412C7.14547 18.2804 7.73556 18.27 8.2189 18.549C8.70224 18.8281 8.98826 19.3443 9.00911 19.9021C9.02331 20.2815 9.05957 20.5417 9.15223 20.7654C9.35522 21.2554 9.74457 21.6448 10.2346 21.8478C10.6022 22 11.0681 22 12 22C12.9319 22 13.3978 22 13.7654 21.8478C14.2554 21.6448 14.6448 21.2554 14.8477 20.7654C14.9404 20.5417 14.9767 20.2815 14.9909 19.902C15.0117 19.3443 15.2977 18.8281 15.781 18.549C16.2643 18.2699 16.8544 18.2804 17.3479 18.5412C17.6836 18.7186 17.927 18.8172 18.167 18.8488C18.6929 18.9181 19.2248 18.7756 19.6456 18.4527C19.9612 18.2105 20.1942 17.807 20.6601 16.9999C21.1261 16.1929 21.3591 15.7894 21.411 15.395C21.4802 14.8691 21.3377 14.3372 21.0148 13.9164C20.8674 13.7243 20.6602 13.5628 20.3387 13.3608C19.8662 13.0639 19.5621 12.558 19.5621 11.9999C19.5621 11.4418 19.8662 10.9361 20.3387 10.6392C20.6603 10.4371 20.8675 10.2757 21.0149 10.0835C21.3378 9.66273 21.4803 9.13087 21.4111 8.60497C21.3592 8.21055 21.1262 7.80703 20.6602 7C20.1943 6.19297 19.9613 5.78945 19.6457 5.54727C19.2249 5.22436 18.693 5.08185 18.1671 5.15109C17.9271 5.18269 17.6837 5.28136 17.3479 5.4588C16.8545 5.71959 16.2644 5.73002 15.7811 5.45096C15.2977 5.17191 15.0117 4.65566 14.9909 4.09794C14.9767 3.71848 14.9404 3.45833 14.8477 3.23463C14.6448 2.74458 14.2554 2.35523 13.7654 2.15224Z"
-              stroke="#1C274C" stroke-width="1.5"></path>
-    </symbol>
-    <symbol id="email" viewBox="0 0 24 24">
-        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-        <path d="M22 7.535v9.465a3 3 0 0 1 -2.824 2.995l-.176 .005h-14a3 3 0 0 1 -2.995 -2.824l-.005 -.176v-9.465l9.445 6.297l.116 .066a1 1 0 0 0 .878 0l.116 -.066l9.445 -6.297z"
-              stroke-width="0" fill="currentColor"></path>
-        <path d="M19 4c1.08 0 2.027 .57 2.555 1.427l-9.555 6.37l-9.555 -6.37a2.999 2.999 0 0 1 2.354 -1.42l.201 -.007h14z"
-              stroke-width="0" fill="currentColor"></path>
-    </symbol>
-    <symbol id="menu" viewBox="0 0 16 16">
-        <path d="M0 1.5A1.5 1.5 0 0 1 1.5 0h2A1.5 1.5 0 0 1 5 1.5v2A1.5 1.5 0 0 1 3.5 5h-2A1.5 1.5 0 0 1 0 3.5v-2zM1.5 1a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 .5.5h2a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-.5-.5h-2zM0 8a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V8zm1 3v2a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2H1zm14-1V8a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v2h14zM2 8.5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5zm0 4a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5z"></path>
-    </symbol>
+  <symbol id="bootstrap" viewBox="0 0 118 94">
+    <title>Bootstrap</title>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M24.509 0c-6.733 0-11.715 5.893-11.492 12.284.214 6.14-.064 14.092-2.066 20.577C8.943 39.365 5.547 43.485 0 44.014v5.972c5.547.529 8.943 4.649 10.951 11.153 2.002 6.485 2.28 14.437 2.066 20.577C12.794 88.106 17.776 94 24.51 94H93.5c6.733 0 11.714-5.893 11.491-12.284-.214-6.14.064-14.092 2.066-20.577 2.009-6.504 5.396-10.624 10.943-11.153v-5.972c-5.547-.529-8.934-4.649-10.943-11.153-2.002-6.484-2.28-14.437-2.066-20.577C105.214 5.894 100.233 0 93.5 0H24.508zM80 57.863C80 66.663 73.436 72 62.543 72H44a2 2 0 01-2-2V24a2 2 0 012-2h18.437c9.083 0 15.044 4.92 15.044 12.474 0 5.302-4.01 10.049-9.119 10.88v.277C75.317 46.394 80 51.21 80 57.863zM60.521 28.34H49.948v14.934h8.905c6.884 0 10.68-2.772 10.68-7.727 0-4.643-3.264-7.207-9.012-7.207zM49.948 49.2v16.458H60.91c7.167 0 10.964-2.876 10.964-8.281 0-5.406-3.903-8.178-11.425-8.178H49.948z"></path>
+  </symbol>
+  <symbol id="home" viewBox="0 0 16 16">
+    <path
+        d="M8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4.5a.5.5 0 0 0 .5-.5v-4h2v4a.5.5 0 0 0 .5.5H14a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146zM2.5 14V7.707l5.5-5.5 5.5 5.5V14H10v-4a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0-.5.5v4H2.5z"></path>
+  </symbol>
+  <symbol id="speedometer2" viewBox="0 0 16 16">
+    <path
+        d="M8 4a.5.5 0 0 1 .5.5V6a.5.5 0 0 1-1 0V4.5A.5.5 0 0 1 8 4zM3.732 5.732a.5.5 0 0 1 .707 0l.915.914a.5.5 0 1 1-.708.708l-.914-.915a.5.5 0 0 1 0-.707zM2 10a.5.5 0 0 1 .5-.5h1.586a.5.5 0 0 1 0 1H2.5A.5.5 0 0 1 2 10zm9.5 0a.5.5 0 0 1 .5-.5h1.5a.5.5 0 0 1 0 1H12a.5.5 0 0 1-.5-.5zm.754-4.246a.389.389 0 0 0-.527-.02L7.547 9.31a.91.91 0 1 0 1.302 1.258l3.434-4.297a.389.389 0 0 0-.029-.518z"></path>
+    <path fill-rule="evenodd"
+          d="M0 10a8 8 0 1 1 15.547 2.661c-.442 1.253-1.845 1.602-2.932 1.25C11.309 13.488 9.475 13 8 13c-1.474 0-3.31.488-4.615.911-1.087.352-2.49.003-2.932-1.25A7.988 7.988 0 0 1 0 10zm8-7a7 7 0 0 0-6.603 9.329c.203.575.923.876 1.68.63C4.397 12.533 6.358 12 8 12s3.604.532 4.923.96c.757.245 1.477-.056 1.68-.631A7 7 0 0 0 8 3z"></path>
+  </symbol>
+  <symbol id="table" viewBox="0 0 16 16">
+    <path
+        d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"></path>
+  </symbol>
+  <symbol id="people-circle" viewBox="0 0 16 16">
+    <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"></path>
+    <path fill-rule="evenodd"
+          d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"></path>
+  </symbol>
+  <symbol id="grid" viewBox="0 0 16 16">
+    <path
+        d="M1 2.5A1.5 1.5 0 0 1 2.5 1h3A1.5 1.5 0 0 1 7 2.5v3A1.5 1.5 0 0 1 5.5 7h-3A1.5 1.5 0 0 1 1 5.5v-3zM2.5 2a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zm6.5.5A1.5 1.5 0 0 1 10.5 1h3A1.5 1.5 0 0 1 15 2.5v3A1.5 1.5 0 0 1 13.5 7h-3A1.5 1.5 0 0 1 9 5.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zM1 10.5A1.5 1.5 0 0 1 2.5 9h3A1.5 1.5 0 0 1 7 10.5v3A1.5 1.5 0 0 1 5.5 15h-3A1.5 1.5 0 0 1 1 13.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zm6.5.5A1.5 1.5 0 0 1 10.5 9h3a1.5 1.5 0 0 1 1.5 1.5v3a1.5 1.5 0 0 1-1.5 1.5h-3A1.5 1.5 0 0 1 9 13.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3z"></path>
+  </symbol>
+  <symbol id="collection" viewBox="0 0 16 16">
+    <path
+        d="M2.5 3.5a.5.5 0 0 1 0-1h11a.5.5 0 0 1 0 1h-11zm2-2a.5.5 0 0 1 0-1h7a.5.5 0 0 1 0 1h-7zM0 13a1.5 1.5 0 0 0 1.5 1.5h13A1.5 1.5 0 0 0 16 13V6a1.5 1.5 0 0 0-1.5-1.5h-13A1.5 1.5 0 0 0 0 6v7zm1.5.5A.5.5 0 0 1 1 13V6a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-13z"></path>
+  </symbol>
+  <symbol id="calendar3" viewBox="0 0 16 16">
+    <path
+        d="M14 0H2a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM1 3.857C1 3.384 1.448 3 2 3h12c.552 0 1 .384 1 .857v10.286c0 .473-.448.857-1 .857H2c-.552 0-1-.384-1-.857V3.857z"></path>
+    <path
+        d="M6.5 7a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm-9 3a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm-9 3a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm3 0a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"></path>
+  </symbol>
+  <symbol id="chat-quote-fill" viewBox="0 0 16 16">
+    <path
+        d="M16 8c0 3.866-3.582 7-8 7a9.06 9.06 0 0 1-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7zM7.194 6.766a1.688 1.688 0 0 0-.227-.272 1.467 1.467 0 0 0-.469-.324l-.008-.004A1.785 1.785 0 0 0 5.734 6C4.776 6 4 6.746 4 7.667c0 .92.776 1.666 1.734 1.666.343 0 .662-.095.931-.26-.137.389-.39.804-.81 1.22a.405.405 0 0 0 .011.59c.173.16.447.155.614-.01 1.334-1.329 1.37-2.758.941-3.706a2.461 2.461 0 0 0-.227-.4zM11 9.073c-.136.389-.39.804-.81 1.22a.405.405 0 0 0 .012.59c.172.16.446.155.613-.01 1.334-1.329 1.37-2.758.942-3.706a2.466 2.466 0 0 0-.228-.4 1.686 1.686 0 0 0-.227-.273 1.466 1.466 0 0 0-.469-.324l-.008-.004A1.785 1.785 0 0 0 10.07 6c-.957 0-1.734.746-1.734 1.667 0 .92.777 1.666 1.734 1.666.343 0 .662-.095.931-.26z"/>
+  </symbol>
+  <symbol id="cpu-fill" viewBox="0 0 16 16">
+    <path
+        d="M6.5 6a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3z"/>
+    <path
+        d="M5.5.5a.5.5 0 0 0-1 0V2A2.5 2.5 0 0 0 2 4.5H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2A2.5 2.5 0 0 0 4.5 14v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14a2.5 2.5 0 0 0 2.5-2.5h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14A2.5 2.5 0 0 0 11.5 2V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1V.5zm1 4.5h3A1.5 1.5 0 0 1 11 6.5v3A1.5 1.5 0 0 1 9.5 11h-3A1.5 1.5 0 0 1 5 9.5v-3A1.5 1.5 0 0 1 6.5 5z"/>
+  </symbol>
+  <symbol id="gear-fill" viewBox="0 0 16 16">
+    <path
+        d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 1 1 0-5.86 2.929 2.929 0 0 1 0 5.858z"/>
+  </symbol>
+  <symbol id="speedometer" viewBox="0 0 16 16">
+    <path
+        d="M8 2a.5.5 0 0 1 .5.5V4a.5.5 0 0 1-1 0V2.5A.5.5 0 0 1 8 2zM3.732 3.732a.5.5 0 0 1 .707 0l.915.914a.5.5 0 1 1-.708.708l-.914-.915a.5.5 0 0 1 0-.707zM2 8a.5.5 0 0 1 .5-.5h1.586a.5.5 0 0 1 0 1H2.5A.5.5 0 0 1 2 8zm9.5 0a.5.5 0 0 1 .5-.5h1.5a.5.5 0 0 1 0 1H12a.5.5 0 0 1-.5-.5zm.754-4.246a.389.389 0 0 0-.527-.02L7.547 7.31A.91.91 0 1 0 8.85 8.569l3.434-4.297a.389.389 0 0 0-.029-.518z"/>
+    <path fill-rule="evenodd"
+          d="M6.664 15.889A8 8 0 1 1 9.336.11a8 8 0 0 1-2.672 15.78zm-4.665-4.283A11.945 11.945 0 0 1 8 10c2.186 0 4.236.585 6.001 1.606a7 7 0 1 0-12.002 0z"/>
+  </symbol>
+  <symbol id="toggles2" viewBox="0 0 16 16">
+    <path
+        d="M9.465 10H12a2 2 0 1 1 0 4H9.465c.34-.588.535-1.271.535-2 0-.729-.195-1.412-.535-2z"></path>
+    <path
+        d="M6 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm0 1a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm.535-10a3.975 3.975 0 0 1-.409-1H4a1 1 0 0 1 0-2h2.126c.091-.355.23-.69.41-1H4a2 2 0 1 0 0 4h2.535z"></path>
+    <path d="M14 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0z"></path>
+  </symbol>
+  <symbol id="tools" viewBox="0 0 16 16">
+    <path
+        d="M1 0L0 1l2.2 3.081a1 1 0 0 0 .815.419h.07a1 1 0 0 1 .708.293l2.675 2.675-2.617 2.654A3.003 3.003 0 0 0 0 13a3 3 0 1 0 5.878-.851l2.654-2.617.968.968-.305.914a1 1 0 0 0 .242 1.023l3.356 3.356a1 1 0 0 0 1.414 0l1.586-1.586a1 1 0 0 0 0-1.414l-3.356-3.356a1 1 0 0 0-1.023-.242L10.5 9.5l-.96-.96 2.68-2.643A3.005 3.005 0 0 0 16 3c0-.269-.035-.53-.102-.777l-2.14 2.141L12 4l-.364-1.757L13.777.102a3 3 0 0 0-3.675 3.68L7.462 6.46 4.793 3.793a1 1 0 0 1-.293-.707v-.071a1 1 0 0 0-.419-.814L1 0zm9.646 10.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708zM3 11l.471.242.529.026.287.445.445.287.026.529L5 13l-.242.471-.026.529-.445.287-.287.445-.529.026L3 15l-.471-.242L2 14.732l-.287-.445L1.268 14l-.026-.529L1 13l.242-.471.026-.529.445-.287.287-.445.529-.026L3 11z"/>
+  </symbol>
+  <symbol id="chevron-right" viewBox="0 0 16 16">
+    <path fill-rule="evenodd"
+          d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
+  </symbol>
+  <symbol id="geo-fill" viewBox="0 0 16 16">
+    <path fill-rule="evenodd"
+          d="M4 4a4 4 0 1 1 4.5 3.969V13.5a.5.5 0 0 1-1 0V7.97A4 4 0 0 1 4 3.999zm2.493 8.574a.5.5 0 0 1-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 0 0-.37.265.301.301 0 0 0-.057.09V14l.002.008a.147.147 0 0 0 .016.033.617.617 0 0 0 .145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 0 0 .146-.15.148.148 0 0 0 .015-.033L12 14v-.004a.301.301 0 0 0-.057-.09 1.318 1.318 0 0 0-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 1 1 .164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 0 1 .575.411z"/>
+  </symbol>
+  <symbol id="geo-fill" viewBox="0 0 16 16">
+    <path fill-rule="evenodd"
+          d="M4 4a4 4 0 1 1 4.5 3.969V13.5a.5.5 0 0 1-1 0V7.97A4 4 0 0 1 4 3.999zm2.493 8.574a.5.5 0 0 1-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 0 0-.37.265.301.301 0 0 0-.057.09V14l.002.008a.147.147 0 0 0 .016.033.617.617 0 0 0 .145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 0 0 .146-.15.148.148 0 0 0 .015-.033L12 14v-.004a.301.301 0 0 0-.057-.09 1.318 1.318 0 0 0-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 1 1 .164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 0 1 .575.411z"></path>
+  </symbol>
+  <symbol id="bug" viewBox="0 0 24 24">
+    <path
+        d="M19 15V11.9375C19 9.76288 17.2371 8 15.0625 8H8.9375C6.76288 8 5 9.76288 5 11.9375V15C5 18.866 8.13401 22 12 22C15.866 22 19 18.866 19 15Z"
+        stroke="#1C274C" stroke-width="1.5"></path>
+    <path
+        d="M16.5 8.5V7.5C16.5 5.01472 14.4853 3 12 3C9.51472 3 7.5 5.01472 7.5 7.5V8.5"
+        stroke="#1C274C"
+        stroke-width="1.5"></path>
+    <path opacity="0.5" d="M19 14H22" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M5 14H2" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M14.5 3.5L17 2" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M9.5 3.5L7 2" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M20.5 20.0002L18.5 19.2002" stroke="#1C274C"
+          stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M20.5 7.9998L18.5 8.7998" stroke="#1C274C"
+          stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M3.5 20.0002L5.5 19.2002" stroke="#1C274C"
+          stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M3.5 7.9998L5.5 8.7998" stroke="#1C274C"
+          stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path opacity="0.5" d="M12 21.5V15" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+  </symbol>
+  <symbol id="administrator" viewBox="0 0 32 32">
+    <path
+        d="M14.68,14.81a6.76,6.76,0,1,1,6.76-6.75A6.77,6.77,0,0,1,14.68,14.81Zm0-11.51a4.76,4.76,0,1,0,4.76,4.76A4.76,4.76,0,0,0,14.68,3.3Z"
+        class="clr-i-outline clr-i-outline-path-1"></path>
+    <path
+        d="M16.42,31.68A2.14,2.14,0,0,1,15.8,30H4V24.22a14.81,14.81,0,0,1,11.09-4.68l.72,0a2.2,2.2,0,0,1,.62-1.85l.12-.11c-.47,0-1-.06-1.46-.06A16.47,16.47,0,0,0,2.2,23.26a1,1,0,0,0-.2.6V30a2,2,0,0,0,2,2H16.7Z"
+        class="clr-i-outline clr-i-outline-path-2"></path>
+    <path d="M26.87,16.29a.37.37,0,0,1,.15,0,.42.42,0,0,0-.15,0Z"
+          class="clr-i-outline clr-i-outline-path-3"></path>
+    <path
+        d="M33.68,23.32l-2-.61a7.21,7.21,0,0,0-.58-1.41l1-1.86A.38.38,0,0,0,32,19l-1.45-1.45a.36.36,0,0,0-.44-.07l-1.84,1a7.15,7.15,0,0,0-1.43-.61l-.61-2a.36.36,0,0,0-.36-.24H23.82a.36.36,0,0,0-.35.26l-.61,2a7,7,0,0,0-1.44.6l-1.82-1a.35.35,0,0,0-.43.07L17.69,19a.38.38,0,0,0-.06.44l1,1.82A6.77,6.77,0,0,0,18,22.69l-2,.6a.36.36,0,0,0-.26.35v2.05A.35.35,0,0,0,16,26l2,.61a7,7,0,0,0,.6,1.41l-1,1.91a.36.36,0,0,0,.06.43l1.45,1.45a.38.38,0,0,0,.44.07l1.87-1a7.09,7.09,0,0,0,1.4.57l.6,2a.38.38,0,0,0,.35.26h2.05a.37.37,0,0,0,.35-.26l.61-2.05a6.92,6.92,0,0,0,1.38-.57l1.89,1a.36.36,0,0,0,.43-.07L32,30.4A.35.35,0,0,0,32,30l-1-1.88a7,7,0,0,0,.58-1.39l2-.61a.36.36,0,0,0,.26-.35V23.67A.36.36,0,0,0,33.68,23.32ZM24.85,28a3.34,3.34,0,1,1,3.33-3.33A3.34,3.34,0,0,1,24.85,28Z"
+        class="clr-i-outline clr-i-outline-path-4"></path>
+  </symbol>
+  <symbol id="database" viewBox="0 0 24 24">
+    <path d="M4 18V6" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path d="M20 12L20 18" stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path
+        d="M12 10C16.4183 10 20 8.20914 20 6C20 3.79086 16.4183 2 12 2C7.58172 2 4 3.79086 4 6C4 8.20914 7.58172 10 12 10Z"
+        stroke="#1C274C" stroke-width="1.5"></path>
+    <path d="M20 12C20 14.2091 16.4183 16 12 16C7.58172 16 4 14.2091 4 12"
+          stroke="#1C274C" stroke-width="1.5"
+          stroke-linecap="round"></path>
+    <path d="M20 18C20 20.2091 16.4183 22 12 22C7.58172 22 4 20.2091 4 18"
+          stroke="#1C274C"
+          stroke-width="1.5"></path>
+  </symbol>
+  <symbol id="group" viewBox="0 0 24 24">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M16 6C14.3432 6 13 7.34315 13 9C13 10.6569 14.3432 12 16 12C17.6569 12 19 10.6569 19 9C19 7.34315 17.6569 6 16 6ZM11 9C11 6.23858 13.2386 4 16 4C18.7614 4 21 6.23858 21 9C21 10.3193 20.489 11.5193 19.6542 12.4128C21.4951 13.0124 22.9176 14.1993 23.8264 15.5329C24.1374 15.9893 24.0195 16.6114 23.5631 16.9224C23.1068 17.2334 22.4846 17.1155 22.1736 16.6591C21.1979 15.2273 19.4178 14 17 14C13.166 14 11 17.0742 11 19C11 19.5523 10.5523 20 10 20C9.44773 20 9.00001 19.5523 9.00001 19C9.00001 18.308 9.15848 17.57 9.46082 16.8425C9.38379 16.7931 9.3123 16.7323 9.24889 16.6602C8.42804 15.7262 7.15417 15 5.50001 15C3.84585 15 2.57199 15.7262 1.75114 16.6602C1.38655 17.075 0.754692 17.1157 0.339855 16.7511C-0.0749807 16.3865 -0.115709 15.7547 0.248886 15.3398C0.809035 14.7025 1.51784 14.1364 2.35725 13.7207C1.51989 12.9035 1.00001 11.7625 1.00001 10.5C1.00001 8.01472 3.01473 6 5.50001 6C7.98529 6 10 8.01472 10 10.5C10 11.7625 9.48013 12.9035 8.64278 13.7207C9.36518 14.0785 9.99085 14.5476 10.5083 15.0777C11.152 14.2659 11.9886 13.5382 12.9922 12.9945C11.7822 12.0819 11 10.6323 11 9ZM3.00001 10.5C3.00001 9.11929 4.1193 8 5.50001 8C6.88072 8 8.00001 9.11929 8.00001 10.5C8.00001 11.8807 6.88072 13 5.50001 13C4.1193 13 3.00001 11.8807 3.00001 10.5Z"
+          fill="#ffffff"></path>
+  </symbol>
+  <symbol id="messages" viewBox="0 0 24 24">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <path
+        d="M21 14l-3 -3h-7a1 1 0 0 1 -1 -1v-6a1 1 0 0 1 1 -1h9a1 1 0 0 1 1 1v10"></path>
+    <path d="M14 15v2a1 1 0 0 1 -1 1h-7l-3 3v-10a1 1 0 0 1 1 -1h2"></path>
+  </symbol>
+  <symbol id="setting" viewBox="0 0 24 24">
+    <path opacity="0.5"
+          d="M13.7654 2.15224C13.3978 2 12.9319 2 12 2C11.0681 2 10.6022 2 10.2346 2.15224C9.74457 2.35523 9.35522 2.74458 9.15223 3.23463C9.05957 3.45834 9.0233 3.7185 9.00911 4.09799C8.98826 4.65568 8.70226 5.17189 8.21894 5.45093C7.73564 5.72996 7.14559 5.71954 6.65219 5.45876C6.31645 5.2813 6.07301 5.18262 5.83294 5.15102C5.30704 5.08178 4.77518 5.22429 4.35436 5.5472C4.03874 5.78938 3.80577 6.1929 3.33983 6.99993C2.87389 7.80697 2.64092 8.21048 2.58899 8.60491C2.51976 9.1308 2.66227 9.66266 2.98518 10.0835C3.13256 10.2756 3.3397 10.437 3.66119 10.639C4.1338 10.936 4.43789 11.4419 4.43786 12C4.43783 12.5581 4.13375 13.0639 3.66118 13.3608C3.33965 13.5629 3.13248 13.7244 2.98508 13.9165C2.66217 14.3373 2.51966 14.8691 2.5889 15.395C2.64082 15.7894 2.87379 16.193 3.33973 17C3.80568 17.807 4.03865 18.2106 4.35426 18.4527C4.77508 18.7756 5.30694 18.9181 5.83284 18.8489C6.07289 18.8173 6.31632 18.7186 6.65204 18.5412C7.14547 18.2804 7.73556 18.27 8.2189 18.549C8.70224 18.8281 8.98826 19.3443 9.00911 19.9021C9.02331 20.2815 9.05957 20.5417 9.15223 20.7654C9.35522 21.2554 9.74457 21.6448 10.2346 21.8478C10.6022 22 11.0681 22 12 22C12.9319 22 13.3978 22 13.7654 21.8478C14.2554 21.6448 14.6448 21.2554 14.8477 20.7654C14.9404 20.5417 14.9767 20.2815 14.9909 19.902C15.0117 19.3443 15.2977 18.8281 15.781 18.549C16.2643 18.2699 16.8544 18.2804 17.3479 18.5412C17.6836 18.7186 17.927 18.8172 18.167 18.8488C18.6929 18.9181 19.2248 18.7756 19.6456 18.4527C19.9612 18.2105 20.1942 17.807 20.6601 16.9999C21.1261 16.1929 21.3591 15.7894 21.411 15.395C21.4802 14.8691 21.3377 14.3372 21.0148 13.9164C20.8674 13.7243 20.6602 13.5628 20.3387 13.3608C19.8662 13.0639 19.5621 12.558 19.5621 11.9999C19.5621 11.4418 19.8662 10.9361 20.3387 10.6392C20.6603 10.4371 20.8675 10.2757 21.0149 10.0835C21.3378 9.66273 21.4803 9.13087 21.4111 8.60497C21.3592 8.21055 21.1262 7.80703 20.6602 7C20.1943 6.19297 19.9613 5.78945 19.6457 5.54727C19.2249 5.22436 18.693 5.08185 18.1671 5.15109C17.9271 5.18269 17.6837 5.28136 17.3479 5.4588C16.8545 5.71959 16.2644 5.73002 15.7811 5.45096C15.2977 5.17191 15.0117 4.65566 14.9909 4.09794C14.9767 3.71848 14.9404 3.45833 14.8477 3.23463C14.6448 2.74458 14.2554 2.35523 13.7654 2.15224Z"
+          stroke="#1C274C" stroke-width="1.5"></path>
+  </symbol>
+  <symbol id="email" viewBox="0 0 24 24">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+    <path
+        d="M22 7.535v9.465a3 3 0 0 1 -2.824 2.995l-.176 .005h-14a3 3 0 0 1 -2.995 -2.824l-.005 -.176v-9.465l9.445 6.297l.116 .066a1 1 0 0 0 .878 0l.116 -.066l9.445 -6.297z"
+        stroke-width="0" fill="currentColor"></path>
+    <path
+        d="M19 4c1.08 0 2.027 .57 2.555 1.427l-9.555 6.37l-9.555 -6.37a2.999 2.999 0 0 1 2.354 -1.42l.201 -.007h14z"
+        stroke-width="0" fill="currentColor"></path>
+  </symbol>
+  <symbol id="menu" viewBox="0 0 16 16">
+    <path
+        d="M0 1.5A1.5 1.5 0 0 1 1.5 0h2A1.5 1.5 0 0 1 5 1.5v2A1.5 1.5 0 0 1 3.5 5h-2A1.5 1.5 0 0 1 0 3.5v-2zM1.5 1a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 .5.5h2a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-.5-.5h-2zM0 8a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V8zm1 3v2a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2H1zm14-1V8a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v2h14zM2 8.5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5zm0 4a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5z"></path>
+  </symbol>
 </svg>
\ No newline at end of file
diff --git a/dsbd/templates/ticket/add.html b/dsbd/templates/ticket/add.html
index 7f39e2d..f6c567f 100644
--- a/dsbd/templates/ticket/add.html
+++ b/dsbd/templates/ticket/add.html
@@ -1,29 +1,32 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">チケット追加</h2>
-                    <br/>
-                    <form method="post">
-                        {% csrf_token %}
-                        <div class="mb-3">
-                            {{ form.ticket_type }}
-                        </div>
-                        <div class="mb-3">
-                            <label for="id_title_label" class="form-label">タイトル</label>
-                            {{ form.title }}
-                        </div>
-                        <div class="mb-3">
-                            <label for="id_body_label" class="form-label">内容</label>
-                            {{ form.body }}
-                        </div>
-                        <br/>
-                        <button type="submit" name="add" class="btn btn-primary">登録確認</button>
-                    </form>
-                </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">チケット追加</h2>
+          <br/>
+          <form method="post">
+            {% csrf_token %}
+            <div class="mb-3">
+              {{ form.ticket_type }}
             </div>
+            <div class="mb-3">
+              <label for="id_title_label"
+                     class="form-label">タイトル</label>
+              {{ form.title }}
+            </div>
+            <div class="mb-3">
+              <label for="id_body_label" class="form-label">内容</label>
+              {{ form.body }}
+            </div>
+            <br/>
+            <button type="submit" name="add" class="btn btn-primary">
+              登録確認
+            </button>
+          </form>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/ticket/chat.html b/dsbd/templates/ticket/chat.html
index ba6ee95..458dc66 100644
--- a/dsbd/templates/ticket/chat.html
+++ b/dsbd/templates/ticket/chat.html
@@ -1,378 +1,393 @@
 {% extends 'base2.html' %}
 {% block extrahead %}
-    <style>
-
-        .chat-card {
-            background: #fff;
-            transition: .5s;
-            border: 0;
-            margin-bottom: 30px;
-            border-radius: .55rem;
-            position: relative;
-            width: 100%;
-            box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
-        }
-
-        .chat-app .people-list {
-            width: 280px;
-            position: absolute;
-            left: 0;
-            top: 0;
-            padding: 20px;
-            z-index: 7
-        }
-
-
-        .chat .chat-header {
-            padding: 15px 20px;
-            border-bottom: 2px solid #f4f7f6
-        }
-
-        .chat .chat-header img {
-            float: left;
-            border-radius: 40px;
-            width: 40px
-        }
-
-        .chat .chat-header .chat-about {
-            float: left;
-            padding-left: 10px
-        }
-
-        .chat .chat-history {
-            padding: 20px;
-            border-bottom: 2px solid #fff
-        }
-
-        .chat .chat-history ul {
-            padding: 0
-        }
-
-        .chat .chat-history ul li {
-            list-style: none;
-            margin-bottom: 30px
-        }
-
-        .chat .chat-history ul li:last-child {
-            margin-bottom: 0px
-        }
-
-        .chat .chat-history .message-data {
-            margin-bottom: 15px
-        }
-
-        .chat .chat-history .message-data img {
-            border-radius: 40px;
-            width: 40px
-        }
-
-        .chat .chat-history .message-data-time {
-            color: #434651;
-            padding-left: 6px
-        }
-
-        .chat .chat-history .message {
-            color: #444;
-            padding: 10px 20px;
-            line-height: 20px;
-            font-size: 16px;
-            border-radius: 7px;
-            display: inline-block;
-            position: relative
-        }
-
-        .chat .chat-history .message:after {
-            bottom: 100%;
-            left: 7%;
-            border: solid transparent;
-            content: " ";
-            height: 0;
-            width: 0;
-            position: absolute;
-            pointer-events: none;
-            border-bottom-color: #fff;
-            border-width: 10px;
-            margin-left: -10px
-        }
-
-        .chat .chat-history .my-message {
-            background: #efefef
-        }
-
-        .chat .chat-history .my-message:after {
-            bottom: 100%;
-            left: 30px;
-            border: solid transparent;
-            content: " ";
-            height: 0;
-            width: 0;
-            position: absolute;
-            pointer-events: none;
-            border-bottom-color: #efefef;
-            border-width: 10px;
-            margin-left: -10px
-        }
-
-        .chat .chat-history .other-message {
-            background: #e8f1f3;
-            text-align: right
-        }
-
-        .chat .chat-history .other-message:after {
-            border-bottom-color: #e8f1f3;
-            left: 93%
-        }
-
-        .chat .chat-message {
-            padding: 20px
-        }
-
-        .float-right {
-            float: right
-        }
-
-        .clearfix:after {
-            visibility: hidden;
-            display: block;
-            font-size: 0;
-            content: " ";
-            clear: both;
-            height: 0
-        }
-
-        @media only screen and (max-width: 767px) {
-            .chat-app .people-list {
-                height: 465px;
-                width: 100%;
-                overflow-x: auto;
-                background: #fff;
-                left: -400px;
-                display: none
-            }
-
-            .chat-app .people-list.open {
-                left: 0
-            }
-
-            .chat-app .chat {
-                margin: 0
-            }
-
-            .chat-app .chat .chat-header {
-                border-radius: 0.55rem 0.55rem 0 0
-            }
-
-            .chat-app .chat-history {
-                height: 300px;
-                overflow-x: auto
-            }
-        }
-
-        @media only screen and (min-width: 768px) and (max-width: 992px) {
-            .chat-app .chat-list {
-                height: 650px;
-                overflow-x: auto
-            }
-
-            .chat-app .chat-history {
-                height: 600px;
-                overflow-x: auto
-            }
-        }
-
-        @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 1) {
-            .chat-app .chat-list {
-                height: 480px;
-                overflow-x: auto
-            }
-
-            .chat-app .chat-history {
-                height: calc(100vh - 350px);
-                overflow-x: auto
-            }
-        }
-    </style>
+  <style>
+
+      .chat-card {
+          background: #fff;
+          transition: .5s;
+          border: 0;
+          margin-bottom: 30px;
+          border-radius: .55rem;
+          position: relative;
+          width: 100%;
+          box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
+      }
+
+      .chat-app .people-list {
+          width: 280px;
+          position: absolute;
+          left: 0;
+          top: 0;
+          padding: 20px;
+          z-index: 7
+      }
+
+
+      .chat .chat-header {
+          padding: 15px 20px;
+          border-bottom: 2px solid #f4f7f6
+      }
+
+      .chat .chat-header img {
+          float: left;
+          border-radius: 40px;
+          width: 40px
+      }
+
+      .chat .chat-header .chat-about {
+          float: left;
+          padding-left: 10px
+      }
+
+      .chat .chat-history {
+          padding: 20px;
+          border-bottom: 2px solid #fff
+      }
+
+      .chat .chat-history ul {
+          padding: 0
+      }
+
+      .chat .chat-history ul li {
+          list-style: none;
+          margin-bottom: 30px
+      }
+
+      .chat .chat-history ul li:last-child {
+          margin-bottom: 0px
+      }
+
+      .chat .chat-history .message-data {
+          margin-bottom: 15px
+      }
+
+      .chat .chat-history .message-data img {
+          border-radius: 40px;
+          width: 40px
+      }
+
+      .chat .chat-history .message-data-time {
+          color: #434651;
+          padding-left: 6px
+      }
+
+      .chat .chat-history .message {
+          color: #444;
+          padding: 10px 20px;
+          line-height: 20px;
+          font-size: 16px;
+          border-radius: 7px;
+          display: inline-block;
+          position: relative
+      }
+
+      .chat .chat-history .message:after {
+          bottom: 100%;
+          left: 7%;
+          border: solid transparent;
+          content: " ";
+          height: 0;
+          width: 0;
+          position: absolute;
+          pointer-events: none;
+          border-bottom-color: #fff;
+          border-width: 10px;
+          margin-left: -10px
+      }
+
+      .chat .chat-history .my-message {
+          background: #efefef
+      }
+
+      .chat .chat-history .my-message:after {
+          bottom: 100%;
+          left: 30px;
+          border: solid transparent;
+          content: " ";
+          height: 0;
+          width: 0;
+          position: absolute;
+          pointer-events: none;
+          border-bottom-color: #efefef;
+          border-width: 10px;
+          margin-left: -10px
+      }
+
+      .chat .chat-history .other-message {
+          background: #e8f1f3;
+          text-align: right
+      }
+
+      .chat .chat-history .other-message:after {
+          border-bottom-color: #e8f1f3;
+          left: 93%
+      }
+
+      .chat .chat-message {
+          padding: 20px
+      }
+
+      .float-right {
+          float: right
+      }
+
+      .clearfix:after {
+          visibility: hidden;
+          display: block;
+          font-size: 0;
+          content: " ";
+          clear: both;
+          height: 0
+      }
+
+      @media only screen and (max-width: 767px) {
+          .chat-app .people-list {
+              height: 465px;
+              width: 100%;
+              overflow-x: auto;
+              background: #fff;
+              left: -400px;
+              display: none
+          }
+
+          .chat-app .people-list.open {
+              left: 0
+          }
+
+          .chat-app .chat {
+              margin: 0
+          }
+
+          .chat-app .chat .chat-header {
+              border-radius: 0.55rem 0.55rem 0 0
+          }
+
+          .chat-app .chat-history {
+              height: 300px;
+              overflow-x: auto
+          }
+      }
+
+      @media only screen and (min-width: 768px) and (max-width: 992px) {
+          .chat-app .chat-list {
+              height: 650px;
+              overflow-x: auto
+          }
+
+          .chat-app .chat-history {
+              height: 600px;
+              overflow-x: auto
+          }
+      }
+
+      @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 1) {
+          .chat-app .chat-list {
+              height: 480px;
+              overflow-x: auto
+          }
+
+          .chat-app .chat-history {
+              height: calc(100vh - 350px);
+              overflow-x: auto
+          }
+      }
+  </style>
 {% endblock extrahead %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">チャット</h2>
-                    <br/>
-                    <div class="card" style="max-width: 50rem">
-                        <div class="card-header">
-                            <div class="row g-0">
-                                <div class="col-sm-6 col-md-10"> ID: {{ ticket.id }}
-                                    作成日: {{ ticket.created_at }} 　　
-                                </div>
-                                <div class="col-6 col-md-2">
-                                    {% if ticket.group %}
-                                        <span class="badge bg-secondary">グループチャット ({{ ticket.group.id }}: {{ ticket.group.name }})</span> {% else %}
-                                        <span class="badge bg-secondary">ユーザチャット</span>
-                                    {% endif %}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="card-body">
-                            <h5 class="card-title">{{ ticket.title }}</h5>
-                            {% autoescape off %}
-                                {{ ticket.body | linebreaks }}
-                            {% endautoescape %}
-                            {% if ticket.is_solved %}
-                                <form method="post">
-                                    {% csrf_token %}
-                                    <button type="submit" class="btn btn-danger btn-sm" name="no_solved">未解決</button>
-                                </form>
-                            {% else %}
-                                <form method="post">
-                                    {% csrf_token %}
-                                    <button type="submit" class="btn btn-primary btn-sm" name="solved">解決済み</button>
-                                </form>
-                            {% endif %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">チャット</h2>
+          <br/>
+          <div class="card" style="max-width: 50rem">
+            <div class="card-header">
+              <div class="row g-0">
+                <div class="col-sm-6 col-md-10"> ID: {{ ticket.id }}
+                  作成日: {{ ticket.created_at }} 　　
+                </div>
+                <div class="col-6 col-md-2">
+                  {% if ticket.group %}
+                    <span
+                        class="badge bg-secondary">グループチャット ({{ ticket.group.id }}: {{ ticket.group.name }})</span> {% else %}
+                    <span class="badge bg-secondary">ユーザチャット</span>
+                  {% endif %}
+                </div>
+              </div>
+            </div>
+            <div class="card-body">
+              <h5 class="card-title">{{ ticket.title }}</h5>
+              {% autoescape off %}
+                {{ ticket.body | linebreaks }}
+              {% endautoescape %}
+              {% if ticket.is_solved %}
+                <form method="post">
+                  {% csrf_token %}
+                  <button type="submit" class="btn btn-danger btn-sm"
+                          name="no_solved">未解決
+                  </button>
+                </form>
+              {% else %}
+                <form method="post">
+                  {% csrf_token %}
+                  <button type="submit" class="btn btn-primary btn-sm"
+                          name="solved">解決済み
+                  </button>
+                </form>
+              {% endif %}
+            </div>
+            <div class="card-footer">
+              {% if ticket.is_solved %}
+                <span class="badge bg-primary">解決済み</span>
+              {% else %}
+                <span class="badge bg-danger">未解決</span>{% endif %}
+              {% if ticket.is_approve %}
+                <span class="badge bg-success">承認済み</span>{% endif %}
+              {% if ticket.is_reject %}
+                <span class="badge bg-warning">拒否済み</span>{% endif %}
+            </div>
+          </div>
+          <br/>
+          <div class="container">
+            <div class="row clearfix">
+              <div class="chat-card chat-app">
+                <div class="chat">
+                  <div class="chat-header clearfix">
+                    <div class="row">
+                      <div class="col-lg-6">
+                        <div class="chat-about">
+                          <h6 class="m-b-0">{{ user.username }}</h6>
                         </div>
-                        <div class="card-footer">
-                            {% if ticket.is_solved %}<span class="badge bg-primary">解決済み</span>
-                            {% else %}<span class="badge bg-danger">未解決</span>{% endif %}
-                            {% if ticket.is_approve %}<span class="badge bg-success">承認済み</span>{% endif %}
-                            {% if ticket.is_reject %}<span class="badge bg-warning">拒否済み</span>{% endif %}
+                        <div class="text-end">
+                          <div id="status"><span
+                              class="badge bg-danger">WebSocket切断済み</span>
+                          </div>
                         </div>
+                      </div>
+
                     </div>
-                    <br/>
-                    <div class="container">
-                        <div class="row clearfix">
-                            <div class="chat-card chat-app">
-                                <div class="chat">
-                                    <div class="chat-header clearfix">
-                                        <div class="row">
-                                            <div class="col-lg-6">
-                                                <div class="chat-about">
-                                                    <h6 class="m-b-0">{{ user.username }}</h6>
-                                                </div>
-                                                <div class="text-end">
-                                                    <div id="status"><span
-                                                            class="badge bg-danger">WebSocket切断済み</span></div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                    <div class="chat-history">
-                                        <ul class="m-b-0">
-                                            {% for chat in chats %}
-                                                <li class="clearfix">
-                                                    {% if request.user == chat.user and not chat.is_admin %}
-                                                        <div class="message-data text-end">
-                                                            <span class="message-data-time">({% time_to_str chat.created_at %})</span>
-                                                            あなた
-                                                        </div>
-                                                        <div class="message other-message float-right"> {{ chat.body | linebreaks }}</div>
-                                                    {% else %}
-                                                        <div class="message-data">
-                                                            {% if chat.is_admin %}
-                                                                <span class="badge bg-primary">管理者</span>
-                                                            {% else %}
-                                                                {{ chat.user }}
-                                                            {% endif %}
-                                                            <span class="message-data-time">({% time_to_str chat.created_at %})</span>
-                                                        </div>
-                                                        <div class="message my-message">{{ chat.body | linebreaks }}</div>
-                                                    {% endif %}
-                                                </li>
-                                            {% endfor %}
-                                            <div id="chat_websocket"></div>
-                                        </ul>
-                                    </div>
-                                    <div class="chat-message clearfix">
-                                        <div class="input-group mb-0">
-                                            <div class="col-12">
-                                <textarea id="text" name="text" class="form-control" rows="5"
-                                          placeholder="Enter text here..."></textarea>
-                                                <button type="submit"
-                                                        class="btn btn-primary btn-block"
-                                                        form="message-form"
-                                                        onclick="send()"
-                                                >Send
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                  </div>
+                  <div class="chat-history">
+                    <ul class="m-b-0">
+                      {% for chat in chats %}
+                        <li class="clearfix">
+                          {% if request.user == chat.user and not chat.is_admin %}
+                            <div class="message-data text-end">
+                              <span
+                                  class="message-data-time">({% time_to_str chat.created_at %})</span>
+                              あなた
                             </div>
-                        </div>
+                            <div
+                                class="message other-message float-right"> {{ chat.body | linebreaks }}</div>
+                          {% else %}
+                            <div class="message-data">
+                              {% if chat.is_admin %}
+                                <span class="badge bg-primary">管理者</span>
+                              {% else %}
+                                {{ chat.user }}
+                              {% endif %}
+                              <span
+                                  class="message-data-time">({% time_to_str chat.created_at %})</span>
+                            </div>
+                            <div
+                                class="message my-message">{{ chat.body | linebreaks }}</div>
+                          {% endif %}
+                        </li>
+                      {% endfor %}
+                      <div id="chat_websocket"></div>
+                    </ul>
+                  </div>
+                  <div class="chat-message clearfix">
+                    <div class="input-group mb-0">
+                      <div class="col-12">
+                                <textarea id="text" name="text" class="form-control"
+                                          rows="5"
+                                          placeholder="Enter text here..."></textarea>
+                        <button type="submit"
+                                class="btn btn-primary btn-block"
+                                form="message-form"
+                                onclick="send()"
+                        >Send
+                        </button>
+                      </div>
                     </div>
+                  </div>
                 </div>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
 
 {% block javascript %}
-    <script>
-        let chatSocket = undefined;
-
-        function send() {
-            const message = document.getElementById("text").value;
-            console.log(message)
-            if (chatSocket && message) {
-                chatSocket.send(JSON.stringify({
-                    message: message
-                }))
-                document.getElementById("text").textContent = ""
-            }
+  <script>
+    let chatSocket = undefined;
+
+    function send() {
+      const message = document.getElementById("text").value;
+      console.log(message)
+      if (chatSocket && message) {
+        chatSocket.send(JSON.stringify({
+          message: message
+        }))
+        document.getElementById("text").textContent = ""
+      }
+    }
+
+    function connect() {
+      const wsScheme = (window.location.protocol === 'https:' ? 'wss' : 'ws');
+      const hostname = window.location.host;
+      console.log(wsScheme)
+      console.log(hostname)
+      const url = `${wsScheme}://${hostname}/ws/ticket/{{ticket.id}}/chat`;
+      chatSocket = new WebSocket(url)
+
+      chatSocket.onmessage = function (e) {
+        const data = JSON.parse(e.data);
+        console.log(data);
+        let element = document.getElementById('chat_websocket');
+
+        let message = data.message.replace(/\n/, '<br>');
+
+        let html = '<li class="clearfix">';
+        if (data.username === '{{ request.user.username }}' && !data.is_admin) {
+          html += '<div class="message-data text-end">';
+          html += '<span class="message-data-time">(' + data.time + ')</span> あなた'
+          html += '</div>';
+          html += '<div class="message other-message float-right">' + message + '</div>'
+        } else {
+          html += '<div class="message-data">';
+          if (data.is_admin) {
+            html += '<span class="badge bg-primary">管理者</span>';
+          } else {
+            html += data.username;
+          }
+          html += '<span class="message-data-time">(' + data.time + ')</span>';
+          html += '</div>';
+          html += '<div class="message my-message">' + message + '</div>';
         }
-
-        function connect() {
-            const wsScheme = (window.location.protocol === 'https:' ? 'wss' : 'ws');
-            const hostname = window.location.host;
-            console.log(wsScheme)
-            console.log(hostname)
-            const url = `${wsScheme}://${hostname}/ws/ticket/{{ticket.id}}/chat`;
-            chatSocket = new WebSocket(url)
-
-            chatSocket.onmessage = function (e) {
-                const data = JSON.parse(e.data);
-                console.log(data);
-                let element = document.getElementById('chat_websocket');
-
-                let message = data.message.replace(/\n/, '<br>');
-
-                let html = '<li class="clearfix">';
-                if (data.username === '{{ request.user.username }}' && !data.is_admin) {
-                    html += '<div class="message-data text-end">';
-                    html += '<span class="message-data-time">(' + data.time + ')</span> あなた'
-                    html += '</div>';
-                    html += '<div class="message other-message float-right">' + message + '</div>'
-                } else {
-                    html += '<div class="message-data">';
-                    if (data.is_admin) {
-                        html += '<span class="badge bg-primary">管理者</span>';
-                    } else {
-                        html += data.username;
-                    }
-                    html += '<span class="message-data-time">(' + data.time + ')</span>';
-                    html += '</div>';
-                    html += '<div class="message my-message">' + message + '</div>';
-                }
-                html += '</li>';
-                element.insertAdjacentHTML('beforebegin', html);
-            };
-
-            chatSocket.onopen = function (e) {
-                console.log("open")
-                document.getElementById('status').innerHTML = '<span class="badge bg-success">WebSocket接続中</span>'
-            }
-
-            chatSocket.onclose = function (e) {
-                document.getElementById('status').innerHTML = '<span class="badge bg-danger">WebSocket切断済み</span>'
-                console.error('Chat socket closed unexpectedly');
-                setTimeout(() => {
-                    connect();
-                }, 3000);
-            };
-        };
-        connect()
-
-
-    </script>
+        html += '</li>';
+        element.insertAdjacentHTML('beforebegin', html);
+      };
+
+      chatSocket.onopen = function (e) {
+        console.log("open")
+        document.getElementById('status').innerHTML = '<span class="badge bg-success">WebSocket接続中</span>'
+      }
+
+      chatSocket.onclose = function (e) {
+        document.getElementById('status').innerHTML = '<span class="badge bg-danger">WebSocket切断済み</span>'
+        console.error('Chat socket closed unexpectedly');
+        setTimeout(() => {
+          connect();
+        }, 3000);
+      };
+    };
+    connect()
+
+
+  </script>
 {% endblock javascript %}
\ No newline at end of file
diff --git a/dsbd/templates/ticket/chat_error.html b/dsbd/templates/ticket/chat_error.html
index 6a31f04..ac84e98 100644
--- a/dsbd/templates/ticket/chat_error.html
+++ b/dsbd/templates/ticket/chat_error.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <h2 class="card-title">チャット</h2>
-    <br/>
-    <p>閲覧権限がありません</p>
+  <h2 class="card-title">チャット</h2>
+  <br/>
+  <p>閲覧権限がありません</p>
 {% endblock content %}
diff --git a/dsbd/templates/ticket/index.html b/dsbd/templates/ticket/index.html
index af72a53..e3148e5 100644
--- a/dsbd/templates/ticket/index.html
+++ b/dsbd/templates/ticket/index.html
@@ -1,156 +1,169 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2>チケット一覧</h2>
-                    <a class="btn btn-primary btn-sm" href="{% url 'ticket:add' %}" role="button"
-                       aria-expanded="false">チケット追加</a>
-                    <div class="btn-group" role="group" aria-label="Basic mixed styles example">
-                        <a type="button"
-                           class="btn btn{% if is_solved == "false" %}-outline{% endif %}-danger btn-sm {% if is_solved == "false" %}disabled{% endif %}"
-                           href="?is_solved=false">未解決のみ</a>
-                        <a type="button"
-                           class="btn btn{% if is_solved == "true" %}-outline{% endif %}-success btn-sm {% if is_solved == "true" %}disabled{% endif %}"
-                           href="?is_solved=true">解決済のみ</a>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>チケット一覧</h2>
+          <a class="btn btn-primary btn-sm" href="{% url 'ticket:add' %}"
+             role="button"
+             aria-expanded="false">チケット追加</a>
+          <div class="btn-group" role="group"
+               aria-label="Basic mixed styles example">
+            <a type="button"
+               class="btn btn{% if is_solved == "false" %}-outline{% endif %}-danger btn-sm {% if is_solved == "false" %}disabled{% endif %}"
+               href="?is_solved=false">未解決のみ</a>
+            <a type="button"
+               class="btn btn{% if is_solved == "true" %}-outline{% endif %}-success btn-sm {% if is_solved == "true" %}disabled{% endif %}"
+               href="?is_solved=true">解決済のみ</a>
+          </div>
+          <br/>
+          <hr>
+          {% if tickets %}
+            {% for ticket in tickets %}
+              <div class="card mb-2" style="max-width: 50rem">
+                <div class="card-header">
+                  <div class="row g-0">
+                    <div class="col-sm-6 col-md-10">
+                      ID: {{ ticket.id }}
+                      作成日: {{ ticket.created_at }} 　　
                     </div>
-                    <br/>
-                    <hr>
-                    {% if tickets %}
-                        {% for ticket in tickets %}
-                            <div class="card mb-2" style="max-width: 50rem">
-                                <div class="card-header">
-                                    <div class="row g-0">
-                                        <div class="col-sm-6 col-md-10"> ID: {{ ticket.id }}
-                                            作成日: {{ ticket.created_at }} 　　
-                                        </div>
-                                        <div class="col-6 col-md-2">
-                                            {% if ticket.group %}
-                                                <span class="badge bg-secondary">グループチャット ({{ ticket.group.id }}: {{ ticket.group.name }})</span> {% else %}
-                                                <span class="badge bg-secondary">ユーザチャット</span>
-                                            {% endif %}
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-body">
-                                    <h5 class="card-title">{{ ticket.title }}</h5>
-                                    {% autoescape off %}
-                                        {{ ticket.body | linebreaks }}
-                                    {% endautoescape %}
-                                    <div class="container">
-                                        <div class="row">
-                                            <form method="post">
-                                                {% csrf_token %}
-                                                <a class="btn btn-primary btn-sm"
-                                                   href="{% url 'ticket:chat' ticket.id %}">チャット</a>
-                                                <input type="text" value={{ ticket.id }} name="id" hidden>
-                                                {% if ticket.is_solved %}
-                                                    <button type="submit" class="btn btn-danger btn-sm"
-                                                            name="no_solved">未解決
-                                                    </button>
-                                                {% else %}
-                                                    <button type="submit" class="btn btn-primary btn-sm"
-                                                            name="solved">解決済み
-                                                    </button>
-                                                {% endif %}
-                                            </form>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-footer">
-                                    {% if ticket.is_solved %}<span class="badge bg-primary">解決済み</span>
-                                    {% else %}<span class="badge bg-danger">未解決</span>{% endif %}
-                                    {% if ticket.is_approve %}<span class="badge bg-success">承認済み</span>{% endif %}
-                                    {% if ticket.is_reject %}<span class="badge bg-warning">拒否済み</span>{% endif %}
-                                </div>
-                            </div>
-                            <br/>
-                        {% endfor %}
-                        <nav aria-label="...">
-                            <ul class="pagination">
-                                {% if tickets.has_previous %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">前へ</span>
-                                    </li>
-                                {% endif %}
-                                {% if tickets.paginator.num_pages > 10 %}
-                                    {% if tickets.number < 6 %}
-                                        {#    先頭 9 ページの表示      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 < 9 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link"
-                                               href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
-                                        {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link"
-                                               href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% else %}
-                                        {#   最後 9 ページの表示   #}
-                                        {% for pg in tickets.paginator.page_range %}
-                                            {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
-                                                {% if tickets.number == pg %}
-                                                    <li class="page-item active">
-                                                        {% else %}
-                                                    <li class="page-item">
-                                                {% endif %}
-                                            <a class="page-link"
-                                               href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                            </li>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% endif %}
-                                {% else %}
-                                    {% for pg in tickets.paginator.page_range %}
-                                        {% if tickets.number == pg %}
-                                            <li class="page-item active">
-                                                {% else %}
-                                            <li class="page-item">
-                                        {% endif %}
-                                    <a class="page-link" href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                                    </li>
-                                    {% endfor %}
-                                {% endif %}
-                                {% if tickets.has_next %}
-                                    <li class="page-item">
-                                        <a class="page-link"
-                                           href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
-                                    </li>
-                                {% else %}
-                                    <li class="page-item disabled">
-                                        <span class="page-link">次へ</span>
-                                    </li>
-                                {% endif %}
-                            </ul>
-                        </nav>
-                    {% else %}
-                        <p>チケットがありません</p>
-                    {% endif %}
+                    <div class="col-6 col-md-2">
+                      {% if ticket.group %}
+                        <span
+                            class="badge bg-secondary">グループチャット ({{ ticket.group.id }}: {{ ticket.group.name }})</span> {% else %}
+                        <span class="badge bg-secondary">ユーザチャット</span>
+                      {% endif %}
+                    </div>
+                  </div>
+                </div>
+                <div class="card-body">
+                  <h5 class="card-title">{{ ticket.title }}</h5>
+                  {% autoescape off %}
+                    {{ ticket.body | linebreaks }}
+                  {% endautoescape %}
+                  <div class="container">
+                    <div class="row">
+                      <form method="post">
+                        {% csrf_token %}
+                        <a class="btn btn-primary btn-sm"
+                           href="{% url 'ticket:chat' ticket.id %}">チャット</a>
+                        <input type="text"
+                               value={{ ticket.id }} name="id"
+                               hidden>
+                        {% if ticket.is_solved %}
+                          <button type="submit"
+                                  class="btn btn-danger btn-sm"
+                                  name="no_solved">未解決
+                          </button>
+                        {% else %}
+                          <button type="submit"
+                                  class="btn btn-primary btn-sm"
+                                  name="solved">解決済み
+                          </button>
+                        {% endif %}
+                      </form>
+                    </div>
+                  </div>
+                </div>
+                <div class="card-footer">
+                  {% if ticket.is_solved %}
+                    <span class="badge bg-primary">解決済み</span>
+                  {% else %}
+                    <span class="badge bg-danger">未解決</span>{% endif %}
+                  {% if ticket.is_approve %}
+                    <span class="badge bg-success">承認済み</span>{% endif %}
+                  {% if ticket.is_reject %}
+                    <span class="badge bg-warning">拒否済み</span>{% endif %}
                 </div>
-            </div>
+              </div>
+              <br/>
+            {% endfor %}
+            <nav aria-label="...">
+              <ul class="pagination">
+                {% if tickets.has_previous %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">前へ</span>
+                  </li>
+                {% endif %}
+                {% if tickets.paginator.num_pages > 10 %}
+                  {% if tickets.number < 6 %}
+                    {#    先頭 9 ページの表示      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 < 9 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
+                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% else %}
+                    {#   最後 9 ページの表示   #}
+                    {% for pg in tickets.paginator.page_range %}
+                      {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
+                        {% if tickets.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% endif %}
+                {% else %}
+                  {% for pg in tickets.paginator.page_range %}
+                    {% if tickets.number == pg %}
+                      <li class="page-item active">
+                        {% else %}
+                      <li class="page-item">
+                    {% endif %}
+                  <a class="page-link"
+                     href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                  </li>
+                  {% endfor %}
+                {% endif %}
+                {% if tickets.has_next %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">次へ</span>
+                  </li>
+                {% endif %}
+              </ul>
+            </nav>
+          {% else %}
+            <p>チケットがありません</p>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/user/change_email.html b/dsbd/templates/user/change_email.html
index 45d5a7a..91dee50 100644
--- a/dsbd/templates/user/change_email.html
+++ b/dsbd/templates/user/change_email.html
@@ -1,33 +1,36 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2>パスワード変更</h2>
-                    <div class="row justify-content-md-center">
-                        <div class="col-8">
-                            <form action="" method="POST">
-                                {{ form.non_field_errors }}
-                                {% for field in form %}
-                                    <div class="form-group">
-                                        <label class="col-6"
-                                               for="{{ field.id_for_label }}">{{ field.label_tag }}</label>
-                                        {{ field }}
-                                        {{ field.errors }}
-                                    </div>
-                                {% endfor %}
-                                {% csrf_token %}
-                                <br/>
-                                <button type="submit" class="btn btn-primary btn-block">送信</button>
-                            </form>
-                            <br/>
-                            <br/>
-                            <a href="{% url 'custom_auth:index' %}" class="btn btn-primary">プロフィールに戻る</a>
-                        </div>
-                    </div>
-                </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>パスワード変更</h2>
+          <div class="row justify-content-md-center">
+            <div class="col-8">
+              <form action="" method="POST">
+                {{ form.non_field_errors }}
+                {% for field in form %}
+                  <div class="form-group">
+                    <label class="col-6"
+                           for="{{ field.id_for_label }}">{{ field.label_tag }}</label>
+                    {{ field }}
+                    {{ field.errors }}
+                  </div>
+                {% endfor %}
+                {% csrf_token %}
+                <br/>
+                <button type="submit" class="btn btn-primary btn-block">
+                  送信
+                </button>
+              </form>
+              <br/>
+              <br/>
+              <a href="{% url 'custom_auth:index' %}"
+                 class="btn btn-primary">プロフィールに戻る</a>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/user/change_password.html b/dsbd/templates/user/change_password.html
index 9612155..96f53ea 100644
--- a/dsbd/templates/user/change_password.html
+++ b/dsbd/templates/user/change_password.html
@@ -1,44 +1,49 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2>パスワード変更</h2>
-                    <div class="row justify-content-md-center">
-                        <div class="col-8">
-                            <div class="card text-bg-warning mb-3">
-                                <div class="card-body">
-                                    <h5 class="card-title">注意点</h5>
-                                    <div class="card-text">
-                                        <ul>
-                                            <li>ご登録情報に似たパスワードにはできません。</li>
-                                            <li>8文字以上32文字以内で設定してください。</li>
-                                            <li>よく使われるパスワードにはできません。</li>
-                                            <li>数字だけのパスワードにはできません。</li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                            {% if form.errors %}
-                                <div class="alert alert-danger" role="alert">
-                                    {{ form.errors }}
-                                </div>
-                            {% endif %}
-                            <form method="post">
-                                {% csrf_token %}
-                                <p>元のパスワード:{{ form.old_password }}</p>
-                                <p>新しいパスワード:{{ form.new_password1 }}</p>
-                                <p>新しいパスワード（確認用）:{{ form.new_password2 }}</p>
-                                <input type="submit" class="btn btn-primary"/>
-                            </form>
-                            <br/>
-                            <br/>
-                            <a href="{% url 'custom_auth:index' %}" class="btn btn-primary">プロフィールに戻る</a>
-                        </div>
-                    </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>パスワード変更</h2>
+          <div class="row justify-content-md-center">
+            <div class="col-8">
+              <div class="card text-bg-warning mb-3">
+                <div class="card-body">
+                  <h5 class="card-title">注意点</h5>
+                  <div class="card-text">
+                    <ul>
+                      <li>
+                        ご登録情報に似たパスワードにはできません。
+                      </li>
+                      <li>8文字以上32文字以内で設定してください。
+                      </li>
+                      <li>よく使われるパスワードにはできません。
+                      </li>
+                      <li>数字だけのパスワードにはできません。</li>
+                    </ul>
+                  </div>
                 </div>
+              </div>
+              {% if form.errors %}
+                <div class="alert alert-danger" role="alert">
+                  {{ form.errors }}
+                </div>
+              {% endif %}
+              <form method="post">
+                {% csrf_token %}
+                <p>元のパスワード:{{ form.old_password }}</p>
+                <p>新しいパスワード:{{ form.new_password1 }}</p>
+                <p>新しいパスワード（確認用）:{{ form.new_password2 }}</p>
+                <input type="submit" class="btn btn-primary"/>
+              </form>
+              <br/>
+              <br/>
+              <a href="{% url 'custom_auth:index' %}"
+                 class="btn btn-primary">プロフィールに戻る</a>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/user/edit_profile.html b/dsbd/templates/user/edit_profile.html
index 221b8a5..1fcfac4 100644
--- a/dsbd/templates/user/edit_profile.html
+++ b/dsbd/templates/user/edit_profile.html
@@ -1,32 +1,36 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2>プロフィールの閲覧・変更</h2>
-                    <div class="row justify-content-md-center">
-                        <div class="col-8">
-                            <form action="" method="POST">
-                                {{ form.non_field_errors }}
-                                {% for field in form %}
-                                    <div class="form-group">
-                                        <label class="col-6" for="{{ field.id_for_label }}">{{ field.label_tag }}</label>
-                                        {{ field }}
-                                        {{ field.errors }}
-                                    </div>
-                                {% endfor %}
-                                {% csrf_token %}
-                                <br/>
-                                <button type="submit" class="btn btn-primary btn-block">送信</button>
-                            </form>
-                        <br/>
-                        <br/>
-                        <a href="{% url 'custom_auth:index' %}" class="btn btn-primary">プロフィールに戻る</a>
-                        </div>
-                    </div>
-                </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>プロフィールの閲覧・変更</h2>
+          <div class="row justify-content-md-center">
+            <div class="col-8">
+              <form action="" method="POST">
+                {{ form.non_field_errors }}
+                {% for field in form %}
+                  <div class="form-group">
+                    <label class="col-6"
+                           for="{{ field.id_for_label }}">{{ field.label_tag }}</label>
+                    {{ field }}
+                    {{ field.errors }}
+                  </div>
+                {% endfor %}
+                {% csrf_token %}
+                <br/>
+                <button type="submit" class="btn btn-primary btn-block">
+                  送信
+                </button>
+              </form>
+              <br/>
+              <br/>
+              <a href="{% url 'custom_auth:index' %}"
+                 class="btn btn-primary">プロフィールに戻る</a>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/user/profile.html b/dsbd/templates/user/profile.html
index c6a5534..68ec2ba 100644
--- a/dsbd/templates/user/profile.html
+++ b/dsbd/templates/user/profile.html
@@ -1,51 +1,61 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">Profile</h2>
-                    <br/>
-                    <div class="card mb-2">
-                        <div class="card-header">
-                            ID: {{ user.id }}
-                        </div>
-                        <div class="card-body">
-                            <h5 class="card-title">{{ user.username }} ({{ user.username_jp }})</h5>
-                            <div class="container">
-                                <div class="row">
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Profile</h2>
+          <br/>
+          <div class="card mb-2">
+            <div class="card-header">
+              ID: {{ user.id }}
+            </div>
+            <div class="card-body">
+              <h5 class="card-title">{{ user.username }}
+                ({{ user.username_jp }})</h5>
+              <div class="container">
+                <div class="row">
 
-                                </div>
-                            </div>
-                        </div>
-                        <div class="card-footer">
-                            <span class="badge bg-secondary">作成日: {{ request.user.created_at }}</span>
-                            <span class="badge bg-secondary">最終Login日: {{ request.user.last_login }}</span>
-                            {% if user.is_active %}<span class="badge bg-success">有効</span>
-                            {% else %}<span class="badge bg-danger">無効</span>{% endif %}
-                            {% if user.is_staff %}<span class="badge bg-primary">dsbd管理者</span>{% endif %}
-                        </div>
-                    </div>
-                    <hr/>
-                    <a class="btn btn-primary btn-sm" href="{% url 'custom_auth:password_change' %}" role="button"
-                       aria-expanded="false">パスワード変更</a>
-                    <a class="btn btn-primary btn-sm" href="{% url 'custom_auth:email_change' %}" role="button"
-                       aria-expanded="false">メールアドレス変更</a>
-                    <a class="btn btn-primary btn-sm" href="{% url 'custom_auth:edit_profile' %}" role="button"
-                       aria-expanded="false">プロフィール閲覧・変更</a>
-                    <hr/>
-                    <div class="card">
-                        <div class="card-body">
-                            <h5 class="card-title">2段階認証のデバイス追加</h5>
-                            <div class="container">
-                                2段階認証用のデバイスを追加したい場合はこちらを選択してください。
-                            </div>
-                            <br/>
-                            <a type="submit" class="btn btn-primary" href="{% url 'custom_auth:list_two_auth' %}">2段階認証のデバイス追加</a>
-                        </div>
-                    </div>
                 </div>
+              </div>
+            </div>
+            <div class="card-footer">
+              <span
+                  class="badge bg-secondary">作成日: {{ request.user.created_at }}</span>
+              <span
+                  class="badge bg-secondary">最終Login日: {{ request.user.last_login }}</span>
+              {% if user.is_active %}
+                <span class="badge bg-success">有効</span>
+              {% else %}
+                <span class="badge bg-danger">無効</span>{% endif %}
+              {% if user.is_staff %}
+                <span class="badge bg-primary">dsbd管理者</span>{% endif %}
+            </div>
+          </div>
+          <hr/>
+          <a class="btn btn-primary btn-sm"
+             href="{% url 'custom_auth:password_change' %}" role="button"
+             aria-expanded="false">パスワード変更</a>
+          <a class="btn btn-primary btn-sm"
+             href="{% url 'custom_auth:email_change' %}" role="button"
+             aria-expanded="false">メールアドレス変更</a>
+          <a class="btn btn-primary btn-sm"
+             href="{% url 'custom_auth:edit_profile' %}" role="button"
+             aria-expanded="false">プロフィール閲覧・変更</a>
+          <hr/>
+          <div class="card">
+            <div class="card-body">
+              <h5 class="card-title">2段階認証のデバイス追加</h5>
+              <div class="container">
+                2段階認証用のデバイスを追加したい場合はこちらを選択してください。
+              </div>
+              <br/>
+              <a type="submit" class="btn btn-primary"
+                 href="{% url 'custom_auth:list_two_auth' %}">2段階認証のデバイス追加</a>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/user/two_auth/add.html b/dsbd/templates/user/two_auth/add.html
index f7cb5a6..eba3a78 100644
--- a/dsbd/templates/user/two_auth/add.html
+++ b/dsbd/templates/user/two_auth/add.html
@@ -1,39 +1,42 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">2段階認証デバイス登録</h2>
-                    <br/>
-                    {% if initial_check %}
-                        <img src="data:image/png;base64,{{ qr }}" width="250"/>
-                        <br/>
-                        <br/>
-                        <br/>
-                        {% if error %}
-                            <div class="alert alert-danger" role="alert">
-                                {{ error }}
-                            </div>
-                        {% endif %}
-                        <form method="post">
-                            {% csrf_token %}
-                            <input type="text" value='{{ secret }}' name="secret" hidden>
-                            <label for="floatingInput">{{ form.title.label }}</label>
-                            {{ form.title }}
-                            <label for="id_password">{{ form.code.label }}</label>
-                            {{ form.code }}
-                            <br/>
-                            <br/>
-                            <button type="submit" name="id" value="submit" class="btn btn-primary">登録</button>
-                        </form>
-                    {% else %}
-                        <div class="alert alert-danger" role="alert">
-                            登録数が上限を超えてます。
-                        </div>
-                    {% endif %}
-                </div>
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">2段階認証デバイス登録</h2>
+          <br/>
+          {% if initial_check %}
+            <img src="data:image/png;base64,{{ qr }}" width="250"/>
+            <br/>
+            <br/>
+            <br/>
+            {% if error %}
+              <div class="alert alert-danger" role="alert">
+                {{ error }}
+              </div>
+            {% endif %}
+            <form method="post">
+              {% csrf_token %}
+              <input type="text" value='{{ secret }}' name="secret"
+                     hidden>
+              <label for="floatingInput">{{ form.title.label }}</label>
+              {{ form.title }}
+              <label for="id_password">{{ form.code.label }}</label>
+              {{ form.code }}
+              <br/>
+              <br/>
+              <button type="submit" name="id" value="submit"
+                      class="btn btn-primary">登録
+              </button>
+            </form>
+          {% else %}
+            <div class="alert alert-danger" role="alert">
+              登録数が上限を超えてます。
             </div>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templates/user/two_auth/list.html b/dsbd/templates/user/two_auth/list.html
index 7fe3a64..2a0dd69 100644
--- a/dsbd/templates/user/two_auth/list.html
+++ b/dsbd/templates/user/two_auth/list.html
@@ -1,47 +1,54 @@
 {% extends 'base2.html' %}
 {% block content %}
-    <div class="container">
-        <div class="row">
-            <div class="container py-4 mb-auto">
-                <div class="h-900 p-2 rounded-3">
-                    <h2 class="card-title">2段階認証リスト</h2>
-                    <br/>
-                    <a class="btn btn-primary btn-sm " href="{% url 'custom_auth:add_two_auth' %}" role="button"
-                       aria-expanded="false">デバイス登録</a>
-                    <br/>
-                    <br/>
-                    {% if devices %}
-                        {% for device in devices %}
-                            <div class="card">
-                                <div class="card-header">
-                                    ID: {{ device.id }} 作成日: {{ device.created_at }}
-                                </div>
-                                <div class="card-body">
-                                    <h5 class="card-title">{{ device.title }}</h5>
-                                    <div class="container">
-                                        <div class="row">
-                                            <form method="post">
-                                                {% csrf_token %}
-                                                <input type="text" value={{ device.id }} name="device_id" hidden>
-                                                <button type="submit" class="btn btn-warning btn-sm" name="id"
-                                                        value="delete">削除
-                                                </button>
-                                            </form>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-footer">
-                                    {% if device.is_active %}<span class="badge bg-primary">有効</span>
-                                    {% else %}<span class="badge bg-danger">無効(再認証が必要)</span>{% endif %}
-                                </div>
-                            </div>
-                            <br/>
-                        {% endfor %}
-                    {% else %}
-                        <p>2段階認証が登録されていません</p>
-                    {% endif %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">2段階認証リスト</h2>
+          <br/>
+          <a class="btn btn-primary btn-sm "
+             href="{% url 'custom_auth:add_two_auth' %}" role="button"
+             aria-expanded="false">デバイス登録</a>
+          <br/>
+          <br/>
+          {% if devices %}
+            {% for device in devices %}
+              <div class="card">
+                <div class="card-header">
+                  ID: {{ device.id }} 作成日: {{ device.created_at }}
                 </div>
-            </div>
+                <div class="card-body">
+                  <h5 class="card-title">{{ device.title }}</h5>
+                  <div class="container">
+                    <div class="row">
+                      <form method="post">
+                        {% csrf_token %}
+                        <input type="text"
+                               value={{ device.id }} name="device_id"
+                               hidden>
+                        <button type="submit"
+                                class="btn btn-warning btn-sm"
+                                name="id"
+                                value="delete">削除
+                        </button>
+                      </form>
+                    </div>
+                  </div>
+                </div>
+                <div class="card-footer">
+                  {% if device.is_active %}
+                    <span class="badge bg-primary">有効</span>
+                  {% else %}
+                    <span class="badge bg-danger">無効(再認証が必要)</span>{% endif %}
+                </div>
+              </div>
+              <br/>
+            {% endfor %}
+          {% else %}
+            <p>2段階認証が登録されていません</p>
+          {% endif %}
         </div>
+      </div>
     </div>
+  </div>
 {% endblock content %}
diff --git a/dsbd/templatetags/extra.py b/dsbd/templatetags/extra.py
index a4c3427..d0778ea 100644
--- a/dsbd/templatetags/extra.py
+++ b/dsbd/templatetags/extra.py
@@ -1,6 +1,6 @@
+import markdown as md
 from django import template
 from django.conf import settings
-import markdown as md
 from pytz import timezone
 
 register = template.Library()
@@ -8,7 +8,7 @@
 
 @register.simple_tag
 def markdown(value):
-    return md.markdown(value, extensions=['markdown.extensions.fenced_code'])
+    return md.markdown(value, extensions=["markdown.extensions.fenced_code"])
 
 
 @register.simple_tag
@@ -46,7 +46,7 @@ def debug():
 
 @register.simple_tag
 def array_to_str(data):
-    return ', '.join(data)
+    return ", ".join(data)
 
 
 @register.simple_tag
diff --git a/dsbd/urls.py b/dsbd/urls.py
index b2c69bf..56d67e4 100644
--- a/dsbd/urls.py
+++ b/dsbd/urls.py
@@ -1,8 +1,8 @@
-"""
-URL configuration for dsbd project.
+"""URL configuration for dsbd project.
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/4.2/topics/http/urls/
+
 Examples:
 Function views
     1. Add an import:  from my_app import views
@@ -14,10 +14,11 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from django.urls import path, include
 
-from dsbd import views
 from django.conf import settings
+from django.urls import include, path
+
+from dsbd import views
 
 urlpatterns = [
     path("", views.index, name="index"),
@@ -26,11 +27,11 @@
     path("sign_out/", views.sign_out, name="sign_out"),
     path("sign_up/", views.sign_up, name="sign_up"),
     path("sign_up/done", views.sign_up_done, name="sign_up_done"),
-    path('forget/', views.PasswordReset.as_view(), name='password_reset'),
-    path('forget/done/', views.PasswordResetDone.as_view(), name='password_reset_done'),
-    path('forget/confirm/<uidb64>/<token>/', views.PasswordResetConfirm.as_view(), name='password_reset_confirm'),
-    path('forget/complete/', views.PasswordResetComplete.as_view(), name='password_reset_complete'),
-    path('activate/<uuid:activate_token>/', views.activate_user, name='activate_user'),
+    path("forget/", views.PasswordReset.as_view(), name="password_reset"),
+    path("forget/done/", views.PasswordResetDone.as_view(), name="password_reset_done"),
+    path("forget/confirm/<uidb64>/<token>/", views.PasswordResetConfirm.as_view(), name="password_reset_confirm"),
+    path("forget/complete/", views.PasswordResetComplete.as_view(), name="password_reset_complete"),
+    path("activate/<uuid:activate_token>/", views.activate_user, name="activate_user"),
     path("group/", include("custom_auth.group_urls")),
     path("profile/", include("custom_auth.urls")),
     path("ticket/", include("ticket.urls")),
@@ -42,8 +43,8 @@
     from django.contrib import admin
 
     urlpatterns += [
-        path('admin/custom/', include("custom_admin.urls")),
-        path('admin/login/', views.admin_sign_in, name='admin_sign_in'),
+        path("admin/custom/", include("custom_admin.urls")),
+        path("admin/login/", views.admin_sign_in, name="admin_sign_in"),
         path("admin/", admin.site.urls),
     ]
 
@@ -51,5 +52,5 @@
     import debug_toolbar
 
     urlpatterns += [
-        path('__debug__/', include(debug_toolbar.urls)),
+        path("__debug__/", include(debug_toolbar.urls)),
     ]
diff --git a/dsbd/views.py b/dsbd/views.py
index 11ab98a..200aa91 100644
--- a/dsbd/views.py
+++ b/dsbd/views.py
@@ -1,22 +1,26 @@
 import time
 from datetime import datetime
+
 import stripe
 from django.conf import settings
-from django.contrib.auth import logout as user_logout, login as user_login
+from django.contrib.auth import login as user_login
+from django.contrib.auth import logout as user_logout
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.views import PasswordResetView, PasswordResetDoneView, PasswordResetConfirmView, \
-    PasswordResetCompleteView
-from django.core.paginator import Paginator, EmptyPage, InvalidPage
+from django.contrib.auth.views import (
+    PasswordResetCompleteView,
+    PasswordResetConfirmView,
+    PasswordResetDoneView,
+    PasswordResetView,
+)
+from django.core.paginator import EmptyPage, InvalidPage, Paginator
+from django.http import HttpResponse
+from django.shortcuts import redirect, render
 from django.urls import reverse_lazy
-from django.shortcuts import render, redirect
-from custom_auth.models import UserActivateToken, User, Group, UserEmailVerify, TOTPDevice
-from dsbd import settings
-from dsbd.form import LoginForm, OTPForm, SignUpForm, ForgetForm, NewSetPasswordForm
-
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
-from django.http import HttpResponse
 
+from custom_auth.models import Group, TOTPDevice, User, UserActivateToken, UserEmailVerify
+from dsbd.form import ForgetForm, LoginForm, NewSetPasswordForm, OTPForm, SignUpForm
 from dsbd.notify import notice_payment
 from notice.models import Notice
 
@@ -24,46 +28,46 @@
 def sign_in(request):
     if request.user.is_authenticated:
         request.session.clear()
-    auth_type = 'auth'
+    auth_type = "auth"
     invalid_code = False
-    if request.method == 'POST':
+    if request.method == "POST":
         auth_type = request.POST.get("id", "auth")
-        if auth_type == 'auth':
+        if auth_type == "auth":
             form = LoginForm(request, data=request.POST)
             if form.is_valid():
                 user = form.get_user()
                 if user:
                     request.session["user"] = user.id
-                    auth_type = 'otp'
-        elif auth_type == 'otp':
+                    auth_type = "otp"
+        elif auth_type == "otp":
             form = OTPForm()
             auth_type = request.POST.get("otp_id", "auth_otp_email")
-            print(request.session.get('user'))
+            print(request.session.get("user"))
             if auth_type == "auth_otp_email":
-                user = User.objects.get(id=int(request.session.get('user')))
+                user = User.objects.get(id=int(request.session.get("user")))
                 UserEmailVerify.objects.create_token(user=user)
-            elif auth_type == 'auth_totp':
-                user = User.objects.get(id=int(request.session.get('user')))
+            elif auth_type == "auth_totp":
+                user = User.objects.get(id=int(request.session.get("user")))
                 if not TOTPDevice.objects.filter(user=user, is_active=True).exists():
-                    invalid_code = 'TOTPデバイスが登録されていません。'
+                    invalid_code = "TOTPデバイスが登録されていません。"
 
-        elif auth_type == 'auth_otp_email':
+        elif auth_type == "auth_otp_email":
             form = OTPForm(request.POST)
             if form.is_valid():
-                user = User.objects.get(id=int(request.session.get('user')))
+                user = User.objects.get(id=int(request.session.get("user")))
                 is_exists = UserEmailVerify.objects.check_token(user_id=user.id, token=form.cleaned_data["token"])
                 if is_exists:
-                    user_login(request, user, backend='django.contrib.auth.backends.ModelBackend')
+                    user_login(request, user, backend="django.contrib.auth.backends.ModelBackend")
                     return redirect("/")
             form = OTPForm()
             invalid_code = True
-        elif auth_type == 'auth_totp':
+        elif auth_type == "auth_totp":
             form = OTPForm(request.POST)
             if form.is_valid():
-                user = User.objects.get(id=int(request.session.get('user')))
+                user = User.objects.get(id=int(request.session.get("user")))
                 is_exists = TOTPDevice.objects.check_totp(user=user, code=form.cleaned_data["token"])
                 if is_exists:
-                    user_login(request, user, backend='django.contrib.auth.backends.ModelBackend')
+                    user_login(request, user, backend="django.contrib.auth.backends.ModelBackend")
                     return redirect("/")
             form = OTPForm()
             invalid_code = True
@@ -74,9 +78,12 @@ def sign_in(request):
     else:
         form = LoginForm()
         request.session.clear()
-    context = {'type': auth_type, 'form': form, }
+    context = {
+        "type": auth_type,
+        "form": form,
+    }
     if invalid_code:
-        context['invalid_code'] = '認証コードが一致しません'
+        context["invalid_code"] = "認証コードが一致しません"
     return render(request, "sign_in.html", context)
 
 
@@ -89,12 +96,14 @@ def sign_out(request):
 
 def sign_up(request):
     form = SignUpForm()
-    if request.method == 'POST':
+    if request.method == "POST":
         form = SignUpForm(request.POST)
         if form.is_valid():
             form.create_user()
             return redirect("sign_up_done")
-    context = {'form': form, }
+    context = {
+        "form": form,
+    }
 
     return render(request, "sign_up.html", context)
 
@@ -104,35 +113,35 @@ def sign_up_done(request):
 
 
 class PasswordReset(PasswordResetView):
-    subject_template_name = 'mail/password_reset/subject.txt'
-    email_template_name = 'mail/password_reset/message.txt'
-    template_name = 'forget.html'
+    subject_template_name = "mail/password_reset/subject.txt"
+    email_template_name = "mail/password_reset/message.txt"
+    template_name = "forget.html"
     form_class = ForgetForm
-    success_url = reverse_lazy('password_reset_done')
+    success_url = reverse_lazy("password_reset_done")
 
 
 class PasswordResetDone(PasswordResetDoneView):
-    template_name = 'forget_done.html'
+    template_name = "forget_done.html"
 
 
 class PasswordResetConfirm(PasswordResetConfirmView):
     form_class = NewSetPasswordForm
-    success_url = reverse_lazy('password_reset_complete')
-    template_name = 'forget_confirm.html'
+    success_url = reverse_lazy("password_reset_complete")
+    template_name = "forget_confirm.html"
 
 
 class PasswordResetComplete(PasswordResetCompleteView):
-    template_name = 'forget_complete.html'
+    template_name = "forget_complete.html"
 
 
 def activate_user(request, activate_token):
-    message = 'ユーザーのアクティベーションが完了しました'
+    message = "ユーザーのアクティベーションが完了しました"
     try:
         UserActivateToken.objects.activate_user_by_token(activate_token)
     except ValueError as error:
         message = error
-    except:
-        message = 'エラーが発生しました。管理者に問い合わせてください'
+    except Exception:
+        message = "エラーが発生しました。管理者に問い合わせてください"
     return render(request, "activate.html", {"message": message})
 
 
@@ -173,28 +182,28 @@ def index(request):
         if id == "create_stripe_customer":
             if not request.user.stripe_customer_id:
                 cus = stripe.Customer.create(
-                    name="[USER] %d: %s" % (request.user.id, request.user.username,),
+                    name="[USER] %d: %s"
+                    % (
+                        request.user.id,
+                        request.user.username,
+                    ),
                     description="dashboard_user",
-                    metadata={
-                        'id': "dashboard_user",
-                        'user_id': request.user.id
-                    }
+                    metadata={"id": "dashboard_user", "user_id": request.user.id},
                 )
                 request.user.stripe_customer_id = cus.id
                 request.user.save()
-                return redirect('/payment')
+                return redirect("/payment")
         elif id == "getting_portal":
             if request.user.stripe_customer_id:
                 session = stripe.billing_portal.Session.create(
-                    customer=request.user.stripe_customer_id,
-                    return_url=settings.DOMAIN_URL
+                    customer=request.user.stripe_customer_id, return_url=settings.DOMAIN_URL
                 )
                 return redirect(session.url, code=303)
 
     context = {
         "notices": notices,
         # "tickets": tickets,
-        "services": services
+        "services": services,
     }
     return render(request, "home.html", context)
 
@@ -217,12 +226,14 @@ def payment(request):
     data = {"name": products.data[0].name, "prices": []}
     index = 0
     for price in prices:
-        tmp = [{
-            "id": price.id,
-            "interval": price.recurring.interval,
-            "amount": price.unit_amount,
-            "description": price.nickname
-        }]
+        tmp = [
+            {
+                "id": price.id,
+                "interval": price.recurring.interval,
+                "amount": price.unit_amount,
+                "description": price.nickname,
+            }
+        ]
         if index == 0:
             data["prices"] = tmp
         else:
@@ -258,7 +269,7 @@ def payment(request):
                         "user_id": request.user.id,
                         "log": "[" + str(request.user.id) + "] " + request.user.username,
                     }
-                }
+                },
             )
             return redirect(session.url, code=303)
 
@@ -270,93 +281,93 @@ def payment(request):
 @csrf_exempt
 def stripe_webhook(request):
     # サーバーのイベントログからの出力ステートメント
-    payload = request.body.decode('utf-8')
-    sig_header = request.META['HTTP_STRIPE_SIGNATURE']
+    payload = request.body.decode("utf-8")
+    sig_header = request.META["HTTP_STRIPE_SIGNATURE"]
     event = None
     try:
         event = stripe.Webhook.construct_event(payload, sig_header, settings.STRIPE_WEBHOOK_SECRET_KEY)
-    except ValueError as e:
+    except ValueError:
         # 有効でないpayload
         return HttpResponse(status=400)
-    except stripe.error.SignatureVerificationError as e:
+    except stripe.error.SignatureVerificationError:
         # 有効でない署名
         return HttpResponse(status=400)
     if "customer.subscription" in event["type"]:
-        obj = event['data']['object']
-        metadata_type = obj['metadata']['type']
-        if metadata_type == 'user_membership' or metadata_type == 'doornoc_membership':
-            id = obj['id']
-            customer_id = obj['customer']
-            plan = obj['plan']
-            plan_id = plan['id']
-            amount = plan['amount']
-            interval = plan['interval']
-            period_start = datetime.fromtimestamp(obj['current_period_start'])
-            period_end = datetime.fromtimestamp(obj['current_period_end'])
-            status = obj['status']
+        obj = event["data"]["object"]
+        metadata_type = obj["metadata"]["type"]
+        if metadata_type == "user_membership" or metadata_type == "doornoc_membership":
+            id = obj["id"]
+            customer_id = obj["customer"]
+            plan = obj["plan"]
+            # plan_id = plan["id"]
+            amount = plan["amount"]
+            interval = plan["interval"]
+            period_start = datetime.fromtimestamp(obj["current_period_start"])
+            period_end = datetime.fromtimestamp(obj["current_period_end"])
+            status = obj["status"]
             data = {
                 "sub_id": id,
                 "plan_amount": amount,
                 "plan_interval": interval,
-                "start": period_start.strftime('%Y/%m/%d %H:%M:%S'),
-                "end": period_start.strftime('%Y/%m/%d %H:%M:%S'),
+                "start": period_start.strftime("%Y/%m/%d %H:%M:%S"),
+                "end": period_start.strftime("%Y/%m/%d %H:%M:%S"),
                 "status": status,
             }
             if event["type"] == "customer.subscription.created":
-                if metadata_type == 'user_membership':
+                if metadata_type == "user_membership":
                     user = User.objects.filter(stripe_customer_id=customer_id)
                     if user.exists():
-                        data['id'] = user[0].id
-                        data['name'] = user[0].username
+                        data["id"] = user[0].id
+                        data["name"] = user[0].username
                         user = User.objects.get(id=user[0].id)
                         user.stripe_subscription_id = id
                         user.expired_at = period_end
                         user.save()
-                elif metadata_type == 'doornoc_membership':
+                elif metadata_type == "doornoc_membership":
                     group = Group.objects.filter(stripe_customer_id=customer_id)
                     if group.exists():
-                        data['id'] = group[0].id
-                        data['name'] = group[0].name
+                        data["id"] = group[0].id
+                        data["name"] = group[0].name
                         group = Group.objects.get(id=group[0].id)
                         group.stripe_subscription_id = id
                         group.expired_at = period_end
                         group.save()
                 notice_payment(metadata_type, event_type=event["type"], data=data)
             elif event["type"] == "customer.subscription.updated":
-                if metadata_type == 'user_membership':
+                if metadata_type == "user_membership":
                     user = User.objects.filter(stripe_customer_id=customer_id)
                     if user.exists():
-                        data['id'] = user[0].id
-                        data['name'] = user[0].username
+                        data["id"] = user[0].id
+                        data["name"] = user[0].username
                         user = User.objects.get(id=user[0].id)
                         user.stripe_subscription_id = id
                         user.expired_at = period_end
                         user.save()
-                elif metadata_type == 'doornoc_membership':
+                elif metadata_type == "doornoc_membership":
                     group = Group.objects.filter(stripe_customer_id=customer_id)
                     if group.exists():
-                        data['id'] = group[0].id
-                        data['name'] = group[0].name
+                        data["id"] = group[0].id
+                        data["name"] = group[0].name
                         group = Group.objects.get(id=group[0].id)
                         group.stripe_subscription_id = id
                         group.expired_at = period_end
                         group.save()
                 notice_payment(metadata_type, event_type=event["type"], data=data)
             elif event["type"] == "customer.subscription.deleted":
-                if metadata_type == 'user_membership':
+                if metadata_type == "user_membership":
                     user = User.objects.filter(stripe_customer_id=customer_id)
                     if user.exists():
-                        data['id'] = user[0].id
-                        data['name'] = user[0].username
+                        data["id"] = user[0].id
+                        data["name"] = user[0].username
                         user = User.objects.get(id=user[0].id)
                         user.stripe_subscription_id = None
                         user.expired_at = None
                         user.save()
-                elif metadata_type == 'doornoc_membership':
+                elif metadata_type == "doornoc_membership":
                     group = Group.objects.filter(stripe_customer_id=customer_id)
                     if group.exists():
-                        data['id'] = group[0].id
-                        data['name'] = group[0].name
+                        data["id"] = group[0].id
+                        data["name"] = group[0].name
                         group = Group.objects.get(id=group[0].id)
                         group.stripe_subscription_id = None
                         group.expired_at = None
diff --git a/dsbd/wsgi.py b/dsbd/wsgi.py
index 94e2e52..71041c8 100644
--- a/dsbd/wsgi.py
+++ b/dsbd/wsgi.py
@@ -1,5 +1,4 @@
-"""
-WSGI config for dsbd project.
+"""WSGI config for dsbd project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +10,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dsbd.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dsbd.settings")
 
 application = get_wsgi_application()
diff --git a/ip/admin.py b/ip/admin.py
index a1a3831..106665b 100644
--- a/ip/admin.py
+++ b/ip/admin.py
@@ -16,13 +16,32 @@ class TermInlineJPNICUserAdmin(admin.TabularInline):
 @admin.register(IP)
 class IP(admin.ModelAdmin):
     fieldsets = (
-        (None, {'fields': ('is_active', 'service',)}),
-        ('ip', {'fields': ('ip_address', 'subnet', 'start_at', 'end_at', 'plan', 'use_case')}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (
+            None,
+            {
+                "fields": (
+                    "is_active",
+                    "service",
+                )
+            },
+        ),
+        ("ip", {"fields": ("ip_address", "subnet", "start_at", "end_at", "plan", "use_case")}),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('id', 'is_active', 'service', 'ip_address', 'subnet', 'start_at', 'end_at')
-    list_filter = ('is_active', 'end_at',)
-    search_fields = ('ip_address',)
+    list_display = ("id", "is_active", "service", "ip_address", "subnet", "start_at", "end_at")
+    list_filter = (
+        "is_active",
+        "end_at",
+    )
+    search_fields = ("ip_address",)
 
     inlines = (TermInlineIPAdmin,)
 
@@ -30,15 +49,50 @@ class IP(admin.ModelAdmin):
 @admin.register(JPNICUser)
 class JPNICUser(admin.ModelAdmin):
     fieldsets = (
-        (None, {'fields': ('group', 'is_active',)}),
-        ('Common', {'fields': ('hidden', 'handle_type', 'jpnic_handle')}),
-        ('Personal info', {'fields': (
-            'name', 'name_jp', 'email', 'org', 'org_jp', 'postcode', 'address', 'address_jp',
-            'dept', 'dept_jp', 'title', 'title_jp', 'tel', 'fax', 'country')}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (
+            None,
+            {
+                "fields": (
+                    "group",
+                    "is_active",
+                )
+            },
+        ),
+        ("Common", {"fields": ("hidden", "handle_type", "jpnic_handle")}),
+        (
+            "Personal info",
+            {
+                "fields": (
+                    "name",
+                    "name_jp",
+                    "email",
+                    "org",
+                    "org_jp",
+                    "postcode",
+                    "address",
+                    "address_jp",
+                    "dept",
+                    "dept_jp",
+                    "title",
+                    "title_jp",
+                    "tel",
+                    "fax",
+                    "country",
+                )
+            },
+        ),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('id', 'is_active', 'group', 'jpnic_handle', 'name', 'org')
-    list_filter = ('is_active', 'group')
-    search_fields = ('name', 'name_jp', 'group', 'org', 'org_jp')
+    list_display = ("id", "is_active", "group", "jpnic_handle", "name", "org")
+    list_filter = ("is_active", "group")
+    search_fields = ("name", "name_jp", "group", "org", "org_jp")
 
     inlines = (TermInlineJPNICUserAdmin,)
diff --git a/ip/migrations/0001_initial.py b/ip/migrations/0001_initial.py
index 7393d32..77bfc72 100644
--- a/ip/migrations/0001_initial.py
+++ b/ip/migrations/0001_initial.py
@@ -1,81 +1,103 @@
 # Generated by Django 5.0.3 on 2024-03-31 08:50
 
 import django.utils.timezone
-import dsbd.models
 from django.db import migrations, models
 
+import dsbd.models
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='IP',
+            name="IP",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('ip_address', models.GenericIPAddressField(unique=True, verbose_name='IP Address')),
-                ('subnet', models.IntegerField(default=32, verbose_name='サブネット')),
-                ('start_at', models.DateTimeField(blank=True, null=True, verbose_name='開通日')),
-                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='解約日')),
-                ('plan', models.JSONField(blank=True, null=True, verbose_name='プラン')),
-                ('use_case', dsbd.models.MediumTextField(default='', verbose_name='使用用途')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("ip_address", models.GenericIPAddressField(unique=True, verbose_name="IP Address")),
+                ("subnet", models.IntegerField(default=32, verbose_name="サブネット")),
+                ("start_at", models.DateTimeField(blank=True, null=True, verbose_name="開通日")),
+                ("end_at", models.DateTimeField(blank=True, null=True, verbose_name="解約日")),
+                ("plan", models.JSONField(blank=True, null=True, verbose_name="プラン")),
+                ("use_case", dsbd.models.MediumTextField(default="", verbose_name="使用用途")),
             ],
             options={
-                'verbose_name': 'IP',
-                'verbose_name_plural': 'IPs',
-                'ordering': ('id',),
+                "verbose_name": "IP",
+                "verbose_name_plural": "IPs",
+                "ordering": ("id",),
             },
         ),
         migrations.CreateModel(
-            name='IPJPNICUser',
+            name="IPJPNICUser",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('user_type', models.CharField(choices=[('admin', '管理者'), ('tech1', '技術担当者1'), ('tech2', '技術担当者2'), ('tech3', '技術担当者3'), ('tech4', '技術担当者4'), ('tech5', '技術担当者5')], default='admin', max_length=255, verbose_name='タイプ')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                (
+                    "user_type",
+                    models.CharField(
+                        choices=[
+                            ("admin", "管理者"),
+                            ("tech1", "技術担当者1"),
+                            ("tech2", "技術担当者2"),
+                            ("tech3", "技術担当者3"),
+                            ("tech4", "技術担当者4"),
+                            ("tech5", "技術担当者5"),
+                        ],
+                        default="admin",
+                        max_length=255,
+                        verbose_name="タイプ",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'IP・JPNIC User',
-                'verbose_name_plural': 'IP・JPNIC Users',
+                "verbose_name": "IP・JPNIC User",
+                "verbose_name_plural": "IP・JPNIC Users",
             },
         ),
         migrations.CreateModel(
-            name='JPNICUser',
+            name="JPNICUser",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('hidden', models.BooleanField(default=False, verbose_name='隠蔽')),
-                ('handle_type', models.CharField(choices=[('group_handle', 'グループハンドル'), ('jpnic_handle', 'JPNICハンドル')], default='jpnic_handle', max_length=255, verbose_name='ハンドルタイプ')),
-                ('jpnic_handle', models.CharField(blank=True, max_length=100, verbose_name='JPNIC Handle')),
-                ('name', models.CharField(max_length=150, verbose_name='name')),
-                ('name_jp', models.CharField(max_length=150, verbose_name='name(japanese)')),
-                ('email', models.EmailField(max_length=150, verbose_name='E-Mail')),
-                ('org', models.CharField(max_length=150, unique=True, verbose_name='Org')),
-                ('org_jp', models.CharField(max_length=150, verbose_name='Org(japanese)')),
-                ('postcode', models.CharField(default='', max_length=20, verbose_name='郵便番号')),
-                ('address', models.CharField(default='', max_length=250, verbose_name='住所')),
-                ('address_jp', models.CharField(default='', max_length=250, verbose_name='住所(Japanese)')),
-                ('dept', models.CharField(blank=True, default='', max_length=250, verbose_name='部署')),
-                ('dept_jp', models.CharField(blank=True, default='', max_length=250, verbose_name='部署(Japanese)')),
-                ('title', models.CharField(blank=True, default='', max_length=250, verbose_name='役職')),
-                ('title_jp', models.CharField(blank=True, default='', max_length=250, verbose_name='役職(Japanese)')),
-                ('tel', models.CharField(default='', max_length=30, verbose_name='tel')),
-                ('fax', models.CharField(default='', max_length=30, verbose_name='fax')),
-                ('country', models.CharField(default='Japan', max_length=100, verbose_name='居住国')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("hidden", models.BooleanField(default=False, verbose_name="隠蔽")),
+                (
+                    "handle_type",
+                    models.CharField(
+                        choices=[("group_handle", "グループハンドル"), ("jpnic_handle", "JPNICハンドル")],
+                        default="jpnic_handle",
+                        max_length=255,
+                        verbose_name="ハンドルタイプ",
+                    ),
+                ),
+                ("jpnic_handle", models.CharField(blank=True, max_length=100, verbose_name="JPNIC Handle")),
+                ("name", models.CharField(max_length=150, verbose_name="name")),
+                ("name_jp", models.CharField(max_length=150, verbose_name="name(japanese)")),
+                ("email", models.EmailField(max_length=150, verbose_name="E-Mail")),
+                ("org", models.CharField(max_length=150, unique=True, verbose_name="Org")),
+                ("org_jp", models.CharField(max_length=150, verbose_name="Org(japanese)")),
+                ("postcode", models.CharField(default="", max_length=20, verbose_name="郵便番号")),
+                ("address", models.CharField(default="", max_length=250, verbose_name="住所")),
+                ("address_jp", models.CharField(default="", max_length=250, verbose_name="住所(Japanese)")),
+                ("dept", models.CharField(blank=True, default="", max_length=250, verbose_name="部署")),
+                ("dept_jp", models.CharField(blank=True, default="", max_length=250, verbose_name="部署(Japanese)")),
+                ("title", models.CharField(blank=True, default="", max_length=250, verbose_name="役職")),
+                ("title_jp", models.CharField(blank=True, default="", max_length=250, verbose_name="役職(Japanese)")),
+                ("tel", models.CharField(default="", max_length=30, verbose_name="tel")),
+                ("fax", models.CharField(default="", max_length=30, verbose_name="fax")),
+                ("country", models.CharField(default="Japan", max_length=100, verbose_name="居住国")),
             ],
             options={
-                'verbose_name': 'JPNIC User',
-                'verbose_name_plural': 'JPNIC Users',
-                'ordering': ('id',),
+                "verbose_name": "JPNIC User",
+                "verbose_name_plural": "JPNIC Users",
+                "ordering": ("id",),
             },
         ),
     ]
diff --git a/ip/migrations/0002_initial.py b/ip/migrations/0002_initial.py
index 78b5c01..363f813 100644
--- a/ip/migrations/0002_initial.py
+++ b/ip/migrations/0002_initial.py
@@ -5,48 +5,55 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
-        ('custom_auth', '0004_group_users_alter_user_groups'),
-        ('ip', '0001_initial'),
-        ('service', '0001_initial'),
+        ("custom_auth", "0004_group_users_alter_user_groups"),
+        ("ip", "0001_initial"),
+        ("service", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='ip',
-            name='service',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='IPService', to='service.service'),
+            model_name="ip",
+            name="service",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="IPService",
+                to="service.service",
+            ),
         ),
         migrations.AddField(
-            model_name='ipjpnicuser',
-            name='ip',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ip.ip'),
+            model_name="ipjpnicuser",
+            name="ip",
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="ip.ip"),
         ),
         migrations.AddField(
-            model_name='jpnicuser',
-            name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='custom_auth.group'),
+            model_name="jpnicuser",
+            name="group",
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="custom_auth.group"),
         ),
         migrations.AddField(
-            model_name='jpnicuser',
-            name='ip',
-            field=models.ManyToManyField(blank=True, related_name='jpnic_set', through='ip.IPJPNICUser', to='ip.ip'),
+            model_name="jpnicuser",
+            name="ip",
+            field=models.ManyToManyField(blank=True, related_name="jpnic_set", through="ip.IPJPNICUser", to="ip.ip"),
         ),
         migrations.AddField(
-            model_name='ipjpnicuser',
-            name='jpnic_user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ip.jpnicuser'),
+            model_name="ipjpnicuser",
+            name="jpnic_user",
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="ip.jpnicuser"),
         ),
         migrations.AddField(
-            model_name='ip',
-            name='jpnic_user',
-            field=models.ManyToManyField(blank=True, related_name='jpnic_user_set', through='ip.IPJPNICUser', to='ip.jpnicuser'),
+            model_name="ip",
+            name="jpnic_user",
+            field=models.ManyToManyField(
+                blank=True, related_name="jpnic_user_set", through="ip.IPJPNICUser", to="ip.jpnicuser"
+            ),
         ),
         migrations.AlterUniqueTogether(
-            name='ipjpnicuser',
-            unique_together={('jpnic_user', 'ip')},
+            name="ipjpnicuser",
+            unique_together={("jpnic_user", "ip")},
         ),
     ]
diff --git a/ip/migrations/0003_ip_owner_alter_ip_ip_address_alter_ip_use_case_and_more.py b/ip/migrations/0003_ip_owner_alter_ip_ip_address_alter_ip_use_case_and_more.py
index 9bfd33b..2c988ec 100644
--- a/ip/migrations/0003_ip_owner_alter_ip_ip_address_alter_ip_use_case_and_more.py
+++ b/ip/migrations/0003_ip_owner_alter_ip_ip_address_alter_ip_use_case_and_more.py
@@ -1,34 +1,39 @@
 # Generated by Django 5.0.3 on 2024-03-31 19:19
 
-import dsbd.models
 from django.db import migrations, models
 
+import dsbd.models
+
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('ip', '0002_initial'),
+        ("ip", "0002_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='ip',
-            name='owner',
-            field=models.CharField(choices=[('form_our', '当団体から割当'), ('form_your', '貴団体から割当')], default='form_our', max_length=255, verbose_name='アドレス所持オーナ'),
+            model_name="ip",
+            name="owner",
+            field=models.CharField(
+                choices=[("form_our", "当団体から割当"), ("form_your", "貴団体から割当")],
+                default="form_our",
+                max_length=255,
+                verbose_name="アドレス所持オーナ",
+            ),
         ),
         migrations.AlterField(
-            model_name='ip',
-            name='ip_address',
-            field=models.GenericIPAddressField(blank=True, null=True, unique=True, verbose_name='IP Address'),
+            model_name="ip",
+            name="ip_address",
+            field=models.GenericIPAddressField(blank=True, null=True, unique=True, verbose_name="IP Address"),
         ),
         migrations.AlterField(
-            model_name='ip',
-            name='use_case',
-            field=dsbd.models.MediumTextField(blank=True, default='', verbose_name='使用用途'),
+            model_name="ip",
+            name="use_case",
+            field=dsbd.models.MediumTextField(blank=True, default="", verbose_name="使用用途"),
         ),
         migrations.AlterField(
-            model_name='jpnicuser',
-            name='fax',
-            field=models.CharField(blank=True, default='', max_length=30, verbose_name='fax'),
+            model_name="jpnicuser",
+            name="fax",
+            field=models.CharField(blank=True, default="", max_length=30, verbose_name="fax"),
         ),
     ]
diff --git a/ip/models.py b/ip/models.py
index 34b510b..cf3aaaf 100644
--- a/ip/models.py
+++ b/ip/models.py
@@ -45,7 +45,9 @@ class Meta:
     service = models.ForeignKey(Service, on_delete=models.SET_NULL, related_name="IPService", null=True, blank=True)
     ip_address = models.GenericIPAddressField("IP Address", unique=True, null=True, blank=True)
     subnet = models.IntegerField("サブネット", default=32)
-    owner = models.CharField("アドレス所持オーナ", default=OWNER_TYPE_FROM_OUR, choices=OWNER_TYPE_CHOICES, max_length=255)
+    owner = models.CharField(
+        "アドレス所持オーナ", default=OWNER_TYPE_FROM_OUR, choices=OWNER_TYPE_CHOICES, max_length=255
+    )
     start_at = models.DateTimeField("開通日", null=True, blank=True)
     end_at = models.DateTimeField("解約日", null=True, blank=True)
     plan = models.JSONField("プラン", null=True, blank=True)
@@ -53,8 +55,8 @@ class Meta:
     jpnic_user = models.ManyToManyField(
         "JPNICUser",
         blank=True,
-        through='IPJPNICUser',
-        through_fields=('ip', 'jpnic_user'),
+        through="IPJPNICUser",
+        through_fields=("ip", "jpnic_user"),
         related_name="jpnic_user_set",
     )
 
@@ -82,7 +84,9 @@ class Meta:
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
     is_active = models.BooleanField("有効", default=True)
     hidden = models.BooleanField("隠蔽", default=False)
-    handle_type = models.CharField("ハンドルタイプ", max_length=255, choices=HANDLE_TYPE_CHOICES, default=HANDLE_TYPE_JPNIC)
+    handle_type = models.CharField(
+        "ハンドルタイプ", max_length=255, choices=HANDLE_TYPE_CHOICES, default=HANDLE_TYPE_JPNIC
+    )
     jpnic_handle = models.CharField("JPNIC Handle", max_length=100, blank=True)
     name = models.CharField("name", max_length=150)
     name_jp = models.CharField("name(japanese)", max_length=150)
@@ -102,8 +106,8 @@ class Meta:
     ip = models.ManyToManyField(
         "IP",
         blank=True,
-        through='IPJPNICUser',
-        through_fields=('jpnic_user', 'ip'),
+        through="IPJPNICUser",
+        through_fields=("jpnic_user", "ip"),
         related_name="jpnic_set",
     )
 
@@ -133,12 +137,14 @@ class IPJPNICUser(models.Model):
     updated_at = models.DateTimeField("更新日", default=timezone.now)
     jpnic_user = models.ForeignKey(JPNICUser, on_delete=models.CASCADE)
     ip = models.ForeignKey(IP, on_delete=models.CASCADE)
-    user_type = models.CharField("タイプ", max_length=255, choices=JPNIC_USER_TYPE_CHOICES, default=JPNIC_USER_TYPE_ADMIN)
+    user_type = models.CharField(
+        "タイプ", max_length=255, choices=JPNIC_USER_TYPE_CHOICES, default=JPNIC_USER_TYPE_ADMIN
+    )
 
     class Meta:
-        verbose_name = 'IP・JPNIC User'
+        verbose_name = "IP・JPNIC User"
         verbose_name_plural = "IP・JPNIC Users"
-        unique_together = ('jpnic_user', 'ip')
+        unique_together = ("jpnic_user", "ip")
 
     def __str__(self):
         return "%s" % (self.id,)
diff --git a/manage.py b/manage.py
index b0e4d59..16d84a5 100755
--- a/manage.py
+++ b/manage.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dsbd.settings')
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dsbd.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -18,5 +19,5 @@ def main():
     execute_from_command_line(sys.argv)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/noc/admin.py b/noc/admin.py
index fde37d9..cedbd27 100644
--- a/noc/admin.py
+++ b/noc/admin.py
@@ -6,11 +6,28 @@
 @admin.register(NOC)
 class NOC(admin.ModelAdmin):
     fieldsets = (
-        (None, {'fields': ('name', 'is_active', 'location', 'bandwidth',)}),
-        ('comment', {'fields': ('comment',)}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "is_active",
+                    "location",
+                    "bandwidth",
+                )
+            },
+        ),
+        ("comment", {"fields": ("comment",)}),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('id', 'name', 'is_active', 'location', 'bandwidth')
-    list_filter = ('is_active', )
-    search_fields = ('name',)
-
+    list_display = ("id", "name", "is_active", "location", "bandwidth")
+    list_filter = ("is_active",)
+    search_fields = ("name",)
diff --git a/noc/migrations/0001_initial.py b/noc/migrations/0001_initial.py
index 8cd8196..1da32a1 100644
--- a/noc/migrations/0001_initial.py
+++ b/noc/migrations/0001_initial.py
@@ -1,34 +1,33 @@
 # Generated by Django 5.0.3 on 2024-03-31 08:50
 
 import django.utils.timezone
-import dsbd.models
 from django.db import migrations, models
 
+import dsbd.models
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='NOC',
+            name="NOC",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('name', models.CharField(default='', max_length=255, verbose_name='名前')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('location', models.CharField(blank=True, default='', max_length=255, verbose_name='場所')),
-                ('bandwidth', models.IntegerField(default=1000, verbose_name='帯域幅')),
-                ('comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='コメント')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("name", models.CharField(default="", max_length=255, verbose_name="名前")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("location", models.CharField(blank=True, default="", max_length=255, verbose_name="場所")),
+                ("bandwidth", models.IntegerField(default=1000, verbose_name="帯域幅")),
+                ("comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="コメント")),
             ],
             options={
-                'verbose_name': 'NOC',
-                'verbose_name_plural': 'NOCs',
-                'ordering': ('id',),
+                "verbose_name": "NOC",
+                "verbose_name_plural": "NOCs",
+                "ordering": ("id",),
             },
         ),
     ]
diff --git a/notice/admin.py b/notice/admin.py
index 11f58f4..8935161 100644
--- a/notice/admin.py
+++ b/notice/admin.py
@@ -7,11 +7,20 @@
 class Notice(admin.ModelAdmin):
     fieldsets = (
         (None, {"fields": ("created_at", "start_at", "end_at", "is_active")}),
-        ('info', {'fields': ('type1', 'title', 'body')}),
-        ('Flags', {'fields': ('is_important', 'is_fail', 'is_info')}),
+        ("info", {"fields": ("type1", "title", "body")}),
+        ("Flags", {"fields": ("is_important", "is_fail", "is_info")}),
     )
     list_display = (
-        "id", "created_at", "start_at", "end_at", "type1", "is_active", "title", "is_important", "is_fail",
-        "is_info")
+        "id",
+        "created_at",
+        "start_at",
+        "end_at",
+        "type1",
+        "is_active",
+        "title",
+        "is_important",
+        "is_fail",
+        "is_info",
+    )
     list_filter = ("end_at",)
     search_fields = ("end_at", "is_important", "is_fail", "is_info")
diff --git a/notice/migrations/0001_initial.py b/notice/migrations/0001_initial.py
index 8b6eb17..f9929a7 100644
--- a/notice/migrations/0001_initial.py
+++ b/notice/migrations/0001_initial.py
@@ -1,35 +1,44 @@
 # Generated by Django 4.2.7 on 2023-11-19 13:54
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
+
 import dsbd.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Notice',
+            name="Notice",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='作成日')),
-                ('start_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='通知開始日')),
-                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='通知終了日')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('type1', models.CharField(choices=[('サービス情報', 'サービス情報'), ('その他', 'その他')], max_length=200, verbose_name='type1')),
-                ('title', models.CharField(max_length=250, verbose_name='title')),
-                ('body', dsbd.models.MediumTextField(blank=True, default='', verbose_name='内容')),
-                ('is_important', models.BooleanField(default=False, verbose_name='重要')),
-                ('is_fail', models.BooleanField(default=False, verbose_name='障害')),
-                ('is_info', models.BooleanField(default=False, verbose_name='情報')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                (
+                    "created_at",
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name="作成日"),
+                ),
+                ("start_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="通知開始日")),
+                ("end_at", models.DateTimeField(blank=True, null=True, verbose_name="通知終了日")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                (
+                    "type1",
+                    models.CharField(
+                        choices=[("サービス情報", "サービス情報"), ("その他", "その他")],
+                        max_length=200,
+                        verbose_name="type1",
+                    ),
+                ),
+                ("title", models.CharField(max_length=250, verbose_name="title")),
+                ("body", dsbd.models.MediumTextField(blank=True, default="", verbose_name="内容")),
+                ("is_important", models.BooleanField(default=False, verbose_name="重要")),
+                ("is_fail", models.BooleanField(default=False, verbose_name="障害")),
+                ("is_info", models.BooleanField(default=False, verbose_name="情報")),
             ],
             options={
-                'ordering': ('-end_at',),
+                "ordering": ("-end_at",),
             },
         ),
     ]
diff --git a/notice/models.py b/notice/models.py
index 28c9e0b..3a40525 100644
--- a/notice/models.py
+++ b/notice/models.py
@@ -9,9 +9,7 @@ class NoticeManager(models.Manager):
     def get_notice(self):
         now = timezone.now()
         notices = self.filter(
-            Q(start_at__lte=now),
-            Q(is_active=True),
-            Q(end_at__gt=timezone.now()) | Q(end_at__isnull=True)
+            Q(start_at__lte=now), Q(is_active=True), Q(end_at__gt=timezone.now()) | Q(end_at__isnull=True)
         )
         return notices
 
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..f73969b
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,15 @@
+[tool.ruff]
+line-length = 120
+target-version = "py312"
+
+[tool.ruff.lint]
+extend-select = [
+    #    "D", # pydocstyle
+    "E", # pycodestyle(Error)
+    "I", # isort
+    "N", # pep8-naming
+    "W", # pycodestyle(Warnig)
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 1cbef29..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-asgiref==3.8.1
-attrs==23.2.0
-autobahn==23.6.2
-Automat==22.10.0
-certifi==2024.2.2
-cffi==1.16.0
-channels==4.1.0
-charset-normalizer==3.3.2
-constantly==23.10.4
-cryptography==42.0.5
-daphne==4.1.2
-Django==5.0.4
-django-auth-ldap==4.8.0
-django-countries==7.6.1
-django-debug-toolbar==4.3.0
-django-qrcode==0.3
-django-widget-tweaks==1.5.0
-hyperlink==21.0.0
-idna==3.7
-incremental==22.10.0
-Markdown==3.6
-mysqlclient==2.2.4
-pyasn1==0.6.0
-pyasn1-modules==0.4.0
-pycparser==2.22
-pyOpenSSL==24.1.0
-pyotp==2.9.0
-pypng==0.20220715.0
-python-ldap==3.4.4
-pytz==2024.1
-qrcode==7.4.2
-requests==2.31.0
-service-identity==24.1.0
-six==1.16.0
-slack-sdk==3.27.1
-sqlparse==0.5.0
-stripe==9.5.0
-Twisted==24.3.0
-txaio==23.1.1
-typing_extensions==4.11.0
-urllib3==2.2.1
-zope.interface==6.3
diff --git a/router/admin.py b/router/admin.py
index 4f40292..03e70ad 100644
--- a/router/admin.py
+++ b/router/admin.py
@@ -1,27 +1,43 @@
 from django.contrib import admin
 
-from .models import TunnelRouter, TunnelIP
+from .models import TunnelIP, TunnelRouter
 
 
 @admin.register(TunnelRouter)
 class Router(admin.ModelAdmin):
     fieldsets = (
-        (None, {'fields': ('is_active', 'noc', 'hostname')}),
-        ('comment', {'fields': ('comment',)}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (None, {"fields": ("is_active", "noc", "hostname")}),
+        ("comment", {"fields": ("comment",)}),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('id', 'is_active', 'noc', 'hostname')
-    list_filter = ('is_active',)
-    search_fields = ('is_active', 'hostname')
+    list_display = ("id", "is_active", "noc", "hostname")
+    list_filter = ("is_active",)
+    search_fields = ("is_active", "hostname")
 
 
 @admin.register(TunnelIP)
 class TunnelIP(admin.ModelAdmin):
     fieldsets = (
-        (None, {'fields': ('is_active', 'tunnel_router', 'ip_address')}),
-        ('comment', {'fields': ('comment',)}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (None, {"fields": ("is_active", "tunnel_router", "ip_address")}),
+        ("comment", {"fields": ("comment",)}),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('id', 'is_active', 'tunnel_router', 'ip_address')
-    list_filter = ('is_active',)
-    search_fields = ('is_active', 'ip_address')
+    list_display = ("id", "is_active", "tunnel_router", "ip_address")
+    list_filter = ("is_active",)
+    search_fields = ("is_active", "ip_address")
diff --git a/router/migrations/0001_initial.py b/router/migrations/0001_initial.py
index ce8eb17..7b91237 100644
--- a/router/migrations/0001_initial.py
+++ b/router/migrations/0001_initial.py
@@ -2,51 +2,54 @@
 
 import django.db.models.deletion
 import django.utils.timezone
-import dsbd.models
 from django.db import migrations, models
 
+import dsbd.models
+
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
-        ('noc', '0001_initial'),
+        ("noc", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='TunnelRouter',
+            name="TunnelRouter",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('hostname', models.CharField(max_length=255, unique=True, verbose_name='ホスト名')),
-                ('comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='コメント')),
-                ('noc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='noc.noc')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("hostname", models.CharField(max_length=255, unique=True, verbose_name="ホスト名")),
+                ("comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="コメント")),
+                ("noc", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="noc.noc")),
             ],
             options={
-                'verbose_name': 'Tunnel Router',
-                'verbose_name_plural': 'Tunnel Routers',
-                'ordering': ('id',),
+                "verbose_name": "Tunnel Router",
+                "verbose_name_plural": "Tunnel Routers",
+                "ordering": ("id",),
             },
         ),
         migrations.CreateModel(
-            name='TunnelIP',
+            name="TunnelIP",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('ip_address', models.GenericIPAddressField(unique=True, verbose_name='IPアドレス')),
-                ('comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='コメント')),
-                ('tunnel_router', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='router.tunnelrouter')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("ip_address", models.GenericIPAddressField(unique=True, verbose_name="IPアドレス")),
+                ("comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="コメント")),
+                (
+                    "tunnel_router",
+                    models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="router.tunnelrouter"),
+                ),
             ],
             options={
-                'verbose_name': 'Tunnel IP',
-                'verbose_name_plural': 'Tunnel IPs',
-                'ordering': ('id',),
+                "verbose_name": "Tunnel IP",
+                "verbose_name_plural": "Tunnel IPs",
+                "ordering": ("id",),
             },
         ),
     ]
diff --git a/router/models.py b/router/models.py
index a2ae903..8e464a2 100644
--- a/router/models.py
+++ b/router/models.py
@@ -36,4 +36,4 @@ class Meta:
     comment = MediumTextField("コメント", default="", blank=True)
 
     def __str__(self):
-        return "%d: (%s)%s" % (self.id, self.tunnel_router.hostname,self.ip_address)
+        return "%d: (%s)%s" % (self.id, self.tunnel_router.hostname, self.ip_address)
diff --git a/service/admin.py b/service/admin.py
index e0e3500..ec9e2df 100644
--- a/service/admin.py
+++ b/service/admin.py
@@ -1,36 +1,84 @@
 from django.contrib import admin
 
-from .models import Service, Connection
+from .models import Connection, Service
 
 
 @admin.register(Service)
 class Service(admin.ModelAdmin):
     fieldsets = (
-        (None, {'fields': ('is_active', 'is_pass', 'allow_connection_add', 'group')}),
-        ('service', {'fields': ('service_type', 'service_number', 'start_at', 'end_at', 'asn')}),
-        ('bandwidth',
-         {'fields': ('ave_upstream', 'max_upstream', 'ave_downstream', 'max_downstream', 'max_bandwidth_as')}),
-        ('comment', {'fields': ('user_comment', 'admin_comment')}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (None, {"fields": ("is_active", "is_pass", "allow_connection_add", "group")}),
+        ("service", {"fields": ("service_type", "service_number", "start_at", "end_at", "asn")}),
+        (
+            "bandwidth",
+            {"fields": ("ave_upstream", "max_upstream", "ave_downstream", "max_downstream", "max_bandwidth_as")},
+        ),
+        ("comment", {"fields": ("user_comment", "admin_comment")}),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('service_code', 'is_active', 'is_pass', 'group', 'start_at', 'end_at')
-    list_filter = ('end_at',)
-    search_fields = ('service_code', 'is_active', 'service_type')
+    list_display = ("service_code", "is_active", "is_pass", "group", "start_at", "end_at")
+    list_filter = ("end_at",)
+    search_fields = ("service_code", "is_active", "service_type")
 
 
 @admin.register(Connection)
 class Connection(admin.ModelAdmin):
     fieldsets = (
-        (None,
-         {'fields': ('is_active', 'is_open', 'service', 'connection_type', 'connection_number', 'connection_comment')}),
-        ('入力情報',
-         {'fields': ('ntt_type', 'ntt_comment', 'ipv4_route', 'ipv4_route_comment', 'ipv6_route', 'ipv6_route_comment',
-                     'start_at', 'end_at', 'is_monitor', 'term_location', 'hope_location')}),
-        ('Info', {'fields': (
-            'tunnel_ip', 'term_ip', 'link_v4_our', 'link_v4_your', 'link_v6_our', 'link_v6_your')}),
-        ('comment', {'fields': ('user_comment', 'admin_comment')}),
-        ('Important dates', {'fields': ('created_at', 'updated_at',)}),
+        (
+            None,
+            {
+                "fields": (
+                    "is_active",
+                    "is_open",
+                    "service",
+                    "connection_type",
+                    "connection_number",
+                    "connection_comment",
+                )
+            },
+        ),
+        (
+            "入力情報",
+            {
+                "fields": (
+                    "ntt_type",
+                    "ntt_comment",
+                    "ipv4_route",
+                    "ipv4_route_comment",
+                    "ipv6_route",
+                    "ipv6_route_comment",
+                    "start_at",
+                    "end_at",
+                    "is_monitor",
+                    "term_location",
+                    "hope_location",
+                )
+            },
+        ),
+        ("Info", {"fields": ("tunnel_ip", "term_ip", "link_v4_our", "link_v4_your", "link_v6_our", "link_v6_your")}),
+        ("comment", {"fields": ("user_comment", "admin_comment")}),
+        (
+            "Important dates",
+            {
+                "fields": (
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
     )
-    list_display = ('service_code', 'is_active', 'is_open', 'service', 'start_at', 'end_at')
-    list_filter = ('is_active', 'is_open', 'start_at', 'end_at',)
-    search_fields = ('service_code', 'is_active', 'service_type')
+    list_display = ("service_code", "is_active", "is_open", "service", "start_at", "end_at")
+    list_filter = (
+        "is_active",
+        "is_open",
+        "start_at",
+        "end_at",
+    )
+    search_fields = ("service_code", "is_active", "service_type")
diff --git a/service/migrations/0001_initial.py b/service/migrations/0001_initial.py
index 4b5997c..652a3aa 100644
--- a/service/migrations/0001_initial.py
+++ b/service/migrations/0001_initial.py
@@ -2,86 +2,203 @@
 
 import django.db.models.deletion
 import django.utils.timezone
-import dsbd.models
 from django.db import migrations, models
 
+import dsbd.models
+
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
-        ('custom_auth', '0004_group_users_alter_user_groups'),
-        ('router', '0001_initial'),
+        ("custom_auth", "0004_group_users_alter_user_groups"),
+        ("router", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Service',
+            name="Service",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('service_type', models.IntegerField(choices=[('2000', 'L2'), ('3S00', 'L3 Static'), ('3B00', 'L3 BGP'), ('IP3B', 'トランジット提供'), ('CL20', 'コロケーションサービス(L2)'), ('CL3S', 'コロケーションサービス(L3 Static)'), ('CL3B', 'コロケーションサービス(L3 BGP)'), ('ET00', 'その他')], default='CL3B', verbose_name='サービスタイプ')),
-                ('service_number', models.IntegerField(default=0, verbose_name='サービス番号')),
-                ('service_comment', models.IntegerField(blank=True, default=0, verbose_name='サービス情報コメント')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('is_pass', models.BooleanField(default=False, verbose_name='審査OK')),
-                ('allow_connection_add', models.BooleanField(default=True, verbose_name='接続追加許可')),
-                ('asn', models.IntegerField(blank=True, default=0, null=True, verbose_name='ASN')),
-                ('ave_upstream', models.IntegerField(default=10, verbose_name='平均アップロード帯域幅')),
-                ('max_upstream', models.IntegerField(default=20, verbose_name='最大アップロード帯域幅')),
-                ('ave_downstream', models.IntegerField(default=10, verbose_name='平均ダウンロード帯域幅')),
-                ('max_downstream', models.IntegerField(default=20, verbose_name='最大ダウンロード帯域幅')),
-                ('max_bandwidth_as', models.CharField(blank=True, default='', max_length=255, verbose_name='最大帯域幅AS')),
-                ('start_at', models.DateTimeField(blank=True, null=True, verbose_name='開通日')),
-                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='解約日')),
-                ('user_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='ユーザコメント')),
-                ('admin_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='管理者コメント')),
-                ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ServiceGroup', to='custom_auth.group')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                (
+                    "service_type",
+                    models.IntegerField(
+                        choices=[
+                            ("2000", "L2"),
+                            ("3S00", "L3 Static"),
+                            ("3B00", "L3 BGP"),
+                            ("IP3B", "トランジット提供"),
+                            ("CL20", "コロケーションサービス(L2)"),
+                            ("CL3S", "コロケーションサービス(L3 Static)"),
+                            ("CL3B", "コロケーションサービス(L3 BGP)"),
+                            ("ET00", "その他"),
+                        ],
+                        default="CL3B",
+                        verbose_name="サービスタイプ",
+                    ),
+                ),
+                ("service_number", models.IntegerField(default=0, verbose_name="サービス番号")),
+                ("service_comment", models.IntegerField(blank=True, default=0, verbose_name="サービス情報コメント")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("is_pass", models.BooleanField(default=False, verbose_name="審査OK")),
+                ("allow_connection_add", models.BooleanField(default=True, verbose_name="接続追加許可")),
+                ("asn", models.IntegerField(blank=True, default=0, null=True, verbose_name="ASN")),
+                ("ave_upstream", models.IntegerField(default=10, verbose_name="平均アップロード帯域幅")),
+                ("max_upstream", models.IntegerField(default=20, verbose_name="最大アップロード帯域幅")),
+                ("ave_downstream", models.IntegerField(default=10, verbose_name="平均ダウンロード帯域幅")),
+                ("max_downstream", models.IntegerField(default=20, verbose_name="最大ダウンロード帯域幅")),
+                (
+                    "max_bandwidth_as",
+                    models.CharField(blank=True, default="", max_length=255, verbose_name="最大帯域幅AS"),
+                ),
+                ("start_at", models.DateTimeField(blank=True, null=True, verbose_name="開通日")),
+                ("end_at", models.DateTimeField(blank=True, null=True, verbose_name="解約日")),
+                ("user_comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="ユーザコメント")),
+                ("admin_comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="管理者コメント")),
+                (
+                    "group",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="ServiceGroup",
+                        to="custom_auth.group",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Service',
-                'verbose_name_plural': 'Services',
-                'ordering': ('id',),
+                "verbose_name": "Service",
+                "verbose_name_plural": "Services",
+                "ordering": ("id",),
             },
         ),
         migrations.CreateModel(
-            name='Connection',
+            name="Connection",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
-                ('connection_type', models.IntegerField(choices=[('EIP', 'EtherIP Tunnel'), ('GRE', 'GRE Tunnel'), ('IPT', 'IPT Tunnel'), ('CC0', 'Cross Connect'), ('ETC', 'ETC')], default='EIP', verbose_name='サービスタイプ')),
-                ('connection_number', models.IntegerField(default=0, verbose_name='接続番号')),
-                ('connection_comment', models.IntegerField(blank=True, default=0, verbose_name='接続情報コメント')),
-                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
-                ('is_open', models.BooleanField(default=False, verbose_name='開通')),
-                ('hope_location', models.CharField(choices=[('east_japan', '東日本'), ('west_japan', '西日本'), ('anywhere', 'どちらでも')], default='anywhere', max_length=255, verbose_name='接続希望場所')),
-                ('term_location', models.CharField(blank=True, default='', max_length=255, verbose_name='接続終端場所')),
-                ('ntt_type', models.CharField(choices=[('type-1', 'はい（IPoEによりIPv6インターネットへ接続可能）'), ('type-2', 'はい（IPoEによりIPv6インターネットへ接続不可）'), ('type-3', 'はい（フレッツv6オプションの契約なし）'), ('type-4', 'いいえ（フレッツ以外でインターネットに接続可能）'), ('type-5', 'いいえ（IPv6でのインターネット接続不可）'), ('etc', 'etc')], default='type-1', max_length=255, verbose_name='NTT接続タイプ')),
-                ('ntt_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='NTT接続コメント')),
-                ('ipv4_route', models.CharField(choices=[('full_route', 'Full Route'), ('default_route', 'Default Route'), ('full_route', 'Etc')], default='full_route', max_length=255, verbose_name='IPv4 Route')),
-                ('ipv4_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='IPv4コメント')),
-                ('ipv6_route', models.CharField(choices=[('full_route', 'Full Route'), ('default_route', 'Default Route'), ('full_route', 'Etc')], default='full_route', max_length=255, verbose_name='IPv6 Route')),
-                ('ipv6_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='IPv6コメント')),
-                ('is_monitor', models.BooleanField(default=False, verbose_name='監視の有無')),
-                ('link_v4_our', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv4接続(HomeNOC側)')),
-                ('link_v4_your', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv4(貴団体側)')),
-                ('link_v6_our', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv6接続(HomeNOC側)')),
-                ('link_v6_your', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv6(貴団体側)')),
-                ('term_ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='終端先IP')),
-                ('start_at', models.DateTimeField(blank=True, null=True, verbose_name='開通日')),
-                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='解約日')),
-                ('user_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='ユーザコメント')),
-                ('admin_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='管理者コメント')),
-                ('tunnel_ip', models.ForeignKey(max_length=255, on_delete=django.db.models.deletion.CASCADE, related_name='ConnectionTunnelIP', to='router.tunnelip')),
-                ('service', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ConnectionService', to='service.service')),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(default=django.utils.timezone.now, verbose_name="更新日")),
+                (
+                    "connection_type",
+                    models.IntegerField(
+                        choices=[
+                            ("EIP", "EtherIP Tunnel"),
+                            ("GRE", "GRE Tunnel"),
+                            ("IPT", "IPT Tunnel"),
+                            ("CC0", "Cross Connect"),
+                            ("ETC", "ETC"),
+                        ],
+                        default="EIP",
+                        verbose_name="サービスタイプ",
+                    ),
+                ),
+                ("connection_number", models.IntegerField(default=0, verbose_name="接続番号")),
+                ("connection_comment", models.IntegerField(blank=True, default=0, verbose_name="接続情報コメント")),
+                ("is_active", models.BooleanField(default=True, verbose_name="有効")),
+                ("is_open", models.BooleanField(default=False, verbose_name="開通")),
+                (
+                    "hope_location",
+                    models.CharField(
+                        choices=[("east_japan", "東日本"), ("west_japan", "西日本"), ("anywhere", "どちらでも")],
+                        default="anywhere",
+                        max_length=255,
+                        verbose_name="接続希望場所",
+                    ),
+                ),
+                (
+                    "term_location",
+                    models.CharField(blank=True, default="", max_length=255, verbose_name="接続終端場所"),
+                ),
+                (
+                    "ntt_type",
+                    models.CharField(
+                        choices=[
+                            ("type-1", "はい（IPoEによりIPv6インターネットへ接続可能）"),
+                            ("type-2", "はい（IPoEによりIPv6インターネットへ接続不可）"),
+                            ("type-3", "はい（フレッツv6オプションの契約なし）"),
+                            ("type-4", "いいえ（フレッツ以外でインターネットに接続可能）"),
+                            ("type-5", "いいえ（IPv6でのインターネット接続不可）"),
+                            ("etc", "etc"),
+                        ],
+                        default="type-1",
+                        max_length=255,
+                        verbose_name="NTT接続タイプ",
+                    ),
+                ),
+                (
+                    "ntt_comment",
+                    models.CharField(blank=True, default="", max_length=255, verbose_name="NTT接続コメント"),
+                ),
+                (
+                    "ipv4_route",
+                    models.CharField(
+                        choices=[
+                            ("full_route", "Full Route"),
+                            ("default_route", "Default Route"),
+                            ("full_route", "Etc"),
+                        ],
+                        default="full_route",
+                        max_length=255,
+                        verbose_name="IPv4 Route",
+                    ),
+                ),
+                ("ipv4_comment", models.CharField(blank=True, default="", max_length=255, verbose_name="IPv4コメント")),
+                (
+                    "ipv6_route",
+                    models.CharField(
+                        choices=[
+                            ("full_route", "Full Route"),
+                            ("default_route", "Default Route"),
+                            ("full_route", "Etc"),
+                        ],
+                        default="full_route",
+                        max_length=255,
+                        verbose_name="IPv6 Route",
+                    ),
+                ),
+                ("ipv6_comment", models.CharField(blank=True, default="", max_length=255, verbose_name="IPv6コメント")),
+                ("is_monitor", models.BooleanField(default=False, verbose_name="監視の有無")),
+                (
+                    "link_v4_our",
+                    models.GenericIPAddressField(blank=True, null=True, verbose_name="IPv4接続(HomeNOC側)"),
+                ),
+                ("link_v4_your", models.GenericIPAddressField(blank=True, null=True, verbose_name="IPv4(貴団体側)")),
+                (
+                    "link_v6_our",
+                    models.GenericIPAddressField(blank=True, null=True, verbose_name="IPv6接続(HomeNOC側)"),
+                ),
+                ("link_v6_your", models.GenericIPAddressField(blank=True, null=True, verbose_name="IPv6(貴団体側)")),
+                ("term_ip", models.GenericIPAddressField(blank=True, null=True, verbose_name="終端先IP")),
+                ("start_at", models.DateTimeField(blank=True, null=True, verbose_name="開通日")),
+                ("end_at", models.DateTimeField(blank=True, null=True, verbose_name="解約日")),
+                ("user_comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="ユーザコメント")),
+                ("admin_comment", dsbd.models.MediumTextField(blank=True, default="", verbose_name="管理者コメント")),
+                (
+                    "tunnel_ip",
+                    models.ForeignKey(
+                        max_length=255,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="ConnectionTunnelIP",
+                        to="router.tunnelip",
+                    ),
+                ),
+                (
+                    "service",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="ConnectionService",
+                        to="service.service",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Connection',
-                'verbose_name_plural': 'Connections',
-                'ordering': ('id',),
+                "verbose_name": "Connection",
+                "verbose_name_plural": "Connections",
+                "ordering": ("id",),
             },
         ),
     ]
diff --git a/service/migrations/0002_remove_connection_ipv4_comment_and_more.py b/service/migrations/0002_remove_connection_ipv4_comment_and_more.py
index 965a58d..fc06a88 100644
--- a/service/migrations/0002_remove_connection_ipv4_comment_and_more.py
+++ b/service/migrations/0002_remove_connection_ipv4_comment_and_more.py
@@ -5,74 +5,125 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('router', '0001_initial'),
-        ('service', '0001_initial'),
+        ("router", "0001_initial"),
+        ("service", "0001_initial"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='connection',
-            name='ipv4_comment',
+            model_name="connection",
+            name="ipv4_comment",
         ),
         migrations.RemoveField(
-            model_name='connection',
-            name='ipv6_comment',
+            model_name="connection",
+            name="ipv6_comment",
         ),
         migrations.AddField(
-            model_name='connection',
-            name='ipv4_route_comment',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='IPv4 Routeコメント'),
+            model_name="connection",
+            name="ipv4_route_comment",
+            field=models.CharField(blank=True, default="", max_length=255, verbose_name="IPv4 Routeコメント"),
         ),
         migrations.AddField(
-            model_name='connection',
-            name='ipv6_route_comment',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='IPv6 Routeコメント'),
+            model_name="connection",
+            name="ipv6_route_comment",
+            field=models.CharField(blank=True, default="", max_length=255, verbose_name="IPv6 Routeコメント"),
         ),
         migrations.AlterField(
-            model_name='connection',
-            name='connection_comment',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='接続情報コメント'),
+            model_name="connection",
+            name="connection_comment",
+            field=models.CharField(blank=True, default="", max_length=255, verbose_name="接続情報コメント"),
         ),
         migrations.AlterField(
-            model_name='connection',
-            name='connection_number',
-            field=models.IntegerField(default=1, verbose_name='接続番号'),
+            model_name="connection",
+            name="connection_number",
+            field=models.IntegerField(default=1, verbose_name="接続番号"),
         ),
         migrations.AlterField(
-            model_name='connection',
-            name='connection_type',
-            field=models.CharField(choices=[('EIP', 'EtherIP Tunnel'), ('GRE', 'GRE Tunnel'), ('IPT', 'IPT Tunnel'), ('CC0', 'Cross Connect'), ('ETC', 'ETC')], default='EIP', max_length=255, verbose_name='接続タイプ'),
+            model_name="connection",
+            name="connection_type",
+            field=models.CharField(
+                choices=[
+                    ("EIP", "EtherIP Tunnel"),
+                    ("GRE", "GRE Tunnel"),
+                    ("IPT", "IPT Tunnel"),
+                    ("CC0", "Cross Connect"),
+                    ("ETC", "ETC"),
+                ],
+                default="EIP",
+                max_length=255,
+                verbose_name="接続タイプ",
+            ),
         ),
         migrations.AlterField(
-            model_name='connection',
-            name='ipv4_route',
-            field=models.CharField(choices=[('none', 'None'), ('full_route', 'Full Route'), ('default_route', 'Default Route'), ('full_route', 'Etc')], default='full_route', max_length=255, verbose_name='IPv4 Route'),
+            model_name="connection",
+            name="ipv4_route",
+            field=models.CharField(
+                choices=[
+                    ("none", "None"),
+                    ("full_route", "Full Route"),
+                    ("default_route", "Default Route"),
+                    ("full_route", "Etc"),
+                ],
+                default="full_route",
+                max_length=255,
+                verbose_name="IPv4 Route",
+            ),
         ),
         migrations.AlterField(
-            model_name='connection',
-            name='ipv6_route',
-            field=models.CharField(choices=[('none', 'None'), ('full_route', 'Full Route'), ('default_route', 'Default Route'), ('full_route', 'Etc')], default='full_route', max_length=255, verbose_name='IPv6 Route'),
+            model_name="connection",
+            name="ipv6_route",
+            field=models.CharField(
+                choices=[
+                    ("none", "None"),
+                    ("full_route", "Full Route"),
+                    ("default_route", "Default Route"),
+                    ("full_route", "Etc"),
+                ],
+                default="full_route",
+                max_length=255,
+                verbose_name="IPv6 Route",
+            ),
         ),
         migrations.AlterField(
-            model_name='connection',
-            name='tunnel_ip',
-            field=models.ForeignKey(blank=True, max_length=255, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ConnectionTunnelIP', to='router.tunnelip'),
+            model_name="connection",
+            name="tunnel_ip",
+            field=models.ForeignKey(
+                blank=True,
+                max_length=255,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="ConnectionTunnelIP",
+                to="router.tunnelip",
+            ),
         ),
         migrations.AlterField(
-            model_name='service',
-            name='service_comment',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='サービス情報コメント'),
+            model_name="service",
+            name="service_comment",
+            field=models.CharField(blank=True, default="", max_length=255, verbose_name="サービス情報コメント"),
         ),
         migrations.AlterField(
-            model_name='service',
-            name='service_number',
-            field=models.IntegerField(default=1, verbose_name='サービス番号'),
+            model_name="service",
+            name="service_number",
+            field=models.IntegerField(default=1, verbose_name="サービス番号"),
         ),
         migrations.AlterField(
-            model_name='service',
-            name='service_type',
-            field=models.CharField(choices=[('2000', 'L2'), ('3S00', 'L3 Static'), ('3B00', 'L3 BGP'), ('IP3B', 'トランジット提供'), ('CL20', 'コロケーションサービス(L2)'), ('CL3S', 'コロケーションサービス(L3 Static)'), ('CL3B', 'コロケーションサービス(L3 BGP)'), ('ET00', 'その他')], default='CL3B', max_length=255, verbose_name='サービスタイプ'),
+            model_name="service",
+            name="service_type",
+            field=models.CharField(
+                choices=[
+                    ("2000", "L2"),
+                    ("3S00", "L3 Static"),
+                    ("3B00", "L3 BGP"),
+                    ("IP3B", "トランジット提供"),
+                    ("CL20", "コロケーションサービス(L2)"),
+                    ("CL3S", "コロケーションサービス(L3 Static)"),
+                    ("CL3B", "コロケーションサービス(L3 BGP)"),
+                    ("ET00", "その他"),
+                ],
+                default="CL3B",
+                max_length=255,
+                verbose_name="サービスタイプ",
+            ),
         ),
     ]
diff --git a/service/models.py b/service/models.py
index 31f977f..8696077 100644
--- a/service/models.py
+++ b/service/models.py
@@ -11,9 +11,7 @@ class ServiceManager(models.Manager):
     def get_notice(self):
         now = timezone.now()
         notices = self.filter(
-            Q(start_at__lte=now),
-            Q(is_active=True),
-            Q(end_at__gt=timezone.now()) | Q(end_at__isnull=True)
+            Q(start_at__lte=now), Q(is_active=True), Q(end_at__gt=timezone.now()) | Q(end_at__isnull=True)
         )
         return notices
 
@@ -47,7 +45,9 @@ class Meta:
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
     group = models.ForeignKey(Group, on_delete=models.SET_NULL, related_name="ServiceGroup", null=True, blank=True)
-    service_type = models.CharField("サービスタイプ", choices=SERVICE_CHOICES, default=SERVICE_COLO_L3_BGP, max_length=255)
+    service_type = models.CharField(
+        "サービスタイプ", choices=SERVICE_CHOICES, default=SERVICE_COLO_L3_BGP, max_length=255
+    )
     service_number = models.IntegerField("サービス番号", default=1)
     service_comment = models.CharField("サービス情報コメント", default="", blank=True, max_length=255)
     is_active = models.BooleanField("有効", default=True)
@@ -68,10 +68,18 @@ class Meta:
 
     @property
     def service_code(self):
-        return "%s-%s%s" % (self.group.id, self.service_type, str(self.service_number).zfill(3),)
+        return "%s-%s%s" % (
+            self.group.id,
+            self.service_type,
+            str(self.service_number).zfill(3),
+        )
 
     def __str__(self):
-        return "%s-%s%s" % (self.group.id, self.service_type, str(self.service_number).zfill(3),)
+        return "%s-%s%s" % (
+            self.group.id,
+            self.service_type,
+            str(self.service_number).zfill(3),
+        )
 
 
 CONNECTION_EIP = "EIP"
@@ -134,14 +142,22 @@ class Meta:
 
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
-    service = models.ForeignKey(Service, on_delete=models.SET_NULL, related_name="ConnectionService", null=True, blank=True)
-    connection_type = models.CharField("接続タイプ", default=CONNECTION_EIP, choices=CONNECTION_TYPE_CHOICES, max_length=255)
+    service = models.ForeignKey(
+        Service, on_delete=models.SET_NULL, related_name="ConnectionService", null=True, blank=True
+    )
+    connection_type = models.CharField(
+        "接続タイプ", default=CONNECTION_EIP, choices=CONNECTION_TYPE_CHOICES, max_length=255
+    )
     connection_number = models.IntegerField("接続番号", default=1)
     connection_comment = models.CharField("接続情報コメント", default="", blank=True, max_length=255)
     is_active = models.BooleanField("有効", default=True)
     is_open = models.BooleanField("開通", default=False)
-    tunnel_ip = models.ForeignKey(TunnelIP, on_delete=models.CASCADE, related_name="ConnectionTunnelIP", max_length=255, null=True, blank=True)
-    hope_location = models.CharField("接続希望場所", default=HOPE_LOCATION_ANYWHERE, choices=HOPE_LOCATION_CHOICES, max_length=255)
+    tunnel_ip = models.ForeignKey(
+        TunnelIP, on_delete=models.CASCADE, related_name="ConnectionTunnelIP", max_length=255, null=True, blank=True
+    )
+    hope_location = models.CharField(
+        "接続希望場所", default=HOPE_LOCATION_ANYWHERE, choices=HOPE_LOCATION_CHOICES, max_length=255
+    )
     term_location = models.CharField("接続終端場所", default="", blank=True, max_length=255)
     ntt_type = models.CharField("NTT接続タイプ", default=NTT_TYPE1, choices=NTT_CHOICES, max_length=255)
     ntt_comment = models.CharField("NTT接続コメント", default="", blank=True, max_length=255)
diff --git a/service/urls.py b/service/urls.py
index 5c7f6a4..3a3bcd0 100644
--- a/service/urls.py
+++ b/service/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path
 
 from . import views
 
diff --git a/service/views.py b/service/views.py
index 2c646dd..d4aa58a 100644
--- a/service/views.py
+++ b/service/views.py
@@ -1,5 +1,5 @@
 from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator, EmptyPage, InvalidPage
+from django.core.paginator import EmptyPage, InvalidPage, Paginator
 from django.db.models import Q
 from django.shortcuts import render
 
@@ -22,7 +22,5 @@ def index(request):
     except (EmptyPage, InvalidPage):
         services = paginator.page(paginator.num_pages)
 
-    context = {
-        "services": services
-    }
+    context = {"services": services}
     return render(request, "service/index.html", context)
diff --git a/ticket/admin.py b/ticket/admin.py
index 66c23d8..4357e43 100644
--- a/ticket/admin.py
+++ b/ticket/admin.py
@@ -8,21 +8,29 @@ class Ticket(admin.ModelAdmin):
     readonly_fields = ["created_at", "updated_at"]
     fieldsets = (
         (None, {"fields": ("created_at", "updated_at", "user", "group")}),
-        ('info', {'fields': ('title', 'body')}),
-        ('Flags', {'fields': ('from_admin', 'is_template', 'is_solved', 'is_approve', 'is_reject')}),
+        ("info", {"fields": ("title", "body")}),
+        ("Flags", {"fields": ("from_admin", "is_template", "is_solved", "is_approve", "is_reject")}),
+    )
+    list_display = (
+        "id",
+        "created_at",
+        "updated_at",
+        "user",
+        "group",
+        "title",
+        "is_solved",
     )
-    list_display = ("id", "created_at", "updated_at", "user", "group", 'title', "is_solved",)
     list_filter = ("is_solved",)
-    search_fields = ('user', 'group', 'from_admin', 'is_solved', 'is_approve', 'is_reject')
+    search_fields = ("user", "group", "from_admin", "is_solved", "is_approve", "is_reject")
 
 
 @admin.register(Chat)
 class Chat(admin.ModelAdmin):
-    readonly_fields = ['created_at']
+    readonly_fields = ["created_at"]
     fieldsets = (
         (None, {"fields": ("created_at", "user", "group", "ticket")}),
-        ('info', {'fields': ('body',)}),
-        ('Flags', {'fields': ('is_admin',)}),
+        ("info", {"fields": ("body",)}),
+        ("Flags", {"fields": ("is_admin",)}),
     )
     list_display = ("id", "created_at", "user", "group", "ticket", "is_admin")
     list_filter = ("group",)
diff --git a/ticket/apps.py b/ticket/apps.py
index fa1d26b..d25449a 100644
--- a/ticket/apps.py
+++ b/ticket/apps.py
@@ -6,4 +6,4 @@ class Ticket(AppConfig):
     verbose_name = "チケット"
 
     def ready(self):
-        from . import signals
+        pass
diff --git a/ticket/consumers.py b/ticket/consumers.py
index 2c64dd0..3535a53 100644
--- a/ticket/consumers.py
+++ b/ticket/consumers.py
@@ -5,10 +5,8 @@
 from channels.generic.websocket import AsyncWebsocketConsumer
 from django.conf import settings
 from django.utils import timezone
-from pytz import timezone
 
-from ticket.models import Chat
-from ticket.models import Ticket
+from ticket.models import Chat, Ticket
 
 
 @sync_to_async()
@@ -83,18 +81,24 @@ async def receive(self, text_data=None, bytes_data=None):
         await self.add_chat(message)
 
         time_format = "%Y/%m/%d %H:%M:%S"
-        time = datetime.datetime.now(tz=datetime.timezone.utc if settings.USE_TZ else None).astimezone(
-            timezone(settings.TIME_ZONE)).strftime(time_format)
-
-        await self.channel_layer.group_send(self.chat_group_name, {
-            "type": "broadcast_message",
-            "time": time,
-            "user_id": self.user.id,
-            "username": self.user.username,
-            "group": self.group,
-            "message": message,
-            "is_admin": False
-        })
+        time = (
+            datetime.datetime.now(tz=datetime.timezone.utc if settings.USE_TZ else None)
+            .astimezone(timezone(settings.TIME_ZONE))
+            .strftime(time_format)
+        )
+
+        await self.channel_layer.group_send(
+            self.chat_group_name,
+            {
+                "type": "broadcast_message",
+                "time": time,
+                "user_id": self.user.id,
+                "username": self.user.username,
+                "group": self.group,
+                "message": message,
+                "is_admin": False,
+            },
+        )
 
     async def broadcast_message(self, event):
         time = event["time"]
@@ -107,11 +111,15 @@ async def broadcast_message(self, event):
             username = ""
             group = 0
 
-        await self.send(text_data=json.dumps({
-            "time": time,
-            "user_id": user_id,
-            "username": username,
-            "group": group,
-            "message": message,
-            "is_admin": is_admin
-        }))
+        await self.send(
+            text_data=json.dumps(
+                {
+                    "time": time,
+                    "user_id": user_id,
+                    "username": username,
+                    "group": group,
+                    "message": message,
+                    "is_admin": is_admin,
+                }
+            )
+        )
diff --git a/ticket/form.py b/ticket/form.py
index caddd5d..b7bc54d 100644
--- a/ticket/form.py
+++ b/ticket/form.py
@@ -3,23 +3,23 @@
 
 class TicketForm(forms.Form):
     ticket_type = forms.fields.ChoiceField(
-        label='チケットの種別(User or Group)を選んでください',
+        label="チケットの種別(User or Group)を選んでください",
         required=True,
     )
     title = forms.CharField(label="タイトル", max_length=250, required=True)
-    body = forms.CharField(label="内容", widget=forms.Textarea(attrs={'cols': '80', 'rows': '10'}), required=True)
+    body = forms.CharField(label="内容", widget=forms.Textarea(attrs={"cols": "80", "rows": "10"}), required=True)
 
     def __init__(self, groups, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in self.fields.values():
-            field.widget.attrs['class'] = 'form-control'
-            field.widget.attrs['placeholder'] = field.label
+            field.widget.attrs["class"] = "form-control"
+            field.widget.attrs["placeholder"] = field.label
 
-        ticket_type_template = [('user', 'ユーザチケット')]
+        ticket_type_template = [("user", "ユーザチケット")]
         if groups.exists():
             for group in groups:
                 ticket_type_template.append(
-                    (str(group.id), 'グループチケット (Group' + str(group.id) + ': ' + group.name + ')')
+                    (str(group.id), "グループチケット (Group" + str(group.id) + ": " + group.name + ")")
                 )
-        self.fields['ticket_type'].choices = ticket_type_template
+        self.fields["ticket_type"].choices = ticket_type_template
diff --git a/ticket/migrations/0001_initial.py b/ticket/migrations/0001_initial.py
index 7ec2cf2..0f7cea6 100644
--- a/ticket/migrations/0001_initial.py
+++ b/ticket/migrations/0001_initial.py
@@ -1,56 +1,66 @@
 # Generated by Django 4.2.7 on 2023-11-26 12:06
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
+
 import dsbd.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('custom_auth', '0001_initial'),
+        ("custom_auth", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Ticket',
+            name="Ticket",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='作成日')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新日')),
-                ('title', models.CharField(max_length=250, verbose_name='title')),
-                ('body', dsbd.models.MediumTextField(blank=True, default='', verbose_name='内容')),
-                ('is_template', models.BooleanField(default=False, verbose_name='templateチケット')),
-                ('is_solved', models.BooleanField(default=False, verbose_name='解決済み')),
-                ('is_approve', models.BooleanField(default=False, verbose_name='承認済み')),
-                ('is_reject', models.BooleanField(default=False, verbose_name='拒否済み')),
-                ('from_admin', models.BooleanField(default=False, verbose_name='運営委員から起票')),
-                ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='custom_auth.group')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(auto_now_add=True, db_index=True, verbose_name="作成日")),
+                ("updated_at", models.DateTimeField(auto_now=True, verbose_name="更新日")),
+                ("title", models.CharField(max_length=250, verbose_name="title")),
+                ("body", dsbd.models.MediumTextField(blank=True, default="", verbose_name="内容")),
+                ("is_template", models.BooleanField(default=False, verbose_name="templateチケット")),
+                ("is_solved", models.BooleanField(default=False, verbose_name="解決済み")),
+                ("is_approve", models.BooleanField(default=False, verbose_name="承認済み")),
+                ("is_reject", models.BooleanField(default=False, verbose_name="拒否済み")),
+                ("from_admin", models.BooleanField(default=False, verbose_name="運営委員から起票")),
+                (
+                    "group",
+                    models.ForeignKey(
+                        blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to="custom_auth.group"
+                    ),
+                ),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'チケット',
-                'verbose_name_plural': 'チケット',
+                "verbose_name": "チケット",
+                "verbose_name_plural": "チケット",
             },
         ),
         migrations.CreateModel(
-            name='Chat',
+            name="Chat",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='作成日')),
-                ('body', dsbd.models.MediumTextField(blank=True, default='', verbose_name='内容')),
-                ('is_admin', models.BooleanField(default=False, verbose_name='運営委員がコメント')),
-                ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='custom_auth.group')),
-                ('ticket', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ticket.ticket')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(auto_now_add=True, db_index=True, verbose_name="作成日")),
+                ("body", dsbd.models.MediumTextField(blank=True, default="", verbose_name="内容")),
+                ("is_admin", models.BooleanField(default=False, verbose_name="運営委員がコメント")),
+                (
+                    "group",
+                    models.ForeignKey(
+                        blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to="custom_auth.group"
+                    ),
+                ),
+                ("ticket", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="ticket.ticket")),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'チャット',
-                'verbose_name_plural': 'チャット',
+                "verbose_name": "チャット",
+                "verbose_name_plural": "チャット",
             },
         ),
     ]
diff --git a/ticket/models.py b/ticket/models.py
index a610068..0bb4b6b 100644
--- a/ticket/models.py
+++ b/ticket/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.db.models import Q
 
-from custom_auth.models import User, Group
+from custom_auth.models import Group, User
 from dsbd.models import MediumTextField
 
 
@@ -15,7 +15,7 @@ def get_ticket(self, user, is_solved=True):
                 q_group_user.add(Q(group=group), Q.OR)
         q &= Q(q_group_user)
         print(q)
-        return self.filter(q).order_by('is_solved', 'id')
+        return self.filter(q).order_by("is_solved", "id")
 
     def get_one_ticket(self, ticket_id, user):
         q = Q()
@@ -46,19 +46,14 @@ class Ticket(models.Model):
     objects = TicketManager()
 
     class Meta:
-        verbose_name = 'チケット'
+        verbose_name = "チケット"
         verbose_name_plural = "チケット"
 
     def __str__(self):
         group_name = "none"
         if self.group:
             group_name = self.group.name
-        return "%d[%s:%s]: %s" % (
-            self.id,
-            self.user.username,
-            group_name,
-            self.title
-        )
+        return "%d[%s:%s]: %s" % (self.id, self.user.username, group_name, self.title)
 
 
 class Chat(models.Model):
@@ -70,7 +65,7 @@ class Chat(models.Model):
     is_admin = models.BooleanField("運営委員がコメント", default=False)
 
     class Meta:
-        verbose_name = 'チャット'
+        verbose_name = "チャット"
         verbose_name_plural = "チャット"
 
     def __str__(self):
diff --git a/ticket/routing.py b/ticket/routing.py
index 2905653..79b5552 100644
--- a/ticket/routing.py
+++ b/ticket/routing.py
@@ -1,6 +1,7 @@
 from django.urls import path
+
 from . import consumers
 
 urlpatterns = [
-    path('ws/ticket/<int:ticket_id>/chat', consumers.ChatConsumer.as_asgi()),
+    path("ws/ticket/<int:ticket_id>/chat", consumers.ChatConsumer.as_asgi()),
 ]
diff --git a/ticket/signals.py b/ticket/signals.py
index 0ae9789..ef9c879 100644
--- a/ticket/signals.py
+++ b/ticket/signals.py
@@ -2,7 +2,7 @@
 from django.dispatch import receiver
 
 from dsbd.notify import notify_db_save
-from ticket.models import Ticket, Chat
+from ticket.models import Chat, Ticket
 
 
 @receiver(pre_save, sender=Ticket)
@@ -30,48 +30,59 @@ def delete_ticket(sender, instance, **kwargs):
 
 
 def get_create_ticket(short, instance):
-    text = '--%d[%s]--\nUser: %s| Group: %s\n' % (instance.id, instance.title, instance.user, instance.group)
-    return text if not short else text + 'title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n' % (
-        instance.title, instance.body, solved_to_str(instance.is_solved), approve_to_str(instance.is_approve),
-        reject_to_str(instance.is_reject), from_admin_to_str(instance.from_admin))
+    text = "--%d[%s]--\nUser: %s| Group: %s\n" % (instance.id, instance.title, instance.user, instance.group)
+    return (
+        text
+        if not short
+        else text
+        + "title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n"
+        % (
+            instance.title,
+            instance.body,
+            solved_to_str(instance.is_solved),
+            approve_to_str(instance.is_approve),
+            reject_to_str(instance.is_reject),
+            from_admin_to_str(instance.from_admin),
+        )
+    )
 
 
 def get_update_ticket(before, after):
-    text = '%s----更新状況----\n' % (get_create_ticket(True, before),)
+    text = "%s----更新状況----\n" % (get_create_ticket(True, before),)
     if before.user != after.user:
-        text += 'user: %s => %s\n' % (before.user, after.user)
+        text += "user: %s => %s\n" % (before.user, after.user)
     if before.group != after.group:
-        text += 'group: %s => %s\n' % (before.group, after.group)
+        text += "group: %s => %s\n" % (before.group, after.group)
     if before.title != after.title:
-        text += 'title: %s => %s\n' % (before.title, after.title)
+        text += "title: %s => %s\n" % (before.title, after.title)
     if before.body != after.body:
-        text += 'body: %s => %s\n' % (before.body, after.body)
+        text += "body: %s => %s\n" % (before.body, after.body)
     if before.is_solved != after.is_solved:
-        text += '解決済み: %s => %s\n' % (solved_to_str(before.is_solved), solved_to_str(after.is_solved))
+        text += "解決済み: %s => %s\n" % (solved_to_str(before.is_solved), solved_to_str(after.is_solved))
     if before.is_approve != after.is_approve:
-        text += '承認済み: %s => %s\n' % (approve_to_str(before.is_approve), approve_to_str(after.is_approve))
+        text += "承認済み: %s => %s\n" % (approve_to_str(before.is_approve), approve_to_str(after.is_approve))
     if before.is_reject != after.is_reject:
-        text += '拒否済み: %s => %s\n' % (reject_to_str(before.is_reject), reject_to_str(after.is_reject))
+        text += "拒否済み: %s => %s\n" % (reject_to_str(before.is_reject), reject_to_str(after.is_reject))
     if before.from_admin != after.from_admin:
-        text += '運営委員から起票: %s => %s\n' % (from_admin_to_str(before.from_admin), reject_to_str(after.from_admin))
-    text += '------------\n'
+        text += "運営委員から起票: %s => %s\n" % (from_admin_to_str(before.from_admin), reject_to_str(after.from_admin))
+    text += "------------\n"
     return text
 
 
 def solved_to_str(is_solved):
-    return '解決済み' if is_solved else '未解決'
+    return "解決済み" if is_solved else "未解決"
 
 
 def approve_to_str(is_approve):
-    return '承認' if is_approve else '未承認'
+    return "承認" if is_approve else "未承認"
 
 
 def reject_to_str(is_reject):
-    return '拒否済み' if is_reject else 'not 拒否'
+    return "拒否済み" if is_reject else "not 拒否"
 
 
 def from_admin_to_str(from_admin):
-    return '運営委員から起票' if from_admin else 'not 運営委員から起票'
+    return "運営委員から起票" if from_admin else "not 運営委員から起票"
 
 
 @receiver(pre_save, sender=Chat)
@@ -99,29 +110,33 @@ def delete_chat(sender, instance, **kwargs):
 
 
 def get_create_chat(short, instance):
-    text = '--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n' % (
-        instance.id, 'ユーザ投稿' if instance.is_admin else '管理者投稿', instance.user, instance.group,
-        instance.ticket)
-    return text if not short else text + 'body: %s\n' % (instance.body,)
+    text = "--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n" % (
+        instance.id,
+        "ユーザ投稿" if instance.is_admin else "管理者投稿",
+        instance.user,
+        instance.group,
+        instance.ticket,
+    )
+    return text if not short else text + "body: %s\n" % (instance.body,)
 
 
 def get_update_chat(before, after):
-    text = '%s----更新状況----\n' % (get_create_chat(True, before),)
+    text = "%s----更新状況----\n" % (get_create_chat(True, before),)
     if before.user != after.user:
-        text += 'user: %s => %s\n' % (before.user, after.user)
+        text += "user: %s => %s\n" % (before.user, after.user)
     if before.group != after.group:
-        text += 'group: %s => %s\n' % (before.group, after.group)
+        text += "group: %s => %s\n" % (before.group, after.group)
     if before.body != after.body:
-        text += 'body: %s => %s\n' % (before.body, after.body)
+        text += "body: %s => %s\n" % (before.body, after.body)
     if before.is_admin != after.is_admin:
-        text += '運営委員回答: %s => %s\n' % (admin_to_str(before.is_admin), admin_to_str(after.is_admin))
-    text += '------------\n'
+        text += "運営委員回答: %s => %s\n" % (admin_to_str(before.is_admin), admin_to_str(after.is_admin))
+    text += "------------\n"
     return text
 
 
 def admin_to_str(is_admin):
-    return '運営委員回答' if is_admin else 'not 運営委員回答'
+    return "運営委員回答" if is_admin else "not 運営委員回答"
 
 
 def active_to_str(is_admin):
-    return '有効' if is_admin else '無効'
+    return "有効" if is_admin else "無効"
diff --git a/ticket/urls.py b/ticket/urls.py
index d38a218..ea7e1ec 100644
--- a/ticket/urls.py
+++ b/ticket/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path
 
 from . import views
 
@@ -6,6 +6,5 @@
 urlpatterns = [
     path("", views.index, name="index"),
     path("add", views.ticket_add, name="add"),
-    path('<int:ticket_id>/chat/', views.chat, name='chat'),
-
+    path("<int:ticket_id>/chat/", views.chat, name="chat"),
 ]
diff --git a/ticket/views.py b/ticket/views.py
index 220e8d9..d2d4e14 100644
--- a/ticket/views.py
+++ b/ticket/views.py
@@ -1,6 +1,6 @@
 from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.shortcuts import render, redirect
+from django.core.paginator import EmptyPage, InvalidPage, Paginator
+from django.shortcuts import redirect, render
 
 from custom_auth.models import Group
 from ticket.form import TicketForm
@@ -9,8 +9,8 @@
 
 @login_required
 def index(request):
-    if request.method == 'POST':
-        id = request.POST.get('id', 0)
+    if request.method == "POST":
+        id = request.POST.get("id", 0)
         if "no_solved" in request.POST:
             ticket = Ticket.objects.get_one_ticket(int(id), request.user)
             ticket.is_solved = False
@@ -19,9 +19,9 @@ def index(request):
             ticket = Ticket.objects.get_one_ticket(int(id), request.user)
             ticket.is_solved = True
             ticket.save()
-        return redirect('/ticket')
+        return redirect("/ticket")
 
-    is_solved = request.GET.get('is_solved', "false")
+    is_solved = request.GET.get("is_solved", "false")
     ticket_objects = Ticket.objects.get_ticket(user=request.user, is_solved=True if is_solved == "true" else False)
 
     paginator = Paginator(ticket_objects, int(request.GET.get("per_page", "5")))
@@ -42,25 +42,27 @@ def ticket_add(request):
     groups = request.user.groups.filter(status=1)
     form = TicketForm(groups, request.POST)
 
-    context = {'form': form, }
-    if request.method == 'POST':
+    context = {
+        "form": form,
+    }
+    if request.method == "POST":
         if form.is_valid():
             group = None
-            ticket_type = form.cleaned_data.get('ticket_type')
-            if ticket_type != 'user':
+            ticket_type = form.cleaned_data.get("ticket_type")
+            if ticket_type != "user":
                 # この場合はgroup
                 if groups.exists() & groups.filter(id=int(ticket_type)).exists():
                     group = Group.objects.filter(id=int(ticket_type)).first()
                 else:
-                    context['error'] = "グループが存在しません"
+                    context["error"] = "グループが存在しません"
                     return render(request, "ticket/add.html", context)
             Ticket.objects.create(
                 group=group,
                 user=request.user,
-                title=form.cleaned_data.get('title'),
-                body=form.cleaned_data.get('body'),
+                title=form.cleaned_data.get("title"),
+                body=form.cleaned_data.get("body"),
             ).save()
-            return redirect('/ticket')
+            return redirect("/ticket")
 
     return render(request, "ticket/add.html", context)
 
@@ -69,16 +71,16 @@ def ticket_add(request):
 def chat(request, ticket_id):
     ticket = Ticket.objects.get_one_ticket(ticket_id, request.user)
 
-    if request.method == 'POST':
+    if request.method == "POST":
         if "no_solved" in request.POST:
             ticket.is_solved = False
             ticket.save()
         elif "solved" in request.POST:
             ticket.is_solved = True
             ticket.save()
-        return redirect('/ticket/' + str(ticket_id) + '/chat')
+        return redirect("/ticket/" + str(ticket_id) + "/chat")
 
     if not ticket:
         return render(request, "ticket/chat_error.html", {})
-    context = {"ticket": ticket, "chats": ticket.chat_set.order_by('created_at').all()}
+    context = {"ticket": ticket, "chats": ticket.chat_set.order_by("created_at").all()}
     return render(request, "ticket/chat.html", context)
diff --git a/web/.eslintrc.cjs b/web/.eslintrc.cjs
index d6c9537..198aa75 100644
--- a/web/.eslintrc.cjs
+++ b/web/.eslintrc.cjs
@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  env: { browser: true, es2020: true },
+  env: {browser: true, es2020: true},
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
@@ -12,7 +12,7 @@ module.exports = {
   rules: {
     'react-refresh/only-export-components': [
       'warn',
-      { allowConstantExport: true },
+      {allowConstantExport: true},
     ],
   },
 }
diff --git a/web/README.md b/web/README.md
index 0d6babe..81a9ecf 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,15 +1,19 @@
 # React + TypeScript + Vite
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+This template provides a minimal setup to get React working in Vite with HMR and some
+ESLint rules.
 
 Currently, two official plugins are available:
 
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md)
+  uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc)
+  uses [SWC](https://swc.rs/) for Fast Refresh
 
 ## Expanding the ESLint configuration
 
-If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+If you are developing a production application, we recommend updating the configuration
+to enable type aware lint rules:
 
 - Configure the top-level `parserOptions` property like this:
 
@@ -25,6 +29,9 @@ export default {
 }
 ```
 
-- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
+- Replace `plugin:@typescript-eslint/recommended` to
+  `plugin:@typescript-eslint/recommended-type-checked` or
+  `plugin:@typescript-eslint/strict-type-checked`
 - Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
-- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and
+  add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
diff --git a/web/public/vite.svg b/web/public/vite.svg
index e7b8dfb..068d55d 100644
--- a/web/public/vite.svg
+++ b/web/public/vite.svg
@@ -1 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88"
+     height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257">
+    <defs>
+        <linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%"
+                        y1="7.652%" y2="78.411%">
+            <stop offset="0%" stop-color="#41D1FF"></stop>
+            <stop offset="100%" stop-color="#BD34FE"></stop>
+        </linearGradient>
+        <linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%"
+                        y1="2.242%" y2="89.03%">
+            <stop offset="0%" stop-color="#FFEA83"></stop>
+            <stop offset="8.333%" stop-color="#FFDD35"></stop>
+            <stop offset="100%" stop-color="#FFA800"></stop>
+        </linearGradient>
+    </defs>
+    <path fill="url(#IconifyId1813088fe1fbc01fb466)"
+          d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path>
+    <path fill="url(#IconifyId1813088fe1fbc01fb467)"
+          d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path>
+</svg>
\ No newline at end of file
diff --git a/web/src/add_connection/App.css b/web/src/add_connection/App.css
index b9d355d..63d28e6 100644
--- a/web/src/add_connection/App.css
+++ b/web/src/add_connection/App.css
@@ -1,42 +1,44 @@
 #root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
+    max-width: 1280px;
+    margin: 0 auto;
+    padding: 2rem;
+    text-align: center;
 }
 
 .logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
+    height: 6em;
+    padding: 1.5em;
+    will-change: filter;
+    transition: filter 300ms;
 }
+
 .logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
+    filter: drop-shadow(0 0 2em #646cffaa);
 }
+
 .logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
+    filter: drop-shadow(0 0 2em #61dafbaa);
 }
 
 @keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
 }
 
 @media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
+    a:nth-of-type(2) .logo {
+        animation: logo-spin infinite 20s linear;
+    }
 }
 
 .card {
-  padding: 2em;
+    padding: 2em;
 }
 
 .read-the-docs {
-  color: #888;
+    color: #888;
 }
diff --git a/web/src/add_connection/App.tsx b/web/src/add_connection/App.tsx
index 7238237..8153970 100644
--- a/web/src/add_connection/App.tsx
+++ b/web/src/add_connection/App.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import {useState} from 'react'
 import reactLogo from '../assets/react.svg'
 import './App.css'
 
@@ -11,7 +11,7 @@ function App() {
         <a href="https://vitejs.dev" target="_blank">
         </a>
         <a href="https://react.dev" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo" />
+          <img src={reactLogo} className="logo react" alt="React logo"/>
         </a>
       </div>
       <h1>Vite + React</h1>
diff --git a/web/src/add_connection/index.css b/web/src/add_connection/index.css
index 6119ad9..588f7ae 100644
--- a/web/src/add_connection/index.css
+++ b/web/src/add_connection/index.css
@@ -1,68 +1,73 @@
 :root {
-  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
+    font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+    line-height: 1.5;
+    font-weight: 400;
 
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+    color-scheme: light dark;
+    color: rgba(255, 255, 255, 0.87);
+    background-color: #242424;
 
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    font-synthesis: none;
+    text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
+    font-weight: 500;
+    color: #646cff;
+    text-decoration: inherit;
 }
+
 a:hover {
-  color: #535bf2;
+    color: #535bf2;
 }
 
 body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
+    margin: 0;
+    display: flex;
+    place-items: center;
+    min-width: 320px;
+    min-height: 100vh;
 }
 
 h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
+    font-size: 3.2em;
+    line-height: 1.1;
 }
 
 button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
+    border-radius: 8px;
+    border: 1px solid transparent;
+    padding: 0.6em 1.2em;
+    font-size: 1em;
+    font-weight: 500;
+    font-family: inherit;
+    background-color: #1a1a1a;
+    cursor: pointer;
+    transition: border-color 0.25s;
 }
+
 button:hover {
-  border-color: #646cff;
+    border-color: #646cff;
 }
+
 button:focus,
 button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
+    outline: 4px auto -webkit-focus-ring-color;
 }
 
 @media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
+    :root {
+        color: #213547;
+        background-color: #ffffff;
+    }
+
+    a:hover {
+        color: #747bff;
+    }
+
+    button {
+        background-color: #f9f9f9;
+    }
 }
diff --git a/web/src/add_connection/index.html b/web/src/add_connection/index.html
index 709a7ca..b833989 100644
--- a/web/src/add_connection/index.html
+++ b/web/src/add_connection/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="main.tsx"></script>
-  </body>
+<head>
+  <meta charset="UTF-8"/>
+  <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <title>Vite + React + TS</title>
+</head>
+<body>
+<div id="root"></div>
+<script type="module" src="main.tsx"></script>
+</body>
 </html>
diff --git a/web/src/add_connection/main.tsx b/web/src/add_connection/main.tsx
index 3d7150d..d704bf5 100644
--- a/web/src/add_connection/main.tsx
+++ b/web/src/add_connection/main.tsx
@@ -5,6 +5,6 @@ import './index.css'
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <App />
+    <App/>
   </React.StrictMode>,
 )
diff --git a/web/src/add_service/App.css b/web/src/add_service/App.css
index b9d355d..63d28e6 100644
--- a/web/src/add_service/App.css
+++ b/web/src/add_service/App.css
@@ -1,42 +1,44 @@
 #root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
+    max-width: 1280px;
+    margin: 0 auto;
+    padding: 2rem;
+    text-align: center;
 }
 
 .logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
+    height: 6em;
+    padding: 1.5em;
+    will-change: filter;
+    transition: filter 300ms;
 }
+
 .logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
+    filter: drop-shadow(0 0 2em #646cffaa);
 }
+
 .logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
+    filter: drop-shadow(0 0 2em #61dafbaa);
 }
 
 @keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
 }
 
 @media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
+    a:nth-of-type(2) .logo {
+        animation: logo-spin infinite 20s linear;
+    }
 }
 
 .card {
-  padding: 2em;
+    padding: 2em;
 }
 
 .read-the-docs {
-  color: #888;
+    color: #888;
 }
diff --git a/web/src/add_service/App.tsx b/web/src/add_service/App.tsx
index 7238237..8153970 100644
--- a/web/src/add_service/App.tsx
+++ b/web/src/add_service/App.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import {useState} from 'react'
 import reactLogo from '../assets/react.svg'
 import './App.css'
 
@@ -11,7 +11,7 @@ function App() {
         <a href="https://vitejs.dev" target="_blank">
         </a>
         <a href="https://react.dev" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo" />
+          <img src={reactLogo} className="logo react" alt="React logo"/>
         </a>
       </div>
       <h1>Vite + React</h1>
diff --git a/web/src/add_service/index.css b/web/src/add_service/index.css
index 6119ad9..588f7ae 100644
--- a/web/src/add_service/index.css
+++ b/web/src/add_service/index.css
@@ -1,68 +1,73 @@
 :root {
-  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
+    font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+    line-height: 1.5;
+    font-weight: 400;
 
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+    color-scheme: light dark;
+    color: rgba(255, 255, 255, 0.87);
+    background-color: #242424;
 
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    font-synthesis: none;
+    text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
+    font-weight: 500;
+    color: #646cff;
+    text-decoration: inherit;
 }
+
 a:hover {
-  color: #535bf2;
+    color: #535bf2;
 }
 
 body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
+    margin: 0;
+    display: flex;
+    place-items: center;
+    min-width: 320px;
+    min-height: 100vh;
 }
 
 h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
+    font-size: 3.2em;
+    line-height: 1.1;
 }
 
 button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
+    border-radius: 8px;
+    border: 1px solid transparent;
+    padding: 0.6em 1.2em;
+    font-size: 1em;
+    font-weight: 500;
+    font-family: inherit;
+    background-color: #1a1a1a;
+    cursor: pointer;
+    transition: border-color 0.25s;
 }
+
 button:hover {
-  border-color: #646cff;
+    border-color: #646cff;
 }
+
 button:focus,
 button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
+    outline: 4px auto -webkit-focus-ring-color;
 }
 
 @media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
+    :root {
+        color: #213547;
+        background-color: #ffffff;
+    }
+
+    a:hover {
+        color: #747bff;
+    }
+
+    button {
+        background-color: #f9f9f9;
+    }
 }
diff --git a/web/src/add_service/index.html b/web/src/add_service/index.html
index 709a7ca..b833989 100644
--- a/web/src/add_service/index.html
+++ b/web/src/add_service/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="main.tsx"></script>
-  </body>
+<head>
+  <meta charset="UTF-8"/>
+  <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <title>Vite + React + TS</title>
+</head>
+<body>
+<div id="root"></div>
+<script type="module" src="main.tsx"></script>
+</body>
 </html>
diff --git a/web/src/add_service/main.tsx b/web/src/add_service/main.tsx
index 3d7150d..d704bf5 100644
--- a/web/src/add_service/main.tsx
+++ b/web/src/add_service/main.tsx
@@ -5,6 +5,6 @@ import './index.css'
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <App />
+    <App/>
   </React.StrictMode>,
 )
diff --git a/web/src/assets/react.svg b/web/src/assets/react.svg
index 6c87de9..ac731cc 100644
--- a/web/src/assets/react.svg
+++ b/web/src/assets/react.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93"
+     height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228">
+    <path fill="#00D8FF"
+          d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path>
+</svg>
\ No newline at end of file
diff --git a/web/tsconfig.json b/web/tsconfig.json
index a7fc6fb..9a5b64e 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -2,10 +2,13 @@
   "compilerOptions": {
     "target": "ES2020",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": [
+      "ES2020",
+      "DOM",
+      "DOM.Iterable"
+    ],
     "module": "ESNext",
     "skipLibCheck": true,
-
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
@@ -13,13 +16,18 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-
     /* Linting */
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
 }
diff --git a/web/tsconfig.node.json b/web/tsconfig.node.json
index 42872c5..b5a3431 100644
--- a/web/tsconfig.node.json
+++ b/web/tsconfig.node.json
@@ -6,5 +6,7 @@
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true
   },
-  "include": ["vite.config.ts"]
+  "include": [
+    "vite.config.ts"
+  ]
 }

From b7ac2b416fe6792a5853a1907e67d76bd9e34fa4 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sat, 7 Sep 2024 22:49:31 +0900
Subject: [PATCH 03/36] =?UTF-8?q?#43=20=E3=82=B5=E3=82=A4=E3=83=89?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AA=BF=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/templates/navbar2.html       | 27 +++++++++++++--------------
 dsbd/templates/service/index.html |  4 ----
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/dsbd/templates/navbar2.html b/dsbd/templates/navbar2.html
index 057c418..9c2c9a6 100644
--- a/dsbd/templates/navbar2.html
+++ b/dsbd/templates/navbar2.html
@@ -87,15 +87,14 @@
         </a>
       </li>
       <li class="nav-item">
-        <a href="{% url 'custom_auth_group:index' %}"
-           class="nav-link text-white" aria-current="page">
+        <a href="{% url 'custom_auth_group:index' %}" class="nav-link text-white">
           <svg class="bi me-2" width="16" height="16">
             <use xlink:href="#group"></use>
           </svg>
           Groups
         </a>
       </li>
-      <li>
+      <li class="nav-item">
         <a href="{% url 'service:index' %}" class="nav-link text-white">
           <svg class="bi me-2" width="16" height="16">
             <use xlink:href="#grid"></use>
@@ -111,7 +110,7 @@
       {#                    Customers#}
       {#                </a>#}
       {#            </li>#}
-      <li>
+      <li class="nav-item">
         <a href="{% url 'ticket:index' %}" class="nav-link text-white"
            aria-current="page">
           <svg class="bi me-2" width="16" height="16">
@@ -120,8 +119,8 @@
           Ticket
         </a>
       </li>
-      <li class="mb-1">
-        <button class="btn text-white align-items-center rounded collapsed"
+      <li class="nav-item">
+        <button class="btn text-white nav-link rounded collapsed"
                 data-bs-toggle="collapse"
                 data-bs-target="#dashboard1-collapse" aria-expanded="false">
           <svg class="bi me-2" width="16" height="16">
@@ -135,7 +134,7 @@
               <a href="#" class="nav-link text-white">
                 <svg class="bi me-2 submenu-logo" width="14"
                      height="14">
-                  <use xlink:href="#email"/>
+                  <use xlink:href="#email"></use>
                 </svg>
                 Overview
               </a>
@@ -144,7 +143,7 @@
               <a href="#" class="nav-link text-white">
                 <svg class="bi me-2 submenu-logo" width="14"
                      height="14">
-                  <use xlink:href="#people-circle"/>
+                  <use xlink:href="#people-circle"></use>
                 </svg>
                 Overview2
               </a>
@@ -153,7 +152,7 @@
               <a href="#" class="nav-link text-white">
                 <svg class="bi me-2 submenu-logo" width="14"
                      height="14">
-                  <use xlink:href="#people-circle"/>
+                  <use xlink:href="#people-circle"></use>
                 </svg>
                 Overview3
               </a>
@@ -162,7 +161,7 @@
               <a href="#" class="nav-link text-white">
                 <svg class="bi me-2 submenu-logo" width="14"
                      height="14">
-                  <use xlink:href="#people-circle"/>
+                  <use xlink:href="#people-circle"></use>
                 </svg>
                 Overview4
               </a>
@@ -177,7 +176,7 @@
                   data-bs-toggle="collapse"
                   data-bs-target="#admin-collapse" aria-expanded="false">
             <svg class="bi me-2" width="16" height="16">
-              <use xlink:href="#administrator"/>
+              <use xlink:href="#administrator"></use>
             </svg>
             Admin Page
           </button>
@@ -187,7 +186,7 @@
                 <a href="{% url 'custom_admin:index' %}"
                    class="nav-link text-white">
                   <svg class="bi me-2" width="16" height="16">
-                    <use xlink:href="#setting"/>
+                    <use xlink:href="#setting"></use>
                   </svg>
                   CustomPage
                 </a>
@@ -196,7 +195,7 @@
                 <a href="{% url 'admin:index' %}"
                    class="nav-link text-white">
                   <svg class="bi me-2" width="16" height="16">
-                    <use xlink:href="#database"/>
+                    <use xlink:href="#database"></use>
                   </svg>
                   Admin(DB)
                 </a>
@@ -209,7 +208,7 @@
         <a href="{% url 'feedback' %}" class="btn text-white"
            aria-expanded="false">
           <svg class="bi me-2" width="16" height="16">
-            <use xlink:href="#bug"/>
+            <use xlink:href="#bug"></use>
           </svg>
           Feedback
         </a>
diff --git a/dsbd/templates/service/index.html b/dsbd/templates/service/index.html
index ec4a054..0dfb348 100644
--- a/dsbd/templates/service/index.html
+++ b/dsbd/templates/service/index.html
@@ -31,10 +31,6 @@
           white-space: pre-wrap;
       / / color: #000000;
       }
-
-      button {
-          margin-left: 10px;
-      }
   </style>
 {% endblock %}
 

From c07319d6f4c6a0ff2245f4350c380b3d5c5a4886 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 00:40:20 +0900
Subject: [PATCH 04/36] =?UTF-8?q?#43=20=E6=8E=B2=E8=BC=89=E7=B5=82?=
 =?UTF-8?q?=E4=BA=86=E3=81=AE=E9=80=9A=E7=9F=A5=E6=83=85=E5=A0=B1=E3=82=92?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=82=B9=E3=82=AF=E3=83=AA?=
 =?UTF-8?q?=E3=83=97=E3=83=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/management/commands/db_auto_remove.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 dsbd/management/commands/db_auto_remove.py

diff --git a/dsbd/management/commands/db_auto_remove.py b/dsbd/management/commands/db_auto_remove.py
new file mode 100644
index 0000000..5e942a9
--- /dev/null
+++ b/dsbd/management/commands/db_auto_remove.py
@@ -0,0 +1,12 @@
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+
+from notice.models import Notice
+
+
+class Command(BaseCommand):
+    def handle(self, *args, **options):
+        print("batch process for db_auto_remove")
+        now = timezone.now()
+        # 掲載終了の通知情報を削除
+        Notice.objects.filter(end_at__lt=now).delete()

From 18816f1a97484bc9732b1a87650f1ab25de5dc40 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 01:31:15 +0900
Subject: [PATCH 05/36] =?UTF-8?q?#43=20django=20signals=E3=81=8C=E5=AE=9F?=
 =?UTF-8?q?=E8=A1=8C=E5=87=BA=E6=9D=A5=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/apps.py | 2 +-
 ticket/apps.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom_auth/apps.py b/custom_auth/apps.py
index 94d8af9..78e23ed 100644
--- a/custom_auth/apps.py
+++ b/custom_auth/apps.py
@@ -7,4 +7,4 @@ class CustomAuth(AppConfig):
     verbose_name = "カスタムユーザ"
 
     def ready(self):
-        pass
+        from . import signals  # noqa
diff --git a/ticket/apps.py b/ticket/apps.py
index d25449a..e5fd237 100644
--- a/ticket/apps.py
+++ b/ticket/apps.py
@@ -6,4 +6,4 @@ class Ticket(AppConfig):
     verbose_name = "チケット"
 
     def ready(self):
-        pass
+        from . import signals  # noqa

From f8340bf4e1ba966625e6b9afb0ce7730769687a2 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 01:39:02 +0900
Subject: [PATCH 06/36] =?UTF-8?q?#43=20README=E3=81=AE=E6=9B=B4=E6=96=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a383b42..ee052c3 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,20 @@
 # dsbd
 
-Home NOC Dashboard
+HomeNOC Dashboard
 
 [![Publish Docker image(dev)](https://github.com/homenoc/dsbd/actions/workflows/build-dev.yaml/badge.svg)](https://github.com/homenoc/dsbd/actions/workflows/build-dev.yaml)
 [![Publish Docker image(prod)](https://github.com/homenoc/dsbd/actions/workflows/build-prod.yaml/badge.svg)](https://github.com/homenoc/dsbd/actions/workflows/build-prod.yaml)
 
-### develop environment
+### develop environment install
 
 ```
-mkdir venv
-python3 -m venv venv
-source venv/bin/activate
-pip install -r requirements.txt
+pipenv install --dev
 ```
 
 ### run server
 
 ```
-python3 manage.py runserver --settings=dsbd.settings
+pipenv run python3 manage.py runserver --settings=dsbd.settings
 ```
 
 ## make migration

From 8e39145ee48cfaed705d7fdbd58024b452117e56 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 01:39:21 +0900
Subject: [PATCH 07/36] =?UTF-8?q?#43=20idea=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=81=AE=E6=9B=B4=E6=96=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e9a235c..79fc1cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Pipenv (dsbd)" />
+  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Pipenv (dsbd)" project-jdk-type="Python SDK" />
-</project>
+</project>
\ No newline at end of file

From 6534b172e2abc679621c47a90f28c1bbfd1a5470 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 01:40:19 +0900
Subject: [PATCH 08/36] =?UTF-8?q?#43=20=E3=82=B0=E3=83=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=97=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E6=83=85=E5=A0=B1?=
 =?UTF-8?q?=E3=82=92=E3=83=88=E3=83=83=E3=83=97=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=AA=E3=81=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0005_alter_group_status.py     |  18 ++++
 custom_auth/models.py                         |   2 +-
 custom_auth/signals.py                        |  61 +++--------
 custom_auth/tool.py                           |  42 ++++++++
 dsbd/templates/home.html                      |  40 ++++---
 dsbd/views.py                                 |   3 +
 ticket/signals.py                             | 102 ++----------------
 ticket/tool.py                                |  85 +++++++++++++++
 8 files changed, 194 insertions(+), 159 deletions(-)
 create mode 100644 custom_auth/migrations/0005_alter_group_status.py
 create mode 100644 ticket/tool.py

diff --git a/custom_auth/migrations/0005_alter_group_status.py b/custom_auth/migrations/0005_alter_group_status.py
new file mode 100644
index 0000000..e3ff3af
--- /dev/null
+++ b/custom_auth/migrations/0005_alter_group_status.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-08 15:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0004_group_users_alter_user_groups'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group',
+            name='status',
+            field=models.IntegerField(choices=[(1, '有効'), (10, 'ユーザより廃止'), (11, '運営委員より廃止'), (12, '審査落ち')], default=1, verbose_name='ステータス'),
+        ),
+    ]
diff --git a/custom_auth/models.py b/custom_auth/models.py
index e99803b..124bfbf 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -80,7 +80,7 @@ class Group(models.Model):  # noqa: F811
     name = models.CharField("name", max_length=150, unique=True)
     name_jp = models.CharField("name(japanese)", max_length=150, unique=True)
     comment = models.CharField("comment", max_length=250, default="", blank=True)
-    status = models.IntegerField("ステータス", default=0, choices=GROUP_STATUS_CHOICES)
+    status = models.IntegerField("ステータス", default=1, choices=GROUP_STATUS_CHOICES)
     allow_service_add = models.BooleanField("サービス追加許可", default=False)
     membership_type = models.IntegerField("会員種別", default=1, choices=MEMBERSHIP_TYPE_CHOICES)
     membership_expired_at = models.DateTimeField("有効期限", blank=True, null=True)
diff --git a/custom_auth/signals.py b/custom_auth/signals.py
index ebee9de..696fd53 100644
--- a/custom_auth/signals.py
+++ b/custom_auth/signals.py
@@ -1,7 +1,8 @@
 from django.db.models.signals import post_save, pre_delete, pre_save
 from django.dispatch import receiver
 
-from custom_auth.models import User
+from custom_auth.models import Group, User
+from custom_auth.tool import SignalTool
 from dsbd.notify import notify_db_save
 
 
@@ -16,58 +17,26 @@ def user_model_pre_save(sender, instance, **kwargs):
 @receiver(post_save, sender=User)
 def post_user(sender, instance, created, **kwargs):
     if created:
-        text = get_create_user(True, instance)
+        text = SignalTool().get_create_user(True, instance)
         notify_db_save(table_name="User", type=0, data=text)
     else:
-        text = get_update_user(instance._pre_save_instance, instance)
+        text = SignalTool().get_update_user(instance._pre_save_instance, instance)
         notify_db_save(table_name="User", type=1, data=text)
 
 
 @receiver(pre_delete, sender=User)
 def delete_user(sender, instance, **kwargs):
-    text = get_create_user(False, instance)
+    text = SignalTool().get_create_user(False, instance)
     notify_db_save(table_name="User", type=2, data=text)
 
 
-def get_create_user(short, instance):
-    text = "--%d[%s]--\n" % (
-        instance.id,
-        instance.username,
-    )
-    return text if not short else text + "有効: %r\nE-Mail: %s\n" % (instance.is_active, instance.email)
-
-
-def get_update_user(before, after):
-    text = "%s----更新状況----\n" % (get_create_user(True, before),)
-    if before.username != after.username:
-        text += "username: %s => %s\n" % (before.username, after.username)
-    if before.username_jp != after.username_jp:
-        text += "username(jp): %s => %s\n" % (before.username, after.username)
-    if before.email != after.email:
-        text += "E-Mail: %s => %s\n" % (before.email, after.email)
-    if before.is_active != after.is_active:
-        text += "有効: %r => %r\n" % (before.is_active, after.is_active)
-    text += "------------\n"
-    return text
-
-
-def get_create_signup_key(short, instance):
-    text = "--%d[%s]--\n" % (
-        instance.id,
-        instance.key,
-    )
-    return text if not short else text + "利用済み: %r\n有効期限: %s\n" % (instance.is_used, instance.expired_at)
-
-
-def get_update_signup_key(before, after):
-    text = "%s----更新状況----\n" % (get_create_signup_key(True, before),)
-    if before.key != after.key:
-        text += "key: %s => %s\n" % (before.key, after.key)
-    if before.is_used != after.is_used:
-        text += "使用済み: %r => %r\n" % (before.is_used, after.is_used)
-    if before.expired_at != after.expired_at:
-        text += "有効期限: %s => %s\n" % (before.expired_at, after.expired_at)
-    if before.comment != after.comment:
-        text += "comment: %r => %r\n" % (before.comment, after.comment)
-    text += "------------\n"
-    return text
+@receiver(post_save, sender=Group)
+def update_group(sender, instance, created, **kwargs):
+    # 審査OKステータス変更時にサービス追加許可にする
+    if instance.is_pass and not instance.allow_service_add:
+        instance.allow_service_add = True
+        instance.save(update_fields=["allow_service_add"])
+    # 審査NGステータス変更時にサービス追加拒否設定にする
+    if not instance.is_pass and instance.allow_service_add:
+        instance.allow_service_add = False
+        instance.save(update_fields=["allow_service_add"])
diff --git a/custom_auth/tool.py b/custom_auth/tool.py
index 0b85aeb..5a489a8 100644
--- a/custom_auth/tool.py
+++ b/custom_auth/tool.py
@@ -5,3 +5,45 @@
 def random_string(num):
     random_list = [random.choice(string.ascii_letters + string.digits) for i in range(num)]
     return "".join(random_list)
+
+
+class SignalTool:
+    def get_create_user(self, short, instance):
+        text = "--%d[%s]--\n" % (
+            instance.id,
+            instance.username,
+        )
+        return text if not short else text + "有効: %r\nE-Mail: %s\n" % (instance.is_active, instance.email)
+
+    def get_update_user(self, before, after):
+        text = "%s----更新状況----\n" % (self.get_create_user(True, before),)
+        if before.username != after.username:
+            text += "username: %s => %s\n" % (before.username, after.username)
+        if before.username_jp != after.username_jp:
+            text += "username(jp): %s => %s\n" % (before.username, after.username)
+        if before.email != after.email:
+            text += "E-Mail: %s => %s\n" % (before.email, after.email)
+        if before.is_active != after.is_active:
+            text += "有効: %r => %r\n" % (before.is_active, after.is_active)
+        text += "------------\n"
+        return text
+
+    def get_create_signup_key(self, short, instance):
+        text = "--%d[%s]--\n" % (
+            instance.id,
+            instance.key,
+        )
+        return text if not short else text + "利用済み: %r\n有効期限: %s\n" % (instance.is_used, instance.expired_at)
+
+    def get_update_signup_key(self, before, after):
+        text = "%s----更新状況----\n" % (self.get_create_signup_key(True, before),)
+        if before.key != after.key:
+            text += "key: %s => %s\n" % (before.key, after.key)
+        if before.is_used != after.is_used:
+            text += "使用済み: %r => %r\n" % (before.is_used, after.is_used)
+        if before.expired_at != after.expired_at:
+            text += "有効期限: %s => %s\n" % (before.expired_at, after.expired_at)
+        if before.comment != after.comment:
+            text += "comment: %r => %r\n" % (before.comment, after.comment)
+        text += "------------\n"
+        return text
diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index 49a4c1c..7d74a11 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -17,24 +17,32 @@
         <div class="container py-4 mb-auto">
           <div class="h-900 p-2 rounded-3">
             <h2>お知らせ</h2>
-            <div class="card text-bg-warning mb-3">
-              <div class="card-body">
-                <h5 class="card-title">Warning card title</h5>
-                <p class="card-text">Some quick example text to build on
-                  the card title and make up the
-                  bulk of the card's content.</p>
+            {% if request.user.groups.count == 0 %}
+              <div class="card text-bg-light mb-3">
+                <div class="card-body">
+                  <h5 class="card-title">グループの新規申請手続き</h5>
+                  <p class="card-text">グループの新規申請手続きを行ってください</p>
+                  <a href="{% url 'custom_auth_group:add' %}"
+                     class="btn btn-sm btn-primary">申請はこちらから</a>
+                </div>
               </div>
-            </div>
+            {% endif %}
+            {% if is_new_group_request %}
+              <div class="card text-bg-warning mb-3">
+                <div class="card-body">
+                  <h5 class="card-title"><b>グループの申請処理中</b></h5>
+                  <p class="card-text">現在、グループの申請処理中です。<br/>この作業には時間が掛かる可能性があります。</p>
+                </div>
+              </div>
+            {% endif %}
             {% for notice in notices %}
               <div class="card mb-2">
                 <div class="card-body">
                   <h6 class="card-subtitle mb-2 text-body-secondary">
-                                        <span
-                                            class="badge bg-secondary">{{ notice.start_at }}~
-                                          {% if notice.end_at != None %}
-                                            {{ notice.end_at }}{% else %}
-                                            無期限{% endif %}
-                                          </span>
+                     <span class="badge bg-secondary">{{ notice.start_at }} ~
+                       {% if notice.end_at != None %}{{ notice.end_at }}{% else %}
+                         無期限{% endif %}
+                     </span>
                     {% if notice.is_info %}
                       <span class="badge text-bg-primary">情報</span>
                     {% endif %}
@@ -60,10 +68,8 @@ <h5 class="card-title">{{ notice.title }}</h5>
                         <div class="modal-header">
                           <h1 class="modal-title fs-5"
                               id="detailLabel">{{ notice.title }}</h1>
-                          <button type="button"
-                                  class="btn-close"
-                                  data-bs-dismiss="modal"
-                                  aria-label="Close"></button>
+                          <button type="button" class="btn-close"
+                                  data-bs-dismiss="modal" aria-label="Close"></button>
                         </div>
                         <div class="modal-body">
                           {{ notice.body | linebreaksbr }}
diff --git a/dsbd/views.py b/dsbd/views.py
index 200aa91..a394bc9 100644
--- a/dsbd/views.py
+++ b/dsbd/views.py
@@ -147,6 +147,8 @@ def activate_user(request, activate_token):
 
 @login_required
 def index(request):
+    # 申請中のグループが存在するかしないか識別
+    is_new_group_request = request.user.groups.filter(is_pass=False, status=1).exists()
     notice_objects = Notice.objects.get_notice()
     # ticket_objects = Ticket.objects.get_ticket(user=request.user).filter(is_solved=False)
 
@@ -204,6 +206,7 @@ def index(request):
         "notices": notices,
         # "tickets": tickets,
         "services": services,
+        "is_new_group_request": is_new_group_request,
     }
     return render(request, "home.html", context)
 
diff --git a/ticket/signals.py b/ticket/signals.py
index ef9c879..e303a62 100644
--- a/ticket/signals.py
+++ b/ticket/signals.py
@@ -3,6 +3,7 @@
 
 from dsbd.notify import notify_db_save
 from ticket.models import Chat, Ticket
+from ticket.tool import SignalTool
 
 
 @receiver(pre_save, sender=Ticket)
@@ -16,75 +17,19 @@ def ticket_model_pre_save(sender, instance, **kwargs):
 @receiver(post_save, sender=Ticket)
 def post_ticket(sender, instance, created, **kwargs):
     if created:
-        text = get_create_ticket(True, instance)
+        text = SignalTool().get_create_ticket(True, instance)
         notify_db_save(table_name="Ticket", type=0, data=text)
     else:
-        text = get_update_ticket(instance._pre_save_instance, instance)
+        text = SignalTool().get_update_ticket(instance._pre_save_instance, instance)
         notify_db_save(table_name="Ticket", type=1, data=text)
 
 
 @receiver(pre_delete, sender=Ticket)
 def delete_ticket(sender, instance, **kwargs):
-    text = get_create_ticket(False, instance)
+    text = SignalTool().get_create_ticket(False, instance)
     notify_db_save(table_name="Ticket", type=2, data=text)
 
 
-def get_create_ticket(short, instance):
-    text = "--%d[%s]--\nUser: %s| Group: %s\n" % (instance.id, instance.title, instance.user, instance.group)
-    return (
-        text
-        if not short
-        else text
-        + "title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n"
-        % (
-            instance.title,
-            instance.body,
-            solved_to_str(instance.is_solved),
-            approve_to_str(instance.is_approve),
-            reject_to_str(instance.is_reject),
-            from_admin_to_str(instance.from_admin),
-        )
-    )
-
-
-def get_update_ticket(before, after):
-    text = "%s----更新状況----\n" % (get_create_ticket(True, before),)
-    if before.user != after.user:
-        text += "user: %s => %s\n" % (before.user, after.user)
-    if before.group != after.group:
-        text += "group: %s => %s\n" % (before.group, after.group)
-    if before.title != after.title:
-        text += "title: %s => %s\n" % (before.title, after.title)
-    if before.body != after.body:
-        text += "body: %s => %s\n" % (before.body, after.body)
-    if before.is_solved != after.is_solved:
-        text += "解決済み: %s => %s\n" % (solved_to_str(before.is_solved), solved_to_str(after.is_solved))
-    if before.is_approve != after.is_approve:
-        text += "承認済み: %s => %s\n" % (approve_to_str(before.is_approve), approve_to_str(after.is_approve))
-    if before.is_reject != after.is_reject:
-        text += "拒否済み: %s => %s\n" % (reject_to_str(before.is_reject), reject_to_str(after.is_reject))
-    if before.from_admin != after.from_admin:
-        text += "運営委員から起票: %s => %s\n" % (from_admin_to_str(before.from_admin), reject_to_str(after.from_admin))
-    text += "------------\n"
-    return text
-
-
-def solved_to_str(is_solved):
-    return "解決済み" if is_solved else "未解決"
-
-
-def approve_to_str(is_approve):
-    return "承認" if is_approve else "未承認"
-
-
-def reject_to_str(is_reject):
-    return "拒否済み" if is_reject else "not 拒否"
-
-
-def from_admin_to_str(from_admin):
-    return "運営委員から起票" if from_admin else "not 運営委員から起票"
-
-
 @receiver(pre_save, sender=Chat)
 def chat_model_pre_save(sender, instance, **kwargs):
     try:
@@ -96,47 +41,14 @@ def chat_model_pre_save(sender, instance, **kwargs):
 @receiver(post_save, sender=Chat)
 def post_chat(sender, instance, created, **kwargs):
     if created:
-        text = get_create_chat(True, instance)
+        text = SignalTool().get_create_chat(True, instance)
         notify_db_save(table_name="Chat", type=0, data=text)
     else:
-        text = get_update_chat(instance._pre_save_instance, instance)
+        text = SignalTool().get_update_chat(instance._pre_save_instance, instance)
         notify_db_save(table_name="Chat", type=1, data=text)
 
 
 @receiver(pre_delete, sender=Chat)
 def delete_chat(sender, instance, **kwargs):
-    text = get_create_chat(False, instance)
+    text = SignalTool().get_create_chat(False, instance)
     notify_db_save(table_name="Chat", type=2, data=text)
-
-
-def get_create_chat(short, instance):
-    text = "--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n" % (
-        instance.id,
-        "ユーザ投稿" if instance.is_admin else "管理者投稿",
-        instance.user,
-        instance.group,
-        instance.ticket,
-    )
-    return text if not short else text + "body: %s\n" % (instance.body,)
-
-
-def get_update_chat(before, after):
-    text = "%s----更新状況----\n" % (get_create_chat(True, before),)
-    if before.user != after.user:
-        text += "user: %s => %s\n" % (before.user, after.user)
-    if before.group != after.group:
-        text += "group: %s => %s\n" % (before.group, after.group)
-    if before.body != after.body:
-        text += "body: %s => %s\n" % (before.body, after.body)
-    if before.is_admin != after.is_admin:
-        text += "運営委員回答: %s => %s\n" % (admin_to_str(before.is_admin), admin_to_str(after.is_admin))
-    text += "------------\n"
-    return text
-
-
-def admin_to_str(is_admin):
-    return "運営委員回答" if is_admin else "not 運営委員回答"
-
-
-def active_to_str(is_admin):
-    return "有効" if is_admin else "無効"
diff --git a/ticket/tool.py b/ticket/tool.py
new file mode 100644
index 0000000..c0597f5
--- /dev/null
+++ b/ticket/tool.py
@@ -0,0 +1,85 @@
+class SignalTool:
+    def get_create_ticket(self, short, instance):
+        text = "--%d[%s]--\nUser: %s| Group: %s\n" % (instance.id, instance.title, instance.user, instance.group)
+        return (
+            text
+            if not short
+            else text
+            + "title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n"
+            % (
+                instance.title,
+                instance.body,
+                self.solved_to_str(instance.is_solved),
+                self.approve_to_str(instance.is_approve),
+                self.reject_to_str(instance.is_reject),
+                self.from_admin_to_str(instance.from_admin),
+            )
+        )
+
+    def get_update_ticket(self, before, after):
+        text = "%s----更新状況----\n" % (self.get_create_ticket(True, before),)
+        if before.user != after.user:
+            text += "user: %s => %s\n" % (before.user, after.user)
+        if before.group != after.group:
+            text += "group: %s => %s\n" % (before.group, after.group)
+        if before.title != after.title:
+            text += "title: %s => %s\n" % (before.title, after.title)
+        if before.body != after.body:
+            text += "body: %s => %s\n" % (before.body, after.body)
+        if before.is_solved != after.is_solved:
+            text += "解決済み: %s => %s\n" % (self.solved_to_str(before.is_solved), self.solved_to_str(after.is_solved))
+        if before.is_approve != after.is_approve:
+            text += "承認済み: %s => %s\n" % (
+                self.approve_to_str(before.is_approve),
+                self.approve_to_str(after.is_approve),
+            )
+        if before.is_reject != after.is_reject:
+            text += "拒否済み: %s => %s\n" % (self.reject_to_str(before.is_reject), self.reject_to_str(after.is_reject))
+        if before.from_admin != after.from_admin:
+            text += "運営委員から起票: %s => %s\n" % (
+                self.from_admin_to_str(before.from_admin),
+                self.reject_to_str(after.from_admin),
+            )
+        text += "------------\n"
+        return text
+
+    def solved_to_str(self, is_solved):
+        return "解決済み" if is_solved else "未解決"
+
+    def approve_to_str(self, is_approve):
+        return "承認" if is_approve else "未承認"
+
+    def reject_to_str(self, is_reject):
+        return "拒否済み" if is_reject else "not 拒否"
+
+    def from_admin_to_str(self, from_admin):
+        return "運営委員から起票" if from_admin else "not 運営委員から起票"
+
+    def get_create_chat(self, short, instance):
+        text = "--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n" % (
+            instance.id,
+            "ユーザ投稿" if instance.is_admin else "管理者投稿",
+            instance.user,
+            instance.group,
+            instance.ticket,
+        )
+        return text if not short else text + "body: %s\n" % (instance.body,)
+
+    def get_update_chat(self, before, after):
+        text = "%s----更新状況----\n" % (self.get_create_chat(True, before),)
+        if before.user != after.user:
+            text += "user: %s => %s\n" % (before.user, after.user)
+        if before.group != after.group:
+            text += "group: %s => %s\n" % (before.group, after.group)
+        if before.body != after.body:
+            text += "body: %s => %s\n" % (before.body, after.body)
+        if before.is_admin != after.is_admin:
+            text += "運営委員回答: %s => %s\n" % (self.admin_to_str(before.is_admin), self.admin_to_str(after.is_admin))
+        text += "------------\n"
+        return text
+
+    def admin_to_str(self, is_admin):
+        return "運営委員回答" if is_admin else "not 運営委員回答"
+
+    def active_to_str(self, is_admin):
+        return "有効" if is_admin else "無効"

From a9df51a8786d82a6a503cb56a8b7816a46ba8310 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 01:49:23 +0900
Subject: [PATCH 09/36] =?UTF-8?q?#43=20pre-commit=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .pre-commit-config.yaml | 18 ++++++++++++++++++
 README.md               |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..2c5c588
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,18 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.6.4
+  hooks:
+  - id: ruff
+    args: [ --fix ]
+  - id: ruff-format
+    types_or: [ python, pyi ]
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.2.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-yaml
+  - id: check-added-large-files
\ No newline at end of file
diff --git a/README.md b/README.md
index ee052c3..4674a76 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ HomeNOC Dashboard
 ### develop environment install
 
 ```
+pre-commit install # pre-commitを入れる必要あり
 pipenv install --dev
 ```
 

From 5c4a5f536e4ca97ed6cdc857e2e021b7c2e46083 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 02:02:18 +0900
Subject: [PATCH 10/36] =?UTF-8?q?#43=20=E3=83=AA=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/views.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/service/views.py b/service/views.py
index d4aa58a..8aeb65b 100644
--- a/service/views.py
+++ b/service/views.py
@@ -3,16 +3,15 @@
 from django.db.models import Q
 from django.shortcuts import render
 
-from custom_auth.models import UserGroup
 from service.models import Service
 
 
 @login_required
 def index(request):
-    user_groups = UserGroup.objects.filter(user=request.user)
+    group_ids = list(request.user.groups.values_list("id", flat=True))
     q = Q()
-    for user_group in user_groups:
-        q.add(Q(group=user_group.group), Q.OR)
+    for group_id in group_ids:
+        q.add(Q(group=group_id), Q.OR)
     services = Service.objects.filter(is_active=True).filter(q).order_by("id")
     per_page = int(request.GET.get("per_page", "20"))
     page = int(request.GET.get("page", "1"))

From 5a3c913d04f57a282761c0e1ab55821b7cafde42 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 03:04:56 +0900
Subject: [PATCH 11/36] =?UTF-8?q?#43=20=E9=96=8B=E7=99=BA=E7=94=A8?=
 =?UTF-8?q?=E3=81=AE=E7=92=B0=E5=A2=83=E3=82=92=E6=95=B4=E5=82=99=20for=20?=
 =?UTF-8?q?web.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/index.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 web/src/index.html

diff --git a/web/src/index.html b/web/src/index.html
new file mode 100644
index 0000000..dec88bb
--- /dev/null
+++ b/web/src/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <title>Vite + React + TS</title>
+</head>
+<body>
+<h2>Web(TEST)</h2>
+<a href="./add_connection/index.html">add_connection</a>
+<br/>
+<a href="./add_service/index.html">add_service</a>
+</body>
+</html>

From 66f50e77d8a3fdb046a5136660d4d311984da018 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 9 Sep 2024 03:05:21 +0900
Subject: [PATCH 12/36] =?UTF-8?q?#43=20=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=20for=20web.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package-lock.json | 2380 ++++++++++++++++++++---------------------
 web/package.json      |   26 +-
 2 files changed, 1160 insertions(+), 1246 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 5916f77..1d9d394 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -8,21 +8,21 @@
       "name": "web",
       "version": "0.0.0",
       "dependencies": {
-        "@types/node": "^20.9.1",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
+        "@types/node": "^20.16.5",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1"
       },
       "devDependencies": {
-        "@types/react": "^18.2.37",
-        "@types/react-dom": "^18.2.15",
-        "@typescript-eslint/eslint-plugin": "^6.10.0",
-        "@typescript-eslint/parser": "^6.10.0",
-        "@vitejs/plugin-react": "^4.2.0",
-        "eslint": "^8.53.0",
-        "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-react-refresh": "^0.4.4",
-        "typescript": "^5.2.2",
-        "vite": "^5.0.0"
+        "@types/react": "^18.3.5",
+        "@types/react-dom": "^18.3.0",
+        "@typescript-eslint/eslint-plugin": "^8.4.0",
+        "@typescript-eslint/parser": "^8.4.0",
+        "@vitejs/plugin-react": "^4.3.1",
+        "eslint": "^8.57.0",
+        "eslint-plugin-react-hooks": "^4.6.2",
+        "eslint-plugin-react-refresh": "^0.4.11",
+        "typescript": "^5.5.4",
+        "vite": "^5.4.3"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -35,56 +35,56 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
-      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
-      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.3",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.3",
-        "@babel/types": "^7.23.3",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -109,14 +109,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
-      "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.3",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -124,14 +124,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -148,63 +148,29 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -214,98 +180,90 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
-      "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
       "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -314,12 +272,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz",
-      "integrity": "sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz",
+      "integrity": "sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -329,12 +287,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz",
-      "integrity": "sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz",
+      "integrity": "sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -344,34 +302,31 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
-      "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.3",
-        "@babel/types": "^7.23.3",
-        "debug": "^4.1.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -379,23 +334,39 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
-      "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz",
-      "integrity": "sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
@@ -409,9 +380,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz",
-      "integrity": "sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
@@ -425,9 +396,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz",
-      "integrity": "sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
@@ -441,9 +412,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz",
-      "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
@@ -457,9 +428,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz",
-      "integrity": "sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
@@ -473,9 +444,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz",
-      "integrity": "sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
@@ -489,9 +460,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz",
-      "integrity": "sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
@@ -505,9 +476,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz",
-      "integrity": "sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
@@ -521,9 +492,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz",
-      "integrity": "sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
@@ -537,9 +508,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz",
-      "integrity": "sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
@@ -553,9 +524,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz",
-      "integrity": "sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
@@ -569,9 +540,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz",
-      "integrity": "sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
@@ -585,9 +556,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz",
-      "integrity": "sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
@@ -601,9 +572,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz",
-      "integrity": "sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
@@ -617,9 +588,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz",
-      "integrity": "sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
@@ -633,9 +604,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz",
-      "integrity": "sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
@@ -649,9 +620,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz",
-      "integrity": "sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
@@ -665,9 +636,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz",
-      "integrity": "sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
@@ -681,9 +652,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz",
-      "integrity": "sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
@@ -697,9 +668,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz",
-      "integrity": "sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
@@ -713,9 +684,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz",
-      "integrity": "sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
@@ -729,9 +700,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz",
-      "integrity": "sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
@@ -760,18 +731,18 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -792,9 +763,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -807,22 +778,23 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
       "engines": {
@@ -843,53 +815,54 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "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,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "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,
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "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,
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "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,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -932,9 +905,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.5.0.tgz",
-      "integrity": "sha512-OINaBGY+Wc++U0rdr7BLuFClxcoWaVW3vQYqmQq6B3bqQ/2olkaoz+K8+af/Mmka/C2yN5j+L9scBkv4BtKsDA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
+      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
       "cpu": [
         "arm"
       ],
@@ -945,9 +918,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.5.0.tgz",
-      "integrity": "sha512-UdMf1pOQc4ZmUA/NTmKhgJTBimbSKnhPS2zJqucqFyBRFPnPDtwA8MzrGNTjDeQbIAWfpJVAlxejw+/lQyBK/w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
+      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
       "cpu": [
         "arm64"
       ],
@@ -958,9 +931,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.5.0.tgz",
-      "integrity": "sha512-L0/CA5p/idVKI+c9PcAPGorH6CwXn6+J0Ys7Gg1axCbTPgI8MeMlhA6fLM9fK+ssFhqogMHFC8HDvZuetOii7w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
+      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
       "cpu": [
         "arm64"
       ],
@@ -971,9 +944,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.5.0.tgz",
-      "integrity": "sha512-QZCbVqU26mNlLn8zi/XDDquNmvcr4ON5FYAHQQsyhrHx8q+sQi/6xduoznYXwk/KmKIXG5dLfR0CvY+NAWpFYQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
+      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
       "cpu": [
         "x64"
       ],
@@ -984,9 +957,22 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.5.0.tgz",
-      "integrity": "sha512-VpSQ+xm93AeV33QbYslgf44wc5eJGYfYitlQzAi3OObu9iwrGXEnmu5S3ilkqE3Pr/FkgOiJKV/2p0ewf4Hrtg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
+      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
+      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
       "cpu": [
         "arm"
       ],
@@ -997,9 +983,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.5.0.tgz",
-      "integrity": "sha512-OrEyIfpxSsMal44JpEVx9AEcGpdBQG1ZuWISAanaQTSMeStBW+oHWwOkoqR54bw3x8heP8gBOyoJiGg+fLY8qQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
+      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
       "cpu": [
         "arm64"
       ],
@@ -1010,9 +996,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.5.0.tgz",
-      "integrity": "sha512-1H7wBbQuE6igQdxMSTjtFfD+DGAudcYWhp106z/9zBA8OQhsJRnemO4XGavdzHpGhRtRxbgmUGdO3YQgrWf2RA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
+      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
       "cpu": [
         "arm64"
       ],
@@ -1022,10 +1008,49 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
+      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
+      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
+      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.5.0.tgz",
-      "integrity": "sha512-FVyFI13tXw5aE65sZdBpNjPVIi4Q5mARnL/39UIkxvSgRAIqCo5sCpCELk0JtXHGee2owZz5aNLbWNfBHzr71Q==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
       "cpu": [
         "x64"
       ],
@@ -1036,9 +1061,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.5.0.tgz",
-      "integrity": "sha512-eBPYl2sLpH/o8qbSz6vPwWlDyThnQjJfcDOGFbNjmjb44XKC1F5dQfakOsADRVrXCNzM6ZsSIPDG5dc6HHLNFg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
+      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
       "cpu": [
         "x64"
       ],
@@ -1049,9 +1074,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.5.0.tgz",
-      "integrity": "sha512-xaOHIfLOZypoQ5U2I6rEaugS4IYtTgP030xzvrBf5js7p9WI9wik07iHmsKaej8Z83ZDxN5GyypfoyKV5O5TJA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
+      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
       "cpu": [
         "arm64"
       ],
@@ -1062,9 +1087,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.5.0.tgz",
-      "integrity": "sha512-Al6quztQUrHwcOoU2TuFblUQ5L+/AmPBXFR6dUvyo4nRj2yQRK0WIUaGMF/uwKulvRcXkpHe3k9A8Vf93VDktA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
+      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
       "cpu": [
         "ia32"
       ],
@@ -1075,9 +1100,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.5.0.tgz",
-      "integrity": "sha512-8kdW+brNhI/NzJ4fxDufuJUjepzINqJKLGHuxyAtpPG9bMbn8P5mtaCcbOm0EzLJ+atg+kF9dwg8jpclkVqx5w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
+      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
       "cpu": [
         "x64"
       ],
@@ -1088,9 +1113,9 @@
       ]
     },
     "node_modules/@types/babel__core": {
-      "version": "7.20.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.4.tgz",
-      "integrity": "sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.20.7",
@@ -1101,9 +1126,9 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.7.tgz",
-      "integrity": "sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==",
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
@@ -1120,26 +1145,26 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.4.tgz",
-      "integrity": "sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==",
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
     },
-    "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==",
+    "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
     },
     "node_modules/@types/node": {
-      "version": "20.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.1.tgz",
-      "integrity": "sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==",
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.19.2"
       }
     },
     "node_modules/@types/prop-types": {
@@ -1149,65 +1174,50 @@
       "dev": true
     },
     "node_modules/@types/react": {
-      "version": "18.2.37",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz",
-      "integrity": "sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==",
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
+      "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
       "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.2.15",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.15.tgz",
-      "integrity": "sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==",
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
       "dev": true,
       "dependencies": {
         "@types/react": "*"
       }
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz",
-      "integrity": "sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==",
-      "dev": true
-    },
-    "node_modules/@types/semver": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz",
-      "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz",
-      "integrity": "sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz",
+      "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.11.0",
-        "@typescript-eslint/type-utils": "6.11.0",
-        "@typescript-eslint/utils": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0",
-        "debug": "^4.3.4",
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.4.0",
+        "@typescript-eslint/type-utils": "8.4.0",
+        "@typescript-eslint/utils": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
+        "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
-        "eslint": "^7.0.0 || ^8.0.0"
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -1216,26 +1226,26 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.11.0.tgz",
-      "integrity": "sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz",
+      "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.11.0",
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/typescript-estree": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0",
+        "@typescript-eslint/scope-manager": "8.4.0",
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/typescript-estree": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.57.0 || ^9.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -1244,16 +1254,16 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz",
-      "integrity": "sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz",
+      "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0"
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1261,26 +1271,23 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz",
-      "integrity": "sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz",
+      "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.11.0",
-        "@typescript-eslint/utils": "6.11.0",
+        "@typescript-eslint/typescript-estree": "8.4.0",
+        "@typescript-eslint/utils": "8.4.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
@@ -1288,12 +1295,12 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.11.0.tgz",
-      "integrity": "sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz",
+      "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==",
       "dev": true,
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1301,21 +1308,22 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz",
-      "integrity": "sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz",
+      "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0",
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1327,42 +1335,63 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.11.0.tgz",
-      "integrity": "sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz",
+      "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.11.0",
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/typescript-estree": "6.11.0",
-        "semver": "^7.5.4"
+        "@typescript-eslint/scope-manager": "8.4.0",
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/typescript-estree": "8.4.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.57.0 || ^9.0.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz",
-      "integrity": "sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz",
+      "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.11.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@typescript-eslint/types": "8.4.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1376,16 +1405,16 @@
       "dev": true
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.0.tgz",
-      "integrity": "sha512-+MHTH/e6H12kRp5HUkzOGqPMksezRMmW+TNzlh/QXfI8rRf6l2Z2yH/v12no1UvTwhZgEDMuQ7g7rrfMseU6FQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
+      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
-        "@types/babel__core": "^7.20.4",
-        "react-refresh": "^0.14.0"
+        "@babel/core": "^7.24.5",
+        "@babel/plugin-transform-react-jsx-self": "^7.24.5",
+        "@babel/plugin-transform-react-jsx-source": "^7.24.1",
+        "@types/babel__core": "^7.20.5",
+        "react-refresh": "^0.14.2"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -1395,9 +1424,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1458,15 +1487,6 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1484,21 +1504,21 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
       "dev": true,
       "funding": [
         {
@@ -1515,10 +1535,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1537,9 +1557,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001563",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz",
-      "integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==",
+      "version": "1.0.30001658",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
+      "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
       "dev": true,
       "funding": [
         {
@@ -1640,18 +1660,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1665,15 +1673,15 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.588",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.588.tgz",
-      "integrity": "sha512-soytjxwbgcCu7nh5Pf4S2/4wa6UIu+A3p03U2yVr53qGxi1/VTR3ENI+p50v+UxqqZAfl48j3z55ud7VHIOr9w==",
+      "version": "1.5.18",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
+      "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
       "dev": true
     },
     "node_modules/esbuild": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz",
-      "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -1683,34 +1691,35 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.19.5",
-        "@esbuild/android-arm64": "0.19.5",
-        "@esbuild/android-x64": "0.19.5",
-        "@esbuild/darwin-arm64": "0.19.5",
-        "@esbuild/darwin-x64": "0.19.5",
-        "@esbuild/freebsd-arm64": "0.19.5",
-        "@esbuild/freebsd-x64": "0.19.5",
-        "@esbuild/linux-arm": "0.19.5",
-        "@esbuild/linux-arm64": "0.19.5",
-        "@esbuild/linux-ia32": "0.19.5",
-        "@esbuild/linux-loong64": "0.19.5",
-        "@esbuild/linux-mips64el": "0.19.5",
-        "@esbuild/linux-ppc64": "0.19.5",
-        "@esbuild/linux-riscv64": "0.19.5",
-        "@esbuild/linux-s390x": "0.19.5",
-        "@esbuild/linux-x64": "0.19.5",
-        "@esbuild/netbsd-x64": "0.19.5",
-        "@esbuild/openbsd-x64": "0.19.5",
-        "@esbuild/sunos-x64": "0.19.5",
-        "@esbuild/win32-arm64": "0.19.5",
-        "@esbuild/win32-ia32": "0.19.5",
-        "@esbuild/win32-x64": "0.19.5"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -1726,16 +1735,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.54.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -1781,9 +1790,9 @@
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -1793,9 +1802,9 @@
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.4.tgz",
-      "integrity": "sha512-eD83+65e8YPVg6603Om2iCIwcQJf/y7++MWm4tACtEswFLYMwxwVWAfwN+e19f5Ad/FOyyNg9Dfi5lXhH3Y3rA==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.11.tgz",
+      "integrity": "sha512-wrAKxMbVr8qhXTtIKfXqAn5SAtRZt0aXxe5P23Fh4pUAdC6XEsybGLB8P0PI4j1yYqOgUEUlzKAGDfo7rJOjcw==",
       "dev": true,
       "peerDependencies": {
         "eslint": ">=7"
@@ -1891,9 +1900,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2053,9 +2062,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -2095,9 +2104,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -2133,6 +2142,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -2170,26 +2180,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -2206,9 +2196,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -2243,6 +2233,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -2432,12 +2423,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -2487,9 +2478,9 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true
     },
     "node_modules/once": {
@@ -2587,19 +2578,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
       "dev": true
     },
     "node_modules/picomatch": {
@@ -2615,9 +2597,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.45",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
       "dev": true,
       "funding": [
         {
@@ -2634,9 +2616,9 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -2681,9 +2663,9 @@
       ]
     },
     "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -2692,21 +2674,21 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "^18.3.1"
       }
     },
     "node_modules/react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2735,6 +2717,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -2747,10 +2730,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.5.0.tgz",
-      "integrity": "sha512-41xsWhzxqjMDASCxH5ibw1mXk+3c4TNI2UjKbLxe6iEzrSQnqOzmmK8/3mufCPbzHNJ2e04Fc1ddI35hHy+8zg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
+      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
       "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.5"
+      },
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -2759,18 +2745,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.5.0",
-        "@rollup/rollup-android-arm64": "4.5.0",
-        "@rollup/rollup-darwin-arm64": "4.5.0",
-        "@rollup/rollup-darwin-x64": "4.5.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.5.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.5.0",
-        "@rollup/rollup-linux-arm64-musl": "4.5.0",
-        "@rollup/rollup-linux-x64-gnu": "4.5.0",
-        "@rollup/rollup-linux-x64-musl": "4.5.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.5.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.5.0",
-        "@rollup/rollup-win32-x64-msvc": "4.5.0",
+        "@rollup/rollup-android-arm-eabi": "4.21.2",
+        "@rollup/rollup-android-arm64": "4.21.2",
+        "@rollup/rollup-darwin-arm64": "4.21.2",
+        "@rollup/rollup-darwin-x64": "4.21.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
+        "@rollup/rollup-linux-arm64-musl": "4.21.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
+        "@rollup/rollup-linux-x64-gnu": "4.21.2",
+        "@rollup/rollup-linux-x64-musl": "4.21.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
+        "@rollup/rollup-win32-x64-msvc": "4.21.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -2798,21 +2788,18 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2820,24 +2807,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2859,19 +2828,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2941,12 +2901,12 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
       "dev": true,
       "engines": {
-        "node": ">=16.13.0"
+        "node": ">=16"
       },
       "peerDependencies": {
         "typescript": ">=4.2.0"
@@ -2977,9 +2937,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -2990,14 +2950,14 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
       "funding": [
         {
@@ -3014,8 +2974,8 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -3034,14 +2994,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.0.tgz",
-      "integrity": "sha512-ESJVM59mdyGpsiNAeHQOR/0fqNoOyWPYesFto8FFZugfmhdHx8Fzd8sF3Q/xkVhZsyOxHfdM7ieiVAorI9RjFw==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
+      "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.31",
-        "rollup": "^4.2.0"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -3060,6 +3020,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -3077,6 +3038,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -3136,47 +3100,47 @@
       "dev": true
     },
     "@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/compat-data": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
-      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
-      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.3",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.3",
-        "@babel/types": "^7.23.3",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -3193,26 +3157,26 @@
       }
     },
     "@babel/generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
-      "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.23.3",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -3225,332 +3189,306 @@
         }
       }
     },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
-    },
-    "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
     "@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
       "dev": true
     },
     "@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
       "dev": true
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "dev": true
     },
     "@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
       }
     },
     "@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
-      "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
-      "dev": true
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.25.6"
+      }
     },
     "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz",
-      "integrity": "sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz",
+      "integrity": "sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz",
-      "integrity": "sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz",
+      "integrity": "sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7"
       }
     },
     "@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
-      "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.3",
-        "@babel/types": "^7.23.3",
-        "debug": "^4.1.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
-      "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "dev": true,
       "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "dev": true,
+      "optional": true
+    },
     "@esbuild/android-arm": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz",
-      "integrity": "sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz",
-      "integrity": "sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz",
-      "integrity": "sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz",
-      "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz",
-      "integrity": "sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz",
-      "integrity": "sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz",
-      "integrity": "sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz",
-      "integrity": "sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz",
-      "integrity": "sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ia32": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz",
-      "integrity": "sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-loong64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz",
-      "integrity": "sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-mips64el": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz",
-      "integrity": "sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ppc64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz",
-      "integrity": "sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-riscv64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz",
-      "integrity": "sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-s390x": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz",
-      "integrity": "sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz",
-      "integrity": "sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/netbsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz",
-      "integrity": "sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/openbsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz",
-      "integrity": "sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "dev": true,
       "optional": true
     },
     "@esbuild/sunos-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz",
-      "integrity": "sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz",
-      "integrity": "sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-ia32": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz",
-      "integrity": "sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz",
-      "integrity": "sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "dev": true,
       "optional": true
     },
@@ -3564,15 +3502,15 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -3587,9 +3525,9 @@
       },
       "dependencies": {
         "globals": {
-          "version": "13.23.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-          "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -3598,19 +3536,19 @@
       }
     },
     "@eslint/js": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
       "dev": true
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "dev": true,
       "requires": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       }
     },
@@ -3621,44 +3559,44 @@
       "dev": true
     },
     "@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "dev": true
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "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,
       "requires": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "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
     },
     "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "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
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "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,
       "requires": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -3692,93 +3630,121 @@
       }
     },
     "@rollup/rollup-android-arm-eabi": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.5.0.tgz",
-      "integrity": "sha512-OINaBGY+Wc++U0rdr7BLuFClxcoWaVW3vQYqmQq6B3bqQ/2olkaoz+K8+af/Mmka/C2yN5j+L9scBkv4BtKsDA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
+      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-android-arm64": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.5.0.tgz",
-      "integrity": "sha512-UdMf1pOQc4ZmUA/NTmKhgJTBimbSKnhPS2zJqucqFyBRFPnPDtwA8MzrGNTjDeQbIAWfpJVAlxejw+/lQyBK/w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
+      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-darwin-arm64": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.5.0.tgz",
-      "integrity": "sha512-L0/CA5p/idVKI+c9PcAPGorH6CwXn6+J0Ys7Gg1axCbTPgI8MeMlhA6fLM9fK+ssFhqogMHFC8HDvZuetOii7w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
+      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-darwin-x64": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.5.0.tgz",
-      "integrity": "sha512-QZCbVqU26mNlLn8zi/XDDquNmvcr4ON5FYAHQQsyhrHx8q+sQi/6xduoznYXwk/KmKIXG5dLfR0CvY+NAWpFYQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
+      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.5.0.tgz",
-      "integrity": "sha512-VpSQ+xm93AeV33QbYslgf44wc5eJGYfYitlQzAi3OObu9iwrGXEnmu5S3ilkqE3Pr/FkgOiJKV/2p0ewf4Hrtg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
+      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
+      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.5.0.tgz",
-      "integrity": "sha512-OrEyIfpxSsMal44JpEVx9AEcGpdBQG1ZuWISAanaQTSMeStBW+oHWwOkoqR54bw3x8heP8gBOyoJiGg+fLY8qQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
+      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-linux-arm64-musl": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.5.0.tgz",
-      "integrity": "sha512-1H7wBbQuE6igQdxMSTjtFfD+DGAudcYWhp106z/9zBA8OQhsJRnemO4XGavdzHpGhRtRxbgmUGdO3YQgrWf2RA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
+      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
+      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
+      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
+      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-linux-x64-gnu": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.5.0.tgz",
-      "integrity": "sha512-FVyFI13tXw5aE65sZdBpNjPVIi4Q5mARnL/39UIkxvSgRAIqCo5sCpCELk0JtXHGee2owZz5aNLbWNfBHzr71Q==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-linux-x64-musl": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.5.0.tgz",
-      "integrity": "sha512-eBPYl2sLpH/o8qbSz6vPwWlDyThnQjJfcDOGFbNjmjb44XKC1F5dQfakOsADRVrXCNzM6ZsSIPDG5dc6HHLNFg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
+      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.5.0.tgz",
-      "integrity": "sha512-xaOHIfLOZypoQ5U2I6rEaugS4IYtTgP030xzvrBf5js7p9WI9wik07iHmsKaej8Z83ZDxN5GyypfoyKV5O5TJA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
+      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.5.0.tgz",
-      "integrity": "sha512-Al6quztQUrHwcOoU2TuFblUQ5L+/AmPBXFR6dUvyo4nRj2yQRK0WIUaGMF/uwKulvRcXkpHe3k9A8Vf93VDktA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
+      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
       "dev": true,
       "optional": true
     },
     "@rollup/rollup-win32-x64-msvc": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.5.0.tgz",
-      "integrity": "sha512-8kdW+brNhI/NzJ4fxDufuJUjepzINqJKLGHuxyAtpPG9bMbn8P5mtaCcbOm0EzLJ+atg+kF9dwg8jpclkVqx5w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
+      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
       "dev": true,
       "optional": true
     },
     "@types/babel__core": {
-      "version": "7.20.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.4.tgz",
-      "integrity": "sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.20.7",
@@ -3789,9 +3755,9 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.7.tgz",
-      "integrity": "sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==",
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
@@ -3808,26 +3774,26 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.20.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.4.tgz",
-      "integrity": "sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==",
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.20.7"
       }
     },
-    "@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==",
+    "@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
     },
     "@types/node": {
-      "version": "20.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.1.tgz",
-      "integrity": "sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==",
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "requires": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.19.2"
       }
     },
     "@types/prop-types": {
@@ -3837,135 +3803,138 @@
       "dev": true
     },
     "@types/react": {
-      "version": "18.2.37",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz",
-      "integrity": "sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==",
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
+      "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
       "dev": true,
       "requires": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
     "@types/react-dom": {
-      "version": "18.2.15",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.15.tgz",
-      "integrity": "sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==",
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
       "dev": true,
       "requires": {
         "@types/react": "*"
       }
     },
-    "@types/scheduler": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz",
-      "integrity": "sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==",
-      "dev": true
-    },
-    "@types/semver": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz",
-      "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==",
-      "dev": true
-    },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz",
-      "integrity": "sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz",
+      "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==",
       "dev": true,
       "requires": {
-        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.11.0",
-        "@typescript-eslint/type-utils": "6.11.0",
-        "@typescript-eslint/utils": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0",
-        "debug": "^4.3.4",
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.4.0",
+        "@typescript-eslint/type-utils": "8.4.0",
+        "@typescript-eslint/utils": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
+        "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^1.3.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.11.0.tgz",
-      "integrity": "sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz",
+      "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.11.0",
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/typescript-estree": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0",
+        "@typescript-eslint/scope-manager": "8.4.0",
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/typescript-estree": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz",
-      "integrity": "sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz",
+      "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0"
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz",
-      "integrity": "sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz",
+      "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.11.0",
-        "@typescript-eslint/utils": "6.11.0",
+        "@typescript-eslint/typescript-estree": "8.4.0",
+        "@typescript-eslint/utils": "8.4.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^1.3.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.11.0.tgz",
-      "integrity": "sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz",
+      "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz",
-      "integrity": "sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz",
+      "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/visitor-keys": "6.11.0",
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/visitor-keys": "8.4.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
     "@typescript-eslint/utils": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.11.0.tgz",
-      "integrity": "sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz",
+      "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.11.0",
-        "@typescript-eslint/types": "6.11.0",
-        "@typescript-eslint/typescript-estree": "6.11.0",
-        "semver": "^7.5.4"
+        "@typescript-eslint/scope-manager": "8.4.0",
+        "@typescript-eslint/types": "8.4.0",
+        "@typescript-eslint/typescript-estree": "8.4.0"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz",
-      "integrity": "sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz",
+      "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "6.11.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@typescript-eslint/types": "8.4.0",
+        "eslint-visitor-keys": "^3.4.3"
       }
     },
     "@ungap/structured-clone": {
@@ -3975,22 +3944,22 @@
       "dev": true
     },
     "@vitejs/plugin-react": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.0.tgz",
-      "integrity": "sha512-+MHTH/e6H12kRp5HUkzOGqPMksezRMmW+TNzlh/QXfI8rRf6l2Z2yH/v12no1UvTwhZgEDMuQ7g7rrfMseU6FQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
+      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
-        "@types/babel__core": "^7.20.4",
-        "react-refresh": "^0.14.0"
+        "@babel/core": "^7.24.5",
+        "@babel/plugin-transform-react-jsx-self": "^7.24.5",
+        "@babel/plugin-transform-react-jsx-source": "^7.24.1",
+        "@types/babel__core": "^7.20.5",
+        "react-refresh": "^0.14.2"
       }
     },
     "acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -4033,12 +4002,6 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -4056,24 +4019,24 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
       }
     },
     "callsites": {
@@ -4083,9 +4046,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001563",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz",
-      "integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==",
+      "version": "1.0.30001658",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
+      "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
       "dev": true
     },
     "chalk": {
@@ -4158,15 +4121,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -4177,45 +4131,46 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.588",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.588.tgz",
-      "integrity": "sha512-soytjxwbgcCu7nh5Pf4S2/4wa6UIu+A3p03U2yVr53qGxi1/VTR3ENI+p50v+UxqqZAfl48j3z55ud7VHIOr9w==",
+      "version": "1.5.18",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
+      "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
       "dev": true
     },
     "esbuild": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz",
-      "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "requires": {
-        "@esbuild/android-arm": "0.19.5",
-        "@esbuild/android-arm64": "0.19.5",
-        "@esbuild/android-x64": "0.19.5",
-        "@esbuild/darwin-arm64": "0.19.5",
-        "@esbuild/darwin-x64": "0.19.5",
-        "@esbuild/freebsd-arm64": "0.19.5",
-        "@esbuild/freebsd-x64": "0.19.5",
-        "@esbuild/linux-arm": "0.19.5",
-        "@esbuild/linux-arm64": "0.19.5",
-        "@esbuild/linux-ia32": "0.19.5",
-        "@esbuild/linux-loong64": "0.19.5",
-        "@esbuild/linux-mips64el": "0.19.5",
-        "@esbuild/linux-ppc64": "0.19.5",
-        "@esbuild/linux-riscv64": "0.19.5",
-        "@esbuild/linux-s390x": "0.19.5",
-        "@esbuild/linux-x64": "0.19.5",
-        "@esbuild/netbsd-x64": "0.19.5",
-        "@esbuild/openbsd-x64": "0.19.5",
-        "@esbuild/sunos-x64": "0.19.5",
-        "@esbuild/win32-arm64": "0.19.5",
-        "@esbuild/win32-ia32": "0.19.5",
-        "@esbuild/win32-x64": "0.19.5"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true
     },
     "escape-string-regexp": {
@@ -4225,16 +4180,16 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.54.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -4311,9 +4266,9 @@
           "dev": true
         },
         "globals": {
-          "version": "13.23.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-          "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -4337,16 +4292,16 @@
       }
     },
     "eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
       "dev": true,
       "requires": {}
     },
     "eslint-plugin-react-refresh": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.4.tgz",
-      "integrity": "sha512-eD83+65e8YPVg6603Om2iCIwcQJf/y7++MWm4tACtEswFLYMwxwVWAfwN+e19f5Ad/FOyyNg9Dfi5lXhH3Y3rA==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.11.tgz",
+      "integrity": "sha512-wrAKxMbVr8qhXTtIKfXqAn5SAtRZt0aXxe5P23Fh4pUAdC6XEsybGLB8P0PI4j1yYqOgUEUlzKAGDfo7rJOjcw==",
       "dev": true,
       "requires": {}
     },
@@ -4468,9 +4423,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
@@ -4498,9 +4453,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
     "fs.realpath": {
@@ -4551,20 +4506,6 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
     "graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -4578,9 +4519,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true
     },
     "import-fresh": {
@@ -4750,12 +4691,12 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },
@@ -4787,9 +4728,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true
     },
     "once": {
@@ -4860,16 +4801,10 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
     "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
       "dev": true
     },
     "picomatch": {
@@ -4879,14 +4814,14 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.45",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
       }
     },
     "prelude-ls": {
@@ -4908,26 +4843,26 @@
       "dev": true
     },
     "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "requires": {
         "loose-envify": "^1.1.0"
       }
     },
     "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "requires": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       }
     },
     "react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "dev": true
     },
     "resolve-from": {
@@ -4952,23 +4887,28 @@
       }
     },
     "rollup": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.5.0.tgz",
-      "integrity": "sha512-41xsWhzxqjMDASCxH5ibw1mXk+3c4TNI2UjKbLxe6iEzrSQnqOzmmK8/3mufCPbzHNJ2e04Fc1ddI35hHy+8zg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
+      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
       "dev": true,
       "requires": {
-        "@rollup/rollup-android-arm-eabi": "4.5.0",
-        "@rollup/rollup-android-arm64": "4.5.0",
-        "@rollup/rollup-darwin-arm64": "4.5.0",
-        "@rollup/rollup-darwin-x64": "4.5.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.5.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.5.0",
-        "@rollup/rollup-linux-arm64-musl": "4.5.0",
-        "@rollup/rollup-linux-x64-gnu": "4.5.0",
-        "@rollup/rollup-linux-x64-musl": "4.5.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.5.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.5.0",
-        "@rollup/rollup-win32-x64-msvc": "4.5.0",
+        "@rollup/rollup-android-arm-eabi": "4.21.2",
+        "@rollup/rollup-android-arm64": "4.21.2",
+        "@rollup/rollup-darwin-arm64": "4.21.2",
+        "@rollup/rollup-darwin-x64": "4.21.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
+        "@rollup/rollup-linux-arm64-musl": "4.21.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
+        "@rollup/rollup-linux-x64-gnu": "4.21.2",
+        "@rollup/rollup-linux-x64-musl": "4.21.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
+        "@rollup/rollup-win32-x64-msvc": "4.21.2",
+        "@types/estree": "1.0.5",
         "fsevents": "~2.3.2"
       }
     },
@@ -4982,38 +4922,18 @@
       }
     },
     "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "requires": {
         "loose-envify": "^1.1.0"
       }
     },
     "semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true
     },
     "shebang-command": {
       "version": "2.0.0",
@@ -5030,16 +4950,10 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
     "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true
     },
     "strip-ansi": {
@@ -5088,9 +5002,9 @@
       }
     },
     "ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
       "dev": true,
       "requires": {}
     },
@@ -5110,24 +5024,24 @@
       "dev": true
     },
     "typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true
     },
     "undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     },
     "update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
       "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       }
     },
     "uri-js": {
@@ -5140,15 +5054,15 @@
       }
     },
     "vite": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.0.tgz",
-      "integrity": "sha512-ESJVM59mdyGpsiNAeHQOR/0fqNoOyWPYesFto8FFZugfmhdHx8Fzd8sF3Q/xkVhZsyOxHfdM7ieiVAorI9RjFw==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
+      "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
       "dev": true,
       "requires": {
-        "esbuild": "^0.19.3",
+        "esbuild": "^0.21.3",
         "fsevents": "~2.3.3",
-        "postcss": "^8.4.31",
-        "rollup": "^4.2.0"
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       }
     },
     "which": {
diff --git a/web/package.json b/web/package.json
index b85dcc8..b39a8d9 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,20 +10,20 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@types/node": "^20.9.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@types/node": "^20.16.5",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
-    "@vitejs/plugin-react": "^4.2.0",
-    "eslint": "^8.53.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.4",
-    "typescript": "^5.2.2",
-    "vite": "^5.0.0"
+    "@types/react": "^18.3.5",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
+    "@vitejs/plugin-react": "^4.3.1",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.11",
+    "typescript": "^5.5.4",
+    "vite": "^5.4.3"
   }
 }

From 832fbad0318b0f29aafe355e66d65f3a270dea62 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 03:35:07 +0900
Subject: [PATCH 13/36] =?UTF-8?q?#43=20=E3=82=B5=E3=83=BC=E3=83=93?=
 =?UTF-8?q?=E3=82=B9=E6=83=85=E5=A0=B1=E3=81=A8=E6=8E=A5=E7=B6=9A=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=81=AE=E7=99=BB=E9=8C=B2=E6=A9=9F=E8=83=BD=E3=81=AE?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/admin.py                          |  44 +-
 .../migrations/0006_group_allow_jpnic_add.py  |  18 +
 custom_auth/models.py                         |   1 +
 custom_auth/urls.py                           |   2 +-
 dsbd/templates/base2.html                     |   2 +
 dsbd/templates/connection/add.html            | 218 ++++++++
 dsbd/templates/connection/index.html          | 337 ++++++++++++
 dsbd/templates/error.html                     |  13 +
 dsbd/templates/group/index.html               |   4 +
 dsbd/templates/home.html                      |  26 +-
 dsbd/templates/ip/jpnic_add.html              | 174 ++++++
 dsbd/templates/ip/jpnic_edit.html             | 114 ++++
 dsbd/templates/ip/jpnic_index.html            |  71 +++
 dsbd/templates/navbar2.html                   |   2 +-
 dsbd/templates/service/add.html               | 304 +++++++++++
 dsbd/templates/service/index.html             | 103 ++--
 dsbd/urls.py                                  |   4 +-
 dsbd/views.py                                 |  25 +-
 ip/admin.py                                   |  16 +-
 ip/form.py                                    |  80 +++
 ip/jpnic_urls.py                              |  10 +
 ip/migrations/0004_alter_jpnicuser_group.py   |  20 +
 ...e_jpnicuser_is_active_jpnicuser_is_pass.py |  22 +
 ip/migrations/0006_alter_jpnicuser_is_pass.py |  18 +
 ..._remove_ip_plan_ip_ipv4_plan_ip_is_pass.py |  27 +
 .../0008_alter_ipjpnicuser_unique_together.py |  17 +
 ip/migrations/0009_jpnicuser_version.py       |  18 +
 .../0010_alter_jpnicuser_unique_together.py   |  18 +
 ip/migrations/0011_alter_jpnicuser_org.py     |  18 +
 ip/migrations/0012_ip_version.py              |  18 +
 ip/migrations/0013_alter_ip_ip_address.py     |  18 +
 ip/models.py                                  |  43 +-
 ip/urls.py                                    |   2 +
 ip/views.py                                   |  58 ++
 service/admin.py                              |  36 ++
 service/check.py                              |  87 +++
 service/form.py                               | 496 ++++++++++++++++++
 service/group_urls.py                         |  10 +
 service/models.py                             |  59 ++-
 service/urls.py                               |   4 +-
 service/views.py                              |  75 ++-
 41 files changed, 2506 insertions(+), 126 deletions(-)
 create mode 100644 custom_auth/migrations/0006_group_allow_jpnic_add.py
 create mode 100644 dsbd/templates/connection/add.html
 create mode 100644 dsbd/templates/connection/index.html
 create mode 100644 dsbd/templates/error.html
 create mode 100644 dsbd/templates/ip/jpnic_add.html
 create mode 100644 dsbd/templates/ip/jpnic_edit.html
 create mode 100644 dsbd/templates/ip/jpnic_index.html
 create mode 100644 dsbd/templates/service/add.html
 create mode 100644 ip/form.py
 create mode 100644 ip/jpnic_urls.py
 create mode 100644 ip/migrations/0004_alter_jpnicuser_group.py
 create mode 100644 ip/migrations/0005_remove_jpnicuser_is_active_jpnicuser_is_pass.py
 create mode 100644 ip/migrations/0006_alter_jpnicuser_is_pass.py
 create mode 100644 ip/migrations/0007_remove_ip_plan_ip_ipv4_plan_ip_is_pass.py
 create mode 100644 ip/migrations/0008_alter_ipjpnicuser_unique_together.py
 create mode 100644 ip/migrations/0009_jpnicuser_version.py
 create mode 100644 ip/migrations/0010_alter_jpnicuser_unique_together.py
 create mode 100644 ip/migrations/0011_alter_jpnicuser_org.py
 create mode 100644 ip/migrations/0012_ip_version.py
 create mode 100644 ip/migrations/0013_alter_ip_ip_address.py
 create mode 100644 ip/urls.py
 create mode 100644 ip/views.py
 create mode 100644 service/check.py
 create mode 100644 service/form.py
 create mode 100644 service/group_urls.py

diff --git a/custom_auth/admin.py b/custom_auth/admin.py
index 78c5559..62ee51d 100644
--- a/custom_auth/admin.py
+++ b/custom_auth/admin.py
@@ -1,16 +1,48 @@
 from django.contrib import admin
+from django.urls import reverse
+from django.utils.html import format_html
 
 from custom_auth.models import Group, TOTPDevice, User, UserActivateToken
+from ip.models import JPNICUser
+from service.models import Service
 
 
 class TermInlineUserAdmin(admin.TabularInline):
     model = User.groups.through
-    extra = 1
+    extra = 0
 
 
 class TermInlineGroupAdmin(admin.TabularInline):
     model = Group.users.through
-    extra = 1
+    extra = 0
+
+
+class TermInlineGroupServiceAdmin(admin.TabularInline):
+    model = Service
+    extra = 0
+    fields = ("service_code", "service_type", "service_number", "is_active", "is_pass")
+    readonly_fields = ("service_code", "service_type", "service_number", "is_active", "is_pass")
+
+    def service_code(self, obj):
+        # 管理ページの編集ページへのリンクを生成
+        url = reverse("admin:service_service_change", args=[obj.id])
+        return format_html('<a href="{}" target="__blank__">{}</a>', url, obj.service_code)
+
+    service_code.short_description = "ServiceCode"
+
+
+class TermInlineGroupJPNICAdmin(admin.TabularInline):
+    model = JPNICUser
+    extra = 0
+    fields = ("id_link", "jpnic_handle", "name", "org", "is_pass")
+    readonly_fields = ("id_link", "jpnic_handle", "name", "org", "is_pass")
+
+    def id_link(self, obj):
+        # 管理ページの編集ページへのリンクを生成
+        url = reverse("admin:ip_jpnicuser_change", args=[obj.id])
+        return format_html('<a href="{}" target="__blank__">{}</a>', url, obj.id)
+
+    id_link.short_description = "ID"
 
 
 @admin.register(User)
@@ -47,7 +79,7 @@ def get_groups(self, obj):
 @admin.register(Group)
 class Group(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ("name", "name_jp", "allow_service_add", "is_pass", "comment")}),
+        (None, {"fields": ("name", "name_jp", "allow_service_add", "allow_jpnic_add", "is_pass", "comment")}),
         ("Membership", {"fields": ("membership_type", "membership_expired_at")}),
         ("Question", {"fields": ("agree", "question")}),
         ("Stripe", {"fields": ("stripe_customer_id", "stripe_subscription_id")}),
@@ -85,7 +117,11 @@ class Group(admin.ModelAdmin):
         "updated_at",
     )
 
-    inlines = (TermInlineGroupAdmin,)
+    inlines = (
+        TermInlineGroupAdmin,
+        TermInlineGroupServiceAdmin,
+        TermInlineGroupJPNICAdmin,
+    )
 
 
 @admin.register(UserActivateToken)
diff --git a/custom_auth/migrations/0006_group_allow_jpnic_add.py b/custom_auth/migrations/0006_group_allow_jpnic_add.py
new file mode 100644
index 0000000..2fc45be
--- /dev/null
+++ b/custom_auth/migrations/0006_group_allow_jpnic_add.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-13 16:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0005_alter_group_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='allow_jpnic_add',
+            field=models.BooleanField(default=False, verbose_name='JPNIC情報追加許可'),
+        ),
+    ]
diff --git a/custom_auth/models.py b/custom_auth/models.py
index 124bfbf..a1a1094 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -82,6 +82,7 @@ class Group(models.Model):  # noqa: F811
     comment = models.CharField("comment", max_length=250, default="", blank=True)
     status = models.IntegerField("ステータス", default=1, choices=GROUP_STATUS_CHOICES)
     allow_service_add = models.BooleanField("サービス追加許可", default=False)
+    allow_jpnic_add = models.BooleanField("JPNIC情報追加許可", default=False)
     membership_type = models.IntegerField("会員種別", default=1, choices=MEMBERSHIP_TYPE_CHOICES)
     membership_expired_at = models.DateTimeField("有効期限", blank=True, null=True)
 
diff --git a/custom_auth/urls.py b/custom_auth/urls.py
index 4ba0db8..cff65cf 100644
--- a/custom_auth/urls.py
+++ b/custom_auth/urls.py
@@ -5,7 +5,7 @@
 app_name = "custom_auth"
 urlpatterns = [
     path("", views.index, name="index"),
-    path("passwor", views.password_change, name="password_change"),
+    path("password", views.password_change, name="password_change"),
     path("email", views.change_email, name="email_change"),
     path("edit", views.edit_profile, name="edit_profile"),
     path("two_auth", views.list_two_auth, name="list_two_auth"),
diff --git a/dsbd/templates/base2.html b/dsbd/templates/base2.html
index 4702e3f..a8ccb25 100644
--- a/dsbd/templates/base2.html
+++ b/dsbd/templates/base2.html
@@ -24,6 +24,8 @@
         href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
   <link rel="stylesheet"
         href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
+  <!-- jquery -->
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
   <style>
       #parent {
diff --git a/dsbd/templates/connection/add.html b/dsbd/templates/connection/add.html
new file mode 100644
index 0000000..53822c9
--- /dev/null
+++ b/dsbd/templates/connection/add.html
@@ -0,0 +1,218 @@
+{% extends 'base2.html' %}
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">接続情報新規申請</h2>
+          <br/>
+          <form method="post" class="h-adr">
+            {% csrf_token %}
+            <h4>0. サービス情報</h4>
+            <input type="text" class="form-control" value="{{ service_code }}" disabled>
+            <br/>
+            <h4>{{ form.connection_type.label }}</h4>
+            {{ form.connection_type }}
+            {% if form.connection_type.errors %}
+              <p class="link-danger">{{ form.connection_type.errors | striptags }}</p>
+            {% endif %}
+            <div id="connectionCommentField" style="display: none;">
+              <h5>{{ form.connection_comment.label }}</h5>
+              {{ form.connection_comment }}
+              {% if form.connection_comment.errors %}
+                <p class="link-danger">{{ form.connection_comment.errors | striptags }}</p>
+              {% endif %}
+            </div>
+            <br/>
+            {% if  is_ipv4_bgp or is_ipv6_bgp %}
+              <h5>1.2.広報する経路</h5>
+              <div class="container">
+                <div class="row align-items-start">
+                  {% if is_ipv4_bgp %}
+                    <div class="col">
+                      <h5>{{ form.ipv4_route.label }}</h5>
+                      {{ form.ipv4_route }}
+                      {% if form.ipv4_route.errors %}
+                        <p class="link-danger">{{ form.ipv4_route.errors | striptags }}</p>
+                      {% endif %}
+                      <br/>
+                      <h5>{{ form.ipv4_route_comment.label }}</h5>
+                      {{ form.ipv4_route_comment }}
+                      {% if form.ipv4_route_comment.errors %}
+                        <p class="link-danger">{{ form.ipv4_route_comment.errors | striptags }}</p>
+                      {% endif %}
+                    </div>
+                  {% endif %}
+                  {% if is_ipv6_bgp %}
+                    <div class="col">
+                      <h5>{{ form.ipv6_route.label }}</h5>
+                      {{ form.ipv6_route }}
+                      {% if form.ipv6_route.errors %}
+                        <p class="link-danger">{{ form.ipv6_route.errors | striptags }}</p>
+                      {% endif %}
+                      <br/>
+                      <h5>{{ form.ipv6_route_comment.label }}</h5>
+                      {{ form.ipv6_route_comment }}
+                      {% if form.ipv6_route_comment.errors %}
+                        <p class="link-danger">{{ form.ipv6_route_comment.errors | striptags }}</p>
+                      {% endif %}
+                    </div>
+                  {% endif %}
+                </div>
+              </div>
+              <br/>
+            {% endif %}
+            <h4>2. 接続情報や場所など</h4>
+            <h5>{{ form.hope_location.label }}</h5>
+            {{ form.hope_location }}
+            {% if form.hope_location.errors %}
+              <p class="link-danger">{{ form.hope_location.errors | striptags }}</p>
+            {% endif %}
+            <br/>
+            <h5>{{ form.term_location.label }}</h5>
+            {{ form.term_location }}
+            {% if form.term_location.errors %}
+              <p class="link-danger">{{ form.term_location.errors | striptags }}</p>
+            {% endif %}
+            <br/>
+            <div id="termField" style="display: none;">
+              <h5>{{ form.term_ip.label }}</h5>
+              {{ form.term_ip }}
+              {% if form.term_ip.errors %}
+                <p class="link-danger">{{ form.term_ip.errors | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>{{ form.ntt_type.label }}</h5>
+              {{ form.ntt_type }}
+              {% if form.ntt_type.errors %}
+                <p class="link-danger">{{ form.ntt_type.errors | striptags }}</p>
+              {% endif %}
+              <br/>
+              <div id="nttCommentField" style="display: none;">
+                <h5>{{ form.ntt_comment.label }}</h5>
+                {{ form.ntt_comment }}
+                {% if form.ntt_comment.errors %}
+                  <p class="link-danger">{{ form.ntt_comment.errors | striptags }}</p>
+                {% endif %}
+                <br/>
+              </div>
+              <br/>
+            </div>
+            <h4>3. 利用開始・終了日</h4>
+            <p>(最短で1週間後から選択できます)</p>
+            <div class="container">
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.start_date.label }}</h5>
+                  {{ form.start_date }}
+                  {% if form.start_date.errors %}
+                    <p class="link-danger">{{ form.start_date.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.end_date.label }}</h5>
+                  <div id="endDateField" style="display: none;">
+                    {{ form.end_date }}
+                    {% if form.end_date.errors %}
+                      <p class="link-danger">{{ form.end_date.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                  <div class="form-check">
+                    {{ form.no_end_date }}
+                    <label class="form-check-label">
+                      {{ form.no_end_date.label }}
+                    </label>
+                    {% if form.no_end_date.errors %}
+                      <p class="link-danger">{{ form.no_end_date.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                </div>
+              </div>
+            </div>
+            <br/>
+            <h4>{{ form.is_monitor.label }}</h4>
+            <div class="form-check">
+              {{ form.is_monitor }}
+              <label class="form-check-label">監視あり</label>
+              {% if form.is_monitor.errors %}
+                <p class="link-danger">{{ form.is_monitor.errors | striptags }}</p>
+              {% endif %}
+            </div>
+            <br/>
+            <h4>{{ form.comment.label }}</h4>
+            {{ form.comment }}
+            {% if form.comment.errors %}
+              <p class="link-danger">{{ form.comment.errors | striptags }}</p>
+            {% endif %}
+            <br/>
+            <br/>
+            <button type="submit" class="btn btn-primary">登録</button>
+          </form>
+          {% if request.user.allow_group_add %}
+          {% else %}
+            <p>
+              <b>新規にグループを登録したい又は既存の登録グループを紐づけたい方は、チケットページよりお問い合わせください</b>
+            </p>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+{% block javascript %}
+  <script>
+    $(document).ready(function () {
+      checkConnectionTypeForm();
+      checkNoEndDateForm();
+      checkNTTCommentForm();
+
+      // サービス種別フォーム変化時
+      $('#id_connection_type').change(function () {
+        checkConnectionTypeForm();
+      });
+      // 終了未定種別フォーム変化時
+      $('#id_no_end_date').change(function () {
+        checkNoEndDateForm();
+      });
+      // 終了未定種別フォーム変化時
+      $('#id_ntt_type').change(function () {
+        checkNTTCommentForm();
+      });
+
+
+      // サービス種別からIP3B,ET00かどうかを判別する
+      function checkConnectionTypeForm() {
+        const selectedValue = $('#id_connection_type').val();
+        if (selectedValue === 'ETC') {
+          $('#connectionCommentField').show();
+        } else {
+          $('#connectionCommentField').hide();
+        }
+
+        if (selectedValue !== 'CC0') {
+          $('#termField').show();
+        } else {
+          $('#termField').hide();
+        }
+      }
+
+      // 終了未定種別がFalseの場合に利用終了日のフォームを出す
+      function checkNoEndDateForm() {
+        if ($('#id_no_end_date').is(':checked')) {
+          $('#endDateField').hide();
+        } else {
+          $('#endDateField').show();
+        }
+      }
+
+      function checkNTTCommentForm() {
+        const selectedValue = $('#id_ntt_type').val();
+        if (selectedValue === 'etc') {
+          $('#nttCommentField').show();
+        } else {
+          $('#nttCommentField').hide();
+        }
+      }
+    });
+  </script>
+{% endblock javascript %}
\ No newline at end of file
diff --git a/dsbd/templates/connection/index.html b/dsbd/templates/connection/index.html
new file mode 100644
index 0000000..2262cda
--- /dev/null
+++ b/dsbd/templates/connection/index.html
@@ -0,0 +1,337 @@
+{% extends 'base2.html' %}
+{% block style %}
+  <style>
+      table {
+          border-collapse: collapse;
+          margin: 0 auto;
+          width: 80%;
+      }
+
+      td,
+      th {
+          border: 1px solid #ccc;
+          padding: 10px;
+          text-align: center;
+      }
+
+      th {
+          background: #e2e8ef;
+          white-space: pre-wrap;
+      }
+
+      tr:first-child th {
+          border-top: 5px solid #005ab3;
+      }
+
+      tr:first-child td {
+          border-top: 5px solid #ccc;
+      }
+
+      p {
+          white-space: pre-wrap;
+      / / color: #000000;
+      }
+  </style>
+{% endblock %}
+
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Service</h2>
+          {% if group_id %}
+            <a href="/group/{{ group_id }}/service/add" type="button"
+               class="btn btn-sm btn-primary">サービス登録
+            </a>
+          {% endif %}
+          <br/>
+          <br/>
+          {% if services %}
+            {% for service in services %}
+              <div class="card">
+                <div class="card-body">
+                  {% if not service.is_pass %}
+                    <div class="alert alert-warning" role="alert">
+                      <h4 class="alert-heading">審査未完了</h4>
+                      <p>審査が完了していません。しばらくお待ちください。</p>
+                    </div>
+                  {% endif %}
+                  {% if service.is_pass and service.allow_connection_add %}
+                    <div class="alert alert-warning" role="alert">
+                      <h4 class="alert-heading">接続情報申請</h4>
+                      <p>接続情報を申請してください。</p>
+                      <a href="/group/{{ service.group.id }}/service/{{ service.id }}/connection/add" type="button"
+                         class="btn btn-sm btn-primary">接続情報の申請</a>
+                    </div>
+                  {% endif %}
+                  <div class="container">
+                    <table>
+                      <thead>
+                      <tr>
+                        <th colspan="2">サービス情報</th>
+                      </tr>
+                      <tr>
+                        <th>サービスコード</th>
+                        <td>{{ service.service_code }}</td>
+                      </tr>
+                      <tr>
+                        <th>サービス種別</th>
+                        <td>{{ service.get_service_type_display }}</td>
+                      </tr>
+                      <tr>
+                        <th>利用料金</th>
+                        <td>FREE</td>
+                      </tr>
+                      <tr>
+                        <th>利用サービス期間</th>
+                        <td>{{ service.start_at|default_if_none:"--" }}
+                          ~ {{ service.end_at|default_if_none:"未定" }}</td>
+                      </tr>
+                      </thead>
+                    </table>
+                    <br/>
+                    {% if service.is_pass %}
+                      <div class="card">
+                        <div class="card-header">
+                          <b>IPアドレス情報</b>
+                        </div>
+                        <div class="card-body">
+                          <table>
+                            <thead>
+                            <tr>
+                              <th colspan="3">
+                                アドレス情報
+                              </th>
+                            </tr>
+                            <tr>
+                              <th>IPアドレス</th>
+                              <th>アドレス割当元</th>
+                            </tr>
+
+                            {% for ip in service.IPService.all %}
+                              <tr>
+                                <td>{{ ip.ip_address }}/{{ ip.subnet }}</td>
+                                <td>{{ ip.get_owner_display }}</td>
+                              </tr>
+                            {% endfor %}
+                            </thead>
+                          </table>
+                        </div>
+                      </div>
+                    {% endif %}
+                    <br/>
+                    {% for connection in service.ConnectionService.all %}
+                      <div class="card">
+                        <div class="card-header">
+                          <b>[Connection] {{ connection.service_code }}</b>
+                        </div>
+                        <div class="card-body">
+                          <table>
+                            <thead>
+                            <tr>
+                              <th colspan="3">接続情報
+                              </th>
+                            </tr>
+                            <tr>
+                              <th>サービス(接続)コード
+                              </th>
+                              <td colspan="2">{{ connection.service_code }}</td>
+                            </tr>
+                            <tr>
+                              <th>開通状況</th>
+                              <td colspan="2">
+                                {% if connection.is_pass %}
+                                  <span class="badge bg-success">開通済み</span>
+                                {% else %}
+                                  <span class="badge bg-danger">未開通</span>{% endif %}
+                              </td>
+                            </tr>
+                            <tr>
+                              <th>接続方式</th>
+                              <td colspan="2">{{ connection.get_connection_type_display }}</td>
+                            </tr>
+                            <tr>
+                              <th>接続NOC</th>
+                              <td colspan="2">{{ connection.tunnel_ip.tunnel_router.noc.name |default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>
+                                トンネル終端アドレス（貴団体側）
+                              </th>
+                              <td colspan="2">{{ connection.term_ip|default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>
+                                トンネル終端アドレス（HomeNOC側）
+                              </th>
+                              <td colspan="2">{{ connection.tunnel_ip.ip_address|default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>利用接続期間</th>
+                              <td colspan="2">{{ connection.start_at|default_if_none:"--" }}
+                                ~ {{ connection.end_at|default_if_none:"未定" }}</td>
+                            </tr>
+                            <tr>
+                              <th colspan="3">
+                                当団体との間の境界アドレス
+                              </th>
+                            </tr>
+                            <tr>
+                              <th></th>
+                              <th>IPv4アドレス</th>
+                              <th>IPv6アドレス</th>
+                            </tr>
+                            <tr>
+                              <th>HomeNOC側</th>
+                              <td>{{ connection.link_v4_our|default_if_none:"---" }}</td>
+                              <td>{{ connection.link_v6_our|default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>貴団体側</th>
+                              <td>{{ connection.link_v4_your |default_if_none:"---" }}</td>
+                              <td>{{ connection.link_v6_your |default_if_none:"---" }}</td>
+                            </tr>
+                            <tr>
+                              <th>広報経路</th>
+                              <td>
+                                <span
+                                    class="badge text-bg-secondary"
+                                    data-bs-toggle="tooltip"
+                                    data-bs-placement="top"
+                                    data-bs-title="
+                                        {% if not connection.ipv4_route %}{{ connection.ipv4_route_comment }}{% else %}{{ connection.ipv4_route }}{% endif %}">{{ connection.ipv4_route }}</span>
+                              </td>
+                              <td>
+                                <span
+                                    class="badge text-bg-secondary"
+                                    data-bs-toggle="tooltip"
+                                    data-bs-placement="top"
+                                    data-bs-title="{% if not connection.ipv6_route %}
+                                      {{ connection.ipv6_route_comment }}{% else %}{{ connection.ipv6_route }}
+                                                                  {% endif %}">{{ connection.ipv6_route }}</span>
+                              </td>
+                            </tr>
+                            </thead>
+                          </table>
+                          <br/>
+                          本ページは電気通信事業法
+                          第26条2（書面の交付義務）に基づく書面となります。
+                          <br/>
+                          なお、郵送での書面交付をご希望頂いた方は、お送りします書面が正式書面となり本画面の表示は参考情報となります。
+                          <br/>
+                        </div>
+                      </div>
+                      <br/>
+                    {% endfor %}
+                  </div>
+                </div>
+                <div class="card-footer">
+                  {% if service.is_pass %}
+                    <span class="badge bg-success">審査OK</span>
+                  {% else %}
+                    <span class="badge bg-danger">未審査</span>{% endif %}
+                  {% if service.administrator %}
+                    <span class="badge bg-success">管理者権限</span>{% endif %}
+                  <span
+                      class="badge bg-secondary">Group: {{ service.group.id }}({{ service.group.name }})</span>
+                </div>
+              </div>
+              <br/>
+            {% endfor %}
+            <nav aria-label="...">
+              <ul class="pagination">
+                {% if services.has_previous %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=services.previous_page_number %}">前へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">前へ</span>
+                  </li>
+                {% endif %}
+                {% if services.paginator.num_pages > 10 %}
+                  {% if services.number < 6 %}
+                    {#    先頭 9 ページの表示      #}
+                    {% for pg in services.paginator.page_range %}
+                      {% if forloop.counter0 < 9 %}
+                        {% if services.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% elif services.number < services.paginator.num_pages|add:-4 %}
+                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
+                    {% for pg in services.paginator.page_range %}
+                      {% if services.number|add:-5 < pg and pg < services.number|add:5 %}
+                        {% if services.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% else %}
+                    {#   最後 9 ページの表示   #}
+                    {% for pg in services.paginator.page_range %}
+                      {% if forloop.counter0 > services.paginator.num_pages|add:-10 %}
+                        {% if services.number == pg %}
+                          <li class="page-item active">
+                            {% else %}
+                          <li class="page-item">
+                        {% endif %}
+                      <a class="page-link"
+                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                      </li>
+                      {% endif %}
+                    {% endfor %}
+                  {% endif %}
+                {% else %}
+                  {% for pg in services.paginator.page_range %}
+                    {% if services.number == pg %}
+                      <li class="page-item active">
+                        {% else %}
+                      <li class="page-item">
+                    {% endif %}
+                  <a class="page-link"
+                     href="?{% url_replace request page=pg %}">{{ pg }}</a>
+                  </li>
+                  {% endfor %}
+                {% endif %}
+                {% if services.has_next %}
+                  <li class="page-item">
+                    <a class="page-link"
+                       href="?{% url_replace request page=services.next_page_number %}">次へ</a>
+                  </li>
+                {% else %}
+                  <li class="page-item disabled">
+                    <span class="page-link">次へ</span>
+                  </li>
+                {% endif %}
+              </ul>
+            </nav>
+          {% else %}
+            <p>サービスがありません</p>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+
+{% block javascript %}
+
+  <script>
+    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+    const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+  </script>
+{% endblock %}
\ No newline at end of file
diff --git a/dsbd/templates/error.html b/dsbd/templates/error.html
new file mode 100644
index 0000000..ca61db7
--- /dev/null
+++ b/dsbd/templates/error.html
@@ -0,0 +1,13 @@
+{% extends 'base2.html' %}
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>{{ error }}</h2>
+          <h2>{{ text }}</h2>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/dsbd/templates/group/index.html b/dsbd/templates/group/index.html
index d5ec80a..e23338e 100644
--- a/dsbd/templates/group/index.html
+++ b/dsbd/templates/group/index.html
@@ -45,6 +45,10 @@ <h5 class="card-title">{{ e.group.name }}</h5>
                          href="{% url 'custom_auth_group:edit' e.group.id %}">情報閲覧・修正</a>
                       <a class="btn btn-primary btn-sm"
                          href="{% url 'custom_auth_group:permission' e.group.id %}">権限設定</a>
+                      <a class="btn btn-primary btn-sm"
+                         href="{{ e.group.id }}/service">サービス情報</a>
+                      <a class="btn btn-primary btn-sm"
+                         href="{{ e.group.id }}/jpnic">JPNIC情報</a>
                       <br/>
                       <br/>
                       {% if e.administrator %}
diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index 7d74a11..c001939 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -17,7 +17,7 @@
         <div class="container py-4 mb-auto">
           <div class="h-900 p-2 rounded-3">
             <h2>お知らせ</h2>
-            {% if request.user.groups.count == 0 %}
+            {% if not request.user.groups %}
               <div class="card text-bg-light mb-3">
                 <div class="card-body">
                   <h5 class="card-title">グループの新規申請手続き</h5>
@@ -31,7 +31,29 @@ <h5 class="card-title">グループの新規申請手続き</h5>
               <div class="card text-bg-warning mb-3">
                 <div class="card-body">
                   <h5 class="card-title"><b>グループの申請処理中</b></h5>
-                  <p class="card-text">現在、グループの申請処理中です。<br/>この作業には時間が掛かる可能性があります。</p>
+                  <p class="card-text">現在、グループの申請処理中です。<br/>この作業には時間が掛かる可能性があります。
+                  </p>
+                </div>
+              </div>
+            {% endif %}
+            {% if not active_services and not is_not_pass_services %}
+              <div class="card text-bg-light mb-3">
+                <div class="card-body">
+                  <h5 class="card-title">サービスの新規申請手続き</h5>
+                  <p class="card-text">
+                    サービスの新規申請手続きを行ってください<br/>
+                    グループページからサービス情報ページの「サービス登録」ボタンから申請可能です。
+                  </p>
+                  <a href="{% url 'custom_auth_group:index' %}" class="btn btn-sm btn-primary">申請はこちらから</a>
+                </div>
+              </div>
+            {% endif %}
+            {% if is_not_pass_services %}
+              <div class="card text-bg-warning mb-3">
+                <div class="card-body">
+                  <h5 class="card-title"><b>サービスの申請処理中</b></h5>
+                  <p class="card-text">現在、グループの申請処理中です。<br/>この作業には時間が掛かる可能性があります。
+                  </p>
                 </div>
               </div>
             {% endif %}
diff --git a/dsbd/templates/ip/jpnic_add.html b/dsbd/templates/ip/jpnic_add.html
new file mode 100644
index 0000000..d60a41d
--- /dev/null
+++ b/dsbd/templates/ip/jpnic_add.html
@@ -0,0 +1,174 @@
+{% extends 'base2.html' %}
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">JPNIC情報の追加</h2>
+          <br/>
+          {% if error %}
+            <div class="alert alert-danger" role="alert">
+              {{ error }}
+            </div>
+            <br/>
+          {% endif %}
+          <form method="post" class="h-adr">
+            {% csrf_token %}
+            <h4>JPNIC管理者情報</h4>
+            <div class="alert alert-warning" role="alert">
+              IPv4とIPv6は別でJPNICハンドルが必要になるため、別々に登録する必要があります<br/>
+            </div>
+            <div class="container">
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.version.label }}</h5>
+                  {{ form.version }}
+                  {% if form.version.errors %}
+                    <p class="link-danger">{{ form.version.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.handle_type.label }}</h5>
+                  {{ form.handle_type }}
+                  {% if form.handle_type.errors %}
+                    <p class="link-danger">{{ form.handle_type.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.jpnic_handle.label }}</h5>
+                  {{ form.jpnic_handle }}
+                  {% if form.jpnic_handle.errors %}
+                    <p class="link-danger">{{ form.jpnic_handle.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.name_jp.label }}</h5>
+                  {{ form.name_jp }}
+                  {% if form.name_jp.errors %}
+                    <p class="link-danger">{{ form.name_jp.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.name.label }}</h5>
+                  {{ form.name }}
+                  {% if form.name.errors %}
+                    <p class="link-danger">{{ form.name.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.email.label }}</h5>
+                  {{ form.email }}
+                  {% if form.email.errors %}
+                    <p class="link-danger">{{ form.email.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.org_jp.label }}</h5>
+                  {{ form.org_jp }}
+                  {% if form.org_jp.errors %}
+                    <p class="link-danger">{{ form.org_jp.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.org.label }}</h5>
+                  {{ form.org }}
+                  {% if form.org.errors %}
+                    <p class="link-danger">{{ form.org.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.postcode.label }}</h5>
+                  {{ form.postcode }}
+                  {% if form.postcode.errors %}
+                    <p class="link-danger">{{ form.postcode.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.address_jp.label }}</h5>
+                  {{ form.address_jp }}
+                  {% if form.address_jp.errors %}
+                    <p class="link-danger">{{ form.address_jp.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.address.label }}</h5>
+                  {{ form.address }}
+                  {% if form.address.errors %}
+                    <p class="link-danger">{{ form.address.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.dept_jp.label }}</h5>
+                  {{ form.dept_jp }}
+                  {% if form.dept_jp.errors %}
+                    <p class="link-danger">{{ form.dept_jp.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.dept.label }}</h5>
+                  {{ form.dept }}
+                  {% if form.dept.errors %}
+                    <p class="link-danger">{{ form.dept.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.title_jp.label }}</h5>
+                  {{ form.title_jp }}
+                  {% if form.title_jp.errors %}
+                    <p class="link-danger">{{ form.title_jp.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.title.label }}</h5>
+                  {{ form.title }}
+                  {% if form.title.errors %}
+                    <p class="link-danger">{{ form.title.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.tel.label }}</h5>
+                  {{ form.tel }}
+                  {% if form.tel.errors %}
+                    <p class="link-danger">{{ form.tel.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.fax.label }}</h5>
+                  {{ form.fax }}
+                  {% if form.fax.errors %}
+                    <p class="link-danger">{{ form.fax.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.country.label }}</h5>
+                  {{ form.country }}
+                  {% if form.country.errors %}
+                    <p class="link-danger">{{ form.country.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+            </div>
+            <br/>
+            <br/>
+            <button type="submit" class="btn btn-primary">更新</button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/dsbd/templates/ip/jpnic_edit.html b/dsbd/templates/ip/jpnic_edit.html
new file mode 100644
index 0000000..8cf8171
--- /dev/null
+++ b/dsbd/templates/ip/jpnic_edit.html
@@ -0,0 +1,114 @@
+{% extends 'base2.html' %}
+{% block content %}
+
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">JPNIC情報の修正</h2>
+          <br/>
+          {% if error %}
+            <div class="alert alert-danger" role="alert">
+              {{ error }}
+            </div>
+            <br/>
+          {% endif %}
+          <form method="post" class="h-adr">
+            {% csrf_token %}
+            <h4>JPNIC管理者情報</h4>
+            <div class="container">
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.handle_type.label }}</h5>
+                  {{ form.handle_type }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.jpnic_handle.label }}</h5>
+                  {{ form.jpnic_handle }}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.name_jp.label }}</h5>
+                  {{ form.name_jp }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.name.label }}</h5>
+                  {{ form.name }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.email.label }}</h5>
+                  {{ form.email }}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.org_jp.label }}</h5>
+                  {{ form.org_jp }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.org.label }}</h5>
+                  {{ form.org }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.postcode.label }}</h5>
+                  {{ form.postcode }}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.address_jp.label }}</h5>
+                  {{ form.address_jp }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.address.label }}</h5>
+                  {{ form.address }}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.dept_jp.label }}</h5>
+                  {{ form.dept_jp }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.dept.label }}</h5>
+                  {{ form.dept }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.title_jp.label }}</h5>
+                  {{ form.title_jp }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.title.label }}</h5>
+                  {{ form.title }}
+                </div>
+              </div>
+              <br/>
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.tel.label }}</h5>
+                  {{ form.tel }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.fax.label }}</h5>
+                  {{ form.fax }}
+                </div>
+                <div class="col">
+                  <h5>{{ form.country.label }}</h5>
+                  {{ form.country }}
+                </div>
+              </div>
+            </div>
+            <br/>
+            <br/>
+            <button type="submit" class="btn btn-primary">登録</button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/dsbd/templates/ip/jpnic_index.html b/dsbd/templates/ip/jpnic_index.html
new file mode 100644
index 0000000..60b74a4
--- /dev/null
+++ b/dsbd/templates/ip/jpnic_index.html
@@ -0,0 +1,71 @@
+{% extends 'base2.html' %}
+{% block style %}
+  <style>
+      .description-text {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+      }
+  </style>
+
+{% endblock style %}
+
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2>JPNIC</h2>
+          <a href="add" type="button"
+             class="btn btn-sm btn-secondary">JPNIC情報の追加</a>
+          <p><b>編集には申請が必要です</b></p>
+          {% for jpnic_user in jpnic_users %}
+            <div class="card mb-2">
+              <div class="card-body">
+                <h6 class="card-subtitle mb-2 text-body-secondary">
+                  <span
+                      class="badge text-bg-primary">{{ jpnic_user.handle_type }}</span>
+                  {% if jpnic_user.hidden %}
+                    <span class="badge text-bg-danger">HIDDEN</span>
+                  {% endif %}
+                  <span
+                      class="badge text-bg-secondary">IPv{{ jpnic_user.version }}</span>
+                </h6>
+                <h5 class="card-title">{{ jpnic_user.jpnic_handle }}: {{ jpnic_user.name_jp }}({{ jpnic_user.name }})</h5>
+                <code class="card-text description-text">
+                  Org: {{ jpnic_user.org_jp }}({{ jpnic_user.org }})<br/>
+                  E-Mail: {{ jpnic_user.email }}<br/>
+                  部署: {% if jpnic_user.dept_jp %}{{ jpnic_user.dept_jp }}(
+                  {{ jpnic_user.dept }}){% else %}---{% endif %}, 役職:
+                  {% if jpnic_user.title_jp %}{{ jpnic_user.title_jp }}(
+                    {{ jpnic_user.title }}){% else %}---{% endif %}<br/>
+                  郵便番号: {{ jpnic_user.postcode }}<br/>
+                  住所: {{ jpnic_user.address_jp }}({{ jpnic_user.address }})<br/>
+                  Tel: {{ jpnic_user.tel }}, Fax:
+                  {% if jpnic_user.fax %}{{ jpnic_user.fax }}{% else %}
+                    ---{% endif %}<br/>
+                  Country: {{ jpnic_user.country }}<br/>
+                </code>
+                <a href="{{ jpnic_user.id }}/edit" type="button"
+                   class="btn btn-sm btn-primary">
+                  編集
+                </a>
+              </div>
+              <div class="card-footer text-body-secondary">
+                {% if jpnic_user.is_pass %}
+                  <span class="badge text-bg-primary">審査OK/Active</span>
+                {% else %}
+                  <span class="badge text-bg-danger">審査中</span>
+                {% endif %}
+                <span
+                    class="badge text-bg-secondary">作成日: {{ jpnic_user.created_at }}</span>
+                <span
+                    class="badge text-bg-secondary">更新日: {{ jpnic_user.updated_at }}</span>
+              </div>
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/dsbd/templates/navbar2.html b/dsbd/templates/navbar2.html
index 9c2c9a6..42b94ef 100644
--- a/dsbd/templates/navbar2.html
+++ b/dsbd/templates/navbar2.html
@@ -95,7 +95,7 @@
         </a>
       </li>
       <li class="nav-item">
-        <a href="{% url 'service:index' %}" class="nav-link text-white">
+        <a href="{% url 'services:index' %}" class="nav-link text-white">
           <svg class="bi me-2" width="16" height="16">
             <use xlink:href="#grid"></use>
           </svg>
diff --git a/dsbd/templates/service/add.html b/dsbd/templates/service/add.html
new file mode 100644
index 0000000..099d3b2
--- /dev/null
+++ b/dsbd/templates/service/add.html
@@ -0,0 +1,304 @@
+{% extends 'base2.html' %}
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">サービス新規申請</h2>
+          <br/>
+          <form method="post" class="h-adr">
+            {% csrf_token %}
+            <h4>1. 申請内容</h4>
+            <h5>{{ form.service_type.label }}</h5>
+            {{ form.service_type }}
+            {% if form.service_type.errors %}
+              <p class="link-danger">{{ form.service_type.errors | striptags }}</p>
+            {% endif %}
+            <div id="serviceTypeCommentField" style="display: none;">
+              <h5>{{ form.service_type_comment.label }}</h5>
+              {{ form.service_type_comment }}
+              {% if form.service_type_comment.errors %}
+                <p class="link-danger">{{ form.service_type_comment.errors | striptags }}</p>
+              {% endif %}
+            </div>
+            <br/>
+            <div id="asnField" style="display: none;">
+              <h5>{{ form.asn.label }}</h5>
+              {{ form.asn }}
+              {% if form.asn.errors %}
+                <p class="link-danger">{{ form.asn.errors | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>1.3.広報する経路</h5>
+              <div class="container">
+                <div class="row align-items-start">
+                  <div class="alert alert-secondary" role="alert">
+                    複数のアドレスを広報する場合は、カンマ区切りで入力してください。<br/>
+                  </div>
+                  <div class="col">
+                    <div id="ipv4-fields">
+                      <h5>{{ form.ipv4_address.label }}</h5>
+                      {{ form.ipv4_address }}<br>
+                    </div>
+                  </div>
+                  <div class="col">
+                    <div id="ipv6-fields">
+                      <h4>{{ form.ipv6_address.label }}</h4>
+                      {{ form.ipv6_address }}<br>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <br/>
+            </div>
+            <div id="assignIPField" style="display: none;">
+              <div class="alert alert-warning" role="alert">
+                本サービス種別の場合、当団体がアドレスのアサインを行うため、JPNIC情報を事前に登録する必要があります。<br/>
+                詳しい内容は、<b>「1.4. JPNIC情報フォーム」</b>をご覧ください<br/>
+              </div>
+              <div class="container">
+                <div class="row align-items-start">
+                  <div class="col">
+                    <h5>{{ form.assign_v4_subnet.label }}</h5>
+                    {{ form.assign_v4_subnet }}
+                    {% if form.assign_v4_subnet.errors %}
+                      <p class="link-danger">{{ form.assign_v4_subnet.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                  <div class="col">
+                    <h5>{{ form.assign_v6_subnet.label }}</h5>
+                    {{ form.assign_v6_subnet }}
+                    {% if form.assign_v6_subnet.errors %}
+                      <p class="link-danger">{{ form.assign_v6_subnet.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                </div>
+              </div>
+              <br/>
+              <h5>{{ form.ipv4_plan.label }}</h5>
+              <div class="alert alert-warning" role="alert">
+                「用途,割当直後のホスト数(25%以上),割当6ヶ月後のホスト数(50%以上),割当12ヶ月後(75%以上),その他」をcsv形式で入力してください。<br/>
+                 注意: ネットワークアドレスとブロードキャストアドレス分は必要ありません。(アドレス個数-2)<br/>
+                <code>
+                  --例--<br/>
+                  Webサーバ,1,2,2,なし<br/>
+                  DNSサーバ,1,2,2,なし<br/>
+                </code>
+              </div>
+              {{ form.ipv4_plan }}
+              {% if form.ipv4_plan.errors %}
+                <p class="link-danger">{{ form.ipv4_plan.errors | striptags }}</p>
+              {% endif %}
+              <br/>
+              <h5>1.4. JPNIC情報</h5>
+              <div class="alert alert-warning" role="alert">
+                このサービス種別の場合、当団体がアドレスのアサインを行うため、JPNIC情報を事前に登録する必要があります。<br/>
+                なお、JPNIC情報を登録後、更新ボタンを押してください。(もし、選択項目に反映されない場合はページをリロードしてください<br/>
+                <a class="btn btn-primary btn-sm"
+                   href="{% url 'jpnic:jpnic_index' group_id %}"
+                   target="_blank">JPNIC情報一覧と登録はこちらから</a>
+                <button type="submit" name="update_jpnic_users"
+                        class="btn btn-sm btn-secondary">更新
+                </button>
+              </div>
+              <div class="container">
+                <div class="row align-items-start">
+                  <div class="col">
+                    <h5>{{ form.ipv4_jpnic_admin.label }}</h5>
+                    {{ form.ipv4_jpnic_admin }}
+                    {% if form.ipv4_jpnic_admin.errors %}
+                      <p class="link-danger">{{ form.ipv4_jpnic_admin.errors | striptags }}</p>
+                    {% endif %}
+                    <br/>
+                    <h5>{{ form.ipv4_jpnic_tech1.label }}</h5>
+                    {{ form.ipv4_jpnic_tech1 }}
+                    {% if form.ipv4_jpnic_tech1.errors %}
+                      <p class="link-danger">{{ form.ipv4_jpnic_tech1.errors | striptags }}</p>
+                    {% endif %}
+                    <br/>
+                    <h5>{{ form.ipv4_jpnic_tech2.label }}</h5>
+                    {{ form.ipv4_jpnic_tech2 }}
+                    {% if form.ipv4_jpnic_tech2.errors %}
+                      <p class="link-danger">{{ form.ipv4_jpnic_tech2.errors | striptags }}</p>
+                    {% endif %}
+                    <br/>
+                    <h5>{{ form.ipv4_jpnic_tech3.label }}</h5>
+                    {{ form.ipv4_jpnic_tech3 }}
+                    {% if form.ipv4_jpnic_tech3.errors %}
+                      <p class="link-danger">{{ form.ipv4_jpnic_tech3.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                  <div class="col">
+                    <h5>{{ form.ipv6_jpnic_admin.label }}</h5>
+                    {{ form.ipv6_jpnic_admin }}
+                    {% if form.ipv6_jpnic_admin.errors %}
+                      <p class="link-danger">{{ form.ipv6_jpnic_admin.errors | striptags }}</p>
+                    {% endif %}
+                    <br/>
+                    <h5>{{ form.ipv6_jpnic_tech1.label }}</h5>
+                    {{ form.ipv6_jpnic_tech1 }}
+                    {% if form.ipv6_jpnic_tech1.errors %}
+                      <p class="link-danger">{{ form.ipv6_jpnic_tech1.errors | striptags }}</p>
+                    {% endif %}
+                    <br/>
+                    <h5>{{ form.ipv6_jpnic_tech2.label }}</h5>
+                    {{ form.ipv6_jpnic_tech2 }}
+                    {% if form.ipv6_jpnic_tech2.errors %}
+                      <p class="link-danger">{{ form.ipv6_jpnic_tech2.errors | striptags }}</p>
+                    {% endif %}
+                    <br/>
+                    <h5>{{ form.ipv6_jpnic_tech3.label }}</h5>
+                    {{ form.ipv6_jpnic_tech3 }}
+                    {% if form.ipv6_jpnic_tech3.errors %}
+                      <p class="link-danger">{{ form.ipv6_jpnic_tech3.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                </div>
+              </div>
+              <br/>
+            </div>
+            <br/>
+            <br/>
+            <h4>2. 利用開始・終了日</h4>
+            <p>(最短で1週間後から選択できます)</p>
+            <div class="container">
+              <div class="row align-items-start">
+                <div class="col">
+                  <h5>{{ form.start_date.label }}</h5>
+                  {{ form.start_date }}
+                  {% if form.start_date.errors %}
+                    <p class="link-danger">{{ form.start_date.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.end_date.label }}</h5>
+                  <div id="endDateField" style="display: none;">
+                    {{ form.end_date }}
+                    {% if form.end_date.errors %}
+                      <p class="link-danger">{{ form.end_date.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                  <div class="form-check">
+                    {{ form.no_end_date }}
+                    <label class="form-check-label">
+                      {{ form.no_end_date.label }}
+                    </label>
+                    {% if form.no_end_date.errors %}
+                      <p class="link-danger">{{ form.no_end_date.errors | striptags }}</p>
+                    {% endif %}
+                  </div>
+                </div>
+              </div>
+            </div>
+            <br/>
+            <br/>
+            <h4>3. 帯域など</h4>
+            <div class="container">
+              <div class="row align-items-end">
+                <div class="col">
+                  <h5>{{ form.ave_upstream.label }}</h5>
+                  {{ form.ave_upstream }}
+                  {% if form.ave_upstream.errors %}
+                    <p class="link-danger">{{ form.ave_upstream.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.max_upstream.label }}</h5>
+                  {{ form.max_upstream }}
+                  {% if form.max_upstream.errors %}
+                    <p class="link-danger">{{ form.max_upstream.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+            </div>
+            <br/>
+            <div class="container">
+              <div class="row align-items-end">
+                <div class="col">
+                  <h5>{{ form.ave_downstream.label }}</h5>
+                  {{ form.ave_downstream }}
+                  {% if form.ave_downstream.errors %}
+                    <p class="link-danger">{{ form.ave_downstream.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+                <div class="col">
+                  <h5>{{ form.max_downstream.label }}</h5>
+                  {{ form.max_downstream }}
+                  {% if form.max_downstream.errors %}
+                    <p class="link-danger">{{ form.max_downstream.errors | striptags }}</p>
+                  {% endif %}
+                </div>
+              </div>
+            </div>
+            <br/>
+            <h5>{{ form.max_bandwidth_as.label }}</h5>
+            {{ form.max_bandwidth_as }}
+            {% if form.max_bandwidth_as.errors %}
+              <p class="link-danger">{{ form.max_bandwidth_as.errors | striptags }}</p>
+            {% endif %}
+            <br/>
+            <br/>
+            <h4>{{ form.comment.label }}</h4>
+            {{ form.comment }}
+            {% if form.comment.errors %}
+              <p class="link-danger">{{ form.comment.errors | striptags }}</p>
+            {% endif %}
+            <br/>
+            <br/>
+            <button type="submit" class="btn btn-primary">登録</button>
+          </form>
+          {% if request.user.allow_group_add %}
+          {% else %}
+            <p>
+              <b>新規にグループを登録したい又は既存の登録グループを紐づけたい方は、チケットページよりお問い合わせください</b>
+            </p>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+{% block javascript %}
+  <script>
+    $(document).ready(function () {
+      checkServiceTypeForm();
+      checkNoEndDateForm();
+
+      // サービス種別フォーム変化時
+      $('#id_service_type').change(function () {
+        checkServiceTypeForm();
+      });
+      // 終了未定種別フォーム変化時
+      $('#id_no_end_date').change(function () {
+        checkNoEndDateForm();
+      });
+
+
+      // サービス種別からIP3B,ET00かどうかを判別する
+      function checkServiceTypeForm() {
+        const selectedValue = $('#id_service_type').val();
+        if (selectedValue !== 'IP3B') {
+          $('#assignIPField').show();
+        } else {
+          $('#assignIPField').hide();
+        }
+        if (selectedValue === 'ET00') {
+          $('#serviceTypeCommentField').show();
+        } else if (selectedValue === 'IP3B') {
+          $('#asnField').show();
+        } else {
+          $('#asnField').hide();
+        }
+      }
+
+      // 終了未定種別がFalseの場合に利用終了日のフォームを出す
+      function checkNoEndDateForm() {
+        if ($('#id_no_end_date').is(':checked')) {
+          $('#endDateField').hide();
+        } else {
+          $('#endDateField').show();
+        }
+      }
+    });
+  </script>
+{% endblock javascript %}
\ No newline at end of file
diff --git a/dsbd/templates/service/index.html b/dsbd/templates/service/index.html
index 0dfb348..d1295d4 100644
--- a/dsbd/templates/service/index.html
+++ b/dsbd/templates/service/index.html
@@ -40,11 +40,34 @@
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
           <h2 class="card-title">Service</h2>
+          {% if group_id %}
+            <a href="/group/{{ group_id }}/service/add" type="button"
+               class="btn btn-sm btn-primary">サービス登録
+            </a>
+          {% endif %}
+          <br/>
           <br/>
           {% if services %}
             {% for service in services %}
               <div class="card">
+                <div class="card-header">
+                  <b>[Service] {{ service.service_code }}</b>
+                </div>
                 <div class="card-body">
+                  {% if not service.is_pass %}
+                    <div class="alert alert-warning" role="alert">
+                      <h4 class="alert-heading">審査未完了</h4>
+                      <p>審査が完了していません。しばらくお待ちください。</p>
+                    </div>
+                  {% endif %}
+                  {% if service.is_pass and service.allow_connection_add %}
+                    <div class="alert alert-warning" role="alert">
+                      <h4 class="alert-heading">接続情報申請</h4>
+                      <p>接続情報を申請してください。</p>
+                      <a href="/group/{{ service.group.id }}/service/{{ service.id }}/connection/add" type="button"
+                         class="btn btn-sm btn-primary">接続情報の申請</a>
+                    </div>
+                  {% endif %}
                   <div class="container">
                     <table>
                       <thead>
@@ -91,7 +114,12 @@ <h2 class="card-title">Service</h2>
 
                             {% for ip in service.IPService.all %}
                               <tr>
-                                <td>{{ ip.ip_address }}/{{ ip.subnet }}</td>
+                                <td>{{ ip.ip_address }}/{{ ip.subnet }}
+                                  {% if ip.is_pass %}
+                                    <span class="badge bg-success">審査OK</span>
+                                  {% else %}
+                                    <span class="badge bg-danger">未審査</span>
+                                  {% endif %}</td>
                                 <td>{{ ip.get_owner_display }}</td>
                               </tr>
                             {% endfor %}
@@ -175,35 +203,20 @@ <h2 class="card-title">Service</h2>
                             <tr>
                               <th>広報経路</th>
                               <td>
-                                                            <span
-                                                                class="badge text-bg-secondary"
-                                                                data-bs-toggle="tooltip"
-                                                                data-bs-placement="top"
-                                                                data-bs-title="{% if not connection.ipv4_route %}
-
-
-
-
-
-
-
-                                                                  {{ connection.ipv4_route_comment }}{% else %}{{ connection.ipv4_route }}
-                                                                  {% endif %}">{{ connection.ipv4_route }}</span>
+                                <span
+                                    class="badge text-bg-secondary"
+                                    data-bs-toggle="tooltip"
+                                    data-bs-placement="top"
+                                    data-bs-title="
+                                        {% if not connection.ipv4_route %}{{ connection.ipv4_route_comment }}{% else %}{{ connection.ipv4_route }}{% endif %}">{{ connection.ipv4_route }}</span>
                               </td>
                               <td>
-                                                        <span
-                                                            class="badge text-bg-secondary"
-                                                            data-bs-toggle="tooltip"
-                                                            data-bs-placement="top"
-                                                            data-bs-title="{% if not connection.ipv6_route %}
-
-
-
-
-
-
-
-                                                              {{ connection.ipv6_route_comment }}{% else %}{{ connection.ipv6_route }}
+                                <span
+                                    class="badge text-bg-secondary"
+                                    data-bs-toggle="tooltip"
+                                    data-bs-placement="top"
+                                    data-bs-title="{% if not connection.ipv6_route %}
+                                      {{ connection.ipv6_route_comment }}{% else %}{{ connection.ipv6_route }}
                                                                   {% endif %}">{{ connection.ipv6_route }}</span>
                               </td>
                             </tr>
@@ -236,22 +249,22 @@ <h2 class="card-title">Service</h2>
             {% endfor %}
             <nav aria-label="...">
               <ul class="pagination">
-                {% if tickets.has_previous %}
+                {% if services.has_previous %}
                   <li class="page-item">
                     <a class="page-link"
-                       href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
+                       href="?{% url_replace request page=services.previous_page_number %}">前へ</a>
                   </li>
                 {% else %}
                   <li class="page-item disabled">
                     <span class="page-link">前へ</span>
                   </li>
                 {% endif %}
-                {% if tickets.paginator.num_pages > 10 %}
-                  {% if tickets.number < 6 %}
+                {% if services.paginator.num_pages > 10 %}
+                  {% if services.number < 6 %}
                     {#    先頭 9 ページの表示      #}
-                    {% for pg in tickets.paginator.page_range %}
+                    {% for pg in services.paginator.page_range %}
                       {% if forloop.counter0 < 9 %}
-                        {% if tickets.number == pg %}
+                        {% if services.number == pg %}
                           <li class="page-item active">
                             {% else %}
                           <li class="page-item">
@@ -261,11 +274,11 @@ <h2 class="card-title">Service</h2>
                       </li>
                       {% endif %}
                     {% endfor %}
-                  {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
+                  {% elif services.number < services.paginator.num_pages|add:-4 %}
                     {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                    {% for pg in tickets.paginator.page_range %}
-                      {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
-                        {% if tickets.number == pg %}
+                    {% for pg in services.paginator.page_range %}
+                      {% if services.number|add:-5 < pg and pg < services.number|add:5 %}
+                        {% if services.number == pg %}
                           <li class="page-item active">
                             {% else %}
                           <li class="page-item">
@@ -277,9 +290,9 @@ <h2 class="card-title">Service</h2>
                     {% endfor %}
                   {% else %}
                     {#   最後 9 ページの表示   #}
-                    {% for pg in tickets.paginator.page_range %}
-                      {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
-                        {% if tickets.number == pg %}
+                    {% for pg in services.paginator.page_range %}
+                      {% if forloop.counter0 > services.paginator.num_pages|add:-10 %}
+                        {% if services.number == pg %}
                           <li class="page-item active">
                             {% else %}
                           <li class="page-item">
@@ -291,8 +304,8 @@ <h2 class="card-title">Service</h2>
                     {% endfor %}
                   {% endif %}
                 {% else %}
-                  {% for pg in tickets.paginator.page_range %}
-                    {% if tickets.number == pg %}
+                  {% for pg in services.paginator.page_range %}
+                    {% if services.number == pg %}
                       <li class="page-item active">
                         {% else %}
                       <li class="page-item">
@@ -302,10 +315,10 @@ <h2 class="card-title">Service</h2>
                   </li>
                   {% endfor %}
                 {% endif %}
-                {% if tickets.has_next %}
+                {% if services.has_next %}
                   <li class="page-item">
                     <a class="page-link"
-                       href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
+                       href="?{% url_replace request page=services.next_page_number %}">次へ</a>
                   </li>
                 {% else %}
                   <li class="page-item disabled">
diff --git a/dsbd/urls.py b/dsbd/urls.py
index 56d67e4..67cd34d 100644
--- a/dsbd/urls.py
+++ b/dsbd/urls.py
@@ -33,9 +33,11 @@
     path("forget/complete/", views.PasswordResetComplete.as_view(), name="password_reset_complete"),
     path("activate/<uuid:activate_token>/", views.activate_user, name="activate_user"),
     path("group/", include("custom_auth.group_urls")),
+    path("group/<int:group_id>/jpnic/", include("ip.jpnic_urls")),
+    path("group/<int:group_id>/service/", include("service.group_urls")),
+    path("services/", include("service.urls")),
     path("profile/", include("custom_auth.urls")),
     path("ticket/", include("ticket.urls")),
-    path("service/", include("service.urls")),
     path("feedback/", views.feedback, name="feedback"),
 ]
 
diff --git a/dsbd/views.py b/dsbd/views.py
index a394bc9..77e80cf 100644
--- a/dsbd/views.py
+++ b/dsbd/views.py
@@ -13,6 +13,7 @@
     PasswordResetView,
 )
 from django.core.paginator import EmptyPage, InvalidPage, Paginator
+from django.db.models import Prefetch
 from django.http import HttpResponse
 from django.shortcuts import redirect, render
 from django.urls import reverse_lazy
@@ -166,17 +167,16 @@ def index(request):
     # except (EmptyPage, InvalidPage):
     #     tickets = ticket_paginator.page(ticket_paginator.num_pages)
 
-    services = None
-
-    # group_filter = request.user.groups.filter(is_active=True)
-    # if group_filter.exists():
-    #     service_objects = Service.objects.get_service(groups=group_filter.all()).filter(is_active=True)
-    #     service_paginator = Paginator(service_objects, int(request.GET.get("ticket_per_page", "3")))
-    #     service_page = int(request.GET.get("ticket_page", "1"))
-    #     try:
-    #         services = service_paginator.page(service_page)
-    #     except (EmptyPage, InvalidPage):
-    #         services = service_paginator.page(service_paginator.num_pages)
+    # Service一覧を取得
+    groups = request.user.groups.prefetch_related(Prefetch("ServiceGroup"))
+    services = []
+    active_services = []
+    is_not_pass_services = []
+    for group in groups:
+        group_services = group.ServiceGroup.prefetch_related(Prefetch("ConnectionService")).all()
+        services.extend(group_services)
+        active_services.extend([service for service in group_services if service.is_pass and service.is_active])
+        is_not_pass_services.extend([service for service in group_services if not service.is_pass])
 
     if request.method == "POST":
         stripe.api_key = settings.STRIPE_SECRET_KEY
@@ -201,11 +201,12 @@ def index(request):
                     customer=request.user.stripe_customer_id, return_url=settings.DOMAIN_URL
                 )
                 return redirect(session.url, code=303)
-
     context = {
         "notices": notices,
         # "tickets": tickets,
         "services": services,
+        "active_services": active_services,
+        "is_not_pass_services": is_not_pass_services,
         "is_new_group_request": is_new_group_request,
     }
     return render(request, "home.html", context)
diff --git a/ip/admin.py b/ip/admin.py
index 106665b..cc3b09c 100644
--- a/ip/admin.py
+++ b/ip/admin.py
@@ -5,12 +5,13 @@
 
 class TermInlineIPAdmin(admin.TabularInline):
     model = IP.jpnic_user.through
-    extra = 1
+    extra = 0
+    readonly_fields = ("created_at", "updated_at", "jpnic_user", "user_type")
 
 
 class TermInlineJPNICUserAdmin(admin.TabularInline):
     model = JPNICUser.ip.through
-    extra = 1
+    extra = 0
 
 
 @admin.register(IP)
@@ -25,7 +26,7 @@ class IP(admin.ModelAdmin):
                 )
             },
         ),
-        ("ip", {"fields": ("ip_address", "subnet", "start_at", "end_at", "plan", "use_case")}),
+        ("ip", {"fields": ("ip_address", "subnet", "start_at", "end_at", "ipv4_plan", "use_case")}),
         (
             "Important dates",
             {
@@ -36,9 +37,10 @@ class IP(admin.ModelAdmin):
             },
         ),
     )
-    list_display = ("id", "is_active", "service", "ip_address", "subnet", "start_at", "end_at")
+    list_display = ("id", "is_active", "is_pass", "service", "ip_address", "subnet", "start_at", "end_at")
     list_filter = (
         "is_active",
+        "is_pass",
         "end_at",
     )
     search_fields = ("ip_address",)
@@ -54,7 +56,7 @@ class JPNICUser(admin.ModelAdmin):
             {
                 "fields": (
                     "group",
-                    "is_active",
+                    "is_pass",
                 )
             },
         ),
@@ -91,8 +93,8 @@ class JPNICUser(admin.ModelAdmin):
             },
         ),
     )
-    list_display = ("id", "is_active", "group", "jpnic_handle", "name", "org")
-    list_filter = ("is_active", "group")
+    list_display = ("id", "is_pass", "group", "jpnic_handle", "name", "org")
+    list_filter = ("is_pass", "group")
     search_fields = ("name", "name_jp", "group", "org", "org_jp")
 
     inlines = (TermInlineJPNICUserAdmin,)
diff --git a/ip/form.py b/ip/form.py
new file mode 100644
index 0000000..cfccc4f
--- /dev/null
+++ b/ip/form.py
@@ -0,0 +1,80 @@
+from django import forms
+from django_countries.fields import CountryField
+
+from ip.models import JPNICUser
+
+
+class JPNICForm(forms.ModelForm):
+    class Meta:
+        model = JPNICUser
+        fields = (
+            "version",
+            "handle_type",
+            "jpnic_handle",
+            "name_jp",
+            "name",
+            "email",
+            "org_jp",
+            "org",
+            "postcode",
+            "address_jp",
+            "address",
+            "dept_jp",
+            "dept",
+            "title_jp",
+            "title",
+            "tel",
+            "fax",
+            "country",
+        )
+
+    def __init__(self, *args, **kwargs):
+        self.group_id = kwargs.pop("group_id", None)  # group_id を引数として受け取る
+        super().__init__(*args, **kwargs)
+
+        for field in self.fields.values():
+            if isinstance(field, forms.BooleanField):
+                field.widget.attrs["class"] = "form-check-input"
+            else:
+                field.widget.attrs["class"] = "form-control"
+                field.widget.attrs["placeholder"] = field.help_text if field.help_text else field.label
+
+    def save(self):
+        instance = super().save(commit=False)
+        instance.group_id = self.group_id
+        instance.save()
+        return instance
+
+
+class JPNICAddForm(forms.Form):
+    jpnic_handle = forms.CharField(label="JPNIC Handle", required=False)
+    name_jp = forms.CharField(label="1. グループ名/名前", required=False)
+    name = forms.CharField(label="2. グループ名/名前(English)", required=False)
+    email = forms.EmailField(label="3. E-Mail", required=False)
+    org_jp = forms.CharField(label="4. 組織名", required=False)
+    org = forms.CharField(label="5. 組織名(English)", required=False)
+    postcode = forms.CharField(label="6. 郵便番号", required=False)
+    address_jp = forms.CharField(label="7. 住所", required=False)
+    address = forms.CharField(label="8. 住所(English)", required=False)
+    dept_jp = forms.CharField(label="9. 部署", required=False)
+    dept = forms.CharField(label="10. 部署(English)", required=False)
+    title_jp = forms.CharField(label="11. 役職", required=False)
+    title = forms.CharField(label="12. 役職(English)", required=False)
+    tel = forms.CharField(label="13. Tel", max_length=30, required=True)
+    fax = forms.CharField(label="14. Fax", max_length=30, required=True)
+    country = CountryField().formfield(label="15. 居住国", required=True)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        for field in self.fields.values():
+            if isinstance(field, forms.BooleanField):
+                field.widget.attrs["class"] = "form-check-input"
+            else:
+                field.widget.attrs["class"] = "form-control"
+                field.widget.attrs["placeholder"] = field.help_text if field.help_text else field.label
+
+    def clean(self):
+        cleaned_data = super().clean()
+
+        return cleaned_data
diff --git a/ip/jpnic_urls.py b/ip/jpnic_urls.py
new file mode 100644
index 0000000..17adec0
--- /dev/null
+++ b/ip/jpnic_urls.py
@@ -0,0 +1,10 @@
+from django.urls import path
+
+from . import views
+
+app_name = "jpnic"
+urlpatterns = [
+    path("", views.jpnic_index, name="jpnic_index"),
+    path("add/", views.jpnic_add, name="jpnic_add"),
+    path("<int:jpnic_id>/edit", views.jpnic_edit, name="jpnic_edit"),
+]
diff --git a/ip/migrations/0004_alter_jpnicuser_group.py b/ip/migrations/0004_alter_jpnicuser_group.py
new file mode 100644
index 0000000..7d8591b
--- /dev/null
+++ b/ip/migrations/0004_alter_jpnicuser_group.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.1.1 on 2024-09-13 15:55
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0005_alter_group_status'),
+        ('ip', '0003_ip_owner_alter_ip_ip_address_alter_ip_use_case_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='jpnicuser',
+            name='group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='JPNICUserGroup', to='custom_auth.group'),
+        ),
+    ]
diff --git a/ip/migrations/0005_remove_jpnicuser_is_active_jpnicuser_is_pass.py b/ip/migrations/0005_remove_jpnicuser_is_active_jpnicuser_is_pass.py
new file mode 100644
index 0000000..42f5147
--- /dev/null
+++ b/ip/migrations/0005_remove_jpnicuser_is_active_jpnicuser_is_pass.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.1 on 2024-09-13 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0004_alter_jpnicuser_group'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='jpnicuser',
+            name='is_active',
+        ),
+        migrations.AddField(
+            model_name='jpnicuser',
+            name='is_pass',
+            field=models.BooleanField(default=True, verbose_name='審査OK'),
+        ),
+    ]
diff --git a/ip/migrations/0006_alter_jpnicuser_is_pass.py b/ip/migrations/0006_alter_jpnicuser_is_pass.py
new file mode 100644
index 0000000..b62b0e2
--- /dev/null
+++ b/ip/migrations/0006_alter_jpnicuser_is_pass.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-13 19:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0005_remove_jpnicuser_is_active_jpnicuser_is_pass'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='jpnicuser',
+            name='is_pass',
+            field=models.BooleanField(default=False, verbose_name='審査OK'),
+        ),
+    ]
diff --git a/ip/migrations/0007_remove_ip_plan_ip_ipv4_plan_ip_is_pass.py b/ip/migrations/0007_remove_ip_plan_ip_ipv4_plan_ip_is_pass.py
new file mode 100644
index 0000000..6703e8e
--- /dev/null
+++ b/ip/migrations/0007_remove_ip_plan_ip_ipv4_plan_ip_is_pass.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.1.1 on 2024-09-14 12:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0006_alter_jpnicuser_is_pass'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ip',
+            name='plan',
+        ),
+        migrations.AddField(
+            model_name='ip',
+            name='ipv4_plan',
+            field=models.JSONField(blank=True, null=True, verbose_name='IPv4プラン'),
+        ),
+        migrations.AddField(
+            model_name='ip',
+            name='is_pass',
+            field=models.BooleanField(default=False, verbose_name='審査OK'),
+        ),
+    ]
diff --git a/ip/migrations/0008_alter_ipjpnicuser_unique_together.py b/ip/migrations/0008_alter_ipjpnicuser_unique_together.py
new file mode 100644
index 0000000..a9c1435
--- /dev/null
+++ b/ip/migrations/0008_alter_ipjpnicuser_unique_together.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.1.1 on 2024-09-14 13:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0007_remove_ip_plan_ip_ipv4_plan_ip_is_pass'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='ipjpnicuser',
+            unique_together={('jpnic_user', 'ip', 'user_type')},
+        ),
+    ]
diff --git a/ip/migrations/0009_jpnicuser_version.py b/ip/migrations/0009_jpnicuser_version.py
new file mode 100644
index 0000000..083e29e
--- /dev/null
+++ b/ip/migrations/0009_jpnicuser_version.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-14 15:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0008_alter_ipjpnicuser_unique_together'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='jpnicuser',
+            name='version',
+            field=models.IntegerField(choices=[(4, 'IPv4'), (6, 'IPv6')], default=4, verbose_name='IPバージョン'),
+        ),
+    ]
diff --git a/ip/migrations/0010_alter_jpnicuser_unique_together.py b/ip/migrations/0010_alter_jpnicuser_unique_together.py
new file mode 100644
index 0000000..1bd4235
--- /dev/null
+++ b/ip/migrations/0010_alter_jpnicuser_unique_together.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-14 15:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0006_group_allow_jpnic_add'),
+        ('ip', '0009_jpnicuser_version'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='jpnicuser',
+            unique_together={('group', 'jpnic_handle', 'version', 'name', 'name_jp')},
+        ),
+    ]
diff --git a/ip/migrations/0011_alter_jpnicuser_org.py b/ip/migrations/0011_alter_jpnicuser_org.py
new file mode 100644
index 0000000..93f7712
--- /dev/null
+++ b/ip/migrations/0011_alter_jpnicuser_org.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-14 15:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0010_alter_jpnicuser_unique_together'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='jpnicuser',
+            name='org',
+            field=models.CharField(max_length=150, verbose_name='Org'),
+        ),
+    ]
diff --git a/ip/migrations/0012_ip_version.py b/ip/migrations/0012_ip_version.py
new file mode 100644
index 0000000..32d91fc
--- /dev/null
+++ b/ip/migrations/0012_ip_version.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-14 15:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0011_alter_jpnicuser_org'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ip',
+            name='version',
+            field=models.IntegerField(choices=[(4, 'IPv4'), (6, 'IPv6')], default=4, verbose_name='IPバージョン'),
+        ),
+    ]
diff --git a/ip/migrations/0013_alter_ip_ip_address.py b/ip/migrations/0013_alter_ip_ip_address.py
new file mode 100644
index 0000000..6b69828
--- /dev/null
+++ b/ip/migrations/0013_alter_ip_ip_address.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-14 16:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ip', '0012_ip_version'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ip',
+            name='ip_address',
+            field=models.GenericIPAddressField(blank=True, null=True, verbose_name='IP Address'),
+        ),
+    ]
diff --git a/ip/models.py b/ip/models.py
index cf3aaaf..f9118b8 100644
--- a/ip/models.py
+++ b/ip/models.py
@@ -5,26 +5,6 @@
 from dsbd.models import MediumTextField
 from service.models import Service
 
-SERVICE_L2 = "2000"
-SERVICE_L3_STATIC = "3S00"
-SERVICE_L3_BGP = "3B00"
-SERVICE_TRANSIT = "IP3B"
-SERVICE_COLO_L2 = "CL20"
-SERVICE_COLO_L3_STATIC = "CL3S"
-SERVICE_COLO_L3_BGP = "CL3B"
-SERVICE_ETC = "ET00"
-
-SERVICE_CHOICES = (
-    (SERVICE_L2, "L2"),
-    (SERVICE_L3_STATIC, "L3 Static"),
-    (SERVICE_L3_BGP, "L3 BGP"),
-    (SERVICE_TRANSIT, "トランジット提供"),
-    (SERVICE_COLO_L2, "コロケーションサービス(L2)"),
-    (SERVICE_COLO_L3_STATIC, "コロケーションサービス(L3 Static)"),
-    (SERVICE_COLO_L3_BGP, "コロケーションサービス(L3 BGP)"),
-    (SERVICE_ETC, "その他"),
-)
-
 OWNER_TYPE_FROM_OUR = "form_our"
 OWNER_TYPE_FROM_YOUR = "form_your"
 OWNER_TYPE_CHOICES = (
@@ -32,6 +12,13 @@
     (OWNER_TYPE_FROM_YOUR, "貴団体から割当"),
 )
 
+IP_VERSION_4 = 4
+IP_VERSION_6 = 6
+IP_VERSION_CHOICES = (
+    (IP_VERSION_4, "IPv4"),
+    (IP_VERSION_6, "IPv6"),
+)
+
 
 class IP(models.Model):
     class Meta:
@@ -42,15 +29,17 @@ class Meta:
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
     is_active = models.BooleanField("有効", default=True)
+    is_pass = models.BooleanField("審査OK", default=False)
     service = models.ForeignKey(Service, on_delete=models.SET_NULL, related_name="IPService", null=True, blank=True)
-    ip_address = models.GenericIPAddressField("IP Address", unique=True, null=True, blank=True)
+    version = models.IntegerField("IPバージョン", choices=IP_VERSION_CHOICES, default=IP_VERSION_4)
+    ip_address = models.GenericIPAddressField("IP Address", null=True, blank=True)
     subnet = models.IntegerField("サブネット", default=32)
     owner = models.CharField(
         "アドレス所持オーナ", default=OWNER_TYPE_FROM_OUR, choices=OWNER_TYPE_CHOICES, max_length=255
     )
     start_at = models.DateTimeField("開通日", null=True, blank=True)
     end_at = models.DateTimeField("解約日", null=True, blank=True)
-    plan = models.JSONField("プラン", null=True, blank=True)
+    ipv4_plan = models.JSONField("IPv4プラン", null=True, blank=True)
     use_case = MediumTextField("使用用途", default="", blank=True)
     jpnic_user = models.ManyToManyField(
         "JPNICUser",
@@ -78,20 +67,22 @@ class Meta:
         ordering = ("id",)
         verbose_name = "JPNIC User"
         verbose_name_plural = "JPNIC Users"
+        unique_together = ("group", "jpnic_handle", "version", "name", "name_jp")
 
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
-    group = models.ForeignKey(Group, on_delete=models.CASCADE)
-    is_active = models.BooleanField("有効", default=True)
+    group = models.ForeignKey(Group, related_name="JPNICUserGroup", on_delete=models.CASCADE)
+    is_pass = models.BooleanField("審査OK", default=False)
     hidden = models.BooleanField("隠蔽", default=False)
     handle_type = models.CharField(
         "ハンドルタイプ", max_length=255, choices=HANDLE_TYPE_CHOICES, default=HANDLE_TYPE_JPNIC
     )
+    version = models.IntegerField("IPバージョン", choices=IP_VERSION_CHOICES, default=IP_VERSION_4)
     jpnic_handle = models.CharField("JPNIC Handle", max_length=100, blank=True)
     name = models.CharField("name", max_length=150)
     name_jp = models.CharField("name(japanese)", max_length=150)
     email = models.EmailField("E-Mail", max_length=150)
-    org = models.CharField("Org", max_length=150, unique=True)
+    org = models.CharField("Org", max_length=150)
     org_jp = models.CharField("Org(japanese)", max_length=150)
     postcode = models.CharField("郵便番号", max_length=20, default="")
     address = models.CharField("住所", max_length=250, default="")
@@ -144,7 +135,7 @@ class IPJPNICUser(models.Model):
     class Meta:
         verbose_name = "IP・JPNIC User"
         verbose_name_plural = "IP・JPNIC Users"
-        unique_together = ("jpnic_user", "ip")
+        unique_together = ("jpnic_user", "ip", "user_type")
 
     def __str__(self):
         return "%s" % (self.id,)
diff --git a/ip/urls.py b/ip/urls.py
new file mode 100644
index 0000000..c1a7b4b
--- /dev/null
+++ b/ip/urls.py
@@ -0,0 +1,2 @@
+app_name = "ip"
+urlpatterns = []
diff --git a/ip/views.py b/ip/views.py
new file mode 100644
index 0000000..0502f7c
--- /dev/null
+++ b/ip/views.py
@@ -0,0 +1,58 @@
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import get_object_or_404, redirect, render
+
+from ip.form import JPNICForm
+from ip.models import JPNICUser
+
+
+@login_required
+def jpnic_add(request, group_id):
+    is_administrator = request.user.usergroup_set.filter(group_id=group_id, user=request.user, is_admin=True).exists()
+    if not is_administrator:
+        return render(request, "error.html", {"text": "権限がありません"})
+    if not request.user.groups.get(id=group_id).allow_jpnic_add:
+        return render(request, "error.html", {"error": "JPNIC情報の新規申請が許可されていません"})
+    if request.method == "POST":
+        form = JPNICForm(request.POST, group_id=group_id)
+        if form.is_valid():
+            form.save()  # フォームからモデルインスタンスを保存
+            return render(request, "done.html", {"text": "登録・変更が完了しました"})  # 保存後にリダイレクト
+    else:
+        form = JPNICForm()
+
+    context = {"form": form}
+    return render(request, "ip/jpnic_add.html", context)
+
+
+def jpnic_edit(request, group_id, jpnic_id):
+    is_administrator = request.user.usergroup_set.filter(group_id=group_id, user=request.user, is_admin=True).exists()
+    if not is_administrator:
+        return render(request, "error.html", {"text": "権限がありません"})
+    jpnic_user = get_object_or_404(JPNICUser, pk=jpnic_id)
+    if not jpnic_user.is_pass:
+        return render(request, "error.html", {"text": "未審査のため変更できません"})
+    if request.method == "POST":
+        # フォームにPOSTされたデータを与える
+        form = JPNICForm(request.POST, instance=jpnic_user)
+        if form.is_valid():
+            # データベースを更新
+            form.save(group_id=group_id)
+            return redirect("jpnic_index")  # 編集完了後、リダイレクト
+    else:
+        # フォームに現在のデータを与えて表示する
+        form = JPNICForm(instance=jpnic_user)
+
+    context = {
+        "form": form,
+    }
+    return render(request, "ip/jpnic_edit.html", context)
+
+
+@login_required
+def jpnic_index(request, group_id):
+    is_administrator = request.user.usergroup_set.filter(group_id=group_id, user=request.user, is_admin=True).exists()
+    if not is_administrator:
+        return render(request, "error.html", {"text": "権限がありません"})
+    jpnic_users = JPNICUser.objects.filter(group=group_id).select_related("group").order_by("id")
+    context = {"jpnic_users": jpnic_users}
+    return render(request, "ip/jpnic_index.html", context)
diff --git a/service/admin.py b/service/admin.py
index ec9e2df..d94201a 100644
--- a/service/admin.py
+++ b/service/admin.py
@@ -1,8 +1,40 @@
 from django.contrib import admin
+from django.urls import reverse
+from django.utils.html import format_html
+
+from ip.models import IP
 
 from .models import Connection, Service
 
 
+class TermInlineServiceIPAdmin(admin.TabularInline):
+    model = IP
+    extra = 0
+    fields = ("id_link", "ip_address", "subnet", "is_active", "is_pass")
+    readonly_fields = ("id_link",)
+
+    def id_link(self, obj):
+        # 管理ページの編集ページへのリンクを生成
+        url = reverse("admin:ip_ip_change", args=[obj.id])
+        return format_html('<a href="{}" target="__blank__">{}</a>', url, obj.id)
+
+    id_link.short_description = "ID"
+
+
+class TermInlineServiceConnectionAdmin(admin.TabularInline):
+    model = Connection
+    extra = 0
+    fields = ("id_link", "is_active", "is_open")
+    readonly_fields = ("id_link",)
+
+    def id_link(self, obj):
+        # 管理ページの編集ページへのリンクを生成
+        url = reverse("admin:service_connection_change", args=[obj.id])
+        return format_html('<a href="{}" target="__blank__">{}</a>', url, obj.service_code)
+
+    id_link.short_description = "ID"
+
+
 @admin.register(Service)
 class Service(admin.ModelAdmin):
     fieldsets = (
@@ -26,6 +58,10 @@ class Service(admin.ModelAdmin):
     list_display = ("service_code", "is_active", "is_pass", "group", "start_at", "end_at")
     list_filter = ("end_at",)
     search_fields = ("service_code", "is_active", "service_type")
+    inlines = [
+        TermInlineServiceIPAdmin,
+        TermInlineServiceConnectionAdmin,
+    ]
 
 
 @admin.register(Connection)
diff --git a/service/check.py b/service/check.py
new file mode 100644
index 0000000..a9192f4
--- /dev/null
+++ b/service/check.py
@@ -0,0 +1,87 @@
+import csv
+import ipaddress
+
+from ip.models import OWNER_TYPE_FROM_YOUR
+
+
+class PlanCheck:
+    def __init__(self, is_ipv4: bool, subnet: str, plan: str):
+        self.is_ipv4: bool = is_ipv4
+        self.subnet: int = int(subnet.split("/")[-1])
+        self.plan: str = plan
+
+    def check(self):
+        if self.is_ipv4:
+            return self.check_ipv4()
+        else:
+            return self.check_ipv6()
+
+    def check_ipv4(self):
+        address_count = pow(2, 32 - self.subnet)
+        enable_address = address_count - 2
+        sum_after = 0
+        sum_after_half_year = 0
+        sum_after_year = 0
+        error = ""
+        for plan in self.read_csv():
+            server_name = plan[0]
+            after = int(plan[1])  # 25%以上
+            after_half_year = int(plan[2])  # 50%以上
+            after_year = int(plan[3])  # 75%以上
+            etc = None
+            if len(plan) == 5:
+                etc = plan[4]
+            sum_after += after
+            sum_after_half_year += after_half_year
+            sum_after_year += after_year
+        if sum_after > enable_address:
+            error += "直後: 有効アドレス数を超えています,"
+        if sum_after_half_year > enable_address:
+            error += "半年後: 有効アドレス数を超えています,"
+        if sum_after_year > enable_address:
+            error += "1年後: 有効アドレス数を超えています,"
+        if sum_after <= int(enable_address * 0.25):
+            error += "直後: 25%以上のアドレスが必要です,"
+        if sum_after_half_year <= int(enable_address * 0.5):
+            error += "半年後: 50%以上のアドレスが必要です,"
+        if sum_after_year <= int(enable_address * 0.75):
+            error += "1年後: 75%以上のアドレスが必要です,"
+
+        if error == "":
+            return None
+
+        return error
+
+    def check_ipv6(self):
+        pass
+
+    def read_csv(self):
+        return csv.reader(self.plan.split("\n"))
+
+
+def validate_ip_addresses(ip_address_str: str, version: int) -> str or None:
+    error = None
+    ip_array = ip_address_str.split(",")
+    for ip in ip_array:
+        ip = ip.strip()  # スペースを取り除く
+        if "/" not in ip:
+            error = "Invalid IP Address."
+        else:
+            try:
+                if version == 4:
+                    ipaddress.IPv4Address(ip)
+                elif version == 6:
+                    ipaddress.IPv6Address(ip)
+            except ipaddress.AddressValueError:
+                error = "Invalid IP Address."
+    return error
+
+
+def ip_address_split(ip_addresses_str: str, ip_version: int) -> list:
+    ip_addresses = ip_addresses_str.split(",")
+    addresses = []
+    for ip_address in ip_addresses:
+        ip, mask = ip_address.split("/")
+        addresses.append({"version": ip_version, "address": ip, "subnet": int(mask), "owner": OWNER_TYPE_FROM_YOUR})
+
+    return addresses
diff --git a/service/form.py b/service/form.py
new file mode 100644
index 0000000..b916bc0
--- /dev/null
+++ b/service/form.py
@@ -0,0 +1,496 @@
+from datetime import date, timedelta
+
+from django import forms
+from django.db import transaction
+
+from custom_auth.models import Group
+from ip.models import (
+    IP,
+    JPNIC_USER_TYPE_ADMIN,
+    JPNIC_USER_TYPE_TECH_1,
+    JPNIC_USER_TYPE_TECH_2,
+    JPNIC_USER_TYPE_TECH_3,
+    OWNER_TYPE_FROM_OUR,
+    IPJPNICUser,
+    JPNICUser,
+)
+from service.check import PlanCheck, ip_address_split, validate_ip_addresses
+from service.models import (
+    CONNECTION_TYPE_CHOICES,
+    HOPE_LOCATION_CHOICES,
+    NTT_CHOICES,
+    ROUTE_CHOICES,
+    SERVICE_L2,
+    SERVICE_L3_BGP,
+    SERVICE_L3_STATIC,
+    SERVICE_TRANSIT,
+    Connection,
+    Service,
+)
+
+IPV4_SUBNET_CHOICES = (
+    (None, "なし"),
+    (30, "/30"),
+    (29, "/29"),
+    (28, "/28"),
+    (27, "/27"),
+)
+IPV6_SUBNET_CHOICES = (
+    (None, "なし"),
+    (64, "/64"),
+    (60, "/60"),
+    (56, "/56"),
+    (48, "/48"),
+)
+
+INPUT_SERVICE_CHOICES = (
+    (SERVICE_L2, "L2"),
+    (SERVICE_L3_STATIC, "L3 Static"),
+    (SERVICE_L3_BGP, "L3 BGP"),
+    (SERVICE_TRANSIT, "トランジット提供"),
+)
+
+
+class ServiceAddForm(forms.Form):
+    service_type = forms.ChoiceField(label="1.1. サービス名", required=True, choices=INPUT_SERVICE_CHOICES)
+    service_type_comment = forms.CharField(label="1.1.1. サービス(その他要望)", required=False)
+    asn = forms.IntegerField(label="1.2. ASN", help_text="例) 59105", required=False)
+    ipv4_address = forms.GenericIPAddressField(
+        label="1.3.1. 広報するIPv4",
+        required=False,
+        help_text="例) xx.xx.xx.xx/23,xx.xx.xx.xx/24",
+    )
+    ipv6_address = forms.GenericIPAddressField(
+        label="1.3.2. 広報するIPv6",
+        required=False,
+        help_text="例) xxxx:xxx1::1/56,xxxx:xxx2::1/56",
+    )
+    assign_v4_subnet = forms.ChoiceField(label="1.2.1. IPv4サブネット", choices=IPV4_SUBNET_CHOICES, required=False)
+    assign_v6_subnet = forms.ChoiceField(label="1.2.2. IPv6サブネット", choices=IPV6_SUBNET_CHOICES, required=False)
+    ipv4_plan = forms.CharField(
+        label="1.3. IPv4アドレス利用プラン", min_length=10, required=False, widget=forms.Textarea()
+    )
+    ipv4_jpnic_admin = forms.ModelChoiceField(
+        label="[IPv4] 管理者連絡窓口", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv4_jpnic_tech1 = forms.ModelChoiceField(
+        label="[IPv4] 技術連絡担当者1", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv4_jpnic_tech2 = forms.ModelChoiceField(
+        label="[IPv4] 技術連絡担当者2", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv4_jpnic_tech3 = forms.ModelChoiceField(
+        label="[IPv4] 技術連絡担当者3", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv6_jpnic_admin = forms.ModelChoiceField(
+        label="[IPv6] 管理者連絡窓口", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv6_jpnic_tech1 = forms.ModelChoiceField(
+        label="[IPv6] 技術連絡担当者1", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv6_jpnic_tech2 = forms.ModelChoiceField(
+        label="[IPv6] 技術連絡担当者2", queryset=JPNICUser.objects.none(), required=False
+    )
+    ipv6_jpnic_tech3 = forms.ModelChoiceField(
+        label="[IPv6] 技術連絡担当者3", queryset=JPNICUser.objects.none(), required=False
+    )
+
+    start_date = forms.DateField(
+        label="利用開始日",
+        widget=forms.DateTimeInput(
+            attrs={"type": "date", "min": (date.today() + timedelta(weeks=1)).strftime("%Y-%m-%d")}
+        ),
+        error_messages={"required": "このフィールドは必須です。日付を入力してください。"},
+        required=True,
+    )
+    end_date = forms.DateField(
+        label="利用終了日",
+        widget=forms.DateTimeInput(
+            attrs={"type": "date", "min": (date.today() + timedelta(weeks=1)).strftime("%Y-%m-%d")}
+        ),
+        required=False,
+    )
+    no_end_date = forms.BooleanField(
+        label="終了日未定",
+        required=False,
+        initial=True,
+        widget=forms.CheckboxInput(attrs={"type": "checkbox"}),
+    )
+    ave_upstream = forms.IntegerField(
+        label="3.1. 平均アップロード帯域幅(Mbps)",
+        help_text="例) 10Mbps",
+        required=True,
+    )
+    max_upstream = forms.IntegerField(
+        label="3.2. 最大アップロード帯域幅(Mbps)",
+        help_text="例) 20Mbps",
+        required=True,
+    )
+    ave_downstream = forms.IntegerField(
+        label="3.3. 平均ダウンロード帯域幅(Mbps)",
+        help_text="例) 10Mbps",
+        required=True,
+    )
+    max_downstream = forms.IntegerField(
+        label="3.4. 最大ダウンロード帯域幅(Mbps)",
+        help_text="例) 20Mbps",
+        required=True,
+    )
+    max_bandwidth_as = forms.CharField(
+        label="3.5. 特定のASに対する大量の通信があるか教えてください(ない場合は記入不要です)",
+        help_text="複数のAS番号を記載する場合は,で区切ってください",
+        required=False,
+    )
+    comment = forms.CharField(
+        label="4. その他コメントはこちら",
+        help_text="この申請で補足などがあればこちらに記載してください",
+        required=False,
+        widget=forms.Textarea(),
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.group_id = kwargs.pop("group_id", None)  # group_id を引数として受け取る
+        super().__init__(*args, **kwargs)
+        self.fields["ipv4_jpnic_admin"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=4)
+        self.fields["ipv4_jpnic_tech1"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=4)
+        self.fields["ipv4_jpnic_tech2"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=4)
+        self.fields["ipv4_jpnic_tech3"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=4)
+        self.fields["ipv6_jpnic_admin"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=6)
+        self.fields["ipv6_jpnic_tech1"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=6)
+        self.fields["ipv6_jpnic_tech2"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=6)
+        self.fields["ipv6_jpnic_tech3"].queryset = JPNICUser.objects.filter(group_id=self.group_id, version=6)
+
+        for field in self.fields.values():
+            if isinstance(field, forms.BooleanField):
+                field.widget.attrs["class"] = "form-check-input"
+            else:
+                field.widget.attrs["class"] = "form-control"
+                field.widget.attrs["placeholder"] = field.help_text if field.help_text else field.label
+
+    def clean(self):
+        cleaned_data = super().clean()
+        cleaned_data["addresses"] = []
+        # service_typeのチェック
+        service_type = cleaned_data.get("service_type")
+        service_type_comment = cleaned_data.get("service_type_comment")
+        if service_type == "ET00" and not service_type_comment:
+            self.add_error("service_type_comment", "This field is required when ETC is selected.")
+        # HomeNOC割当IPチェック
+        if service_type != "IP3B":
+            if not cleaned_data.get("assign_v4_subnet") and not cleaned_data.get("assign_v6_subnet"):
+                self.add_error("assign_v4_subnet", "IPv4 or IPv6 Assign field is required when L2/L3/ETC is selected.")
+                self.add_error("assign_v6_subnet", "IPv4 or IPv6 Assign field is required when L2/L3/ETC is selected.")
+            # IPv4 Planチェック機構
+            if cleaned_data.get("assign_v4_subnet"):
+                ipv4_plan = cleaned_data.get("ipv4_plan")
+                if not ipv4_plan:
+                    self.add_error("ipv4_plan", "This field is required when IPv4 Assign is selected.")
+                # csvチェック
+                check_ipv4 = PlanCheck(
+                    is_ipv4=True, subnet=cleaned_data.get("assign_v4_subnet"), plan=ipv4_plan
+                ).check()
+                if check_ipv4:
+                    self.add_error("ipv4_plan", check_ipv4)
+                cleaned_data["addresses"].append(
+                    {
+                        "version": 4,
+                        "address": None,
+                        "subnet": int(cleaned_data.get("assign_v4_subnet").split("/")[0]),
+                        "owner": OWNER_TYPE_FROM_OUR,
+                    }
+                )
+                self.check_jpnic(cleaned_data, version=4)
+            # IPv6
+            if cleaned_data.get("assign_v6_subnet"):
+                cleaned_data["addresses"].append(
+                    {
+                        "version": 6,
+                        "address": None,
+                        "subnet": int(cleaned_data.get("assign_v6_subnet").split("/")[0]),
+                        "owner": OWNER_TYPE_FROM_OUR,
+                    }
+                )
+                self.check_jpnic(cleaned_data, version=6)
+
+        # Transitユーザチェック
+        if service_type == "IP3B":
+            if not cleaned_data.get("asn"):
+                self.add_error("asn", "This field is required when IP Transit is selected.")
+            ipv4_address = cleaned_data.get("ipv4_address")
+            ipv6_address = cleaned_data.get("ipv6_address")
+            if not ipv4_address and not ipv6_address:
+                self.add_error(
+                    "ipv4_address",
+                    "IPv4 or IPv6 Address field is required when IP Transit is selected.",
+                )
+            if ipv4_address:
+                error = validate_ip_addresses(ipv4_address, 4)
+                if error:
+                    self.add_error("ipv4_address", "Invalid IPv4 Address.")
+                cleaned_data["addresses"].extend(ip_address_split(ipv4_address, 4))
+            if ipv6_address:
+                error = validate_ip_addresses(ipv4_address, 6)
+                if error:
+                    self.add_error("ipv6_address", "Invalid IPv6 Address.")
+                cleaned_data["addresses"].extend(ip_address_split(ipv6_address, 6))
+
+        # 開始日のチェック
+        start_date = cleaned_data.get("start_date")
+        if start_date < date.today() + timedelta(weeks=1):
+            self.add_error("start_date", "You cannot select a date in the past.")
+        # 終了日のチェック
+        end_date = cleaned_data.get("end_date")
+        no_end_date = cleaned_data.get("no_end_date")
+        if no_end_date:
+            cleaned_data["end_date"] = None
+        if not no_end_date and not end_date:
+            raise forms.ValidationError("終了日が未定でない場合、終了日を入力してください。")
+        if end_date and start_date and end_date < start_date:
+            raise forms.ValidationError("終了日は開始日以降でなければなりません。")
+
+        return cleaned_data
+
+    def check_jpnic(self, cleaned_data, version: int = 4):
+        # JPNIC情報チェック(管理者連絡窓口)
+        if not cleaned_data.get(f"ipv{version}_jpnic_admin"):
+            self.add_error(f"ipv{version}_jpnic_admin", "ユーザを選択してください。")
+        # JPNIC情報チェック(技術連絡担当者)
+        if not cleaned_data.get(f"ipv{version}_jpnic_tech1"):
+            self.add_error(f"ipv{version}_jpnic_tech1", "技術連絡担当者1の入力は必須です")
+        if cleaned_data.get(f"ipv{version}_jpnic_tech1"):
+            if cleaned_data.get(f"ipv{version}_jpnic_tech1") == cleaned_data.get(f"ipv{version}_jpnic_tech2"):
+                self.add_error(f"ipv{version}_jpnic_tech2", "技術連絡担当者1と技術連絡担当者2のユーザが同じです")
+            if cleaned_data.get(f"ipv{version}_jpnic_tech1") == cleaned_data.get(f"ipv{version}_jpnic_tech3"):
+                self.add_error(f"ipv{version}_jpnic_tech3", "技術連絡担当者1と技術連絡担当者3のユーザが同じです")
+        if cleaned_data.get(f"ipv{version}_jpnic_tech2") and (
+            cleaned_data.get(f"ipv{version}_jpnic_tech2") == cleaned_data.get(f"ipv{version}_jpnic_tech3")
+        ):
+            self.add_error(f"ipv{version}_jpnic_tech3", "技術連絡担当者2と技術連絡担当者3のユーザが同じです")
+        # Groupに所属しているかチェック
+        if (
+            cleaned_data.get(f"ipv{version}_jpnic_admin")
+            and cleaned_data.get(f"ipv{version}_jpnic_admin").group_id != self.group_id
+        ):
+            self.add_error(f"ipv{version}_jpnic_admin", "This user does not belong to any group.")
+        if (
+            cleaned_data.get(f"ipv{version}_jpnic_tech1")
+            and cleaned_data.get(f"ipv{version}_jpnic_tech1").group_id != self.group_id
+        ):
+            self.add_error(f"ipv{version}_jpnic_tech1", "This user does not belong to any group.")
+        if (
+            cleaned_data.get(f"ipv{version}_jpnic_tech2")
+            and cleaned_data.get(f"ipv{version}_jpnic_tech2").group_id != self.group_id
+        ):
+            self.add_error(f"ipv{version}_jpnic_tech2", "This user does not belong to any group.")
+        if (
+            cleaned_data.get(f"ipv{version}_jpnic_tech3")
+            and cleaned_data.get(f"ipv{version}_jpnic_tech3").group_id != self.group_id
+        ):
+            self.add_error(f"ipv{version}_jpnic_tech3", "This user does not belong to any group.")
+
+    def save(self):
+        cleaned_data = self.clean()
+        try:
+            with transaction.atomic():
+                service_instance = Service.objects.create(
+                    group_id=self.group_id,
+                    service_type=cleaned_data["service_type"],
+                    service_number=Service.objects.get_new_number(self.group_id),
+                    service_comment=cleaned_data.get("service_type_comment", None),
+                    asn=cleaned_data.get("asn", None),
+                    start_at=cleaned_data["start_date"],
+                    end_at=cleaned_data.get("end_date", None),
+                    ave_upstream=cleaned_data["ave_upstream"],
+                    max_upstream=cleaned_data["max_upstream"],
+                    ave_downstream=cleaned_data["ave_downstream"],
+                    max_downstream=cleaned_data["max_downstream"],
+                    max_bandwidth_as=cleaned_data.get("max_bandwidth_as", None),
+                    user_comment=cleaned_data.get("comment", None),
+                )
+                service_id = service_instance.id
+                ip_instances = []
+                # IPアドレスの保存
+                ip_data = {
+                    "service": service_instance,
+                    "start_at": cleaned_data["start_date"],
+                    "end_at": cleaned_data["end_date"],
+                }
+                for address in cleaned_data["addresses"]:
+                    if cleaned_data["service_type"] != "IP3B" and address["version"] == 4:
+                        # HomeNOC側の割当IPかつIPv4の場合はPlanを必須とする
+                        ip_data["ipv4_plan"] = cleaned_data["ipv4_plan"]
+                    ip_data["version"] = address["version"]
+                    ip_data["ip_address"] = address["address"]
+                    ip_data["subnet"] = address["subnet"]
+                    ip_data["owner"] = address["owner"]
+                    ip_instances.append(IP.objects.create(**ip_data))
+
+                # IP3B以外の場合、IPとJPNICの紐づけを行う
+                if cleaned_data["service_type"] != "IP3B":
+                    for ip in ip_instances:
+                        IPJPNICUser.objects.create(
+                            ip_id=ip.id,
+                            jpnic_user=cleaned_data[f"ipv{ip.version}_jpnic_admin"],
+                            user_type=JPNIC_USER_TYPE_ADMIN,
+                        )
+                        IPJPNICUser.objects.create(
+                            ip_id=ip.id,
+                            jpnic_user=cleaned_data[f"ipv{ip.version}_jpnic_tech1"],
+                            user_type=JPNIC_USER_TYPE_TECH_1,
+                        )
+                        if cleaned_data[f"ipv{ip.version}_jpnic_tech2"]:
+                            IPJPNICUser.objects.create(
+                                ip_id=ip.id,
+                                jpnic_user=cleaned_data[f"ipv{ip.version}_jpnic_tech2"],
+                                user_type=JPNIC_USER_TYPE_TECH_2,
+                            )
+                        if cleaned_data[f"ipv{ip.version}_jpnic_tech3"]:
+                            IPJPNICUser.objects.create(
+                                ip_id=ip.id,
+                                jpnic_user=cleaned_data[f"ipv{ip.version}_jpnic_tech3"],
+                                user_type=JPNIC_USER_TYPE_TECH_3,
+                            )
+
+                group = Group.objects.get(id=self.group_id)
+                group.allow_service_add = False
+                group.allow_jpnic_add = False
+                group.save()
+        except Exception as e:
+            # エラーログの出力や追加処理
+            print(f"エラーが発生しました: {e}")
+            raise  # 必要に応じて例外を再度発生させる
+
+
+class ConnectionAddForm(forms.Form):
+    connection_type = forms.ChoiceField(label="1. 接続方式", required=True, choices=CONNECTION_TYPE_CHOICES)
+    connection_comment = forms.CharField(label="1.1. 接続情報コメント", required=False)
+    ipv4_route = forms.ChoiceField(label="1.2.1. IPv4 BGP広報経路", required=False, choices=ROUTE_CHOICES)
+    ipv4_route_comment = forms.CharField(label="1.2.1.1. IPv4 BGP広報経路(その他コメント)", required=False)
+    ipv6_route = forms.ChoiceField(label="1.2.2. IPv6 BGP広報経路", required=False, choices=ROUTE_CHOICES)
+    ipv6_route_comment = forms.CharField(label="1.2.2.1. IPv6 BGP広報経路(その他コメント)", required=False)
+    hope_location = forms.ChoiceField(label="2.1. 接続希望場所", choices=HOPE_LOCATION_CHOICES, required=True)
+    term_location = forms.CharField(label="2.2. 終端先ユーザの市町村", required=True)
+    term_ip = forms.GenericIPAddressField(label="2.3. 終端IPアドレス", required=False, help_text="例) xxxx:xxx1::1")
+    ntt_type = forms.ChoiceField(
+        label="2.4. 接続終端場所にNTTフレッツ光が利用可能かをお知らせください",
+        required=False,
+        choices=NTT_CHOICES,
+    )
+    ntt_comment = forms.CharField(label="2.4.1. 接続終端場所のコメント", required=False)
+    start_date = forms.DateField(
+        label="3.1.利用開始日",
+        widget=forms.DateTimeInput(
+            attrs={"type": "date", "min": (date.today() + timedelta(weeks=1)).strftime("%Y-%m-%d")}
+        ),
+        error_messages={"required": "このフィールドは必須です。日付を入力してください。"},
+        required=True,
+    )
+    end_date = forms.DateField(
+        label="3.2.利用終了日",
+        widget=forms.DateTimeInput(
+            attrs={"type": "date", "min": (date.today() + timedelta(weeks=1)).strftime("%Y-%m-%d")}
+        ),
+        required=False,
+    )
+    no_end_date = forms.BooleanField(
+        label="終了日未定",
+        required=False,
+        initial=True,
+        widget=forms.CheckboxInput(attrs={"type": "checkbox"}),
+    )
+    is_monitor = forms.BooleanField(
+        label="4. 監視の有無",
+        help_text="当団体によるネットワーク監視をご希望の場合はチェックを入れて下さい",
+        required=False,
+    )
+    comment = forms.CharField(
+        label="5. その他コメントはこちら",
+        help_text="この申請で補足などがあればこちらに記載してください",
+        required=False,
+        widget=forms.Textarea(),
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.group_id = kwargs.pop("group_id", None)
+        self.service_id = kwargs.pop("service_id", None)
+        self.is_ipv4_bgp = kwargs.pop("is_ipv4_bgp", None)
+        self.is_ipv6_bgp = kwargs.pop("is_ipv6_bgp", None)
+        super().__init__(*args, **kwargs)
+
+        for field in self.fields.values():
+            if isinstance(field, forms.BooleanField):
+                field.widget.attrs["class"] = "form-check-input"
+            else:
+                field.widget.attrs["class"] = "form-control"
+                field.widget.attrs["placeholder"] = field.help_text if field.help_text else field.label
+
+    def clean(self):
+        cleaned_data = super().clean()
+        connection_type = cleaned_data.get("connection_type")
+
+        if connection_type == "ETC" and not cleaned_data.get("connection_comment"):
+            self.add_error("connection_type", "This field is required when ETC is selected.")
+        if connection_type != "CC0":
+            if not cleaned_data.get("term_ip"):
+                self.add_error("term_ip", "This field is required.")
+            if not cleaned_data.get("ntt_type"):
+                self.add_error("ntt_type", "This field is required.")
+
+        if self.is_ipv4_bgp:
+            if not cleaned_data.get("ipv4_route"):
+                self.add_error("ipv4_route", "This field is required when IPv4 BGP is selected.")
+            if cleaned_data.get("ipv4_route") == "ETC" and not cleaned_data.get("ipv4_route_comment"):
+                self.add_error("ipv4_route_comment", "This field is required when ETC is selected.")
+        if self.is_ipv6_bgp:
+            if not cleaned_data.get("ipv6_route"):
+                self.add_error("ipv6_route", "This field is required when IPv6 BGP is selected.")
+            if cleaned_data.get("ipv6_route") == "ETC" and not cleaned_data.get("ipv6_route_comment"):
+                self.add_error("ipv6_route_comment", "This field is required when ETC is selected.")
+
+        # 開始日のチェック
+        start_date = cleaned_data.get("start_date")
+        if start_date < date.today() + timedelta(weeks=1):
+            self.add_error("start_date", "You cannot select a date in the past.")
+        # 終了日のチェック
+        end_date = cleaned_data.get("end_date")
+        no_end_date = cleaned_data.get("no_end_date")
+        if no_end_date:
+            cleaned_data["end_date"] = None
+        if not no_end_date and not end_date:
+            raise forms.ValidationError("終了日が未定でない場合、終了日を入力してください。")
+        if end_date and start_date and end_date < start_date:
+            raise forms.ValidationError("終了日は開始日以降でなければなりません。")
+
+        return cleaned_data
+
+    def save(self):
+        cleaned_data = self.clean()
+        try:
+            with transaction.atomic():
+                Connection.objects.create(
+                    service_id=self.service_id,
+                    connection_type=cleaned_data["connection_type"],
+                    connection_number=Connection.objects.get_new_number(self.service_id),
+                    connection_comment=cleaned_data.get("connection_comment", None),
+                    ipv4_route=cleaned_data.get("ipv4_route", None),
+                    ipv4_route_comment=cleaned_data.get("ipv4_route_comment", None),
+                    ipv6_route=cleaned_data.get("ipv6_route", None),
+                    ipv6_route_comment=cleaned_data.get("ipv6_route_comment", None),
+                    tunnel_ip=cleaned_data.get("asn", None),
+                    hope_location=cleaned_data.get("hope_location", None),
+                    term_location=cleaned_data.get("term_location", None),
+                    ntt_type=cleaned_data.get("ntt_type", None),
+                    ntt_comment=cleaned_data.get("ntt_comment", None),
+                    start_at=cleaned_data["start_date"],
+                    end_at=cleaned_data.get("end_date", None),
+                    is_monitor=cleaned_data.get("is_monitor", False),
+                    user_comment=cleaned_data.get("comment", None),
+                )
+
+                service = Service.objects.get(id=self.service_id)
+                service.allow_connection_add = False
+                service.save()
+        except Exception as e:
+            # エラーログの出力や追加処理
+            print(f"エラーが発生しました: {e}")
+            raise  # 必要に応じて例外を再度発生させる
diff --git a/service/group_urls.py b/service/group_urls.py
new file mode 100644
index 0000000..b7af2b6
--- /dev/null
+++ b/service/group_urls.py
@@ -0,0 +1,10 @@
+from django.urls import path
+
+from . import views
+
+app_name = "service"
+urlpatterns = [
+    path("", views.service_index, name="index"),
+    path("add/", views.service_add, name="add"),
+    path("<int:service_id>/connection/add", views.connection_add, name="connection_add"),
+]
diff --git a/service/models.py b/service/models.py
index 8696077..30ba975 100644
--- a/service/models.py
+++ b/service/models.py
@@ -15,6 +15,43 @@ def get_notice(self):
         )
         return notices
 
+    def get_new_number(self, group_id: int):
+        number = 1
+        for service in self.filter(group_id=group_id):
+            if service.service_number >= number:
+                number = service.service_number + 1
+        return number
+
+
+class ConnectionManager(models.Manager):
+    def get_new_number(self, service_id: int):
+        number = 1
+        for connection in self.filter(service_id=service_id):
+            if connection.connection_number >= number:
+                number = connection.connection_number + 1
+        return number
+
+
+SERVICE_L2 = "2000"
+SERVICE_L3_STATIC = "3S00"
+SERVICE_L3_BGP = "3B00"
+SERVICE_TRANSIT = "IP3B"
+SERVICE_COLO_L2 = "CL20"
+SERVICE_COLO_L3_STATIC = "CL3S"
+SERVICE_COLO_L3_BGP = "CL3B"
+SERVICE_ETC = "ET00"
+
+SERVICE_CHOICES = (
+    (SERVICE_L2, "L2"),
+    (SERVICE_L3_STATIC, "L3 Static"),
+    (SERVICE_L3_BGP, "L3 BGP"),
+    (SERVICE_TRANSIT, "トランジット提供"),
+    (SERVICE_COLO_L2, "コロケーションサービス(L2)"),
+    (SERVICE_COLO_L3_STATIC, "コロケーションサービス(L3 Static)"),
+    (SERVICE_COLO_L3_BGP, "コロケーションサービス(L3 BGP)"),
+    (SERVICE_ETC, "その他"),
+)
+
 
 class Service(models.Model):
     class Meta:
@@ -22,26 +59,6 @@ class Meta:
         verbose_name = "Service"
         verbose_name_plural = "Services"
 
-    SERVICE_L2 = "2000"
-    SERVICE_L3_STATIC = "3S00"
-    SERVICE_L3_BGP = "3B00"
-    SERVICE_TRANSIT = "IP3B"
-    SERVICE_COLO_L2 = "CL20"
-    SERVICE_COLO_L3_STATIC = "CL3S"
-    SERVICE_COLO_L3_BGP = "CL3B"
-    SERVICE_ETC = "ET00"
-
-    SERVICE_CHOICES = (
-        (SERVICE_L2, "L2"),
-        (SERVICE_L3_STATIC, "L3 Static"),
-        (SERVICE_L3_BGP, "L3 BGP"),
-        (SERVICE_TRANSIT, "トランジット提供"),
-        (SERVICE_COLO_L2, "コロケーションサービス(L2)"),
-        (SERVICE_COLO_L3_STATIC, "コロケーションサービス(L3 Static)"),
-        (SERVICE_COLO_L3_BGP, "コロケーションサービス(L3 BGP)"),
-        (SERVICE_ETC, "その他"),
-    )
-
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
     group = models.ForeignKey(Group, on_delete=models.SET_NULL, related_name="ServiceGroup", null=True, blank=True)
@@ -176,6 +193,8 @@ class Meta:
     user_comment = MediumTextField("ユーザコメント", default="", blank=True)
     admin_comment = MediumTextField("管理者コメント", default="", blank=True)
 
+    objects = ConnectionManager()
+
     @property
     def service_code(self):
         return "%s-%s%s-%s%s" % (
diff --git a/service/urls.py b/service/urls.py
index 3a3bcd0..0e749d0 100644
--- a/service/urls.py
+++ b/service/urls.py
@@ -2,7 +2,7 @@
 
 from . import views
 
-app_name = "service"
+app_name = "services"
 urlpatterns = [
-    path("", views.index, name="index"),
+    path("", views.service_index, name="index"),
 ]
diff --git a/service/views.py b/service/views.py
index 8aeb65b..ffc303b 100644
--- a/service/views.py
+++ b/service/views.py
@@ -3,15 +3,39 @@
 from django.db.models import Q
 from django.shortcuts import render
 
+from ip.models import IP
+from service.form import ConnectionAddForm, ServiceAddForm
 from service.models import Service
 
 
 @login_required
-def index(request):
-    group_ids = list(request.user.groups.values_list("id", flat=True))
+def service_add(request, group_id: int):
+    is_administrator = request.user.usergroup_set.filter(group_id=group_id, user=request.user, is_admin=True).exists()
+    if not is_administrator:
+        return render(request, "error.html", {"error": "権限がありません"})
+    if not request.user.groups.get(id=group_id).allow_service_add:
+        return render(request, "error.html", {"error": "サービスの新規申請が許可されていません"})
+    form = ServiceAddForm(data=request.POST or None, group_id=group_id)
+    # if not request.user.allow_group_add:
+    # error = "グループの新規登録が申請不可能です"
+    if request.method == "POST":
+        # print(form.errors)
+        if "update_jpnic_users" in request.POST:
+            print("update jpnic users")
+        elif form.is_valid():
+            form.save()
+            return render(request, "done.html", {"text": "登録・変更が完了しました"})
+    context = {"form": form, "group_id": group_id}
+    return render(request, "service/add.html", context)
+
+
+@login_required
+def service_index(request, group_id=None):
+    # TODO: 修正必要あり(dsbd/views.pyを参照)
+    user_group_ids = list(request.user.groups.values_list("id", flat=True))
     q = Q()
-    for group_id in group_ids:
-        q.add(Q(group=group_id), Q.OR)
+    for user_group_id in user_group_ids:
+        q.add(Q(group=user_group_id), Q.OR)
     services = Service.objects.filter(is_active=True).filter(q).order_by("id")
     per_page = int(request.GET.get("per_page", "20"))
     page = int(request.GET.get("page", "1"))
@@ -21,5 +45,46 @@ def index(request):
     except (EmptyPage, InvalidPage):
         services = paginator.page(paginator.num_pages)
 
-    context = {"services": services}
+    context = {"services": services, "group_id": group_id}
     return render(request, "service/index.html", context)
+
+
+@login_required
+def connection_add(request, group_id: int, service_id: int):
+    is_administrator = request.user.usergroup_set.filter(group_id=group_id, user=request.user, is_admin=True).exists()
+    if not is_administrator:
+        return render(request, "error.html", {"error": "権限がありません"})
+    service = Service.objects.get(id=service_id)
+    if not service.allow_connection_add:  # 接続情報の新規申請許可チェック
+        return render(request, "error.html", {"error": "接続情報の新規申請が許可されていません"})
+    if not service.is_pass:  # サービスが審査済みであるかチェック
+        return render(request, "error.html", {"error": "サービス側の審査が終わっていません"})
+    service_code = service.__str__()
+    # BGP接続があるかどうかチェック
+    is_ipv4_bgp = False
+    is_ipv6_bgp = False
+    for ip in IP.objects.filter(service=service, is_pass=True):
+        match ip.version:
+            case 4:
+                is_ipv4_bgp = True
+            case 6:
+                is_ipv6_bgp = True
+    form = ConnectionAddForm(
+        data=request.POST or None,
+        group_id=group_id,
+        service_id=service_id,
+        is_ipv4_bgp=is_ipv4_bgp,
+        is_ipv6_bgp=is_ipv6_bgp,
+    )
+    if request.method == "POST":
+        if form.is_valid():
+            form.save()
+            return render(request, "done.html", {"text": "登録・変更が完了しました"})
+    context = {
+        "form": form,
+        "group_id": group_id,
+        "service_code": f"{service_code}",
+        "is_ipv4_bgp": is_ipv4_bgp,
+        "is_ipv6_bgp": is_ipv6_bgp,
+    }
+    return render(request, "connection/add.html", context)

From b1b5420a9ff676087e6c1cb8622be5656920ee35 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 03:35:36 +0900
Subject: [PATCH 14/36] =?UTF-8?q?#43=20Web=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=80=E3=81=AE=E5=89=8A=E9=99=A4(=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E3=81=AE=E3=81=9F=E3=82=81).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/.eslintrc.cjs                 |   18 -
 web/.gitignore                    |   24 -
 web/README.md                     |   37 -
 web/package-lock.json             | 5096 -----------------------------
 web/package.json                  |   29 -
 web/public/vite.svg               |   21 -
 web/src/add_connection/App.css    |   44 -
 web/src/add_connection/App.tsx    |   33 -
 web/src/add_connection/index.css  |   73 -
 web/src/add_connection/index.html |   13 -
 web/src/add_connection/main.tsx   |   10 -
 web/src/add_service/App.css       |   44 -
 web/src/add_service/App.tsx       |   33 -
 web/src/add_service/index.css     |   73 -
 web/src/add_service/index.html    |   13 -
 web/src/add_service/main.tsx      |   10 -
 web/src/assets/react.svg          |    6 -
 web/src/index.html                |   15 -
 web/src/vite-env.d.ts             |    1 -
 web/tsconfig.json                 |   33 -
 web/tsconfig.node.json            |   12 -
 web/vite.config.ts                |   17 -
 22 files changed, 5655 deletions(-)
 delete mode 100644 web/.eslintrc.cjs
 delete mode 100644 web/.gitignore
 delete mode 100644 web/README.md
 delete mode 100644 web/package-lock.json
 delete mode 100644 web/package.json
 delete mode 100644 web/public/vite.svg
 delete mode 100644 web/src/add_connection/App.css
 delete mode 100644 web/src/add_connection/App.tsx
 delete mode 100644 web/src/add_connection/index.css
 delete mode 100644 web/src/add_connection/index.html
 delete mode 100644 web/src/add_connection/main.tsx
 delete mode 100644 web/src/add_service/App.css
 delete mode 100644 web/src/add_service/App.tsx
 delete mode 100644 web/src/add_service/index.css
 delete mode 100644 web/src/add_service/index.html
 delete mode 100644 web/src/add_service/main.tsx
 delete mode 100644 web/src/assets/react.svg
 delete mode 100644 web/src/index.html
 delete mode 100644 web/src/vite-env.d.ts
 delete mode 100644 web/tsconfig.json
 delete mode 100644 web/tsconfig.node.json
 delete mode 100644 web/vite.config.ts

diff --git a/web/.eslintrc.cjs b/web/.eslintrc.cjs
deleted file mode 100644
index 198aa75..0000000
--- a/web/.eslintrc.cjs
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-  root: true,
-  env: {browser: true, es2020: true},
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-  ],
-  ignorePatterns: ['dist', '.eslintrc.cjs'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
-  rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      {allowConstantExport: true},
-    ],
-  },
-}
diff --git a/web/.gitignore b/web/.gitignore
deleted file mode 100644
index a547bf3..0000000
--- a/web/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/web/README.md b/web/README.md
deleted file mode 100644
index 81a9ecf..0000000
--- a/web/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# React + TypeScript + Vite
-
-This template provides a minimal setup to get React working in Vite with HMR and some
-ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md)
-  uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc)
-  uses [SWC](https://swc.rs/) for Fast Refresh
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration
-to enable type aware lint rules:
-
-- Configure the top-level `parserOptions` property like this:
-
-```js
-export default {
-  // other rules...
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-    project: ['./tsconfig.json', './tsconfig.node.json'],
-    tsconfigRootDir: __dirname,
-  },
-}
-```
-
-- Replace `plugin:@typescript-eslint/recommended` to
-  `plugin:@typescript-eslint/recommended-type-checked` or
-  `plugin:@typescript-eslint/strict-type-checked`
-- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
-- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and
-  add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
diff --git a/web/package-lock.json b/web/package-lock.json
deleted file mode 100644
index 1d9d394..0000000
--- a/web/package-lock.json
+++ /dev/null
@@ -1,5096 +0,0 @@
-{
-  "name": "web",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "web",
-      "version": "0.0.0",
-      "dependencies": {
-        "@types/node": "^20.16.5",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1"
-      },
-      "devDependencies": {
-        "@types/react": "^18.3.5",
-        "@types/react-dom": "^18.3.0",
-        "@typescript-eslint/eslint-plugin": "^8.4.0",
-        "@typescript-eslint/parser": "^8.4.0",
-        "@vitejs/plugin-react": "^4.3.1",
-        "eslint": "^8.57.0",
-        "eslint-plugin-react-hooks": "^4.6.2",
-        "eslint-plugin-react-refresh": "^0.4.11",
-        "typescript": "^5.5.4",
-        "vite": "^5.4.3"
-      }
-    },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.24.7",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.25.6",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.25.6"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz",
-      "integrity": "sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz",
-      "integrity": "sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "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,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "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,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "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,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "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,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
-      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
-      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
-      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
-      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
-      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
-      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
-      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
-      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
-      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
-      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
-      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
-      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
-      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
-      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
-      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
-      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
-      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.7"
-      }
-    },
-    "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
-    },
-    "node_modules/@types/node": {
-      "version": "20.16.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
-      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
-      "dependencies": {
-        "undici-types": "~6.19.2"
-      }
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.10",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz",
-      "integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==",
-      "dev": true
-    },
-    "node_modules/@types/react": {
-      "version": "18.3.5",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
-      "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
-      "dev": true,
-      "dependencies": {
-        "@types/prop-types": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "18.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
-      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz",
-      "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.4.0",
-        "@typescript-eslint/type-utils": "8.4.0",
-        "@typescript-eslint/utils": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz",
-      "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.4.0",
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/typescript-estree": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz",
-      "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz",
-      "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.4.0",
-        "@typescript-eslint/utils": "8.4.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz",
-      "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz",
-      "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz",
-      "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.4.0",
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/typescript-estree": "8.4.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz",
-      "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "8.4.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
-    "node_modules/@vitejs/plugin-react": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
-      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.24.5",
-        "@babel/plugin-transform-react-jsx-self": "^7.24.5",
-        "@babel/plugin-transform-react-jsx-source": "^7.24.1",
-        "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.14.2"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
-      "dev": true,
-      "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"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001658",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
-      "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
-      "dev": true,
-      "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"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
-      "dev": true
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.18",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
-      "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
-      "dev": true
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
-      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.11.tgz",
-      "integrity": "sha512-wrAKxMbVr8qhXTtIKfXqAn5SAtRZt0aXxe5P23Fh4pUAdC6XEsybGLB8P0PI4j1yYqOgUEUlzKAGDfo7rJOjcw==",
-      "dev": true,
-      "peerDependencies": {
-        "eslint": ">=7"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/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,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "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,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "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
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "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,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "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==",
-      "dev": true
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.45",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
-      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
-      },
-      "peerDependencies": {
-        "react": "^18.3.1"
-      }
-    },
-    "node_modules/react-refresh": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
-      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
-      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.2",
-        "@rollup/rollup-android-arm64": "4.21.2",
-        "@rollup/rollup-darwin-arm64": "4.21.2",
-        "@rollup/rollup-darwin-x64": "4.21.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
-        "@rollup/rollup-linux-arm64-musl": "4.21.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-musl": "4.21.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
-        "@rollup/rollup-win32-x64-msvc": "4.21.2",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.2.0"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    },
-    "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==",
-      "dev": true,
-      "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"
-        }
-      ],
-      "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,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/vite": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
-      "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
-  "dependencies": {
-    "@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true
-    },
-    "@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.24.7",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
-      "requires": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.25.6",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
-      "dev": true
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
-      "dev": true
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
-      "dev": true
-    },
-    "@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.25.6"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz",
-      "integrity": "sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz",
-      "integrity": "sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      }
-    },
-    "@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "dev": true,
-      "optional": true
-    },
-    "@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "dev": true
-    },
-    "@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "13.24.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        }
-      }
-    },
-    "@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "dev": true
-    },
-    "@jridgewell/gen-mapping": {
-      "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,
-      "requires": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "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
-    },
-    "@jridgewell/set-array": {
-      "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
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "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,
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
-      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-android-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
-      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-darwin-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
-      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-darwin-x64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
-      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
-      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
-      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
-      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
-      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
-      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
-      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
-      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
-      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
-      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
-      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
-      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
-      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
-      "dev": true,
-      "optional": true
-    },
-    "@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
-      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.20.7"
-      }
-    },
-    "@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
-    },
-    "@types/node": {
-      "version": "20.16.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
-      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
-      "requires": {
-        "undici-types": "~6.19.2"
-      }
-    },
-    "@types/prop-types": {
-      "version": "15.7.10",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz",
-      "integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==",
-      "dev": true
-    },
-    "@types/react": {
-      "version": "18.3.5",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
-      "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
-      "dev": true,
-      "requires": {
-        "@types/prop-types": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/react-dom": {
-      "version": "18.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
-      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz",
-      "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.4.0",
-        "@typescript-eslint/type-utils": "8.4.0",
-        "@typescript-eslint/utils": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz",
-      "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "8.4.0",
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/typescript-estree": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0",
-        "debug": "^4.3.4"
-      }
-    },
-    "@typescript-eslint/scope-manager": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz",
-      "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0"
-      }
-    },
-    "@typescript-eslint/type-utils": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz",
-      "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/typescript-estree": "8.4.0",
-        "@typescript-eslint/utils": "8.4.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz",
-      "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz",
-      "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/visitor-keys": "8.4.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "dependencies": {
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "9.0.5",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/utils": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz",
-      "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.4.0",
-        "@typescript-eslint/types": "8.4.0",
-        "@typescript-eslint/typescript-estree": "8.4.0"
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz",
-      "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "8.4.0",
-        "eslint-visitor-keys": "^3.4.3"
-      }
-    },
-    "@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
-    "@vitejs/plugin-react": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
-      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.24.5",
-        "@babel/plugin-transform-react-jsx-self": "^7.24.5",
-        "@babel/plugin-transform-react-jsx-source": "^7.24.1",
-        "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.14.2"
-      }
-    },
-    "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.1.1"
-      }
-    },
-    "browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001658",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
-      "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.5.18",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
-      "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
-      "dev": true
-    },
-    "esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "requires": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true
-    },
-    "eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "globals": {
-          "version": "13.24.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "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
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
-      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-plugin-react-refresh": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.11.tgz",
-      "integrity": "sha512-wrAKxMbVr8qhXTtIKfXqAn5SAtRZt0aXxe5P23Fh4pUAdC6XEsybGLB8P0PI4j1yYqOgUEUlzKAGDfo7rJOjcw==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      }
-    },
-    "esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      }
-    },
-    "esrecurse": {
-      "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,
-      "requires": {
-        "estraverse": "^5.2.0"
-      }
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        }
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "optional": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "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
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
-    "keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "requires": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "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==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "requires": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true
-    },
-    "postcss": {
-      "version": "8.4.45",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
-      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
-      }
-    },
-    "react-refresh": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
-      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
-      "dev": true
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rollup": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
-      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
-      "dev": true,
-      "requires": {
-        "@rollup/rollup-android-arm-eabi": "4.21.2",
-        "@rollup/rollup-android-arm64": "4.21.2",
-        "@rollup/rollup-darwin-arm64": "4.21.2",
-        "@rollup/rollup-darwin-x64": "4.21.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
-        "@rollup/rollup-linux-arm64-musl": "4.21.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-musl": "4.21.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
-        "@rollup/rollup-win32-x64-msvc": "4.21.2",
-        "@types/estree": "1.0.5",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
-    "typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "dev": true
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    },
-    "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==",
-      "dev": true,
-      "requires": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "vite": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
-      "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
-      "dev": true,
-      "requires": {
-        "esbuild": "^0.21.3",
-        "fsevents": "~2.3.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    }
-  }
-}
diff --git a/web/package.json b/web/package.json
deleted file mode 100644
index b39a8d9..0000000
--- a/web/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "web",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@types/node": "^20.16.5",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
-  },
-  "devDependencies": {
-    "@types/react": "^18.3.5",
-    "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.4.0",
-    "@typescript-eslint/parser": "^8.4.0",
-    "@vitejs/plugin-react": "^4.3.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.11",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.3"
-  }
-}
diff --git a/web/public/vite.svg b/web/public/vite.svg
deleted file mode 100644
index 068d55d..0000000
--- a/web/public/vite.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88"
-     height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257">
-    <defs>
-        <linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%"
-                        y1="7.652%" y2="78.411%">
-            <stop offset="0%" stop-color="#41D1FF"></stop>
-            <stop offset="100%" stop-color="#BD34FE"></stop>
-        </linearGradient>
-        <linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%"
-                        y1="2.242%" y2="89.03%">
-            <stop offset="0%" stop-color="#FFEA83"></stop>
-            <stop offset="8.333%" stop-color="#FFDD35"></stop>
-            <stop offset="100%" stop-color="#FFA800"></stop>
-        </linearGradient>
-    </defs>
-    <path fill="url(#IconifyId1813088fe1fbc01fb466)"
-          d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path>
-    <path fill="url(#IconifyId1813088fe1fbc01fb467)"
-          d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path>
-</svg>
\ No newline at end of file
diff --git a/web/src/add_connection/App.css b/web/src/add_connection/App.css
deleted file mode 100644
index 63d28e6..0000000
--- a/web/src/add_connection/App.css
+++ /dev/null
@@ -1,44 +0,0 @@
-#root {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-}
-
-.logo {
-    height: 6em;
-    padding: 1.5em;
-    will-change: filter;
-    transition: filter 300ms;
-}
-
-.logo:hover {
-    filter: drop-shadow(0 0 2em #646cffaa);
-}
-
-.logo.react:hover {
-    filter: drop-shadow(0 0 2em #61dafbaa);
-}
-
-@keyframes logo-spin {
-    from {
-        transform: rotate(0deg);
-    }
-    to {
-        transform: rotate(360deg);
-    }
-}
-
-@media (prefers-reduced-motion: no-preference) {
-    a:nth-of-type(2) .logo {
-        animation: logo-spin infinite 20s linear;
-    }
-}
-
-.card {
-    padding: 2em;
-}
-
-.read-the-docs {
-    color: #888;
-}
diff --git a/web/src/add_connection/App.tsx b/web/src/add_connection/App.tsx
deleted file mode 100644
index 8153970..0000000
--- a/web/src/add_connection/App.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {useState} from 'react'
-import reactLogo from '../assets/react.svg'
-import './App.css'
-
-function App() {
-  const [count, setCount] = useState(0)
-
-  return (
-    <>
-      <div>
-        <a href="https://vitejs.dev" target="_blank">
-        </a>
-        <a href="https://react.dev" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo"/>
-        </a>
-      </div>
-      <h1>Vite + React</h1>
-      <div className="card">
-        <button onClick={() => setCount((count) => count + 1)}>
-          count is {count}
-        </button>
-        <p>
-          Edit <code>src/App.tsx</code> and save to test HMR
-        </p>
-      </div>
-      <p className="read-the-docs">
-        Click on the Vite and React logos to learn more
-      </p>
-    </>
-  )
-}
-
-export default App
diff --git a/web/src/add_connection/index.css b/web/src/add_connection/index.css
deleted file mode 100644
index 588f7ae..0000000
--- a/web/src/add_connection/index.css
+++ /dev/null
@@ -1,73 +0,0 @@
-:root {
-    font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-    line-height: 1.5;
-    font-weight: 400;
-
-    color-scheme: light dark;
-    color: rgba(255, 255, 255, 0.87);
-    background-color: #242424;
-
-    font-synthesis: none;
-    text-rendering: optimizeLegibility;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-a {
-    font-weight: 500;
-    color: #646cff;
-    text-decoration: inherit;
-}
-
-a:hover {
-    color: #535bf2;
-}
-
-body {
-    margin: 0;
-    display: flex;
-    place-items: center;
-    min-width: 320px;
-    min-height: 100vh;
-}
-
-h1 {
-    font-size: 3.2em;
-    line-height: 1.1;
-}
-
-button {
-    border-radius: 8px;
-    border: 1px solid transparent;
-    padding: 0.6em 1.2em;
-    font-size: 1em;
-    font-weight: 500;
-    font-family: inherit;
-    background-color: #1a1a1a;
-    cursor: pointer;
-    transition: border-color 0.25s;
-}
-
-button:hover {
-    border-color: #646cff;
-}
-
-button:focus,
-button:focus-visible {
-    outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-    :root {
-        color: #213547;
-        background-color: #ffffff;
-    }
-
-    a:hover {
-        color: #747bff;
-    }
-
-    button {
-        background-color: #f9f9f9;
-    }
-}
diff --git a/web/src/add_connection/index.html b/web/src/add_connection/index.html
deleted file mode 100644
index b833989..0000000
--- a/web/src/add_connection/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8"/>
-  <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <title>Vite + React + TS</title>
-</head>
-<body>
-<div id="root"></div>
-<script type="module" src="main.tsx"></script>
-</body>
-</html>
diff --git a/web/src/add_connection/main.tsx b/web/src/add_connection/main.tsx
deleted file mode 100644
index d704bf5..0000000
--- a/web/src/add_connection/main.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import App from './App.tsx'
-import './index.css'
-
-ReactDOM.createRoot(document.getElementById('root')!).render(
-  <React.StrictMode>
-    <App/>
-  </React.StrictMode>,
-)
diff --git a/web/src/add_service/App.css b/web/src/add_service/App.css
deleted file mode 100644
index 63d28e6..0000000
--- a/web/src/add_service/App.css
+++ /dev/null
@@ -1,44 +0,0 @@
-#root {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-}
-
-.logo {
-    height: 6em;
-    padding: 1.5em;
-    will-change: filter;
-    transition: filter 300ms;
-}
-
-.logo:hover {
-    filter: drop-shadow(0 0 2em #646cffaa);
-}
-
-.logo.react:hover {
-    filter: drop-shadow(0 0 2em #61dafbaa);
-}
-
-@keyframes logo-spin {
-    from {
-        transform: rotate(0deg);
-    }
-    to {
-        transform: rotate(360deg);
-    }
-}
-
-@media (prefers-reduced-motion: no-preference) {
-    a:nth-of-type(2) .logo {
-        animation: logo-spin infinite 20s linear;
-    }
-}
-
-.card {
-    padding: 2em;
-}
-
-.read-the-docs {
-    color: #888;
-}
diff --git a/web/src/add_service/App.tsx b/web/src/add_service/App.tsx
deleted file mode 100644
index 8153970..0000000
--- a/web/src/add_service/App.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {useState} from 'react'
-import reactLogo from '../assets/react.svg'
-import './App.css'
-
-function App() {
-  const [count, setCount] = useState(0)
-
-  return (
-    <>
-      <div>
-        <a href="https://vitejs.dev" target="_blank">
-        </a>
-        <a href="https://react.dev" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo"/>
-        </a>
-      </div>
-      <h1>Vite + React</h1>
-      <div className="card">
-        <button onClick={() => setCount((count) => count + 1)}>
-          count is {count}
-        </button>
-        <p>
-          Edit <code>src/App.tsx</code> and save to test HMR
-        </p>
-      </div>
-      <p className="read-the-docs">
-        Click on the Vite and React logos to learn more
-      </p>
-    </>
-  )
-}
-
-export default App
diff --git a/web/src/add_service/index.css b/web/src/add_service/index.css
deleted file mode 100644
index 588f7ae..0000000
--- a/web/src/add_service/index.css
+++ /dev/null
@@ -1,73 +0,0 @@
-:root {
-    font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-    line-height: 1.5;
-    font-weight: 400;
-
-    color-scheme: light dark;
-    color: rgba(255, 255, 255, 0.87);
-    background-color: #242424;
-
-    font-synthesis: none;
-    text-rendering: optimizeLegibility;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-a {
-    font-weight: 500;
-    color: #646cff;
-    text-decoration: inherit;
-}
-
-a:hover {
-    color: #535bf2;
-}
-
-body {
-    margin: 0;
-    display: flex;
-    place-items: center;
-    min-width: 320px;
-    min-height: 100vh;
-}
-
-h1 {
-    font-size: 3.2em;
-    line-height: 1.1;
-}
-
-button {
-    border-radius: 8px;
-    border: 1px solid transparent;
-    padding: 0.6em 1.2em;
-    font-size: 1em;
-    font-weight: 500;
-    font-family: inherit;
-    background-color: #1a1a1a;
-    cursor: pointer;
-    transition: border-color 0.25s;
-}
-
-button:hover {
-    border-color: #646cff;
-}
-
-button:focus,
-button:focus-visible {
-    outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-    :root {
-        color: #213547;
-        background-color: #ffffff;
-    }
-
-    a:hover {
-        color: #747bff;
-    }
-
-    button {
-        background-color: #f9f9f9;
-    }
-}
diff --git a/web/src/add_service/index.html b/web/src/add_service/index.html
deleted file mode 100644
index b833989..0000000
--- a/web/src/add_service/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8"/>
-  <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <title>Vite + React + TS</title>
-</head>
-<body>
-<div id="root"></div>
-<script type="module" src="main.tsx"></script>
-</body>
-</html>
diff --git a/web/src/add_service/main.tsx b/web/src/add_service/main.tsx
deleted file mode 100644
index d704bf5..0000000
--- a/web/src/add_service/main.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import App from './App.tsx'
-import './index.css'
-
-ReactDOM.createRoot(document.getElementById('root')!).render(
-  <React.StrictMode>
-    <App/>
-  </React.StrictMode>,
-)
diff --git a/web/src/assets/react.svg b/web/src/assets/react.svg
deleted file mode 100644
index ac731cc..0000000
--- a/web/src/assets/react.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93"
-     height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228">
-    <path fill="#00D8FF"
-          d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path>
-</svg>
\ No newline at end of file
diff --git a/web/src/index.html b/web/src/index.html
deleted file mode 100644
index dec88bb..0000000
--- a/web/src/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8"/>
-  <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <title>Vite + React + TS</title>
-</head>
-<body>
-<h2>Web(TEST)</h2>
-<a href="./add_connection/index.html">add_connection</a>
-<br/>
-<a href="./add_service/index.html">add_service</a>
-</body>
-</html>
diff --git a/web/src/vite-env.d.ts b/web/src/vite-env.d.ts
deleted file mode 100644
index 11f02fe..0000000
--- a/web/src/vite-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="vite/client" />
diff --git a/web/tsconfig.json b/web/tsconfig.json
deleted file mode 100644
index 9a5b64e..0000000
--- a/web/tsconfig.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "lib": [
-      "ES2020",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "module": "ESNext",
-    "skipLibCheck": true,
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": [
-    "src"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.node.json"
-    }
-  ]
-}
diff --git a/web/tsconfig.node.json b/web/tsconfig.node.json
deleted file mode 100644
index b5a3431..0000000
--- a/web/tsconfig.node.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "skipLibCheck": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true
-  },
-  "include": [
-    "vite.config.ts"
-  ]
-}
diff --git a/web/vite.config.ts b/web/vite.config.ts
deleted file mode 100644
index a188998..0000000
--- a/web/vite.config.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {defineConfig} from 'vite'
-import react from '@vitejs/plugin-react'
-import {resolve} from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [react()],
-  root: './src',
-  build: {
-    rollupOptions: {
-      input: {
-        add_service: resolve(__dirname, './src/add_service/index.html'),
-        add_connection: resolve(__dirname, './src/add_connection/index.html'),
-      }
-    }
-  }
-})

From 6e7c654400ea8e6b8f5b11ce13e58c32dd36639b Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 04:13:11 +0900
Subject: [PATCH 15/36] =?UTF-8?q?#43=20router=E3=82=84noc=20model=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/templates/service/index.html       |  2 +-
 noc/admin.py                            | 21 +++++++++++++++++++++
 router/admin.py                         | 23 +++++++++++++++++++++--
 router/migrations/0002_tunnelip_name.py | 18 ++++++++++++++++++
 router/models.py                        |  3 ++-
 5 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 router/migrations/0002_tunnelip_name.py

diff --git a/dsbd/templates/service/index.html b/dsbd/templates/service/index.html
index d1295d4..fa78222 100644
--- a/dsbd/templates/service/index.html
+++ b/dsbd/templates/service/index.html
@@ -149,7 +149,7 @@ <h4 class="alert-heading">接続情報申請</h4>
                             <tr>
                               <th>開通状況</th>
                               <td colspan="2">
-                                {% if connection.is_pass %}
+                                {% if connection.is_open %}
                                   <span class="badge bg-success">開通済み</span>
                                 {% else %}
                                   <span class="badge bg-danger">未開通</span>{% endif %}
diff --git a/noc/admin.py b/noc/admin.py
index cedbd27..f07ec26 100644
--- a/noc/admin.py
+++ b/noc/admin.py
@@ -1,8 +1,26 @@
 from django.contrib import admin
+from django.urls import reverse
+from django.utils.html import format_html
+
+from router.models import TunnelRouter
 
 from .models import NOC
 
 
+class TermInlineNOCRouterAdmin(admin.TabularInline):
+    model = TunnelRouter
+    extra = 0
+    fields = ("id_link", "is_active", "hostname", "comment")
+    readonly_fields = ("id_link", "comment")
+
+    def id_link(self, obj):
+        # 管理ページの編集ページへのリンクを生成
+        url = reverse("admin:router_tunnelrouter_change", args=[obj.id])
+        return format_html('<a href="{}" target="__blank__">{}</a>', url, obj.id)
+
+    id_link.short_description = "ID"
+
+
 @admin.register(NOC)
 class NOC(admin.ModelAdmin):
     fieldsets = (
@@ -31,3 +49,6 @@ class NOC(admin.ModelAdmin):
     list_display = ("id", "name", "is_active", "location", "bandwidth")
     list_filter = ("is_active",)
     search_fields = ("name",)
+    inlines = [
+        TermInlineNOCRouterAdmin,
+    ]
diff --git a/router/admin.py b/router/admin.py
index 03e70ad..04bda1a 100644
--- a/router/admin.py
+++ b/router/admin.py
@@ -1,8 +1,24 @@
 from django.contrib import admin
+from django.urls import reverse
+from django.utils.html import format_html
 
 from .models import TunnelIP, TunnelRouter
 
 
+class TermInlineRouterTunnelIPAdmin(admin.TabularInline):
+    model = TunnelIP
+    extra = 0
+    fields = ("id_link", "is_active", "name", "ip_address", "comment")
+    readonly_fields = ("id_link", "comment")
+
+    def id_link(self, obj):
+        # 管理ページの編集ページへのリンクを生成
+        url = reverse("admin:router_tunnelip_change", args=[obj.id])
+        return format_html('<a href="{}" target="__blank__">{}</a>', url, obj.id)
+
+    id_link.short_description = "ID"
+
+
 @admin.register(TunnelRouter)
 class Router(admin.ModelAdmin):
     fieldsets = (
@@ -21,12 +37,15 @@ class Router(admin.ModelAdmin):
     list_display = ("id", "is_active", "noc", "hostname")
     list_filter = ("is_active",)
     search_fields = ("is_active", "hostname")
+    inlines = [
+        TermInlineRouterTunnelIPAdmin,
+    ]
 
 
 @admin.register(TunnelIP)
 class TunnelIP(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ("is_active", "tunnel_router", "ip_address")}),
+        (None, {"fields": ("is_active", "name", "tunnel_router", "ip_address")}),
         ("comment", {"fields": ("comment",)}),
         (
             "Important dates",
@@ -38,6 +57,6 @@ class TunnelIP(admin.ModelAdmin):
             },
         ),
     )
-    list_display = ("id", "is_active", "tunnel_router", "ip_address")
+    list_display = ("id", "is_active", "name", "tunnel_router", "ip_address")
     list_filter = ("is_active",)
     search_fields = ("is_active", "ip_address")
diff --git a/router/migrations/0002_tunnelip_name.py b/router/migrations/0002_tunnelip_name.py
new file mode 100644
index 0000000..ea219ea
--- /dev/null
+++ b/router/migrations/0002_tunnelip_name.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-14 18:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('router', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tunnelip',
+            name='name',
+            field=models.CharField(default='', max_length=255, verbose_name='名前'),
+        ),
+    ]
diff --git a/router/models.py b/router/models.py
index 8e464a2..1d775be 100644
--- a/router/models.py
+++ b/router/models.py
@@ -31,9 +31,10 @@ class Meta:
     created_at = models.DateTimeField("作成日", default=timezone.now)
     updated_at = models.DateTimeField("更新日", default=timezone.now)
     is_active = models.BooleanField("有効", default=True)
+    name = models.CharField("名前", max_length=255, default="")
     tunnel_router = models.ForeignKey(TunnelRouter, on_delete=models.CASCADE)
     ip_address = models.GenericIPAddressField("IPアドレス", unique=True)
     comment = MediumTextField("コメント", default="", blank=True)
 
     def __str__(self):
-        return "%d: (%s)%s" % (self.id, self.tunnel_router.hostname, self.ip_address)
+        return "%d: %s[%s]%s" % (self.id, self.name, self.tunnel_router.hostname, self.ip_address)

From c314df9dd6188bcc9349669e2ea30bf0699a4ec3 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 04:16:14 +0900
Subject: [PATCH 16/36] =?UTF-8?q?#43=20=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pipfile      |  4 +--
 Pipfile.lock | 82 ++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Pipfile b/Pipfile
index ddc8332..a62e4d6 100644
--- a/Pipfile
+++ b/Pipfile
@@ -26,8 +26,8 @@ idna = "==3.*"
 incremental = "==24.*"
 markdown = "==3.*"
 mysqlclient = "==2.*"
-pyasn1 = "==0.6.0"
-pyasn1-modules = "==0.4.0"
+pyasn1 = "==0.6.*"
+pyasn1-modules = "==0.4.*"
 pycparser = "==2.22"
 pyopenssl = "==24.*"
 pyotp = "==2.9.0"
diff --git a/Pipfile.lock b/Pipfile.lock
index 9c9d8b8..5169914 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "7268eae3a6ab10ff57be98f2fb8273737f997fd5acc8c6b872880ceba7309862"
+            "sha256": "829780f92ed386bf6300e549d3776cba2a83a3226a293116efb2c9ac14c4c3b3"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -354,12 +354,12 @@
         },
         "idna": {
             "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:69297d5da0cc9281c77efffb4e730254dd45943f45bbfb461de5991713989b1e",
+                "sha256:e5c5dafde284f26e9e0f28f6ea2d6400abd5ca099864a67f576f3981c6476124"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==3.8"
+            "version": "==3.9"
         },
         "incremental": {
             "hashes": [
@@ -397,21 +397,21 @@
         },
         "pyasn1": {
             "hashes": [
-                "sha256:3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c",
-                "sha256:cca4bb0f2df5504f02f6f8a775b6e416ff9b0b3b16f7ee80b5a3153d9b804473"
+                "sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629",
+                "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==0.6.0"
+            "version": "==0.6.1"
         },
         "pyasn1-modules": {
             "hashes": [
-                "sha256:831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6",
-                "sha256:be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b"
+                "sha256:49bfa96b45a292b711e986f222502c1c9a5e1f4e568fc30e2574a6c7d07838fd",
+                "sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==0.4.0"
+            "version": "==0.4.1"
         },
         "pycparser": {
             "hashes": [
@@ -458,11 +458,11 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812",
-                "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"
+                "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a",
+                "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"
             ],
             "index": "pypi",
-            "version": "==2024.1"
+            "version": "==2024.2"
         },
         "qrcode": {
             "hashes": [
@@ -528,12 +528,12 @@
         },
         "stripe": {
             "hashes": [
-                "sha256:36ab5f75e4af790dd6888450d812f502357b3e699a93cd2f1a8fd0014a4b4fca",
-                "sha256:82351f9e1055c2161dc38c08a9bbf5c4b6c7f1caffcf911e999a7012369415e2"
+                "sha256:24300df559e547f58989e880c1f006460ed322d1c963d7b833562632b5eb956a",
+                "sha256:d18e1b498331fefd7738f7f72a8c0e852d7b933be9639604f81c8d575f44a1d7"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==10.10.0"
+            "version": "==10.11.0"
         },
         "twisted": {
             "extras": [
@@ -567,12 +567,12 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
-                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+                "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+                "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.2"
+            "version": "==2.2.3"
         },
         "zope.interface": {
             "hashes": [
@@ -627,11 +627,11 @@
         },
         "cattrs": {
             "hashes": [
-                "sha256:043bb8af72596432a7df63abcff0055ac0f198a4d2e95af8db5a936a7074a761",
-                "sha256:8274f18b253bf7674a43da851e3096370d67088165d23138b04a1c04c8eaf48e"
+                "sha256:16e94a13f9aaf6438bd5be5df521e072b1b00481b4cf807bcb1acbd49f814c08",
+                "sha256:ec8ce8fdc725de9d07547cd616f968670687c6fa7a2e263b088370c46d834d97"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==24.1.0"
+            "version": "==24.1.1"
         },
         "lsprotocol": {
             "hashes": [
@@ -659,28 +659,28 @@
         },
         "ruff": {
             "hashes": [
-                "sha256:0308610470fcc82969082fc83c76c0d362f562e2f0cdab0586516f03a4e06ec6",
-                "sha256:0b52387d3289ccd227b62102c24714ed75fbba0b16ecc69a923a37e3b5e0aaaa",
-                "sha256:0ea086601b22dc5e7693a78f3fcfc460cceabfdf3bdc36dc898792aba48fbad6",
-                "sha256:34d5efad480193c046c86608dbba2bccdc1c5fd11950fb271f8086e0c763a5d1",
-                "sha256:50e30b437cebef547bd5c3edf9ce81343e5dd7c737cb36ccb4fe83573f3d392e",
-                "sha256:549daccee5227282289390b0222d0fbee0275d1db6d514550d65420053021a58",
-                "sha256:66dbfea86b663baab8fcae56c59f190caba9398df1488164e2df53e216248baa",
-                "sha256:7862f42fc1a4aca1ea3ffe8a11f67819d183a5693b228f0bb3a531f5e40336fc",
-                "sha256:803b96dea21795a6c9d5bfa9e96127cc9c31a1987802ca68f35e5c95aed3fc0d",
-                "sha256:932063a03bac394866683e15710c25b8690ccdca1cf192b9a98260332ca93408",
-                "sha256:ac3b5bfbee99973f80aa1b7cbd1c9cbce200883bdd067300c22a6cc1c7fba212",
-                "sha256:ac4b75e898ed189b3708c9ab3fc70b79a433219e1e87193b4f2b77251d058d14",
-                "sha256:bedff9e4f004dad5f7f76a9d39c4ca98af526c9b1695068198b3bda8c085ef60",
-                "sha256:c44536df7b93a587de690e124b89bd47306fddd59398a0fb12afd6133c7b3818",
-                "sha256:c4b153fc152af51855458e79e835fb6b933032921756cec9af7d0ba2aa01a258",
-                "sha256:d02a4127a86de23002e694d7ff19f905c51e338c72d8e09b56bfb60e1681724f",
-                "sha256:eebe4ff1967c838a1a9618a5a59a3b0a00406f8d7eefee97c70411fefc353617",
-                "sha256:f0f8968feea5ce3777c0d8365653d5e91c40c31a81d95824ba61d871a11b8523"
+                "sha256:005256d977021790cc52aa23d78f06bb5090dc0bfbd42de46d49c201533982ae",
+                "sha256:09c72a833fd3551135ceddcba5ebdb68ff89225d30758027280968c9acdc7810",
+                "sha256:381413ec47f71ce1d1c614f7779d88886f406f1fd53d289c77e4e533dc6ea200",
+                "sha256:3a8d42d11fff8d3143ff4da41742a98f8f233bf8890e9fe23077826818f8d680",
+                "sha256:3e42a57b58e3612051a636bc1ac4e6b838679530235520e8f095f7c44f706ff9",
+                "sha256:482c1e6bfeb615eafc5899127b805d28e387bd87db38b2c0c41d271f5e58d8cc",
+                "sha256:4d32d87fab433c0cf285c3683dd4dae63be05fd7a1d65b3f5bf7cdd05a6b96fb",
+                "sha256:51935067740773afdf97493ba9b8231279e9beef0f2a8079188c4776c25688e0",
+                "sha256:52e75a82bbc9b42e63c08d22ad0ac525117e72aee9729a069d7c4f235fc4d276",
+                "sha256:7291e64d7129f24d1b0c947ec3ec4c0076e958d1475c61202497c6aced35dd19",
+                "sha256:794ada3400a0d0b89e3015f1a7e01f4c97320ac665b7bc3ade24b50b54cb2972",
+                "sha256:7e4e308f16e07c95fc7753fc1aaac690a323b2bb9f4ec5e844a97bb7fbebd748",
+                "sha256:800c50371bdcb99b3c1551d5691e14d16d6f07063a518770254227f7f6e8c178",
+                "sha256:8e25ddd9cd63ba1f3bd51c1f09903904a6adf8429df34f17d728a8fa11174253",
+                "sha256:932cd69eefe4daf8c7d92bd6689f7e8182571cb934ea720af218929da7bd7d69",
+                "sha256:9ad7dfbd138d09d9a7e6931e6a7e797651ce29becd688be8a0d4d5f8177b4b0c",
+                "sha256:a50af6e828ee692fb10ff2dfe53f05caecf077f4210fae9677e06a808275754f",
+                "sha256:cf4d3fa53644137f6a4a27a2b397381d16454a1566ae5335855c187fbf67e4f5"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==0.6.4"
+            "version": "==0.6.5"
         },
         "ruff-lsp": {
             "hashes": [

From cee3ec863aa104be6f6c3c6dc551ebf67562aeb8 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 04:39:58 +0900
Subject: [PATCH 17/36] =?UTF-8?q?#43=20=E8=BB=BD=E5=BE=AE=E3=81=AA?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/templates/home.html | 13 +++++++++++++
 dsbd/templates/menu.html | 27 +++++++++++----------------
 service/admin.py         |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index c001939..3c7e17b 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -57,6 +57,19 @@ <h5 class="card-title"><b>サービスの申請処理中</b></h5>
                 </div>
               </div>
             {% endif %}
+            {% for active_service in active_services %}
+              {% if active_service.allow_connection_add %}
+                <div class="card text-bg-light mb-3">
+                  <div class="card-body">
+                    <h5 class="card-title">接続情報の新規申請手続き</h5>
+                    <p class="card-text">
+                      接続情報の新規申請手続きを行ってください<br/>
+                    </p>
+                    <a href="{% url 'service:connection_add' active_service.group.id active_service.id %}" class="btn btn-sm btn-primary">申請はこちらから</a>
+                  </div>
+                </div>
+              {% endif %}
+            {% endfor %}
             {% for notice in notices %}
               <div class="card mb-2">
                 <div class="card-body">
diff --git a/dsbd/templates/menu.html b/dsbd/templates/menu.html
index f3fd801..9179c49 100644
--- a/dsbd/templates/menu.html
+++ b/dsbd/templates/menu.html
@@ -16,13 +16,13 @@ <h1 class="fw-light">Welcome</h1>
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
-            <h4 class="card-text">サービス情報一覧</h4>
-            <p class="card-text">サービス情報一覧はこちらから</p>
+            <h4 class="card-text">ホーム&通知など</h4>
+            <p class="card-text">通知はこちらから</p>
             <div class="d-flex justify-content-between align-items-center">
               <div class="btn-group">
                 <a type="button"
                    class="btn btn-sm btn-outline-secondary"
-                   href="/service">View</a>
+                   href="/">View</a>
               </div>
             </div>
           </div>
@@ -31,13 +31,13 @@ <h4 class="card-text">サービス情報一覧</h4>
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
-            <h4 class="card-text">チケットシステム</h4>
-            <p class="card-text">チケット作成・返事などはこちらから</p>
+            <h4 class="card-text">サービス情報一覧</h4>
+            <p class="card-text">サービス情報一覧はこちらから</p>
             <div class="d-flex justify-content-between align-items-center">
               <div class="btn-group">
                 <a type="button"
                    class="btn btn-sm btn-outline-secondary"
-                   href="/ticket">View</a>
+                   href="/services">View</a>
               </div>
             </div>
           </div>
@@ -46,19 +46,14 @@ <h4 class="card-text">チケットシステム</h4>
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body">
-            <p class="card-text">This is a wider card with supporting text
-              below as a natural lead-in to additional content. This
-              content is a little bit longer.</p>
+            <h4 class="card-text">チケットシステム</h4>
+            <p class="card-text">チケット作成・返事などはこちらから</p>
             <div class="d-flex justify-content-between align-items-center">
               <div class="btn-group">
-                <button type="button"
-                        class="btn btn-sm btn-outline-secondary">View
-                </button>
-                <button type="button"
-                        class="btn btn-sm btn-outline-secondary">Edit
-                </button>
+                <a type="button"
+                   class="btn btn-sm btn-outline-secondary"
+                   href="/ticket">View</a>
               </div>
-              <small class="text-body-secondary">9 mins</small>
             </div>
           </div>
         </div>
diff --git a/service/admin.py b/service/admin.py
index d94201a..d34d2f7 100644
--- a/service/admin.py
+++ b/service/admin.py
@@ -57,7 +57,7 @@ class Service(admin.ModelAdmin):
     )
     list_display = ("service_code", "is_active", "is_pass", "group", "start_at", "end_at")
     list_filter = ("end_at",)
-    search_fields = ("service_code", "is_active", "service_type")
+    search_fields = ("service_code", "is_active", "is_pass", "service_type")
     inlines = [
         TermInlineServiceIPAdmin,
         TermInlineServiceConnectionAdmin,

From 1cce464761f2e36838bfdf5765250a91855bb1ec Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 05:23:00 +0900
Subject: [PATCH 18/36] =?UTF-8?q?#43=20=E3=83=81=E3=82=B1=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E3=81=A8=E3=83=A1=E3=83=BC=E3=83=AB=E9=80=81=E4=BF=A1?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=AE=E8=BF=BD=E5=8A=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/notify.py                         | 24 +++++++++--------
 dsbd/templates/mail/ticket/message.txt | 11 ++++++++
 ticket/consumers.py                    | 36 +++++++-------------------
 ticket/signals.py                      | 17 +++++++++++-
 ticket/tool.py                         |  7 +++++
 5 files changed, 57 insertions(+), 38 deletions(-)
 create mode 100644 dsbd/templates/mail/ticket/message.txt

diff --git a/dsbd/notify.py b/dsbd/notify.py
index 79ed4e9..fb99067 100644
--- a/dsbd/notify.py
+++ b/dsbd/notify.py
@@ -5,11 +5,12 @@
 def notify_db_save(table_name="", type=0, data=""):
     event_name = "create"
     color = "good"
-    if type == 1:
-        event_name = "update"
-    if type == 2:
-        event_name = "delete"
-        color = "danger"
+    match type:
+        case 1:
+            event_name = "update"
+        case 2:
+            event_name = "delete"
+            color = "danger"
     client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
     client.send(
         text="[%s(%s)]" % (table_name, event_name),
@@ -34,9 +35,10 @@ def notice_payment(metadata_type="", event_type="", data=None):
 
 
 def get_color(status):
-    if status == "customer.subscription.created":
-        return "warning"
-    elif status == "customer.subscription.updated":
-        return "good"
-    elif status == "customer.subscription.deleted":
-        return "danger"
+    match status:
+        case "customer.subscription.created":
+            return "warning"
+        case "customer.subscription.updated":
+            return "good"
+        case "customer.subscription.deleted":
+            return "danger"
diff --git a/dsbd/templates/mail/ticket/message.txt b/dsbd/templates/mail/ticket/message.txt
new file mode 100644
index 0000000..a54cf78
--- /dev/null
+++ b/dsbd/templates/mail/ticket/message.txt
@@ -0,0 +1,11 @@
+{{ username }} 様
+
+下記チケットより、新規メッセージがあります。
+-- チケット情報 --
+チケット番号: {{ ticket_id }}
+タイトル: {{ ticket_title }}
+-- 新規メッセージ --
+{{ message }}
+
+詳細やチャット履歴はWebシステムよりご覧いただけます。
+
diff --git a/ticket/consumers.py b/ticket/consumers.py
index 3535a53..be40bc8 100644
--- a/ticket/consumers.py
+++ b/ticket/consumers.py
@@ -1,19 +1,12 @@
-import datetime
 import json
 
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncWebsocketConsumer
-from django.conf import settings
 from django.utils import timezone
 
 from ticket.models import Chat, Ticket
 
 
-@sync_to_async()
-def get_ticket(id):
-    return Ticket.objects.filter(id=id).first()
-
-
 class ChatConsumer(AsyncWebsocketConsumer):
     def __init__(self, *args, **kwargs):
         super().__init__(args, kwargs)
@@ -32,7 +25,7 @@ def add_chat(self, message):
     @sync_to_async
     def check(self):
         ticket = Ticket.objects.filter(id=self.ticket_id).first()
-        if ticket.group is None:
+        if not ticket.group:
             if self.user.id != ticket.user.id:
                 return False
         else:
@@ -60,7 +53,6 @@ async def connect(self):
             return
 
         await self.get_ticket()
-
         await self.accept()
 
         # JOIN CHAT Group
@@ -72,7 +64,6 @@ async def disconnect(self, close_code):
             print("ERROR")
         # LEAVE CHAT Group
         await self.channel_layer.group_discard(self.chat_group_name, self.channel_name)
-        pass
 
     async def receive(self, text_data=None, bytes_data=None):
         text_data_json = json.loads(text_data)
@@ -80,18 +71,14 @@ async def receive(self, text_data=None, bytes_data=None):
 
         await self.add_chat(message)
 
-        time_format = "%Y/%m/%d %H:%M:%S"
-        time = (
-            datetime.datetime.now(tz=datetime.timezone.utc if settings.USE_TZ else None)
-            .astimezone(timezone(settings.TIME_ZONE))
-            .strftime(time_format)
-        )
+        current_time = timezone.localtime(timezone.now())
+        formatted_time = current_time.strftime("%Y/%m/%d %H:%M:%S")
 
         await self.channel_layer.group_send(
             self.chat_group_name,
             {
                 "type": "broadcast_message",
-                "time": time,
+                "time": formatted_time,
                 "user_id": self.user.id,
                 "username": self.user.username,
                 "group": self.group,
@@ -100,13 +87,10 @@ async def receive(self, text_data=None, bytes_data=None):
             },
         )
 
-    async def broadcast_message(self, event):
-        time = event["time"]
-        user_id = int(event["user_id"])
+    async def broadcast_message(self, event: dict):
         username = event["username"]
-        group = int(event["group"])
-        message = event["message"]
         is_admin = event["is_admin"]
+        group = event["group"]
         if is_admin:
             username = ""
             group = 0
@@ -114,12 +98,12 @@ async def broadcast_message(self, event):
         await self.send(
             text_data=json.dumps(
                 {
-                    "time": time,
-                    "user_id": user_id,
+                    "time": event["time"],
+                    "user_id": event["user_id"],
                     "username": username,
                     "group": group,
-                    "message": message,
-                    "is_admin": is_admin,
+                    "message": event["message"],
+                    "is_admin": event["is_admin"],
                 }
             )
         )
diff --git a/ticket/signals.py b/ticket/signals.py
index e303a62..cc73717 100644
--- a/ticket/signals.py
+++ b/ticket/signals.py
@@ -1,9 +1,12 @@
+from django.conf import settings
+from django.core.mail import send_mail
 from django.db.models.signals import post_save, pre_delete, pre_save
 from django.dispatch import receiver
+from django.template.loader import render_to_string
 
 from dsbd.notify import notify_db_save
 from ticket.models import Chat, Ticket
-from ticket.tool import SignalTool
+from ticket.tool import SignalTool, get_user_lists
 
 
 @receiver(pre_save, sender=Ticket)
@@ -43,6 +46,18 @@ def post_chat(sender, instance, created, **kwargs):
     if created:
         text = SignalTool().get_create_chat(True, instance)
         notify_db_save(table_name="Chat", type=0, data=text)
+        subject = "[HomeNOC Dashboard System]新着のメッセージがあります"
+        for user_list in get_user_lists(instance.ticket):
+            message = render_to_string(
+                "mail/ticket/message.txt",
+                {
+                    "username": user_list.username,
+                    "ticket_id": instance.ticket.id,
+                    "ticket_title": instance.ticket.title,
+                    "message": instance.body,
+                },
+            )
+            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user_list.email], fail_silently=False)
     else:
         text = SignalTool().get_update_chat(instance._pre_save_instance, instance)
         notify_db_save(table_name="Chat", type=1, data=text)
diff --git a/ticket/tool.py b/ticket/tool.py
index c0597f5..8a1a977 100644
--- a/ticket/tool.py
+++ b/ticket/tool.py
@@ -83,3 +83,10 @@ def admin_to_str(self, is_admin):
 
     def active_to_str(self, is_admin):
         return "有効" if is_admin else "無効"
+
+
+def get_user_lists(ticket):
+    if ticket.group:
+        return ticket.group.users.all()
+    else:
+        return [ticket.user]

From 8f7986ec013532f28bfb8e6d355cafaa300084f7 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 05:49:20 +0900
Subject: [PATCH 19/36] =?UTF-8?q?#43=20django-simple-history=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=9F=E5=B1=A5=E6=AD=B4=E3=82=92=E8=A8=98?=
 =?UTF-8?q?=E9=8C=B2=E3=81=99=E3=82=8B=E4=BB=95=E7=B5=84=E3=81=BF=E3=82=92?=
 =?UTF-8?q?=E5=B0=8E=E5=85=A5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/admin.py                          |   5 +-
 ...roup_historicaluser_historicalusergroup.py | 110 +++++++++++++++++
 custom_auth/models.py                         |   4 +
 dsbd/settings.py                              |   2 +
 ip/admin.py                                   |   5 +-
 ...oricalip_historicalipjpnicuser_and_more.py | 116 ++++++++++++++++++
 ip/models.py                                  |   4 +
 noc/admin.py                                  |   3 +-
 noc/migrations/0002_historicalnoc.py          |  44 +++++++
 noc/models.py                                 |   2 +
 notice/admin.py                               |   3 +-
 notice/migrations/0002_historicalnotice.py    |  47 +++++++
 notice/models.py                              |   2 +
 router/admin.py                               |   5 +-
 ...storicaltunnelip_historicaltunnelrouter.py |  69 +++++++++++
 router/models.py                              |   3 +
 service/admin.py                              |   5 +-
 ..._historicalconnection_historicalservice.py | 103 ++++++++++++++++
 service/models.py                             |   3 +
 ticket/admin.py                               |   5 +-
 .../0002_historicalchat_historicalticket.py   |  72 +++++++++++
 ticket/models.py                              |   3 +
 22 files changed, 603 insertions(+), 12 deletions(-)
 create mode 100644 custom_auth/migrations/0007_historicalgroup_historicaluser_historicalusergroup.py
 create mode 100644 ip/migrations/0014_historicalip_historicalipjpnicuser_and_more.py
 create mode 100644 noc/migrations/0002_historicalnoc.py
 create mode 100644 notice/migrations/0002_historicalnotice.py
 create mode 100644 router/migrations/0003_historicaltunnelip_historicaltunnelrouter.py
 create mode 100644 service/migrations/0003_historicalconnection_historicalservice.py
 create mode 100644 ticket/migrations/0002_historicalchat_historicalticket.py

diff --git a/custom_auth/admin.py b/custom_auth/admin.py
index 62ee51d..3ed67c2 100644
--- a/custom_auth/admin.py
+++ b/custom_auth/admin.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.urls import reverse
 from django.utils.html import format_html
+from simple_history.admin import SimpleHistoryAdmin
 
 from custom_auth.models import Group, TOTPDevice, User, UserActivateToken
 from ip.models import JPNICUser
@@ -46,7 +47,7 @@ def id_link(self, obj):
 
 
 @admin.register(User)
-class User(admin.ModelAdmin):
+class User(SimpleHistoryAdmin):
     fieldsets = (
         (None, {"fields": ("username", "username_jp", "password")}),
         ("Personal info", {"fields": ("email",)}),
@@ -77,7 +78,7 @@ def get_groups(self, obj):
 
 
 @admin.register(Group)
-class Group(admin.ModelAdmin):
+class Group(SimpleHistoryAdmin):
     fieldsets = (
         (None, {"fields": ("name", "name_jp", "allow_service_add", "allow_jpnic_add", "is_pass", "comment")}),
         ("Membership", {"fields": ("membership_type", "membership_expired_at")}),
diff --git a/custom_auth/migrations/0007_historicalgroup_historicaluser_historicalusergroup.py b/custom_auth/migrations/0007_historicalgroup_historicaluser_historicalusergroup.py
new file mode 100644
index 0000000..371275a
--- /dev/null
+++ b/custom_auth/migrations/0007_historicalgroup_historicaluser_historicalusergroup.py
@@ -0,0 +1,110 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.contrib.auth.validators
+import django.db.models.deletion
+import django.utils.timezone
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0006_group_allow_jpnic_add'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalGroup',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('name', models.CharField(db_index=True, max_length=150, verbose_name='name')),
+                ('name_jp', models.CharField(db_index=True, max_length=150, verbose_name='name(japanese)')),
+                ('comment', models.CharField(blank=True, default='', max_length=250, verbose_name='comment')),
+                ('status', models.IntegerField(choices=[(1, '有効'), (10, 'ユーザより廃止'), (11, '運営委員より廃止'), (12, '審査落ち')], default=1, verbose_name='ステータス')),
+                ('allow_service_add', models.BooleanField(default=False, verbose_name='サービス追加許可')),
+                ('allow_jpnic_add', models.BooleanField(default=False, verbose_name='JPNIC情報追加許可')),
+                ('membership_type', models.IntegerField(choices=[(1, '一般会員'), (40, '運営委員(優勝)'), (70, '学生委員'), (90, '運営委員(無償)'), (99, 'その他')], default=1, verbose_name='会員種別')),
+                ('membership_expired_at', models.DateTimeField(blank=True, null=True, verbose_name='有効期限')),
+                ('agree', models.BooleanField(default=False, verbose_name='規約確認済み')),
+                ('question', dsbd.models.MediumTextField(default='', verbose_name='質問内容')),
+                ('is_pass', models.BooleanField(default=False, verbose_name='審査OK')),
+                ('stripe_customer_id', models.CharField(blank=True, max_length=200, null=True, verbose_name='Stripe(CusID)')),
+                ('stripe_subscription_id', models.CharField(blank=True, max_length=200, null=True, verbose_name='Stripe(SubID)')),
+                ('postcode', models.CharField(default='', max_length=20, verbose_name='郵便番号')),
+                ('address', models.CharField(default='', max_length=250, verbose_name='住所')),
+                ('address_jp', models.CharField(default='', max_length=250, verbose_name='住所(Japanese)')),
+                ('phone', models.CharField(default='', max_length=30, verbose_name='phone')),
+                ('country', models.CharField(default='Japan', max_length=100, verbose_name='居住国')),
+                ('contract_type', models.CharField(choices=[('E-Mail', 'E-Mail'), ('AirMail', 'AirMail)')], default='E-Mail', max_length=100, verbose_name='契約種別')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical グループ',
+                'verbose_name_plural': 'historical グループ',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalUser',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('display_name', models.CharField(blank=True, default='', max_length=150, verbose_name='display_name')),
+                ('username', models.CharField(db_index=True, max_length=150, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('username_jp', models.CharField(db_index=True, max_length=150, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username(japanese)')),
+                ('email', models.EmailField(db_index=True, max_length=254, verbose_name='email')),
+                ('is_staff', models.BooleanField(default=False, verbose_name='管理者ステータス')),
+                ('is_active', models.BooleanField(default=False, verbose_name='有効')),
+                ('allow_group_add', models.BooleanField(default=True, verbose_name='グループ追加許可')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical ユーザ',
+                'verbose_name_plural': 'historical ユーザ',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalUserGroup',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('is_admin', models.BooleanField(default=False, verbose_name='管理者')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('group', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='custom_auth.group')),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical ユーザ・グループ',
+                'verbose_name_plural': 'historical ユーザ・グループ',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/custom_auth/models.py b/custom_auth/models.py
index a1a1094..605f97d 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -11,6 +11,7 @@
 from django.db import models
 from django.template.loader import render_to_string
 from django.utils import timezone
+from simple_history.models import HistoricalRecords
 
 from custom_auth.tool import random_string
 from dsbd.models import MediumTextField
@@ -109,6 +110,7 @@ class Group(models.Model):  # noqa: F811
         through_fields=("group", "user"),
         related_name="group_users_set",
     )
+    history = HistoricalRecords()
 
     objects = GroupManager()
 
@@ -215,6 +217,7 @@ class User(AbstractBaseUser):
         through_fields=("user", "group"),
         related_name="user_set",
     )
+    history = HistoricalRecords()
 
     objects = UserManager()
 
@@ -313,6 +316,7 @@ class UserGroup(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
     is_admin = models.BooleanField("管理者", default=False)
+    history = HistoricalRecords()
 
     class Meta:
         verbose_name = "ユーザ・グループ"
diff --git a/dsbd/settings.py b/dsbd/settings.py
index 0b181d2..ee54e8e 100644
--- a/dsbd/settings.py
+++ b/dsbd/settings.py
@@ -69,6 +69,7 @@ def _import_ldap_group_type(group_type_name):
     "router",
     "ip",
     "service",
+    "simple_history",
 ]
 
 MIDDLEWARE = [
@@ -79,6 +80,7 @@ def _import_ldap_group_type(group_type_name):
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "simple_history.middleware.HistoryRequestMiddleware",
 ]
 
 AUTHENTICATION_BACKENDS = [
diff --git a/ip/admin.py b/ip/admin.py
index cc3b09c..9f8d2a8 100644
--- a/ip/admin.py
+++ b/ip/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
+from simple_history.admin import SimpleHistoryAdmin
 
 from .models import IP, JPNICUser
 
@@ -15,7 +16,7 @@ class TermInlineJPNICUserAdmin(admin.TabularInline):
 
 
 @admin.register(IP)
-class IP(admin.ModelAdmin):
+class IP(SimpleHistoryAdmin):
     fieldsets = (
         (
             None,
@@ -49,7 +50,7 @@ class IP(admin.ModelAdmin):
 
 
 @admin.register(JPNICUser)
-class JPNICUser(admin.ModelAdmin):
+class JPNICUser(SimpleHistoryAdmin):
     fieldsets = (
         (
             None,
diff --git a/ip/migrations/0014_historicalip_historicalipjpnicuser_and_more.py b/ip/migrations/0014_historicalip_historicalipjpnicuser_and_more.py
new file mode 100644
index 0000000..acd8b56
--- /dev/null
+++ b/ip/migrations/0014_historicalip_historicalipjpnicuser_and_more.py
@@ -0,0 +1,116 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.db.models.deletion
+import django.utils.timezone
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0007_historicalgroup_historicaluser_historicalusergroup'),
+        ('ip', '0013_alter_ip_ip_address'),
+        ('service', '0003_historicalconnection_historicalservice'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalIP',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('is_pass', models.BooleanField(default=False, verbose_name='審査OK')),
+                ('version', models.IntegerField(choices=[(4, 'IPv4'), (6, 'IPv6')], default=4, verbose_name='IPバージョン')),
+                ('ip_address', models.GenericIPAddressField(blank=True, null=True, verbose_name='IP Address')),
+                ('subnet', models.IntegerField(default=32, verbose_name='サブネット')),
+                ('owner', models.CharField(choices=[('form_our', '当団体から割当'), ('form_your', '貴団体から割当')], default='form_our', max_length=255, verbose_name='アドレス所持オーナ')),
+                ('start_at', models.DateTimeField(blank=True, null=True, verbose_name='開通日')),
+                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='解約日')),
+                ('ipv4_plan', models.JSONField(blank=True, null=True, verbose_name='IPv4プラン')),
+                ('use_case', dsbd.models.MediumTextField(blank=True, default='', verbose_name='使用用途')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('service', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='service.service')),
+            ],
+            options={
+                'verbose_name': 'historical IP',
+                'verbose_name_plural': 'historical IPs',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalIPJPNICUser',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('user_type', models.CharField(choices=[('admin', '管理者'), ('tech1', '技術担当者1'), ('tech2', '技術担当者2'), ('tech3', '技術担当者3'), ('tech4', '技術担当者4'), ('tech5', '技術担当者5')], default='admin', max_length=255, verbose_name='タイプ')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('ip', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ip.ip')),
+                ('jpnic_user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ip.jpnicuser')),
+            ],
+            options={
+                'verbose_name': 'historical IP・JPNIC User',
+                'verbose_name_plural': 'historical IP・JPNIC Users',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalJPNICUser',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('is_pass', models.BooleanField(default=False, verbose_name='審査OK')),
+                ('hidden', models.BooleanField(default=False, verbose_name='隠蔽')),
+                ('handle_type', models.CharField(choices=[('group_handle', 'グループハンドル'), ('jpnic_handle', 'JPNICハンドル')], default='jpnic_handle', max_length=255, verbose_name='ハンドルタイプ')),
+                ('version', models.IntegerField(choices=[(4, 'IPv4'), (6, 'IPv6')], default=4, verbose_name='IPバージョン')),
+                ('jpnic_handle', models.CharField(blank=True, max_length=100, verbose_name='JPNIC Handle')),
+                ('name', models.CharField(max_length=150, verbose_name='name')),
+                ('name_jp', models.CharField(max_length=150, verbose_name='name(japanese)')),
+                ('email', models.EmailField(max_length=150, verbose_name='E-Mail')),
+                ('org', models.CharField(max_length=150, verbose_name='Org')),
+                ('org_jp', models.CharField(max_length=150, verbose_name='Org(japanese)')),
+                ('postcode', models.CharField(default='', max_length=20, verbose_name='郵便番号')),
+                ('address', models.CharField(default='', max_length=250, verbose_name='住所')),
+                ('address_jp', models.CharField(default='', max_length=250, verbose_name='住所(Japanese)')),
+                ('dept', models.CharField(blank=True, default='', max_length=250, verbose_name='部署')),
+                ('dept_jp', models.CharField(blank=True, default='', max_length=250, verbose_name='部署(Japanese)')),
+                ('title', models.CharField(blank=True, default='', max_length=250, verbose_name='役職')),
+                ('title_jp', models.CharField(blank=True, default='', max_length=250, verbose_name='役職(Japanese)')),
+                ('tel', models.CharField(default='', max_length=30, verbose_name='tel')),
+                ('fax', models.CharField(blank=True, default='', max_length=30, verbose_name='fax')),
+                ('country', models.CharField(default='Japan', max_length=100, verbose_name='居住国')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('group', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='custom_auth.group')),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical JPNIC User',
+                'verbose_name_plural': 'historical JPNIC Users',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/ip/models.py b/ip/models.py
index f9118b8..3bdbf41 100644
--- a/ip/models.py
+++ b/ip/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils import timezone
+from simple_history.models import HistoricalRecords
 
 from custom_auth.models import Group
 from dsbd.models import MediumTextField
@@ -48,6 +49,7 @@ class Meta:
         through_fields=("ip", "jpnic_user"),
         related_name="jpnic_user_set",
     )
+    history = HistoricalRecords()
 
     def __str__(self):
         return "%d: %s/%s" % (self.id, self.ip_address, self.subnet)
@@ -101,6 +103,7 @@ class Meta:
         through_fields=("jpnic_user", "ip"),
         related_name="jpnic_set",
     )
+    history = HistoricalRecords()
 
     def __str__(self):
         return "%d: %s(%s)" % (self.id, self.name, self.name_jp)
@@ -131,6 +134,7 @@ class IPJPNICUser(models.Model):
     user_type = models.CharField(
         "タイプ", max_length=255, choices=JPNIC_USER_TYPE_CHOICES, default=JPNIC_USER_TYPE_ADMIN
     )
+    history = HistoricalRecords()
 
     class Meta:
         verbose_name = "IP・JPNIC User"
diff --git a/noc/admin.py b/noc/admin.py
index f07ec26..e5e9d02 100644
--- a/noc/admin.py
+++ b/noc/admin.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.urls import reverse
 from django.utils.html import format_html
+from simple_history.admin import SimpleHistoryAdmin
 
 from router.models import TunnelRouter
 
@@ -22,7 +23,7 @@ def id_link(self, obj):
 
 
 @admin.register(NOC)
-class NOC(admin.ModelAdmin):
+class NOC(SimpleHistoryAdmin):
     fieldsets = (
         (
             None,
diff --git a/noc/migrations/0002_historicalnoc.py b/noc/migrations/0002_historicalnoc.py
new file mode 100644
index 0000000..8e36694
--- /dev/null
+++ b/noc/migrations/0002_historicalnoc.py
@@ -0,0 +1,44 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.db.models.deletion
+import django.utils.timezone
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('noc', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalNOC',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('name', models.CharField(default='', max_length=255, verbose_name='名前')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('location', models.CharField(blank=True, default='', max_length=255, verbose_name='場所')),
+                ('bandwidth', models.IntegerField(default=1000, verbose_name='帯域幅')),
+                ('comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='コメント')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical NOC',
+                'verbose_name_plural': 'historical NOCs',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/noc/models.py b/noc/models.py
index 6158c92..b37f2f8 100644
--- a/noc/models.py
+++ b/noc/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils import timezone
+from simple_history.models import HistoricalRecords
 
 from dsbd.models import MediumTextField
 
@@ -17,6 +18,7 @@ class Meta:
     location = models.CharField("場所", default="", max_length=255, blank=True)
     bandwidth = models.IntegerField("帯域幅", default=1000)
     comment = MediumTextField("コメント", default="", blank=True)
+    history = HistoricalRecords()
 
     def __str__(self):
         return "%d: %s" % (self.id, self.name)
diff --git a/notice/admin.py b/notice/admin.py
index 8935161..92f4f89 100644
--- a/notice/admin.py
+++ b/notice/admin.py
@@ -1,10 +1,11 @@
 from django.contrib import admin
+from simple_history.admin import SimpleHistoryAdmin
 
 from notice.models import Notice
 
 
 @admin.register(Notice)
-class Notice(admin.ModelAdmin):
+class Notice(SimpleHistoryAdmin):
     fieldsets = (
         (None, {"fields": ("created_at", "start_at", "end_at", "is_active")}),
         ("info", {"fields": ("type1", "title", "body")}),
diff --git a/notice/migrations/0002_historicalnotice.py b/notice/migrations/0002_historicalnotice.py
new file mode 100644
index 0000000..74b0568
--- /dev/null
+++ b/notice/migrations/0002_historicalnotice.py
@@ -0,0 +1,47 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.db.models.deletion
+import django.utils.timezone
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notice', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalNotice',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='作成日')),
+                ('start_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='通知開始日')),
+                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='通知終了日')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('type1', models.CharField(choices=[('サービス情報', 'サービス情報'), ('その他', 'その他')], max_length=200, verbose_name='type1')),
+                ('title', models.CharField(max_length=250, verbose_name='title')),
+                ('body', dsbd.models.MediumTextField(blank=True, default='', verbose_name='内容')),
+                ('is_important', models.BooleanField(default=False, verbose_name='重要')),
+                ('is_fail', models.BooleanField(default=False, verbose_name='障害')),
+                ('is_info', models.BooleanField(default=False, verbose_name='情報')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical notice',
+                'verbose_name_plural': 'historical notices',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/notice/models.py b/notice/models.py
index 3a40525..f5ca1a2 100644
--- a/notice/models.py
+++ b/notice/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone
+from simple_history.models import HistoricalRecords
 
 from dsbd.models import MediumTextField
 
@@ -36,6 +37,7 @@ class Meta:
     is_important = models.BooleanField("重要", default=False)
     is_fail = models.BooleanField("障害", default=False)
     is_info = models.BooleanField("情報", default=False)
+    history = HistoricalRecords()
 
     objects = NoticeManager()
 
diff --git a/router/admin.py b/router/admin.py
index 04bda1a..0396e93 100644
--- a/router/admin.py
+++ b/router/admin.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.urls import reverse
 from django.utils.html import format_html
+from simple_history.admin import SimpleHistoryAdmin
 
 from .models import TunnelIP, TunnelRouter
 
@@ -20,7 +21,7 @@ def id_link(self, obj):
 
 
 @admin.register(TunnelRouter)
-class Router(admin.ModelAdmin):
+class Router(SimpleHistoryAdmin):
     fieldsets = (
         (None, {"fields": ("is_active", "noc", "hostname")}),
         ("comment", {"fields": ("comment",)}),
@@ -43,7 +44,7 @@ class Router(admin.ModelAdmin):
 
 
 @admin.register(TunnelIP)
-class TunnelIP(admin.ModelAdmin):
+class TunnelIP(SimpleHistoryAdmin):
     fieldsets = (
         (None, {"fields": ("is_active", "name", "tunnel_router", "ip_address")}),
         ("comment", {"fields": ("comment",)}),
diff --git a/router/migrations/0003_historicaltunnelip_historicaltunnelrouter.py b/router/migrations/0003_historicaltunnelip_historicaltunnelrouter.py
new file mode 100644
index 0000000..5ec21a8
--- /dev/null
+++ b/router/migrations/0003_historicaltunnelip_historicaltunnelrouter.py
@@ -0,0 +1,69 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.db.models.deletion
+import django.utils.timezone
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('noc', '0002_historicalnoc'),
+        ('router', '0002_tunnelip_name'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalTunnelIP',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('name', models.CharField(default='', max_length=255, verbose_name='名前')),
+                ('ip_address', models.GenericIPAddressField(db_index=True, verbose_name='IPアドレス')),
+                ('comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='コメント')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('tunnel_router', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='router.tunnelrouter')),
+            ],
+            options={
+                'verbose_name': 'historical Tunnel IP',
+                'verbose_name_plural': 'historical Tunnel IPs',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalTunnelRouter',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('hostname', models.CharField(db_index=True, max_length=255, verbose_name='ホスト名')),
+                ('comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='コメント')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('noc', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='noc.noc')),
+            ],
+            options={
+                'verbose_name': 'historical Tunnel Router',
+                'verbose_name_plural': 'historical Tunnel Routers',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/router/models.py b/router/models.py
index 1d775be..166fc8d 100644
--- a/router/models.py
+++ b/router/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils import timezone
+from simple_history.models import HistoricalRecords
 
 from dsbd.models import MediumTextField
 from noc.models import NOC
@@ -17,6 +18,7 @@ class Meta:
     noc = models.ForeignKey(NOC, on_delete=models.CASCADE)
     hostname = models.CharField("ホスト名", unique=True, max_length=255)
     comment = MediumTextField("コメント", default="", blank=True)
+    history = HistoricalRecords()
 
     def __str__(self):
         return "%d: %s" % (self.id, self.hostname)
@@ -35,6 +37,7 @@ class Meta:
     tunnel_router = models.ForeignKey(TunnelRouter, on_delete=models.CASCADE)
     ip_address = models.GenericIPAddressField("IPアドレス", unique=True)
     comment = MediumTextField("コメント", default="", blank=True)
+    history = HistoricalRecords()
 
     def __str__(self):
         return "%d: %s[%s]%s" % (self.id, self.name, self.tunnel_router.hostname, self.ip_address)
diff --git a/service/admin.py b/service/admin.py
index d34d2f7..00cf597 100644
--- a/service/admin.py
+++ b/service/admin.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.urls import reverse
 from django.utils.html import format_html
+from simple_history.admin import SimpleHistoryAdmin
 
 from ip.models import IP
 
@@ -36,7 +37,7 @@ def id_link(self, obj):
 
 
 @admin.register(Service)
-class Service(admin.ModelAdmin):
+class Service(SimpleHistoryAdmin):
     fieldsets = (
         (None, {"fields": ("is_active", "is_pass", "allow_connection_add", "group")}),
         ("service", {"fields": ("service_type", "service_number", "start_at", "end_at", "asn")}),
@@ -65,7 +66,7 @@ class Service(admin.ModelAdmin):
 
 
 @admin.register(Connection)
-class Connection(admin.ModelAdmin):
+class Connection(SimpleHistoryAdmin):
     fieldsets = (
         (
             None,
diff --git a/service/migrations/0003_historicalconnection_historicalservice.py b/service/migrations/0003_historicalconnection_historicalservice.py
new file mode 100644
index 0000000..98d24ee
--- /dev/null
+++ b/service/migrations/0003_historicalconnection_historicalservice.py
@@ -0,0 +1,103 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.db.models.deletion
+import django.utils.timezone
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0007_historicalgroup_historicaluser_historicalusergroup'),
+        ('router', '0003_historicaltunnelip_historicaltunnelrouter'),
+        ('service', '0002_remove_connection_ipv4_comment_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalConnection',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('connection_type', models.CharField(choices=[('EIP', 'EtherIP Tunnel'), ('GRE', 'GRE Tunnel'), ('IPT', 'IPT Tunnel'), ('CC0', 'Cross Connect'), ('ETC', 'ETC')], default='EIP', max_length=255, verbose_name='接続タイプ')),
+                ('connection_number', models.IntegerField(default=1, verbose_name='接続番号')),
+                ('connection_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='接続情報コメント')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('is_open', models.BooleanField(default=False, verbose_name='開通')),
+                ('hope_location', models.CharField(choices=[('east_japan', '東日本'), ('west_japan', '西日本'), ('anywhere', 'どちらでも')], default='anywhere', max_length=255, verbose_name='接続希望場所')),
+                ('term_location', models.CharField(blank=True, default='', max_length=255, verbose_name='接続終端場所')),
+                ('ntt_type', models.CharField(choices=[('type-1', 'はい（IPoEによりIPv6インターネットへ接続可能）'), ('type-2', 'はい（IPoEによりIPv6インターネットへ接続不可）'), ('type-3', 'はい（フレッツv6オプションの契約なし）'), ('type-4', 'いいえ（フレッツ以外でインターネットに接続可能）'), ('type-5', 'いいえ（IPv6でのインターネット接続不可）'), ('etc', 'etc')], default='type-1', max_length=255, verbose_name='NTT接続タイプ')),
+                ('ntt_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='NTT接続コメント')),
+                ('ipv4_route', models.CharField(choices=[('none', 'None'), ('full_route', 'Full Route'), ('default_route', 'Default Route'), ('full_route', 'Etc')], default='full_route', max_length=255, verbose_name='IPv4 Route')),
+                ('ipv4_route_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='IPv4 Routeコメント')),
+                ('ipv6_route', models.CharField(choices=[('none', 'None'), ('full_route', 'Full Route'), ('default_route', 'Default Route'), ('full_route', 'Etc')], default='full_route', max_length=255, verbose_name='IPv6 Route')),
+                ('ipv6_route_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='IPv6 Routeコメント')),
+                ('is_monitor', models.BooleanField(default=False, verbose_name='監視の有無')),
+                ('link_v4_our', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv4接続(HomeNOC側)')),
+                ('link_v4_your', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv4(貴団体側)')),
+                ('link_v6_our', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv6接続(HomeNOC側)')),
+                ('link_v6_your', models.GenericIPAddressField(blank=True, null=True, verbose_name='IPv6(貴団体側)')),
+                ('term_ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='終端先IP')),
+                ('start_at', models.DateTimeField(blank=True, null=True, verbose_name='開通日')),
+                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='解約日')),
+                ('user_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='ユーザコメント')),
+                ('admin_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='管理者コメント')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('service', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='service.service')),
+                ('tunnel_ip', models.ForeignKey(blank=True, db_constraint=False, max_length=255, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='router.tunnelip')),
+            ],
+            options={
+                'verbose_name': 'historical Connection',
+                'verbose_name_plural': 'historical Connections',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalService',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新日')),
+                ('service_type', models.CharField(choices=[('2000', 'L2'), ('3S00', 'L3 Static'), ('3B00', 'L3 BGP'), ('IP3B', 'トランジット提供'), ('CL20', 'コロケーションサービス(L2)'), ('CL3S', 'コロケーションサービス(L3 Static)'), ('CL3B', 'コロケーションサービス(L3 BGP)'), ('ET00', 'その他')], default='CL3B', max_length=255, verbose_name='サービスタイプ')),
+                ('service_number', models.IntegerField(default=1, verbose_name='サービス番号')),
+                ('service_comment', models.CharField(blank=True, default='', max_length=255, verbose_name='サービス情報コメント')),
+                ('is_active', models.BooleanField(default=True, verbose_name='有効')),
+                ('is_pass', models.BooleanField(default=False, verbose_name='審査OK')),
+                ('allow_connection_add', models.BooleanField(default=True, verbose_name='接続追加許可')),
+                ('asn', models.IntegerField(blank=True, default=0, null=True, verbose_name='ASN')),
+                ('ave_upstream', models.IntegerField(default=10, verbose_name='平均アップロード帯域幅')),
+                ('max_upstream', models.IntegerField(default=20, verbose_name='最大アップロード帯域幅')),
+                ('ave_downstream', models.IntegerField(default=10, verbose_name='平均ダウンロード帯域幅')),
+                ('max_downstream', models.IntegerField(default=20, verbose_name='最大ダウンロード帯域幅')),
+                ('max_bandwidth_as', models.CharField(blank=True, default='', max_length=255, verbose_name='最大帯域幅AS')),
+                ('start_at', models.DateTimeField(blank=True, null=True, verbose_name='開通日')),
+                ('end_at', models.DateTimeField(blank=True, null=True, verbose_name='解約日')),
+                ('user_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='ユーザコメント')),
+                ('admin_comment', dsbd.models.MediumTextField(blank=True, default='', verbose_name='管理者コメント')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('group', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='custom_auth.group')),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical Service',
+                'verbose_name_plural': 'historical Services',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/service/models.py b/service/models.py
index 30ba975..42cded6 100644
--- a/service/models.py
+++ b/service/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone
+from simple_history.models import HistoricalRecords
 
 from custom_auth.models import Group
 from dsbd.models import MediumTextField
@@ -80,6 +81,7 @@ class Meta:
     end_at = models.DateTimeField("解約日", null=True, blank=True)
     user_comment = MediumTextField("ユーザコメント", default="", blank=True)
     admin_comment = MediumTextField("管理者コメント", default="", blank=True)
+    history = HistoricalRecords()
 
     objects = ServiceManager()
 
@@ -192,6 +194,7 @@ class Meta:
     end_at = models.DateTimeField("解約日", null=True, blank=True)
     user_comment = MediumTextField("ユーザコメント", default="", blank=True)
     admin_comment = MediumTextField("管理者コメント", default="", blank=True)
+    history = HistoricalRecords()
 
     objects = ConnectionManager()
 
diff --git a/ticket/admin.py b/ticket/admin.py
index 4357e43..3f09f13 100644
--- a/ticket/admin.py
+++ b/ticket/admin.py
@@ -1,10 +1,11 @@
 from django.contrib import admin
+from simple_history.admin import SimpleHistoryAdmin
 
 from ticket.models import Chat, Ticket
 
 
 @admin.register(Ticket)
-class Ticket(admin.ModelAdmin):
+class Ticket(SimpleHistoryAdmin):
     readonly_fields = ["created_at", "updated_at"]
     fieldsets = (
         (None, {"fields": ("created_at", "updated_at", "user", "group")}),
@@ -25,7 +26,7 @@ class Ticket(admin.ModelAdmin):
 
 
 @admin.register(Chat)
-class Chat(admin.ModelAdmin):
+class Chat(SimpleHistoryAdmin):
     readonly_fields = ["created_at"]
     fieldsets = (
         (None, {"fields": ("created_at", "user", "group", "ticket")}),
diff --git a/ticket/migrations/0002_historicalchat_historicalticket.py b/ticket/migrations/0002_historicalchat_historicalticket.py
new file mode 100644
index 0000000..9f9a368
--- /dev/null
+++ b/ticket/migrations/0002_historicalchat_historicalticket.py
@@ -0,0 +1,72 @@
+# Generated by Django 5.1.1 on 2024-09-14 20:33
+
+import django.db.models.deletion
+import dsbd.models
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0007_historicalgroup_historicaluser_historicalusergroup'),
+        ('ticket', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalChat',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(blank=True, db_index=True, editable=False, verbose_name='作成日')),
+                ('body', dsbd.models.MediumTextField(blank=True, default='', verbose_name='内容')),
+                ('is_admin', models.BooleanField(default=False, verbose_name='運営委員がコメント')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('group', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='custom_auth.group')),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('ticket', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ticket.ticket')),
+                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical チャット',
+                'verbose_name_plural': 'historical チャット',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalTicket',
+            fields=[
+                ('id', models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('created_at', models.DateTimeField(blank=True, db_index=True, editable=False, verbose_name='作成日')),
+                ('updated_at', models.DateTimeField(blank=True, editable=False, verbose_name='更新日')),
+                ('title', models.CharField(max_length=250, verbose_name='title')),
+                ('body', dsbd.models.MediumTextField(blank=True, default='', verbose_name='内容')),
+                ('is_template', models.BooleanField(default=False, verbose_name='templateチケット')),
+                ('is_solved', models.BooleanField(default=False, verbose_name='解決済み')),
+                ('is_approve', models.BooleanField(default=False, verbose_name='承認済み')),
+                ('is_reject', models.BooleanField(default=False, verbose_name='拒否済み')),
+                ('from_admin', models.BooleanField(default=False, verbose_name='運営委員から起票')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('group', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='custom_auth.group')),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical チケット',
+                'verbose_name_plural': 'historical チケット',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/ticket/models.py b/ticket/models.py
index 0bb4b6b..1ef5a2a 100644
--- a/ticket/models.py
+++ b/ticket/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.db.models import Q
+from simple_history.models import HistoricalRecords
 
 from custom_auth.models import Group, User
 from dsbd.models import MediumTextField
@@ -42,6 +43,7 @@ class Ticket(models.Model):
     is_approve = models.BooleanField("承認済み", default=False)
     is_reject = models.BooleanField("拒否済み", default=False)
     from_admin = models.BooleanField("運営委員から起票", default=False)
+    history = HistoricalRecords()
 
     objects = TicketManager()
 
@@ -63,6 +65,7 @@ class Chat(models.Model):
     ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE)
     body = MediumTextField(verbose_name="内容", default="", blank=True)
     is_admin = models.BooleanField("運営委員がコメント", default=False)
+    history = HistoricalRecords()
 
     class Meta:
         verbose_name = "チャット"

From a091b144feb51ad643c6652219974ed389b693aa Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 17:01:58 +0900
Subject: [PATCH 20/36] =?UTF-8?q?#43=20DB=E6=83=85=E5=A0=B1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=99=82=E3=81=ABSlack=E9=80=9A=E7=9F=A5=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E6=A9=9F=E8=83=BD=E3=81=AE=E5=AE=9F=E8=A3=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/signals.py | 55 ++++++++++++++++++++----------
 dsbd/notify.py         | 77 ++++++++++++++++++++++++++++++++++++------
 dsbd/settings.py       |  1 +
 dsbd/utils.py          | 30 ++++++++++++++++
 ip/apps.py             |  3 ++
 ip/signals.py          | 44 ++++++++++++++++++++++++
 noc/apps.py            |  3 ++
 noc/signals.py         | 18 ++++++++++
 notice/apps.py         |  3 ++
 notice/signals.py      | 18 ++++++++++
 router/apps.py         |  3 ++
 router/signals.py      | 31 +++++++++++++++++
 service/apps.py        |  3 ++
 service/signals.py     | 31 +++++++++++++++++
 ticket/signals.py      | 26 ++++++--------
 15 files changed, 302 insertions(+), 44 deletions(-)
 create mode 100644 dsbd/utils.py
 create mode 100644 ip/signals.py
 create mode 100644 noc/signals.py
 create mode 100644 notice/signals.py
 create mode 100644 router/signals.py
 create mode 100644 service/signals.py

diff --git a/custom_auth/signals.py b/custom_auth/signals.py
index 696fd53..3cbc269 100644
--- a/custom_auth/signals.py
+++ b/custom_auth/signals.py
@@ -1,9 +1,8 @@
 from django.db.models.signals import post_save, pre_delete, pre_save
 from django.dispatch import receiver
 
-from custom_auth.models import Group, User
-from custom_auth.tool import SignalTool
-from dsbd.notify import notify_db_save
+from custom_auth.models import Group, User, UserGroup
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
 
 
 @receiver(pre_save, sender=User)
@@ -17,26 +16,48 @@ def user_model_pre_save(sender, instance, **kwargs):
 @receiver(post_save, sender=User)
 def post_user(sender, instance, created, **kwargs):
     if created:
-        text = SignalTool().get_create_user(True, instance)
-        notify_db_save(table_name="User", type=0, data=text)
-    else:
-        text = SignalTool().get_update_user(instance._pre_save_instance, instance)
-        notify_db_save(table_name="User", type=1, data=text)
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_insert_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(pre_delete, sender=User)
 def delete_user(sender, instance, **kwargs):
-    text = SignalTool().get_create_user(False, instance)
-    notify_db_save(table_name="User", type=2, data=text)
+    notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(post_save, sender=Group)
-def update_group(sender, instance, created, **kwargs):
-    # 審査OKステータス変更時にサービス追加許可にする
-    if instance.is_pass and not instance.allow_service_add:
+def post_group(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+
+    notify_update_db(model_name=sender.__name__, instance=instance)
+    # 審査NG => 審査OKの場合にサービス追加とJPNIC追加を出来るようにする
+    if not instance._pre_save_instance.is_pass and instance.is_pass:
         instance.allow_service_add = True
-        instance.save(update_fields=["allow_service_add"])
-    # 審査NGステータス変更時にサービス追加拒否設定にする
-    if not instance.is_pass and instance.allow_service_add:
+        instance.allow_jpnic_add = True
+        instance.save(update_fields=["allow_service_add", "allow_jpnic_add"])
+    # Statusが1以外の場合はサービス追加とJPNIC追加を禁止する
+    if instance.status != 1:
         instance.allow_service_add = False
-        instance.save(update_fields=["allow_service_add"])
+        instance.allow_jpnic_add = False
+        instance.save(update_fields=["allow_service_add", "allow_jpnic_add"])
+
+
+@receiver(pre_delete, sender=Group)
+def delete_group(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(post_save, sender=UserGroup)
+def post_user_group(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_insert_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=UserGroup)
+def delete_user_group(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/dsbd/notify.py b/dsbd/notify.py
index fb99067..c836c7d 100644
--- a/dsbd/notify.py
+++ b/dsbd/notify.py
@@ -1,23 +1,78 @@
 from django.conf import settings
 from slack_sdk import WebhookClient
 
+from dsbd.utils import get_admin_history_url, get_admin_url
 
-def notify_db_save(table_name="", type=0, data=""):
-    event_name = "create"
-    color = "good"
-    match type:
-        case 1:
-            event_name = "update"
-        case 2:
-            event_name = "delete"
-            color = "danger"
+
+def notify_delete_db(model_name: str, instance):
+    admin_history_url = get_admin_history_url(instance)
+
+    message = f"レコードが削除されました:\n{instance}"
+    client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
+    client.send(
+        attachments=[
+            {
+                "color": "danger",
+                "title": "[%s]" % f"{model_name}",
+                "text": f"{message}\n管理画面(履歴): {admin_history_url}",
+            }
+        ],
+    )
+
+
+def notify_insert_db(model_name: str, instance):
+    admin_url = get_admin_url(instance)
+    admin_history_url = get_admin_history_url(instance)
+
+    message = f"新しいレコードが登録されました:\n{instance}"
     client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
     client.send(
-        text="[%s(%s)]" % (table_name, event_name),
-        attachments=[{"color": color, "title": "[%s(%s)]" % (table_name, event_name), "text": "%s" % (data,)}],
+        attachments=[
+            {
+                "color": "good",
+                "title": "[%s]" % f"{model_name}",
+                "text": f"{message}\n管理画面: {admin_url}\n管理画面(履歴): {admin_history_url}",
+            }
+        ],
     )
 
 
+def notify_update_db(model_name: str, instance):
+    admin_url = get_admin_url(instance)
+    admin_history_url = get_admin_history_url(instance)
+
+    history = instance.history.all()
+    if history.count() < 2:
+        return  # 履歴が2つ未満の場合は差分がないため、何もしない
+
+    latest = history.first()  # 最新の履歴
+    previous = history[1]  # 直前の履歴
+
+    changes = []
+
+    # フィールドごとの差分を確認
+    for field in instance._meta.fields:
+        field_name = field.name
+        old_value = getattr(previous, field_name, None)
+        new_value = getattr(latest, field_name, None)
+
+        if old_value != new_value:
+            changes.append(f"{field_name}: {old_value} -> {new_value}")
+
+    if changes:
+        message = f"モデル '{instance}' の以下のフィールドが変更されました:\n" + "\n".join(changes)
+        client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
+        client.send(
+            attachments=[
+                {
+                    "color": "good",
+                    "title": "[%s]" % f"{model_name}",
+                    "text": f"{message}\n管理画面: {admin_url}\n管理画面(履歴): {admin_history_url}",
+                }
+            ],
+        )
+
+
 def notice_payment(metadata_type="", event_type="", data=None):
     client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
     client.send(
diff --git a/dsbd/settings.py b/dsbd/settings.py
index ee54e8e..d1722cc 100644
--- a/dsbd/settings.py
+++ b/dsbd/settings.py
@@ -193,6 +193,7 @@ def _import_ldap_group_type(group_type_name):
 LOGIN_REDIRECT_URL = "/"
 
 DOMAIN_URL = os.environ.get("DOMAIN_URL", "http://localhost:8000")
+ADMIN_DOMAIN_URL = os.environ.get("ADMIN_DOMAIN_URL", "http://localhost:8001")
 
 USER_LOGIN_VERIFY_EMAIL_EXPIRED_HOURS = os.environ.get("USER_LOGIN_VERIFY_EMAIL_EXPIRED_HOURS", 1)
 USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES = os.environ.get("USER_LOGIN_VERIFY_EMAIL_EXPIRED_MINUTES", 10)
diff --git a/dsbd/utils.py b/dsbd/utils.py
new file mode 100644
index 0000000..8e759dc
--- /dev/null
+++ b/dsbd/utils.py
@@ -0,0 +1,30 @@
+from django.conf import settings
+from django.urls import reverse
+
+
+def get_admin_url(instance) -> str:
+    """
+    任意のモデルインスタンスの管理ページURLを生成する。
+    """
+    model_name = instance._meta.model_name
+    app_label = instance._meta.app_label
+    admin_url = reverse(f"admin:{app_label}_{model_name}_change", args=[instance.pk])
+
+    # フルURLにするために現在のサイトドメインを取得
+    full_admin_url = f"{settings.ADMIN_DOMAIN_URL}{admin_url}"
+
+    return full_admin_url
+
+
+def get_admin_history_url(instance) -> str:
+    """
+    任意のモデルインスタンスの管理ページURLを生成する。
+    """
+    model_name = instance._meta.model_name
+    app_label = instance._meta.app_label
+    admin_url = reverse(f"admin:{app_label}_{model_name}_history", args=[instance.pk])
+
+    # フルURLにするために現在のサイトドメインを取得
+    admin_history_url = f"{settings.ADMIN_DOMAIN_URL}{admin_url}"
+
+    return admin_history_url
diff --git a/ip/apps.py b/ip/apps.py
index 2cd3d87..362c754 100644
--- a/ip/apps.py
+++ b/ip/apps.py
@@ -4,3 +4,6 @@
 class CustomAdmin(AppConfig):
     name = "ip"
     verbose_name = "IP"
+
+    def ready(self):
+        from . import signals  # noqa
diff --git a/ip/signals.py b/ip/signals.py
new file mode 100644
index 0000000..bea9ba2
--- /dev/null
+++ b/ip/signals.py
@@ -0,0 +1,44 @@
+from django.db.models.signals import post_save, pre_delete
+from django.dispatch import receiver
+
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
+from ip.models import IP, IPJPNICUser, JPNICUser
+
+
+@receiver(post_save, sender=JPNICUser)
+def post_jpnic_user(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=JPNICUser)
+def delete_jpnic_user(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(post_save, sender=IP)
+def post_ip(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=IP)
+def delete_ip(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(post_save, sender=IPJPNICUser)
+def post_ip_jpnic_user(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=IPJPNICUser)
+def delete_ip_jpnic_user(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/noc/apps.py b/noc/apps.py
index fd8e3c3..d83f964 100644
--- a/noc/apps.py
+++ b/noc/apps.py
@@ -4,3 +4,6 @@
 class CustomAdmin(AppConfig):
     name = "noc"
     verbose_name = "NOC"
+
+    def ready(self):
+        from . import signals  # noqa
diff --git a/noc/signals.py b/noc/signals.py
new file mode 100644
index 0000000..f738ef0
--- /dev/null
+++ b/noc/signals.py
@@ -0,0 +1,18 @@
+from django.db.models.signals import post_save, pre_delete
+from django.dispatch import receiver
+
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
+from noc.models import NOC
+
+
+@receiver(post_save, sender=NOC)
+def post_noc(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=NOC)
+def delete_noc(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/notice/apps.py b/notice/apps.py
index 89cafc9..febc65c 100644
--- a/notice/apps.py
+++ b/notice/apps.py
@@ -4,3 +4,6 @@
 class Notice(AppConfig):
     name = "notice"
     verbose_name = "通知"
+
+    def ready(self):
+        from . import signals  # noqa
diff --git a/notice/signals.py b/notice/signals.py
new file mode 100644
index 0000000..b5c8cb3
--- /dev/null
+++ b/notice/signals.py
@@ -0,0 +1,18 @@
+from django.db.models.signals import post_save, pre_delete
+from django.dispatch import receiver
+
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
+from notice.models import Notice
+
+
+@receiver(post_save, sender=Notice)
+def post_notice(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=Notice)
+def delete_notice(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/router/apps.py b/router/apps.py
index 9b31c20..974b048 100644
--- a/router/apps.py
+++ b/router/apps.py
@@ -4,3 +4,6 @@
 class CustomAdmin(AppConfig):
     name = "router"
     verbose_name = "Router"
+
+    def ready(self):
+        from . import signals  # noqa
diff --git a/router/signals.py b/router/signals.py
new file mode 100644
index 0000000..668a2fe
--- /dev/null
+++ b/router/signals.py
@@ -0,0 +1,31 @@
+from django.db.models.signals import post_save, pre_delete
+from django.dispatch import receiver
+
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
+from router.models import TunnelIP, TunnelRouter
+
+
+@receiver(post_save, sender=TunnelRouter)
+def post_tunnel_router(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=TunnelRouter)
+def delete_tunnel_router(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(post_save, sender=TunnelIP)
+def post_tunnel_ip(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=TunnelIP)
+def delete_tunnel_ip(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/service/apps.py b/service/apps.py
index e1c140e..6c3247b 100644
--- a/service/apps.py
+++ b/service/apps.py
@@ -4,3 +4,6 @@
 class CustomAdmin(AppConfig):
     name = "service"
     verbose_name = "Service"
+
+    def ready(self):
+        from . import signals  # noqa
diff --git a/service/signals.py b/service/signals.py
new file mode 100644
index 0000000..1506630
--- /dev/null
+++ b/service/signals.py
@@ -0,0 +1,31 @@
+from django.db.models.signals import post_save, pre_delete
+from django.dispatch import receiver
+
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
+from service.models import Connection, Service
+
+
+@receiver(post_save, sender=Service)
+def post_service(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=Service)
+def delete_service(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(post_save, sender=Connection)
+def post_connection(sender, instance, created, **kwargs):
+    if created:
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
+
+
+@receiver(pre_delete, sender=Connection)
+def delete_connection(sender, instance, **kwargs):
+    notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/ticket/signals.py b/ticket/signals.py
index cc73717..72536b1 100644
--- a/ticket/signals.py
+++ b/ticket/signals.py
@@ -4,9 +4,9 @@
 from django.dispatch import receiver
 from django.template.loader import render_to_string
 
-from dsbd.notify import notify_db_save
+from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
 from ticket.models import Chat, Ticket
-from ticket.tool import SignalTool, get_user_lists
+from ticket.tool import get_user_lists
 
 
 @receiver(pre_save, sender=Ticket)
@@ -20,17 +20,14 @@ def ticket_model_pre_save(sender, instance, **kwargs):
 @receiver(post_save, sender=Ticket)
 def post_ticket(sender, instance, created, **kwargs):
     if created:
-        text = SignalTool().get_create_ticket(True, instance)
-        notify_db_save(table_name="Ticket", type=0, data=text)
-    else:
-        text = SignalTool().get_update_ticket(instance._pre_save_instance, instance)
-        notify_db_save(table_name="Ticket", type=1, data=text)
+        notify_insert_db(model_name=sender.__name__, instance=instance)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(pre_delete, sender=Ticket)
 def delete_ticket(sender, instance, **kwargs):
-    text = SignalTool().get_create_ticket(False, instance)
-    notify_db_save(table_name="Ticket", type=2, data=text)
+    notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(pre_save, sender=Chat)
@@ -44,8 +41,7 @@ def chat_model_pre_save(sender, instance, **kwargs):
 @receiver(post_save, sender=Chat)
 def post_chat(sender, instance, created, **kwargs):
     if created:
-        text = SignalTool().get_create_chat(True, instance)
-        notify_db_save(table_name="Chat", type=0, data=text)
+        notify_insert_db(model_name=sender.__name__, instance=instance)
         subject = "[HomeNOC Dashboard System]新着のメッセージがあります"
         for user_list in get_user_lists(instance.ticket):
             message = render_to_string(
@@ -58,12 +54,10 @@ def post_chat(sender, instance, created, **kwargs):
                 },
             )
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user_list.email], fail_silently=False)
-    else:
-        text = SignalTool().get_update_chat(instance._pre_save_instance, instance)
-        notify_db_save(table_name="Chat", type=1, data=text)
+        return
+    notify_update_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(pre_delete, sender=Chat)
 def delete_chat(sender, instance, **kwargs):
-    text = SignalTool().get_create_chat(False, instance)
-    notify_db_save(table_name="Chat", type=2, data=text)
+    notify_delete_db(model_name=sender.__name__, instance=instance)

From d98bcad5f2e7679ad70b97646d72c6f36fbad7d5 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 17:08:13 +0900
Subject: [PATCH 21/36] =?UTF-8?q?#43=20User=E3=83=A2=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=A7Slack=E9=80=9A=E7=9F=A5=E5=87=BA=E6=9D=A5=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/utils.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dsbd/utils.py b/dsbd/utils.py
index 8e759dc..921330e 100644
--- a/dsbd/utils.py
+++ b/dsbd/utils.py
@@ -1,5 +1,4 @@
 from django.conf import settings
-from django.urls import reverse
 
 
 def get_admin_url(instance) -> str:
@@ -8,10 +7,9 @@ def get_admin_url(instance) -> str:
     """
     model_name = instance._meta.model_name
     app_label = instance._meta.app_label
-    admin_url = reverse(f"admin:{app_label}_{model_name}_change", args=[instance.pk])
 
     # フルURLにするために現在のサイトドメインを取得
-    full_admin_url = f"{settings.ADMIN_DOMAIN_URL}{admin_url}"
+    full_admin_url = f"{settings.ADMIN_DOMAIN_URL}/admin/{app_label}/{model_name}/{instance.pk}/change/"
 
     return full_admin_url
 
@@ -22,9 +20,8 @@ def get_admin_history_url(instance) -> str:
     """
     model_name = instance._meta.model_name
     app_label = instance._meta.app_label
-    admin_url = reverse(f"admin:{app_label}_{model_name}_history", args=[instance.pk])
 
     # フルURLにするために現在のサイトドメインを取得
-    admin_history_url = f"{settings.ADMIN_DOMAIN_URL}{admin_url}"
+    admin_history_url = f"{settings.ADMIN_DOMAIN_URL}/admin/{app_label}/{model_name}/{instance.pk}/history/"
 
     return admin_history_url

From 8f8ba91171a7b812c363a883e654576aaf1e372a Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 17:23:46 +0900
Subject: [PATCH 22/36] =?UTF-8?q?#43=20=E9=80=9A=E7=9F=A5=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=81=AE=E6=94=B9=E4=BF=AE(=E7=99=BB=E9=8C=B2?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E5=87=A6=E7=90=86).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/models.py |  2 +-
 custom_auth/tool.py   | 49 -----------------------
 custom_auth/utils.py  |  7 ++++
 dsbd/notify.py        |  9 ++++-
 ticket/signals.py     |  2 +-
 ticket/tool.py        | 92 -------------------------------------------
 ticket/utils.py       |  5 +++
 7 files changed, 22 insertions(+), 144 deletions(-)
 delete mode 100644 custom_auth/tool.py
 create mode 100644 custom_auth/utils.py
 delete mode 100644 ticket/tool.py
 create mode 100644 ticket/utils.py

diff --git a/custom_auth/models.py b/custom_auth/models.py
index 605f97d..a40a5d4 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -13,7 +13,7 @@
 from django.utils import timezone
 from simple_history.models import HistoricalRecords
 
-from custom_auth.tool import random_string
+from custom_auth.utils import random_string
 from dsbd.models import MediumTextField
 
 
diff --git a/custom_auth/tool.py b/custom_auth/tool.py
deleted file mode 100644
index 5a489a8..0000000
--- a/custom_auth/tool.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import random
-import string
-
-
-def random_string(num):
-    random_list = [random.choice(string.ascii_letters + string.digits) for i in range(num)]
-    return "".join(random_list)
-
-
-class SignalTool:
-    def get_create_user(self, short, instance):
-        text = "--%d[%s]--\n" % (
-            instance.id,
-            instance.username,
-        )
-        return text if not short else text + "有効: %r\nE-Mail: %s\n" % (instance.is_active, instance.email)
-
-    def get_update_user(self, before, after):
-        text = "%s----更新状況----\n" % (self.get_create_user(True, before),)
-        if before.username != after.username:
-            text += "username: %s => %s\n" % (before.username, after.username)
-        if before.username_jp != after.username_jp:
-            text += "username(jp): %s => %s\n" % (before.username, after.username)
-        if before.email != after.email:
-            text += "E-Mail: %s => %s\n" % (before.email, after.email)
-        if before.is_active != after.is_active:
-            text += "有効: %r => %r\n" % (before.is_active, after.is_active)
-        text += "------------\n"
-        return text
-
-    def get_create_signup_key(self, short, instance):
-        text = "--%d[%s]--\n" % (
-            instance.id,
-            instance.key,
-        )
-        return text if not short else text + "利用済み: %r\n有効期限: %s\n" % (instance.is_used, instance.expired_at)
-
-    def get_update_signup_key(self, before, after):
-        text = "%s----更新状況----\n" % (self.get_create_signup_key(True, before),)
-        if before.key != after.key:
-            text += "key: %s => %s\n" % (before.key, after.key)
-        if before.is_used != after.is_used:
-            text += "使用済み: %r => %r\n" % (before.is_used, after.is_used)
-        if before.expired_at != after.expired_at:
-            text += "有効期限: %s => %s\n" % (before.expired_at, after.expired_at)
-        if before.comment != after.comment:
-            text += "comment: %r => %r\n" % (before.comment, after.comment)
-        text += "------------\n"
-        return text
diff --git a/custom_auth/utils.py b/custom_auth/utils.py
new file mode 100644
index 0000000..0b85aeb
--- /dev/null
+++ b/custom_auth/utils.py
@@ -0,0 +1,7 @@
+import random
+import string
+
+
+def random_string(num):
+    random_list = [random.choice(string.ascii_letters + string.digits) for i in range(num)]
+    return "".join(random_list)
diff --git a/dsbd/notify.py b/dsbd/notify.py
index c836c7d..eb9652f 100644
--- a/dsbd/notify.py
+++ b/dsbd/notify.py
@@ -21,10 +21,17 @@ def notify_delete_db(model_name: str, instance):
 
 
 def notify_insert_db(model_name: str, instance):
+    field_details = []
+    for field in instance._meta.fields:
+        field_name = field.verbose_name
+        field_value = getattr(instance, field.name)
+        field_details.append(f"{field_name}: {field_value}")
+
     admin_url = get_admin_url(instance)
     admin_history_url = get_admin_history_url(instance)
 
-    message = f"新しいレコードが登録されました:\n{instance}"
+    detailed_info = "\n".join(field_details)
+    message = f"新しいレコードが登録されました:\n{detailed_info}"
     client = WebhookClient(settings.SLACK_WEBHOOK_LOG)
     client.send(
         attachments=[
diff --git a/ticket/signals.py b/ticket/signals.py
index 72536b1..6585ded 100644
--- a/ticket/signals.py
+++ b/ticket/signals.py
@@ -6,7 +6,7 @@
 
 from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
 from ticket.models import Chat, Ticket
-from ticket.tool import get_user_lists
+from ticket.utils import get_user_lists
 
 
 @receiver(pre_save, sender=Ticket)
diff --git a/ticket/tool.py b/ticket/tool.py
deleted file mode 100644
index 8a1a977..0000000
--- a/ticket/tool.py
+++ /dev/null
@@ -1,92 +0,0 @@
-class SignalTool:
-    def get_create_ticket(self, short, instance):
-        text = "--%d[%s]--\nUser: %s| Group: %s\n" % (instance.id, instance.title, instance.user, instance.group)
-        return (
-            text
-            if not short
-            else text
-            + "title: %s\nbody: %s\n解決済み: %s\n承認済み: %s\n拒否済み: %s\n運営委員から起票: %s\n"
-            % (
-                instance.title,
-                instance.body,
-                self.solved_to_str(instance.is_solved),
-                self.approve_to_str(instance.is_approve),
-                self.reject_to_str(instance.is_reject),
-                self.from_admin_to_str(instance.from_admin),
-            )
-        )
-
-    def get_update_ticket(self, before, after):
-        text = "%s----更新状況----\n" % (self.get_create_ticket(True, before),)
-        if before.user != after.user:
-            text += "user: %s => %s\n" % (before.user, after.user)
-        if before.group != after.group:
-            text += "group: %s => %s\n" % (before.group, after.group)
-        if before.title != after.title:
-            text += "title: %s => %s\n" % (before.title, after.title)
-        if before.body != after.body:
-            text += "body: %s => %s\n" % (before.body, after.body)
-        if before.is_solved != after.is_solved:
-            text += "解決済み: %s => %s\n" % (self.solved_to_str(before.is_solved), self.solved_to_str(after.is_solved))
-        if before.is_approve != after.is_approve:
-            text += "承認済み: %s => %s\n" % (
-                self.approve_to_str(before.is_approve),
-                self.approve_to_str(after.is_approve),
-            )
-        if before.is_reject != after.is_reject:
-            text += "拒否済み: %s => %s\n" % (self.reject_to_str(before.is_reject), self.reject_to_str(after.is_reject))
-        if before.from_admin != after.from_admin:
-            text += "運営委員から起票: %s => %s\n" % (
-                self.from_admin_to_str(before.from_admin),
-                self.reject_to_str(after.from_admin),
-            )
-        text += "------------\n"
-        return text
-
-    def solved_to_str(self, is_solved):
-        return "解決済み" if is_solved else "未解決"
-
-    def approve_to_str(self, is_approve):
-        return "承認" if is_approve else "未承認"
-
-    def reject_to_str(self, is_reject):
-        return "拒否済み" if is_reject else "not 拒否"
-
-    def from_admin_to_str(self, from_admin):
-        return "運営委員から起票" if from_admin else "not 運営委員から起票"
-
-    def get_create_chat(self, short, instance):
-        text = "--%d--\n[%s] User: %s| Group: %s\nTicket: %s\n" % (
-            instance.id,
-            "ユーザ投稿" if instance.is_admin else "管理者投稿",
-            instance.user,
-            instance.group,
-            instance.ticket,
-        )
-        return text if not short else text + "body: %s\n" % (instance.body,)
-
-    def get_update_chat(self, before, after):
-        text = "%s----更新状況----\n" % (self.get_create_chat(True, before),)
-        if before.user != after.user:
-            text += "user: %s => %s\n" % (before.user, after.user)
-        if before.group != after.group:
-            text += "group: %s => %s\n" % (before.group, after.group)
-        if before.body != after.body:
-            text += "body: %s => %s\n" % (before.body, after.body)
-        if before.is_admin != after.is_admin:
-            text += "運営委員回答: %s => %s\n" % (self.admin_to_str(before.is_admin), self.admin_to_str(after.is_admin))
-        text += "------------\n"
-        return text
-
-    def admin_to_str(self, is_admin):
-        return "運営委員回答" if is_admin else "not 運営委員回答"
-
-    def active_to_str(self, is_admin):
-        return "有効" if is_admin else "無効"
-
-
-def get_user_lists(ticket):
-    if ticket.group:
-        return ticket.group.users.all()
-    else:
-        return [ticket.user]
diff --git a/ticket/utils.py b/ticket/utils.py
new file mode 100644
index 0000000..7bf8bba
--- /dev/null
+++ b/ticket/utils.py
@@ -0,0 +1,5 @@
+def get_user_lists(ticket):
+    if ticket.group:
+        return ticket.group.users.all()
+    else:
+        return [ticket.user]

From fd4c913a5b6485cad6342deda6493cddf5076991 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 19:01:45 +0900
Subject: [PATCH 23/36] =?UTF-8?q?#43=20=E3=83=AA=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/form.py                       | 57 ++++++--------
 custom_auth/group_urls.py                 |  4 +-
 custom_auth/models.py                     |  3 +-
 custom_auth/signals.py                    | 12 +--
 custom_auth/views.py                      | 94 +++++++++--------------
 dsbd/templates/group/edit.html            |  2 +-
 dsbd/templates/group/edit_permission.html | 38 ++++-----
 dsbd/templates/ticket/chat.html           | 15 +++-
 8 files changed, 100 insertions(+), 125 deletions(-)

diff --git a/custom_auth/form.py b/custom_auth/form.py
index 9e96193..6dcaf14 100644
--- a/custom_auth/form.py
+++ b/custom_auth/form.py
@@ -139,51 +139,38 @@ def create_group(self, user_id):
             raise ValueError("ユーザとグループの紐づけに失敗しました")
 
 
-class GroupForm(forms.Form):
-    name = forms.CharField(label="グループ名", max_length=150, required=True)
-    postcode = forms.CharField(label="郵便番号", max_length=10, required=True)
-    address = forms.CharField(label="住所", max_length=250, required=True)
-    address_en = forms.CharField(label="住所(English)", max_length=250, required=True)
-    phone = forms.CharField(label="phone", max_length=30, required=True)
-    country = forms.CharField(label="居住国", max_length=30, initial="Japan", required=True)
-
-    def __init__(self, edit=False, disable=False, *args, **kwargs):
+class GroupForm(forms.ModelForm):
+    class Meta:
+        model = Group
+        fields = ("postcode", "address_jp", "address", "phone", "country")
+        labels = {
+            "postcode": "郵便番号",
+            "address_jp": "住所",
+            "address": "住所(English)",
+            "phone": "phone",
+            "country": "居住国",
+        }
+
+    def __init__(self, *args, **kwargs):
+        editable = kwargs.pop("editable", False)  # group_id を引数として受け取る
         super().__init__(*args, **kwargs)
-        if edit:
-            self.fields["name"].widget.attrs["readonly"] = True
-            if disable:
-                self.fields["postcode"].widget.attrs["disabled"] = True
-                self.fields["address"].widget.attrs["disabled"] = True
-                self.fields["address_en"].widget.attrs["disabled"] = True
-                self.fields["phone"].widget.attrs["disabled"] = True
-                self.fields["country"].widget.attrs["disabled"] = True
-        self.fields["name"].widget.attrs["class"] = "form-control"
+        if editable:
+            self.fields["postcode"].widget.attrs["disabled"] = True
+            self.fields["address_jp"].widget.attrs["disabled"] = True
+            self.fields["address"].widget.attrs["disabled"] = True
+            self.fields["phone"].widget.attrs["disabled"] = True
+            self.fields["country"].widget.attrs["disabled"] = True
         self.fields["postcode"].widget.attrs["class"] = "form-control p-postal-code"
-        self.fields["address"].widget.attrs["class"] = (
+        self.fields["address_jp"].widget.attrs["class"] = (
             "form-control p-region p-locality p-street-address p-extended-address"
         )
-        self.fields["address_en"].widget.attrs["class"] = "form-control"
+        self.fields["address"].widget.attrs["class"] = "form-control"
         self.fields["phone"].widget.attrs["class"] = "form-control"
         self.fields["country"].widget.attrs["class"] = "form-control p-country-name"
 
         for field in self.fields.values():
             field.widget.attrs["placeholder"] = field.label
 
-    def update_group(self, group_id):
-        try:
-            Group.objects.update_group(
-                group_id=group_id,
-                postcode=self.cleaned_data["postcode"],
-                name=self.cleaned_data["name"],
-                address=self.cleaned_data["address"],
-                address_en=self.cleaned_data["address_en"],
-                email=self.cleaned_data["email"],
-                phone=self.cleaned_data["phone"],
-                country=self.cleaned_data["country"],
-            )
-        except Exception:
-            raise ValueError("グループの更新に失敗しました")
-
 
 class TwoAuthForm(forms.Form):
     title = forms.CharField(label="名前", max_length=100, required=True)
diff --git a/custom_auth/group_urls.py b/custom_auth/group_urls.py
index 27a13ff..a59d681 100644
--- a/custom_auth/group_urls.py
+++ b/custom_auth/group_urls.py
@@ -6,7 +6,7 @@
 urlpatterns = [
     path("", views.list_groups, name="index"),
     path("add/", views.add_group, name="add"),
-    path("edit/<int:group_id>", views.edit_group, name="edit"),
-    path("permission/<int:group_id>", views.group_permission, name="permission"),
+    path("<int:group_id>/edit", views.edit_group, name="edit"),
+    path("<int:group_id>/permission", views.group_permission, name="permission"),
     path("<int:group_id>/payment", views.group_payment, name="payment"),
 ]
diff --git a/custom_auth/models.py b/custom_auth/models.py
index a40a5d4..f38c236 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -39,12 +39,11 @@ def create_group(
             **extra_fields,
         )
 
-    def update_group(self, group_id, postcode, address, address_en, email, phone, country):
+    def update_group(self, group_id, postcode, address, address_en, phone, country):
         group = Group.objects.get(id=group_id)
         group.postcode = postcode
         group.address = address
         group.address_en = address_en
-        group.email = email
         group.phone = phone
         group.country = country
         group.save()
diff --git a/custom_auth/signals.py b/custom_auth/signals.py
index 3cbc269..50a040e 100644
--- a/custom_auth/signals.py
+++ b/custom_auth/signals.py
@@ -33,11 +33,13 @@ def post_group(sender, instance, created, **kwargs):
         return
 
     notify_update_db(model_name=sender.__name__, instance=instance)
-    # 審査NG => 審査OKの場合にサービス追加とJPNIC追加を出来るようにする
-    if not instance._pre_save_instance.is_pass and instance.is_pass:
-        instance.allow_service_add = True
-        instance.allow_jpnic_add = True
-        instance.save(update_fields=["allow_service_add", "allow_jpnic_add"])
+    # インスタンスに以前の状態があれば審査状態の変化を確認する
+    if hasattr(instance, "_pre_save_instance") and instance._pre_save_instance:
+        # 審査NG => 審査OKの場合にサービス追加とJPNIC追加を出来るようにする
+        if not instance._pre_save_instance.is_pass and instance.is_pass:
+            instance.allow_service_add = True
+            instance.allow_jpnic_add = True
+            instance.save(update_fields=["allow_service_add", "allow_jpnic_add"])
     # Statusが1以外の場合はサービス追加とJPNIC追加を禁止する
     if instance.status != 1:
         instance.allow_service_add = False
diff --git a/custom_auth/views.py b/custom_auth/views.py
index 50d2f3c..4e06ade 100644
--- a/custom_auth/views.py
+++ b/custom_auth/views.py
@@ -8,6 +8,7 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render
+from django.urls import reverse
 
 from custom_auth.form import (
     EmailChangeForm,
@@ -180,71 +181,50 @@ def add_group(request):
 
 @login_required
 def edit_group(request, group_id):
-    error = None
-    administrator = False
-    try:
-        group = request.user.groups.get(id=group_id)
-        group_data = {
-            "name": group.name,
-            "postcode": group.postcode,
-            "address": group.address_jp,
-            "address_en": group.address,
-            "phone": group.phone,
-            "country": group.country,
-        }
-        administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-        if request.method == "POST" and administrator and group.is_pass:
-            form = GroupForm(data=request.POST)
-            if form.is_valid():
-                try:
-                    form.update_group(group_id=group.id)
-                    return render(request, "done.html", {"text": "登録・変更が完了しました"})
-                except ValueError as err:
-                    error = err
-        else:
-            form = GroupForm(initial=group_data, edit=True, disable=not group.is_pass)
-    except Exception:
-        group = None
-        form = None
+    user_group = request.user.usergroup_set.filter(group_id=group_id, user=request.user).first()
+    if not user_group:
+        return render(request, "error.html", {"text": "このグループにアクセスする権限がありません"})
+    form = GroupForm(request.POST or None, instance=user_group.group, editable=not user_group.is_admin)
+    if request.method == "POST" and user_group.is_admin and user_group.group.is_pass:
+        if form.is_valid():
+            form.save()
+            return render(request, "done.html", {"text": "登録・変更が完了しました"})
 
-    context = {"form": form, "group": group, "administrator": administrator, "error": error}
+    context = {"form": form, "group": user_group.group, "is_administrator": user_group.is_admin}
     return render(request, "group/edit.html", context)
 
 
 @login_required
 def group_permission(request, group_id):
     error = None
-    administrator = False
-    permission_all = False
-    try:
-        group = request.user.groups.get(id=group_id)
-        permission_all = group.usergroup_set.all()
-        administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-        if request.method == "POST" and administrator and group.is_active:
-            id = request.POST.get("id", 0)
-            is_exists = False
-            for permission_user in permission_all:
-                if permission_user.id == int(id):
-                    is_exists = True
-                    break
-            if not is_exists:
-                error = "変更権限がありません"
-            else:
-                try:
-                    user_group = UserGroup.objects.get(id=int(id))
-                    if "no_admin" in request.POST:
-                        user_group.is_admin = False
-                        user_group.save()
-                    elif "admin" in request.POST:
-                        user_group.is_admin = True
-                        user_group.save()
-                    return redirect("/group/permission/%d" % group_id)
-                except Exception:
-                    error = "アップデート処理でエラーが発生しました"
-    except Exception:
-        group = None
+    user_group = request.user.usergroup_set.filter(group_id=group_id, user=request.user).first()
+    if not user_group:
+        return render(request, "error.html", {"text": "このグループにアクセスする権限がありません"})
+    permissions = user_group.group.usergroup_set.all()
+    if request.method == "POST" and user_group.is_admin and user_group.group.is_pass:
+        permission_id = int(request.POST.get("id", 0))
+        is_exists = user_group.group.usergroup_set.filter(id=permission_id).exists()
+        if not is_exists:
+            error = "変更権限がありません"
+        else:
+            try:
+                user_group = UserGroup.objects.get(id=permission_id)
+                if "no_admin" in request.POST:
+                    user_group.is_admin = False
+                    user_group.save()
+                elif "admin" in request.POST:
+                    user_group.is_admin = True
+                    user_group.save()
+                return redirect(reverse("custom_auth_group:permission", args=[group_id]))
+            except Exception:
+                error = "アップデート処理でエラーが発生しました"
 
-    context = {"group": group, "permission": permission_all, "administrator": administrator, "error": error}
+    context = {
+        "group": user_group.group,
+        "permissions": permissions,
+        "is_administrator": user_group.is_admin,
+        "error": error,
+    }
     return render(request, "group/edit_permission.html", context)
 
 
diff --git a/dsbd/templates/group/edit.html b/dsbd/templates/group/edit.html
index ae7de76..71a6ab4 100644
--- a/dsbd/templates/group/edit.html
+++ b/dsbd/templates/group/edit.html
@@ -24,7 +24,7 @@ <h2 class="card-title">Group情報閲覧・修正</h2>
               {% csrf_token %}
               {{ form }}
               <br/>
-              {% if group.is_active and administrator %}
+              {% if group.status == 1 and is_administrator %}
                 <button type="submit" class="btn btn-primary">変更
                 </button>{% endif %}
             </form>
diff --git a/dsbd/templates/group/edit_permission.html b/dsbd/templates/group/edit_permission.html
index 979cc29..0ba6374 100644
--- a/dsbd/templates/group/edit_permission.html
+++ b/dsbd/templates/group/edit_permission.html
@@ -20,19 +20,13 @@ <h2 class="card-title">Group権限設定</h2>
               <div class="card-body">
                 <h5 class="card-title">{{ group.name }}</h5>
                 <br/>
-                <div class="container">
-                  <div>
-                    <a class="btn btn-primary btn-sm"
-                       href="{% url 'custom_auth_group:permission' group.id %}">権限設定</a>
-                  </div>
-                </div>
               </div>
               <div class="card-footer">
-                {% if group.is_active %}
+                {% if group.status == 1 %}
                   <span class="badge bg-primary">有効</span>
                 {% else %}
                   <span class="badge bg-danger">無効</span>{% endif %}
-                {% if administrator %}
+                {% if is_administrator %}
                   <span class="badge bg-success">管理者権限</span>{% endif %}
                 <span
                     class="badge bg-secondary">Service: {{ group.service_set.count }}</span>
@@ -40,7 +34,7 @@ <h5 class="card-title">{{ group.name }}</h5>
             </div>
             <br/>
             <br/>
-            {% if permission %}
+            {% if permissions %}
               <table class="table table-striped">
                 <thead>
                 <tr>
@@ -53,37 +47,37 @@ <h5 class="card-title">{{ group.name }}</h5>
                 </tr>
                 </thead>
                 <tbody>
-                {% for e in permission %}
+                {% for permission in permissions %}
                   <tr>
-                    <th scope="row">{{ e.id }}</th>
-                    <td>{{ e.created_at }}</td>
-                    <td>{{ e.user.id }}: {{ e.user.username }}</td>
-                    <td>{{ e.group.id }}: {{ e.group.name }}</td>
+                    <th scope="row">{{ permission.id }}</th>
+                    <td>{{ permission.created_at }}</td>
+                    <td>{{ permission.user.id }}: {{ permission.user.username }}</td>
+                    <td>{{ permission.group.id }}: {{ permission.group.name }}</td>
                     <td>
-                      {% if e.is_admin %}
+                      {% if permission.is_admin %}
                         <span class="badge bg-success">管理者権限</span>
                       {% else %}
                         <span class="badge bg-primary">ユーザ権限</span>
                       {% endif %}
-                      {% if e.enable_ldap %}
+                      {% if permission.enable_ldap %}
                         <span class="badge bg-success">LDAP有効</span>
-                      {% elif e.ldap_register %}
+                      {% elif permission.ldap_register %}
                         <span class="badge bg-danger">LDAP無効</span>
                       {% endif %}
                     </td>
                     <td>
-                      {% if administrator %}
+                      {% if is_administrator %}
                         <form method="post">
                           {% csrf_token %}
                           <input type="text"
-                                 value={{ e.id }} name="id"
+                                 value={{ permission.id }} name="id"
                                  hidden>
-                          {% if e.is_admin and e.user.id != request.user.id %}
+                          {% if permission.is_admin and permission.user.id != request.user.id %}
                             <button type="submit"
                                     class="btn btn-primary btn-sm"
                                     name="no_admin">ユーザ権限に変更
                             </button>
-                          {% elif e.is_admin %}
+                          {% elif permission.is_admin %}
                             ユーザ権限に変更出来ません
                           {% else %}
                             <button type="submit"
@@ -101,7 +95,7 @@ <h5 class="card-title">{{ group.name }}</h5>
                 </tbody>
               </table>
             {% endif %}
-            {% if not administrator %}
+            {% if not is_administrator %}
               <p>管理者権限がないため、権限設定を変更出来ません。</p>
             {% endif %}
           {% else %}
diff --git a/dsbd/templates/ticket/chat.html b/dsbd/templates/ticket/chat.html
index 458dc66..fce5155 100644
--- a/dsbd/templates/ticket/chat.html
+++ b/dsbd/templates/ticket/chat.html
@@ -337,6 +337,19 @@ <h6 class="m-b-0">{{ user.username }}</h6>
       }
     }
 
+    function escapeHTML(str) {
+      return str.replace(/[&<>"']/g, function (match) {
+        const escape = {
+          '&': '&amp;',
+          '<': '&lt;',
+          '>': '&gt;',
+          '"': '&quot;',
+          "'": '&#39;'
+        };
+        return escape[match];
+      });
+    }
+
     function connect() {
       const wsScheme = (window.location.protocol === 'https:' ? 'wss' : 'ws');
       const hostname = window.location.host;
@@ -350,7 +363,7 @@ <h6 class="m-b-0">{{ user.username }}</h6>
         console.log(data);
         let element = document.getElementById('chat_websocket');
 
-        let message = data.message.replace(/\n/, '<br>');
+        let message = escapeHTML(data.message).replace(/\n/g, '<br>');
 
         let html = '<li class="clearfix">';
         if (data.username === '{{ request.user.username }}' && !data.is_admin) {

From 69f91994c7a5e0022895e7b990b8c2c581cef990 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 19:05:44 +0900
Subject: [PATCH 24/36] =?UTF-8?q?#43=20=E3=83=AA=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/templates/custom_admin/ticket/chat.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dsbd/templates/custom_admin/ticket/chat.html b/dsbd/templates/custom_admin/ticket/chat.html
index 93722fd..2c22064 100644
--- a/dsbd/templates/custom_admin/ticket/chat.html
+++ b/dsbd/templates/custom_admin/ticket/chat.html
@@ -349,6 +349,19 @@ <h6 class="m-b-0">{{ user.username }}</h6>
       }
     }
 
+    function escapeHTML(str) {
+      return str.replace(/[&<>"']/g, function (match) {
+        const escape = {
+          '&': '&amp;',
+          '<': '&lt;',
+          '>': '&gt;',
+          '"': '&quot;',
+          "'": '&#39;'
+        };
+        return escape[match];
+      });
+    }
+
     function connect() {
       const wsScheme = (window.location.protocol === 'https:' ? 'wss' : 'ws');
       const hostname = window.location.host;
@@ -360,7 +373,7 @@ <h6 class="m-b-0">{{ user.username }}</h6>
         console.log(data);
         let element = document.getElementById('chat_websocket');
 
-        let message = data.message.replace(/\n/, '<br>');
+        let message = escapeHTML(data.message).replace(/\n/g, '<br>');
         let html = '<li class="clearfix">';
         if (data.username === '{{ request.user.username }}' && data.is_admin) {
           html += '<div class="message-data text-end">';

From 3ec7eec0fc6db66bb9a21ad595232dcfd963760b Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 19:07:50 +0900
Subject: [PATCH 25/36] =?UTF-8?q?#43=20pipenv=20install=E5=BF=98=E3=82=8C?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pipfile      |  1 +
 Pipfile.lock | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Pipfile b/Pipfile
index a62e4d6..b1e16d9 100644
--- a/Pipfile
+++ b/Pipfile
@@ -46,6 +46,7 @@ txaio = "==23.*"
 typing-extensions = "==4.*"
 urllib3 = "==2.*"
 "zope.interface" = "==7.*"
+django-simple-history = "*"
 
 [dev-packages]
 ruff = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 5169914..f87a2d4 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "829780f92ed386bf6300e549d3776cba2a83a3226a293116efb2c9ac14c4c3b3"
+            "sha256": "f6f11aac9ad521c1635f4145cdc080318045ce3955e3c229433edb4f004d6887"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -335,6 +335,15 @@
             "index": "pypi",
             "version": "==0.3"
         },
+        "django-simple-history": {
+            "hashes": [
+                "sha256:282cb2c4aa63f51547f17da7f2130abaa81ba01694676d19b88d52c94a57a52c",
+                "sha256:ac3b7ca8b0d33f7ea6be8fe7fc98cf43415efa500ff5dfe736fbd1ebc0cf39f9"
+            ],
+            "index": "pypi",
+            "markers": "python_version >= '3.8'",
+            "version": "==3.7.0"
+        },
         "django-widget-tweaks": {
             "hashes": [
                 "sha256:1c2180681ebb994e922c754804c7ffebbe1245014777ac47897a81f57cc629c7",

From 29a723a6d4af7e1af3a75513799f7780e804f3be Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 19:18:15 +0900
Subject: [PATCH 26/36] =?UTF-8?q?#43=20Dockerfile=E3=81=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0&workflows=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-dev.yaml | 12 +++++++++++-
 Dockerfile                       |  4 ++--
 Pipfile                          | 16 ++++++++--------
 Pipfile.lock                     |  2 +-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
index 8395066..2d848f0 100644
--- a/.github/workflows/build-dev.yaml
+++ b/.github/workflows/build-dev.yaml
@@ -5,9 +5,19 @@ on:
     paths:
     - '.github/**'
     - 'files/**'
+    - 'custom_admin/**'
+    - 'custom_auth/**'
     - 'dsbd/**'
+    - 'ip/**'
+    - 'noc/**'
+    - 'notice/**'
+    - 'router/**'
+    - 'service/**'
+    - 'ticket/**'
+    - 'manage.py'
     - 'Dockerfile'
-    - 'requirements.txt'
+    - 'Pipfile'
+    - 'Pipfile.lock'
 
 jobs:
   push_to_registry:
diff --git a/Dockerfile b/Dockerfile
index 59d40d8..94395c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.4 AS app
+FROM python:3.12 AS app
 
 RUN pip install --upgrade pip && pip install pipenv
 RUN apt-get update && \
@@ -17,7 +17,7 @@ RUN pip install gunicorn daphne
 ENV PYTHONPATH=/opt/app/
 ADD Pipfile /opt/app/Pipfile
 ADD Pipfile.lock /opt/app/Pipfile.lock
-RUN pipenv install --system
+RUN pipenv sync --system
 
 ADD manage.py /opt/app/
 ADD dsbd/ /opt/app/dsbd/
diff --git a/Pipfile b/Pipfile
index b1e16d9..14893a3 100644
--- a/Pipfile
+++ b/Pipfile
@@ -10,25 +10,25 @@ autobahn = "==24.*"
 automat = "==24.*"
 certifi = "==2024.*"
 cffi = "==1.*"
-channels = "==4.1.0"
+channels = "==4.*"
 charset-normalizer = "==3.*"
-constantly = "==23.10.4"
+constantly = "==23.*"
 cryptography = "==43.*"
-daphne = "==4.1.2"
-django = "==5.1.*"
+daphne = "==4.*"
+django = "==5.*"
 django-auth-ldap = "==4.*"
 django-countries = "==7.*"
 django-debug-toolbar = "==4.*"
-django-qrcode = "==0.3"
-django-widget-tweaks = "==1.5.0"
-hyperlink = "==21.0.0"
+django-qrcode = "==0.*"
+django-widget-tweaks = "==1.*"
+hyperlink = "==21.*"
 idna = "==3.*"
 incremental = "==24.*"
 markdown = "==3.*"
 mysqlclient = "==2.*"
 pyasn1 = "==0.6.*"
 pyasn1-modules = "==0.4.*"
-pycparser = "==2.22"
+pycparser = "==2.*"
 pyopenssl = "==24.*"
 pyotp = "==2.9.0"
 pypng = "==0.20220715.0"
diff --git a/Pipfile.lock b/Pipfile.lock
index f87a2d4..19d05ee 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "f6f11aac9ad521c1635f4145cdc080318045ce3955e3c229433edb4f004d6887"
+            "sha256": "acd94fdedbf8620e3e75cfc8125feb96f1376853e081750056fe48460d2a81e5"
         },
         "pipfile-spec": 6,
         "requires": {

From 3afd2dc542e559b117ac5bf22672f4a26ecf8a57 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 19:28:28 +0900
Subject: [PATCH 27/36] =?UTF-8?q?#43=20=E7=AE=A1=E7=90=86=E8=80=85?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E6=99=82=E3=81=AB=E3=82=BF=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E6=A9=9F=E8=83=BD=E3=81=AE=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dsbd/templates/base1.html   | 3 +++
 dsbd/templates/home.html    | 2 +-
 dsbd/templates/navbar2.html | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dsbd/templates/base1.html b/dsbd/templates/base1.html
index 48c28b1..99349e9 100644
--- a/dsbd/templates/base1.html
+++ b/dsbd/templates/base1.html
@@ -48,8 +48,11 @@
     <div class="collapse navbar-collapse" id="navbarsExampleDefault">
       <ul class="navbar-nav mr-auto">
         {% include 'navbar1.html' %}
+
+
       </ul>
     </div>
+    <h6><span class="badge bg-secondary">Version: {% get_version %}</span></h6>
   </div>
 </nav>
 
diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index 3c7e17b..230273d 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -130,7 +130,7 @@ <h5 class="card-title">{{ notice.title }}</h5>
                                   data-bs-dismiss="modal">
                             Close
                           </button>
-                          {% if request.user.is_staff %}
+                          {% if request.user.is_staff and is_admin_mode%}
                             <a href="/admin/notice/notice/{{ notice.id }}/change"
                                class="btn btn-primary">編集</a>
                             <a href="/admin/notice/notice/{{ notice.id }}/delete"
diff --git a/dsbd/templates/navbar2.html b/dsbd/templates/navbar2.html
index 42b94ef..4801671 100644
--- a/dsbd/templates/navbar2.html
+++ b/dsbd/templates/navbar2.html
@@ -215,6 +215,9 @@
       </li>
     </ul>
     <h6><span class="badge bg-secondary">Version: {% get_version %}</span></h6>
+    {% if is_admin_mode %}
+      <h6><span class="badge bg-primary">管理者モード</span></h6>
+    {% endif %}
     <hr>
     <div class="dropdown">
       <a href="#"

From d340ff2f12dce53f00bd447379a0ea869b6c9891 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sun, 15 Sep 2024 20:51:41 +0900
Subject: [PATCH 28/36] =?UTF-8?q?#43=20=E3=83=AA=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/admin.py   |  4 ++--
 custom_auth/signals.py | 41 +++++++++++++++++++++++------------------
 ip/signals.py          |  8 ++++----
 noc/signals.py         |  4 ++--
 notice/signals.py      |  4 ++--
 router/signals.py      |  8 ++++----
 service/signals.py     |  8 ++++----
 ticket/signals.py      |  8 ++++----
 8 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/custom_auth/admin.py b/custom_auth/admin.py
index 3ed67c2..eb4fd02 100644
--- a/custom_auth/admin.py
+++ b/custom_auth/admin.py
@@ -80,7 +80,7 @@ def get_groups(self, obj):
 @admin.register(Group)
 class Group(SimpleHistoryAdmin):
     fieldsets = (
-        (None, {"fields": ("name", "name_jp", "allow_service_add", "allow_jpnic_add", "is_pass", "comment")}),
+        (None, {"fields": ("name", "name_jp", "allow_service_add", "allow_jpnic_add", "status", "is_pass", "comment")}),
         ("Membership", {"fields": ("membership_type", "membership_expired_at")}),
         ("Question", {"fields": ("agree", "question")}),
         ("Stripe", {"fields": ("stripe_customer_id", "stripe_subscription_id")}),
@@ -133,7 +133,7 @@ class UserActivateToken(admin.ModelAdmin):
     )
     list_display = ("user", "token", "expired_at", "is_used")
     list_filter = ("is_used",)
-    search_fields = ("user", "token", "expired_at", "is_used")
+    search_fields = ("token", "expired_at", "is_used")
 
 
 @admin.register(TOTPDevice)
diff --git a/custom_auth/signals.py b/custom_auth/signals.py
index 50a040e..a0d13d4 100644
--- a/custom_auth/signals.py
+++ b/custom_auth/signals.py
@@ -14,7 +14,7 @@ def user_model_pre_save(sender, instance, **kwargs):
 
 
 @receiver(post_save, sender=User)
-def post_user(sender, instance, created, **kwargs):
+def user_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -22,38 +22,43 @@ def post_user(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=User)
-def delete_user(sender, instance, **kwargs):
+def user_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
+@receiver(pre_save, sender=Group)
+def group_model_pre_save(sender, instance, **kwargs):
+    try:
+        instance._pre_save_instance = Group.objects.get(pk=instance.pk)
+    except Group.DoesNotExist:
+        instance._pre_save_instance = instance
+    # 審査NG => 審査OKの場合にサービス追加とJPNIC追加を出来るようにする
+    if not instance._pre_save_instance.is_pass and instance.is_pass:
+        instance.allow_service_add = True
+        instance.allow_jpnic_add = True
+
+    # Statusが1以外の場合はサービス追加とJPNIC追加を禁止する
+    if instance.status != 1:
+        instance.allow_service_add = False
+        instance.allow_jpnic_add = False
+
+
 @receiver(post_save, sender=Group)
-def post_group(sender, instance, created, **kwargs):
+def group_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
 
     notify_update_db(model_name=sender.__name__, instance=instance)
-    # インスタンスに以前の状態があれば審査状態の変化を確認する
-    if hasattr(instance, "_pre_save_instance") and instance._pre_save_instance:
-        # 審査NG => 審査OKの場合にサービス追加とJPNIC追加を出来るようにする
-        if not instance._pre_save_instance.is_pass and instance.is_pass:
-            instance.allow_service_add = True
-            instance.allow_jpnic_add = True
-            instance.save(update_fields=["allow_service_add", "allow_jpnic_add"])
-    # Statusが1以外の場合はサービス追加とJPNIC追加を禁止する
-    if instance.status != 1:
-        instance.allow_service_add = False
-        instance.allow_jpnic_add = False
-        instance.save(update_fields=["allow_service_add", "allow_jpnic_add"])
 
 
 @receiver(pre_delete, sender=Group)
-def delete_group(sender, instance, **kwargs):
+def group_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(post_save, sender=UserGroup)
-def post_user_group(sender, instance, created, **kwargs):
+def user_group_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -61,5 +66,5 @@ def post_user_group(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=UserGroup)
-def delete_user_group(sender, instance, **kwargs):
+def user_group_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/ip/signals.py b/ip/signals.py
index bea9ba2..b30d120 100644
--- a/ip/signals.py
+++ b/ip/signals.py
@@ -6,7 +6,7 @@
 
 
 @receiver(post_save, sender=JPNICUser)
-def post_jpnic_user(sender, instance, created, **kwargs):
+def jpnic_user_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -14,12 +14,12 @@ def post_jpnic_user(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=JPNICUser)
-def delete_jpnic_user(sender, instance, **kwargs):
+def jpnic_user_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(post_save, sender=IP)
-def post_ip(sender, instance, created, **kwargs):
+def ip_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -27,7 +27,7 @@ def post_ip(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=IP)
-def delete_ip(sender, instance, **kwargs):
+def ip_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
diff --git a/noc/signals.py b/noc/signals.py
index f738ef0..8df57dd 100644
--- a/noc/signals.py
+++ b/noc/signals.py
@@ -6,7 +6,7 @@
 
 
 @receiver(post_save, sender=NOC)
-def post_noc(sender, instance, created, **kwargs):
+def noc_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -14,5 +14,5 @@ def post_noc(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=NOC)
-def delete_noc(sender, instance, **kwargs):
+def noc_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/notice/signals.py b/notice/signals.py
index b5c8cb3..969b454 100644
--- a/notice/signals.py
+++ b/notice/signals.py
@@ -6,7 +6,7 @@
 
 
 @receiver(post_save, sender=Notice)
-def post_notice(sender, instance, created, **kwargs):
+def notice_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -14,5 +14,5 @@ def post_notice(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=Notice)
-def delete_notice(sender, instance, **kwargs):
+def notice_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/router/signals.py b/router/signals.py
index 668a2fe..c50ef06 100644
--- a/router/signals.py
+++ b/router/signals.py
@@ -6,7 +6,7 @@
 
 
 @receiver(post_save, sender=TunnelRouter)
-def post_tunnel_router(sender, instance, created, **kwargs):
+def tunnel_router_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -14,12 +14,12 @@ def post_tunnel_router(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=TunnelRouter)
-def delete_tunnel_router(sender, instance, **kwargs):
+def tunnel_router_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(post_save, sender=TunnelIP)
-def post_tunnel_ip(sender, instance, created, **kwargs):
+def tunnel_ip_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -27,5 +27,5 @@ def post_tunnel_ip(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=TunnelIP)
-def delete_tunnel_ip(sender, instance, **kwargs):
+def tunnel_ip_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/service/signals.py b/service/signals.py
index 1506630..6641119 100644
--- a/service/signals.py
+++ b/service/signals.py
@@ -6,7 +6,7 @@
 
 
 @receiver(post_save, sender=Service)
-def post_service(sender, instance, created, **kwargs):
+def service_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -14,12 +14,12 @@ def post_service(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=Service)
-def delete_service(sender, instance, **kwargs):
+def service_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
 @receiver(post_save, sender=Connection)
-def post_connection(sender, instance, created, **kwargs):
+def connection_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -27,5 +27,5 @@ def post_connection(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=Connection)
-def delete_connection(sender, instance, **kwargs):
+def connection_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
diff --git a/ticket/signals.py b/ticket/signals.py
index 6585ded..31044f1 100644
--- a/ticket/signals.py
+++ b/ticket/signals.py
@@ -18,7 +18,7 @@ def ticket_model_pre_save(sender, instance, **kwargs):
 
 
 @receiver(post_save, sender=Ticket)
-def post_ticket(sender, instance, created, **kwargs):
+def ticket_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         return
@@ -26,7 +26,7 @@ def post_ticket(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=Ticket)
-def delete_ticket(sender, instance, **kwargs):
+def ticket_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)
 
 
@@ -39,7 +39,7 @@ def chat_model_pre_save(sender, instance, **kwargs):
 
 
 @receiver(post_save, sender=Chat)
-def post_chat(sender, instance, created, **kwargs):
+def chat_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
         subject = "[HomeNOC Dashboard System]新着のメッセージがあります"
@@ -59,5 +59,5 @@ def post_chat(sender, instance, created, **kwargs):
 
 
 @receiver(pre_delete, sender=Chat)
-def delete_chat(sender, instance, **kwargs):
+def chat_model_pre_delete(sender, instance, **kwargs):
     notify_delete_db(model_name=sender.__name__, instance=instance)

From 812a1a47840e9c7f90f6b75f434bb4bdc7bd8c61 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 16 Sep 2024 18:16:16 +0900
Subject: [PATCH 29/36] =?UTF-8?q?#43=20=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pipfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 19d05ee..6c9f37c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -363,12 +363,12 @@
         },
         "idna": {
             "hashes": [
-                "sha256:69297d5da0cc9281c77efffb4e730254dd45943f45bbfb461de5991713989b1e",
-                "sha256:e5c5dafde284f26e9e0f28f6ea2d6400abd5ca099864a67f576f3981c6476124"
+                "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+                "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==3.9"
+            "version": "==3.10"
         },
         "incremental": {
             "hashes": [
@@ -502,11 +502,11 @@
         },
         "setuptools": {
             "hashes": [
-                "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308",
-                "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6"
+                "sha256:25af69c809d9334cd8e653d385277abeb5a102dca255954005a7092d282575ea",
+                "sha256:791ae94f04f78c880b5e614e560dd32d4b4af5d151bd9e7483e3377846caf90a"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==74.1.2"
+            "version": "==75.0.0"
         },
         "six": {
             "hashes": [

From 0e280e986acfaca5f86f68e96d87fb496b854e1f Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Tue, 17 Sep 2024 03:28:53 +0900
Subject: [PATCH 30/36] =?UTF-8?q?#43=20=E4=BC=9A=E8=B2=BB=E6=94=AF?=
 =?UTF-8?q?=E6=89=95=E3=81=84=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=81=AE?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/group_urls.py                     |   1 +
 ...e_group_stripe_subscription_id_and_more.py |  31 ++++
 custom_auth/models.py                         |   5 +-
 custom_auth/views.py                          | 166 ++++++------------
 dsbd/payment.py                               | 101 +++++++++++
 dsbd/settings.py                              |   3 +
 dsbd/templates/group/index.html               | 132 +++-----------
 dsbd/templates/group/payment.html             |  62 -------
 dsbd/templates/payment.html                   |  51 ------
 dsbd/templates/payment/payment.html           | 114 ++++++++++++
 dsbd/templates/svg.html                       |   3 +
 service/form.py                               |   6 -
 service/signals.py                            |   5 +
 13 files changed, 336 insertions(+), 344 deletions(-)
 create mode 100644 custom_auth/migrations/0008_remove_group_stripe_subscription_id_and_more.py
 create mode 100644 dsbd/payment.py
 delete mode 100644 dsbd/templates/group/payment.html
 delete mode 100644 dsbd/templates/payment.html
 create mode 100644 dsbd/templates/payment/payment.html

diff --git a/custom_auth/group_urls.py b/custom_auth/group_urls.py
index a59d681..de3137e 100644
--- a/custom_auth/group_urls.py
+++ b/custom_auth/group_urls.py
@@ -5,6 +5,7 @@
 app_name = "custom_auth_group"
 urlpatterns = [
     path("", views.list_groups, name="index"),
+    path("<int:group_id>/", views.list_group, name="list"),
     path("add/", views.add_group, name="add"),
     path("<int:group_id>/edit", views.edit_group, name="edit"),
     path("<int:group_id>/permission", views.group_permission, name="permission"),
diff --git a/custom_auth/migrations/0008_remove_group_stripe_subscription_id_and_more.py b/custom_auth/migrations/0008_remove_group_stripe_subscription_id_and_more.py
new file mode 100644
index 0000000..93b2fb0
--- /dev/null
+++ b/custom_auth/migrations/0008_remove_group_stripe_subscription_id_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 5.1.1 on 2024-09-16 18:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_auth', '0007_historicalgroup_historicaluser_historicalusergroup'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='group',
+            name='stripe_subscription_id',
+        ),
+        migrations.RemoveField(
+            model_name='historicalgroup',
+            name='stripe_subscription_id',
+        ),
+        migrations.AddField(
+            model_name='historicaluser',
+            name='stripe_donate_customer_id',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Stripe Donate(CusID)'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='stripe_donate_customer_id',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Stripe Donate(CusID)'),
+        ),
+    ]
diff --git a/custom_auth/models.py b/custom_auth/models.py
index f38c236..2a71723 100644
--- a/custom_auth/models.py
+++ b/custom_auth/models.py
@@ -93,7 +93,6 @@ class Group(models.Model):  # noqa: F811
 
     # stripe
     stripe_customer_id = models.CharField("Stripe(CusID)", max_length=200, blank=True, null=True)
-    stripe_subscription_id = models.CharField("Stripe(SubID)", max_length=200, blank=True, null=True)
 
     # group personal info
     postcode = models.CharField("郵便番号", max_length=20, default="")
@@ -209,6 +208,10 @@ class User(AbstractBaseUser):
     is_staff = models.BooleanField("管理者ステータス", default=False)
     is_active = models.BooleanField("有効", default=False)
     allow_group_add = models.BooleanField("グループ追加許可", default=True)
+
+    # stripe
+    stripe_donate_customer_id = models.CharField("Stripe Donate(CusID)", max_length=200, blank=True, null=True)
+
     groups = models.ManyToManyField(
         "Group",
         blank=True,
diff --git a/custom_auth/views.py b/custom_auth/views.py
index 4e06ade..7e74174 100644
--- a/custom_auth/views.py
+++ b/custom_auth/views.py
@@ -1,11 +1,8 @@
 import base64
-import time
 from io import BytesIO
 
 import pyotp
 import qrcode
-import stripe
-from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render
 from django.urls import reverse
@@ -19,6 +16,7 @@
     TwoAuthForm,
 )
 from custom_auth.models import TOTPDevice, UserGroup
+from dsbd.payment import MEMBERSHIP_TAG_TYPE, Payment, check_expired
 
 
 @login_required
@@ -120,43 +118,20 @@ def list_two_auth(request):
 
 @login_required
 def list_groups(request):
-    data = []
+    groups = []
     for group in request.user.groups.all():
-        data.append(
-            {"group": group, "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()}
+        groups.append(
+            {"data": group, "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()}
         )
 
-    if request.method == "POST":
-        stripe.api_key = settings.STRIPE_SECRET_KEY
-        id = request.POST.get("id", "")
-        group_id = request.POST.get("group_id", 0)
-        group = request.user.groups.get(id=group_id)
-        administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-        if administrator and id == "create_stripe_customer":
-            name = "[GROUP] %d: %s" % (
-                int(group_id),
-                group.name,
-            )
-            if not group.stripe_customer_id:
-                cus = stripe.Customer.create(
-                    name=name,
-                    description="doornoc_service",  # TODO: change description
-                    metadata={
-                        "id": "doornoc_service",  # TODO: change description
-                        "user_id": request.user.id,
-                        "group_id": group_id,
-                    },
-                )
-                group.stripe_customer_id = cus.id
-                group.save()
-                redirect_url = "/group/%d/payment" % (int(group_id),)
-                return redirect(redirect_url)
-        elif administrator and id == "getting_portal":
-            if group.stripe_customer_id:
-                session = stripe.billing_portal.Session.create(
-                    customer=group.stripe_customer_id, return_url=settings.DOMAIN_URL + "/group"
-                )
-                return redirect(session.url, code=303)
+    context = {"groups": groups}
+    return render(request, "group/index.html", context)
+
+
+@login_required
+def list_group(request, group_id: int):
+    group = request.user.groups.get(id=group_id)
+    data = [{"group": group, "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()}]
 
     context = {"data": data}
     return render(request, "group/index.html", context)
@@ -180,7 +155,7 @@ def add_group(request):
 
 
 @login_required
-def edit_group(request, group_id):
+def edit_group(request, group_id: int):
     user_group = request.user.usergroup_set.filter(group_id=group_id, user=request.user).first()
     if not user_group:
         return render(request, "error.html", {"text": "このグループにアクセスする権限がありません"})
@@ -195,7 +170,7 @@ def edit_group(request, group_id):
 
 
 @login_required
-def group_permission(request, group_id):
+def group_permission(request, group_id: int):
     error = None
     user_group = request.user.usergroup_set.filter(group_id=group_id, user=request.user).first()
     if not user_group:
@@ -229,85 +204,42 @@ def group_permission(request, group_id):
 
 
 @login_required
-def group_payment(request, group_id):
-    error = None
-    administrator = False
-    permission_all = False
-    data = []
-    try:
-        group = request.user.groups.get(id=group_id)
-        permission_all = group.usergroup_set.all()
-        administrator = group.usergroup_set.filter(user=request.user, is_admin=True).exists()
-
-        stripe.api_key = settings.STRIPE_SECRET_KEY
-        products = stripe.Product.search(
-            query="active:'true' AND metadata['id']:'doornoc_service'",
-        )
-        if administrator:
-            for product in products:
-                prices = stripe.Price.search(
-                    query="active:'true' AND product:'%s'" % (product.id,),
+def group_payment(request, group_id: int):
+    user_group = request.user.usergroup_set.filter(group_id=group_id, user=request.user, is_admin=True).first()
+    if not user_group:
+        return render(request, "error.html", {"text": "このグループにアクセスする権限がありません"})
+
+    payment = Payment()
+    product_id = payment.get_product(stripe_type=MEMBERSHIP_TAG_TYPE).id
+    prices = payment.get_prices(product_id=product_id)
+    is_expired = check_expired(expired_at=user_group.group.membership_expired_at)
+    if request.method == "POST":
+        match request.POST:
+            case {"billing_portal": _}:
+                session_url = payment.get_billing_portal(customer_id=user_group.group.stripe_customer_id)
+                return redirect(session_url, code=303)
+            case {"create_customer": _}:
+                if payment.create_customer(group_id=group_id, user_id=request.user.id):
+                    return redirect(reverse("custom_auth_group:payment", args=[group_id]))
+            case {"checkout": _}:
+                price_id = request.POST.get("checkout", None)
+                if not price_id:
+                    return render(request, "error.html", {"text": "price_idが不正です"})
+                session_url = payment.checkout_membership(
+                    customer_id=user_group.group.stripe_customer_id,
+                    price_id=price_id,
+                    group=user_group.group,
+                    user=request.user,
                 )
-                tmp_prices = []
-                idx_prices = 0
-                for price in prices:
-                    tmp_price = [
-                        {
-                            "id": price.id,
-                            "interval": price.recurring.interval,
-                            "amount": price.unit_amount,
-                            "description": price.nickname,
-                        }
-                    ]
-                    if idx_prices == 0:
-                        tmp_prices = tmp_price
-                    else:
-                        if price.recurring.interval == "year":
-                            tmp_prices += tmp_price
-                        elif price.recurring.interval == "month":
-                            tmp_prices = tmp_price + tmp_prices
-                    idx_prices += 1
-                data.append({"name": product.name, "prices": tmp_prices, "number": int(product.metadata.tag)})
-            data.sort(key=lambda x: x["number"])
-    except Exception:
-        group = None
-    if administrator and request.method == "POST":
-        id = request.POST.get("price_id", "")
-        is_exists = False
-        for one_data in data:
-            for price in one_data["prices"]:
-                if price["id"] == id:
-                    is_exists = True
-                    break
-        url = settings.DOMAIN_URL + "/group"
-        if is_exists and group.stripe_customer_id and not group.stripe_subscription_id:
-            session = stripe.checkout.Session.create(
-                mode="subscription",
-                line_items=[
-                    {
-                        "price": id,
-                        "quantity": 1,
-                    },
-                ],
-                customer=group.stripe_customer_id,
-                success_url=url,
-                cancel_url=url,
-                expires_at=int(time.time() + (60 * 30)),
-                subscription_data={
-                    "metadata": {
-                        "type": "doornoc_membership",
-                        "group_id": group_id,
-                        "log": "[" + str(group.id) + "] " + group.name,
-                    }
-                },
-            )
-            return redirect(session.url, code=303)
+                return redirect(session_url, code=303)
+            case {"update_membership": _}:
+                payment.update_membership_expired(group=user_group.group)
+                return redirect(reverse("custom_auth_group:payment", args=[group_id]))
 
     context = {
-        "data": data,
-        "group": group,
-        "permission": permission_all,
-        "administrator": administrator,
-        "error": error,
+        "name": "会費のお支払い",
+        "prices": prices,
+        "group": user_group.group,
+        "is_expired": is_expired,
     }
-    return render(request, "group/payment.html", context)
+    return render(request, "payment/payment.html", context)
diff --git a/dsbd/payment.py b/dsbd/payment.py
new file mode 100644
index 0000000..762c9ac
--- /dev/null
+++ b/dsbd/payment.py
@@ -0,0 +1,101 @@
+import time as default_time
+from datetime import datetime, time
+
+import stripe
+from django.conf import settings
+from django.utils import timezone
+
+from custom_auth.models import Group, User
+
+MEMBERSHIP_TAG_TYPE = f"{settings.STRIPE_MEMBERSHIP_TAG_NAME}"
+DONATE_TAG_TYPE = f"{settings.STRIPE_DONATE_TAG_NAME}"
+DONATE_MEMBERSHIP_TAG_TYPE = f"{settings.STRIPE_DONATE_MEMBERSHIP_TAG_NAME}"
+
+
+def check_expired(expired_at):
+    if not expired_at:
+        return True
+    return expired_at < timezone.now()
+
+
+class Payment:
+    def __init__(self):
+        self.stripe = stripe
+        self.stripe.api_key = settings.STRIPE_SECRET_KEY
+
+    def create_customer(self, group_id: int, user_id: int):
+        group = Group.objects.get(id=group_id)
+        name = f"[GROUP] {group.id}: {group.name}"
+        if not group.stripe_customer_id:
+            return None
+        customer = self.stripe.Customer.create(
+            name=name,
+            description="doornoc_service",  # TODO: change description
+            metadata={
+                "id": "doornoc_service",  # TODO: change description
+                "user_id": user_id,
+                "group_id": group.id,
+                "version": 2,
+            },
+        )
+        group.stripe_customer_id = customer.id
+        group.save()
+        return customer.id
+
+    def get_billing_portal(self, customer_id: str, group_id: int = 0):
+        return_url = f"{settings.DOMAIN_URL}/group"
+        if group_id != 0:
+            return_url += f"/{group_id}/payment"
+        session = self.stripe.billing_portal.Session.create(customer=customer_id, return_url=return_url)
+        return session.url
+
+    def checkout_membership(self, customer_id: str, price_id: str, group: Group, user: User):
+        payment_return_url = f"{settings.DOMAIN_URL}/group/{group.id}/payment"
+        session = self.stripe.checkout.Session.create(
+            mode="subscription",
+            line_items=[
+                {
+                    "price": price_id,
+                    "quantity": 1,
+                },
+            ],
+            customer=customer_id,
+            success_url=payment_return_url,
+            cancel_url=payment_return_url,
+            expires_at=int(default_time.time() + (60 * 30)),
+            subscription_data={
+                "metadata": {
+                    "type": "membership",
+                    "user_id": user.id,
+                    "group_id": group.id,
+                    "log": f"[{group.id}] {group.name}",
+                }
+            },
+        )
+        return session.url
+
+    def get_product(self, stripe_type: str):
+        products = self.stripe.Product.search(query=f"metadata['service_id']:'{stripe_type}'")
+        if not products["data"]:
+            raise ValueError("Products not found")
+        return products.data[0]
+
+    def get_prices(self, product_id: str):
+        prices = self.stripe.Price.list(product=product_id, limit=10)
+        return prices.data
+
+    def update_membership_expired(self, group: Group):
+        product_id = self.get_product(stripe_type=MEMBERSHIP_TAG_TYPE).id
+        subscriptions = self.stripe.Subscription.list(customer=group.stripe_customer_id)
+        period_end = None
+        for subscription in subscriptions.data:
+            if subscription.plan.product != product_id:
+                continue
+            period_start_date = datetime.fromtimestamp(subscription.current_period_start).date()
+            period_end_date = datetime.fromtimestamp(subscription.current_period_end).date()
+            period_start = datetime.combine(period_start_date, time(0, 0, 0))
+            tmp_period_end = datetime.combine(period_end_date, time(23, 59, 59))
+            if period_end is None or period_end < tmp_period_end:
+                period_end = tmp_period_end
+            group.membership_expired_at = period_end
+            group.save()
diff --git a/dsbd/settings.py b/dsbd/settings.py
index d1722cc..8195808 100644
--- a/dsbd/settings.py
+++ b/dsbd/settings.py
@@ -208,6 +208,9 @@ def _import_ldap_group_type(group_type_name):
 STRIPE_PRIVATE_KEY = os.environ.get("STRIPE_PRIVATE_KEY", "")
 STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "")
 STRIPE_WEBHOOK_SECRET_KEY = os.environ.get("STRIPE_WEBHOOK_SECRET_KEY", "")
+STRIPE_MEMBERSHIP_TAG_NAME = os.environ.get("STRIPE_MEMBERSHIP_TAG_NAME", "membership")
+STRIPE_DONATE_MEMBERSHIP_TAG_NAME = os.environ.get("STRIPE_DONATE_MEMBERSHIP_TAG_NAME", "donate_membership")
+STRIPE_DONATE_TAG_NAME = os.environ.get("STRIPE_DONATE_TAG_NAME", "donate")
 
 # Slack
 SLACK_WEBHOOK_LOG = os.environ.get("SLACK_WEBHOOK_LOG", "")
diff --git a/dsbd/templates/group/index.html b/dsbd/templates/group/index.html
index e23338e..9f96ecb 100644
--- a/dsbd/templates/group/index.html
+++ b/dsbd/templates/group/index.html
@@ -18,57 +18,55 @@ <h2 class="card-title">Group</h2>
           {% endif %}
           <br/>
           <br/>
-          {% if data %}
-            {% for e in data %}
+          {% if groups %}
+            {% for group in groups %}
               <div class="card">
                 <div class="card-header">
-                  ID: {{ e.group.id }}
-                  作成日: {{ e.group.created_at }}
+                  ID: {{ group.data.id }}
+                  作成日: {{ group.data.created_at }}
                 </div>
                 <div class="card-body">
-                  <h5 class="card-title">{{ e.group.name }}</h5>
-                  {% if e.group.is_charge %}
-                    {% if e.group.expired_at %}
-                      <p class="card-text">
-                        課金情報: {{ e.group.expired_at }}まで</p>
-                    {% else %}
-                      <p class="card-text">課金情報:
-                        会費未徴収</p>
-                    {% endif %}
+                  <h5 class="card-title">{{ group.data.name }}</h5>
+                  <p class="card-text">
+                    会員種別: <b>{{ group.data.get_membership_type_display }}</b><br/>
+                  {% if group.data.membership_type < 50 %}
+                    有効期限: <b>{{ group.data.membership_expired_at }}まで</b>
                   {% else %}
-                    <p class="card-text">課金情報:
-                      課金ステータス無効</p>
+                    課金情報: <b>課金ステータス無効</b>
                   {% endif %}
+                  </p>
                   <div class="container">
                     <div>
                       <a class="btn btn-primary btn-sm"
-                         href="{% url 'custom_auth_group:edit' e.group.id %}">情報閲覧・修正</a>
+                         href="{% url 'custom_auth_group:edit' group.data.id %}">情報閲覧・修正</a>
                       <a class="btn btn-primary btn-sm"
-                         href="{% url 'custom_auth_group:permission' e.group.id %}">権限設定</a>
+                         href="{% url 'custom_auth_group:permission' group.data.id %}">権限設定</a>
                       <a class="btn btn-primary btn-sm"
-                         href="{{ e.group.id }}/service">サービス情報</a>
+                         href="{% url 'custom_auth_group:payment' group.data.id %}">支払い情報</a>
                       <a class="btn btn-primary btn-sm"
-                         href="{{ e.group.id }}/jpnic">JPNIC情報</a>
+                         href="{{ group.data.id }}/service">サービス情報</a>
+                      <a class="btn btn-primary btn-sm"
+                         href="{{ group.data.id }}/jpnic">JPNIC情報</a>
                       <br/>
                       <br/>
                       {% if e.administrator %}
                         <form method="post">
                           {% csrf_token %}
                           <input type="text"
-                                 value={{ e.group.id }} name="group_id"
+                                 value={{ group.data.id }} name="group_id"
                                  hidden>
-                          {% if e.group.is_charge and e.group.stripe_customer_id and not e.group.stripe_subscription_id %}
+                          {% if group.data.is_charge and group.data.stripe_customer_id and not group.data.stripe_subscription_id %}
                             <a class="btn btn-primary btn-sm"
-                               href="{% url 'group_payment' e.group.id %}">会費のお支払いはこちらから</a>
+                               href="{% url 'group_payment' group.data.id %}">会費のお支払いはこちらから</a>
                           {% endif %}
-                          {% if not e.group.stripe_customer_id %}
+                          {% if not group.data.stripe_customer_id %}
                             <button type="submit" name="id"
                                     value="create_stripe_customer"
                                     class="btn btn-primary btn-sm">
                               会費のお支払いはこちらから
                             </button>
                           {% endif %}
-                          {% if e.group.is_charge and e.group.stripe_customer_id %}
+                          {% if group.data.is_charge and group.data.stripe_customer_id %}
                             <button type="submit" name="id"
                                     value="getting_portal"
                                     class="btn btn-primary btn-sm">
@@ -81,98 +79,18 @@ <h5 class="card-title">{{ e.group.name }}</h5>
                   </div>
                 </div>
                 <div class="card-footer">
-                  {% if e.group.is_pass %}
+                  {% if group.data.is_pass %}
                     <span class="badge bg-primary">審査済</span>
                   {% else %}
                     <span class="badge bg-danger">未審査</span>{% endif %}
-                  {% if e.administrator %}
+                  {% if group.administrator %}
                     <span class="badge bg-success">管理者権限</span>{% endif %}
                   <span
-                      class="badge bg-secondary">Service: {{ e.group.service_set.count }}</span>
+                      class="badge bg-secondary">Service: {{ group.data.service_set.count }}</span>
                 </div>
               </div>
               <br/>
             {% endfor %}
-            <nav aria-label="...">
-              <ul class="pagination">
-                {% if tickets.has_previous %}
-                  <li class="page-item">
-                    <a class="page-link"
-                       href="?{% url_replace request page=tickets.previous_page_number %}">前へ</a>
-                  </li>
-                {% else %}
-                  <li class="page-item disabled">
-                    <span class="page-link">前へ</span>
-                  </li>
-                {% endif %}
-                {% if tickets.paginator.num_pages > 10 %}
-                  {% if tickets.number < 6 %}
-                    {#    先頭 9 ページの表示      #}
-                    {% for pg in tickets.paginator.page_range %}
-                      {% if forloop.counter0 < 9 %}
-                        {% if tickets.number == pg %}
-                          <li class="page-item active">
-                            {% else %}
-                          <li class="page-item">
-                        {% endif %}
-                      <a class="page-link"
-                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                      </li>
-                      {% endif %}
-                    {% endfor %}
-                  {% elif tickets.number < tickets.paginator.num_pages|add:-4 %}
-                    {#    手前 4 ページ | 現在のページ | 続き 4 ページ      #}
-                    {% for pg in tickets.paginator.page_range %}
-                      {% if tickets.number|add:-5 < pg and pg < tickets.number|add:5 %}
-                        {% if tickets.number == pg %}
-                          <li class="page-item active">
-                            {% else %}
-                          <li class="page-item">
-                        {% endif %}
-                      <a class="page-link"
-                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                      </li>
-                      {% endif %}
-                    {% endfor %}
-                  {% else %}
-                    {#   最後 9 ページの表示   #}
-                    {% for pg in tickets.paginator.page_range %}
-                      {% if forloop.counter0 > tickets.paginator.num_pages|add:-10 %}
-                        {% if tickets.number == pg %}
-                          <li class="page-item active">
-                            {% else %}
-                          <li class="page-item">
-                        {% endif %}
-                      <a class="page-link"
-                         href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                      </li>
-                      {% endif %}
-                    {% endfor %}
-                  {% endif %}
-                {% else %}
-                  {% for pg in tickets.paginator.page_range %}
-                    {% if tickets.number == pg %}
-                      <li class="page-item active">
-                        {% else %}
-                      <li class="page-item">
-                    {% endif %}
-                  <a class="page-link"
-                     href="?{% url_replace request page=pg %}">{{ pg }}</a>
-                  </li>
-                  {% endfor %}
-                {% endif %}
-                {% if tickets.has_next %}
-                  <li class="page-item">
-                    <a class="page-link"
-                       href="?{% url_replace request page=tickets.next_page_number %}">次へ</a>
-                  </li>
-                {% else %}
-                  <li class="page-item disabled">
-                    <span class="page-link">次へ</span>
-                  </li>
-                {% endif %}
-              </ul>
-            </nav>
           {% else %}
             <p>グループがありません</p>
           {% endif %}
diff --git a/dsbd/templates/group/payment.html b/dsbd/templates/group/payment.html
deleted file mode 100644
index c50348a..0000000
--- a/dsbd/templates/group/payment.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% extends 'base2.html' %}
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="container py-4 mb-auto">
-        <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">会費</h2>
-          <br/>
-          {% if administrator and group.is_charge and group.stripe_customer_id and not group.stripe_subscription_id %}
-            {% for one_data in data %}
-              <div class="card">
-                <div class="card-body">
-                  <h3 class="card-title">{{ one_data.name }}</h3>
-                  <br/>
-                  <form method="post">
-                    {% csrf_token %}
-                    <div class="row  mb-3 text-center">
-                      {% for price in one_data.prices %}
-                        <div class="col">
-                          <div class="card mb-4 rounded-3 shadow-sm">
-                            <div class="card-header py-3">
-                              <h4 class="my-0 fw-normal">{{ price.interval }}</h4>
-                            </div>
-                            <div class="card-body">
-                              <h1 class="card-title pricing-card-title">{{ price.amount }}円<small
-                                  class="text-muted fw-light">/{{ price.interval }}</small>
-                              </h1>
-                              <ul class="list-unstyled mt-3 mb-4">
-                                <li>{{ price.description }}</li>
-                              </ul>
-
-                              <button type="submit"
-                                      name="price_id"
-                                      value="{{ price.id }}"
-                                      class="w-100 btn btn-lg btn-outline-primary">
-                                会費支払い
-                              </button>
-                            </div>
-                          </div>
-                        </div>
-                      {% endfor %}
-                    </div>
-                  </form>
-                </div>
-              </div>
-              <br/>
-            {% endfor %}
-            <br/>
-          {% else %}
-            <p><b>寄付済み又はエラーです</b></p>
-          {% endif %}
-          <br/>
-          <br/>
-          <br/>
-          <a class="btn btn-primary"
-             href="{% url 'custom_auth_group:index' %}" role="button"
-             aria-expanded="false">ホームへ戻る</a>
-        </div>
-      </div>
-    </div>
-  </div>
-{% endblock content %}
diff --git a/dsbd/templates/payment.html b/dsbd/templates/payment.html
deleted file mode 100644
index 64ee362..0000000
--- a/dsbd/templates/payment.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends 'base1.html' %}
-{% block content %}
-  <h2 class="card-title">会費</h2>
-  <br/>
-  {% if request.user.is_charge and request.user.stripe_customer_id and not request.user.stripe_subscription_id. %}
-    <div class="card">
-      <div class="card-body">
-        <h3 class="card-title">{{ data.name }}</h3>
-        <br/>
-
-        <form method="post">
-          {% csrf_token %}
-
-          <div class="row  mb-3 text-center">
-            {% for price in data.prices %}
-              <div class="col">
-                <div class="card mb-4 rounded-3 shadow-sm">
-                  <div class="card-header py-3">
-                    <h4 class="my-0 fw-normal">{{ price.interval }}</h4>
-                  </div>
-                  <div class="card-body">
-                    <h1 class="card-title pricing-card-title">{{ price.amount }}円<small
-                        class="text-muted fw-light">/{{ price.interval }}</small>
-                    </h1>
-                    <ul class="list-unstyled mt-3 mb-4">
-                      <li>{{ price.description }}</li>
-                    </ul>
-
-                    <button type="submit" name="price_id"
-                            value="{{ price.id }}"
-                            class="w-100 btn btn-lg btn-outline-primary">
-                      会費支払い
-                    </button>
-                  </div>
-                </div>
-              </div>
-            {% endfor %}
-          </div>
-        </form>
-      </div>
-    </div>
-    <br/>
-  {% else %}
-    <p><b>寄付済みです</b></p>
-  {% endif %}
-  <br/>
-  <br/>
-  <br/>
-  <a class="btn btn-primary" href="{% url 'index' %}" role="button"
-     aria-expanded="false">ホームへ戻る</a>
-{% endblock content %}
diff --git a/dsbd/templates/payment/payment.html b/dsbd/templates/payment/payment.html
new file mode 100644
index 0000000..8b4902b
--- /dev/null
+++ b/dsbd/templates/payment/payment.html
@@ -0,0 +1,114 @@
+{% extends 'base2.html' %}
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">{{ name }}</h2>
+          <br/>
+          <h5>会員種別: {{ group.get_membership_type_display }}</h5>
+          {% if group.membership_expired_at and is_expired %}
+            <h5>有効期限: <b>期限切れ</b>({{ group.membership_expired_at }})</h5>
+          {% elif not group.membership_expired_at and is_expired %}
+            <h5>有効期限: <b>期限切れ</b></h5>
+          {% else %}
+            <h5>有効期限: {{ group.membership_expired_at }}</h5>
+          {% endif %}
+          <p>情報更新のタイムラグにより、有効期限切れと表示される可能性があります。<br/>
+            （有効期限を即時更新したい場合は、<b>「Membership情報更新(有効期限の更新)」ボタン</b>を押してください）</p>
+          <br/>
+          {% if group.membership_type >= 50 %}
+            <h3>
+              <b>本グループは{{ group.get_membership_type_display }}のため、費用免除されています</b>
+            </h3>
+          {% elif not group.stripe_customer_id %}
+            <div class="alert alert-warning" role="alert">
+              test
+            </div>
+          {% elif group.stripe_customer_id and is_expired %}
+            <h3>
+              <b>期限切れです。支払い状況を確認してください</b>
+            </h3>
+            {% if is_expired %}
+              <div class="alert alert-warning" role="alert">
+                <p>
+                  <b>二重請求防止のため、まずは「支払い履歴・情報・プラン変更」ボタンより確認のほどお願いします</b>
+                </p>
+                <form method="post">
+                  {% csrf_token %}
+                  <button type="submit" class="btn btn-primary btn-sm"
+                          name="billing_portal">支払い履歴/情報/プラン変更
+                  </button>
+                  <p>
+                    支払い完了後、Membership情報更新ボタンを押してください(有効期限の更新を行うために必要となります)</p>
+                  <button type="submit" class="btn btn-primary btn-sm"
+                          name="update_membership">Membership情報更新(有効期限の更新)
+                  </button>
+                </form>
+              </div>
+            {% endif %}
+            <div class="card">
+              <div class="card-body">
+                <h3 class="card-title">プラン</h3>
+                <br/>
+                <form method="post">
+                  {% csrf_token %}
+                  <div class="row  mb-3 text-center">
+                    {% for price in prices %}
+                      <div class="col">
+                        <div class="card mb-4 rounded-3 shadow-sm">
+                          <div class="card-header py-3">
+                            <h4 class="my-0 fw-normal">{{ price.recurring.interval }}</h4>
+                          </div>
+                          <div class="card-body">
+                            <h1 class="card-title pricing-card-title">{{ price.unit_amount }} {{ price.currency }}<small
+                                class="text-muted fw-light">/{{ price.recurring.interval }}</small>
+                            </h1>
+                            <button type="submit"
+                                    name="checkout"
+                                    value="{{ price.id }}"
+                                    class="w-100 btn btn-lg btn-outline-primary">
+                              会費支払い
+                            </button>
+                          </div>
+                        </div>
+                      </div>
+                    {% endfor %}
+                  </div>
+                </form>
+              </div>
+            </div>
+          {% elif not is_expired %}
+            <h4><b>有効中</b></h4>
+            <p>解約する場合は、「支払い履歴・情報・プラン変更」より可能です。</p>
+          {% else %}
+            <div class="alert alert-warning" role="alert">
+              <p><b>何かしらのエラーが発生しました</b></p>
+            </div>
+          {% endif %}
+          {% if group.stripe_customer_id %}
+            <br/>
+            <form method="post">
+              {% csrf_token %}
+              <p><b>支払い履歴やプラン変更などはこちらから確認可能です</b></p>
+              <button type="submit" class="btn btn-primary btn-sm"
+                      name="billing_portal">支払い履歴・情報・プラン変更
+              </button>
+              <button type="submit" class="btn btn-primary btn-sm"
+                      name="update_membership">Membership情報更新(有効期限の更新)
+              </button>
+            </form>
+            <br/>
+          {% endif %}
+          <p>
+            ご不明な場合などがありましたら、Supportチャットにてご連絡のほどお願いいたします。</p>
+          <br/>
+          <br/>
+          <a class="btn btn-primary"
+             href="{% url 'custom_auth_group:index' %}" role="button"
+             aria-expanded="false">ホームへ戻る</a>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/dsbd/templates/svg.html b/dsbd/templates/svg.html
index 690ea55..dd9ab4a 100644
--- a/dsbd/templates/svg.html
+++ b/dsbd/templates/svg.html
@@ -19,6 +19,9 @@
     <path
         d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"></path>
   </symbol>
+  <symbol id="wallet" viewBox="0 0 16 16">
+    <path d="M0 3a2 2 0 0 1 2-2h13.5a.5.5 0 0 1 0 1H15v2a1 1 0 0 1 1 1v8.5a1.5 1.5 0 0 1-1.5 1.5h-12A2.5 2.5 0 0 1 0 12.5V3zm1 1.732V12.5A1.5 1.5 0 0 0 2.5 14h12a.5.5 0 0 0 .5-.5V5H2a1.99 1.99 0 0 1-1-.268zM1 3a1 1 0 0 0 1 1h12V2H2a1 1 0 0 0-1 1z"></path>
+  </symbol>
   <symbol id="people-circle" viewBox="0 0 16 16">
     <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"></path>
     <path fill-rule="evenodd"
diff --git a/service/form.py b/service/form.py
index b916bc0..1be58ea 100644
--- a/service/form.py
+++ b/service/form.py
@@ -3,7 +3,6 @@
 from django import forms
 from django.db import transaction
 
-from custom_auth.models import Group
 from ip.models import (
     IP,
     JPNIC_USER_TYPE_ADMIN,
@@ -350,11 +349,6 @@ def save(self):
                                 jpnic_user=cleaned_data[f"ipv{ip.version}_jpnic_tech3"],
                                 user_type=JPNIC_USER_TYPE_TECH_3,
                             )
-
-                group = Group.objects.get(id=self.group_id)
-                group.allow_service_add = False
-                group.allow_jpnic_add = False
-                group.save()
         except Exception as e:
             # エラーログの出力や追加処理
             print(f"エラーが発生しました: {e}")
diff --git a/service/signals.py b/service/signals.py
index 6641119..b2da096 100644
--- a/service/signals.py
+++ b/service/signals.py
@@ -1,6 +1,7 @@
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch import receiver
 
+from custom_auth.models import Group
 from dsbd.notify import notify_delete_db, notify_insert_db, notify_update_db
 from service.models import Connection, Service
 
@@ -9,6 +10,8 @@
 def service_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
+        # Group側の「サービス追加許可」、「JPNIC情報追加許可」をFalseにする
+        Group.objects.filter(id=instance.group_id).update(allow_service_add=False, allow_jpnic_add=False)
         return
     notify_update_db(model_name=sender.__name__, instance=instance)
 
@@ -22,6 +25,8 @@ def service_model_pre_delete(sender, instance, **kwargs):
 def connection_model_post_save(sender, instance, created, **kwargs):
     if created:
         notify_insert_db(model_name=sender.__name__, instance=instance)
+        # service側の「接続追加許可」をFalseにする
+        Service.objects.filter(id=instance.service_id).update(allow_connection_add=False)
         return
     notify_update_db(model_name=sender.__name__, instance=instance)
 

From 320f2f5b39ea30c5f6cd1f337a9fbb257f67392d Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Tue, 17 Sep 2024 03:31:23 +0900
Subject: [PATCH 31/36] =?UTF-8?q?#43=20=E6=96=87=E8=A8=80=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/views.py                | 1 -
 dsbd/templates/payment/payment.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/custom_auth/views.py b/custom_auth/views.py
index 7e74174..74d0f06 100644
--- a/custom_auth/views.py
+++ b/custom_auth/views.py
@@ -237,7 +237,6 @@ def group_payment(request, group_id: int):
                 return redirect(reverse("custom_auth_group:payment", args=[group_id]))
 
     context = {
-        "name": "会費のお支払い",
         "prices": prices,
         "group": user_group.group,
         "is_expired": is_expired,
diff --git a/dsbd/templates/payment/payment.html b/dsbd/templates/payment/payment.html
index 8b4902b..550f01c 100644
--- a/dsbd/templates/payment/payment.html
+++ b/dsbd/templates/payment/payment.html
@@ -4,7 +4,7 @@
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">{{ name }}</h2>
+          <h2 class="card-title">会費のお支払い</h2>
           <br/>
           <h5>会員種別: {{ group.get_membership_type_display }}</h5>
           {% if group.membership_expired_at and is_expired %}

From f1982c3ed7f3c28920da262839ef277596714e7b Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Tue, 17 Sep 2024 04:40:51 +0900
Subject: [PATCH 32/36] =?UTF-8?q?#43=20donation=E3=82=B7=E3=82=B9=E3=83=86?=
 =?UTF-8?q?=E3=83=A0=E3=81=AE=E5=AE=9F=E8=A3=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/views.py               |   3 +-
 dsbd/payment.py                    |  76 +++++++++++++-------
 dsbd/settings.py                   |   1 -
 dsbd/templates/home.html           |   5 +-
 dsbd/templates/navbar2.html        |  17 ++---
 dsbd/templates/payment/donate.html | 108 +++++++++++++++++++++++++++++
 dsbd/urls.py                       |   1 +
 dsbd/views.py                      |  96 ++++++++-----------------
 8 files changed, 198 insertions(+), 109 deletions(-)
 create mode 100644 dsbd/templates/payment/donate.html

diff --git a/custom_auth/views.py b/custom_auth/views.py
index 74d0f06..d364a53 100644
--- a/custom_auth/views.py
+++ b/custom_auth/views.py
@@ -225,8 +225,7 @@ def group_payment(request, group_id: int):
                 price_id = request.POST.get("checkout", None)
                 if not price_id:
                     return render(request, "error.html", {"text": "price_idが不正です"})
-                session_url = payment.checkout_membership(
-                    customer_id=user_group.group.stripe_customer_id,
+                session_url = payment.checkout(
                     price_id=price_id,
                     group=user_group.group,
                     user=request.user,
diff --git a/dsbd/payment.py b/dsbd/payment.py
index 762c9ac..de6e48f 100644
--- a/dsbd/payment.py
+++ b/dsbd/payment.py
@@ -9,7 +9,6 @@
 
 MEMBERSHIP_TAG_TYPE = f"{settings.STRIPE_MEMBERSHIP_TAG_NAME}"
 DONATE_TAG_TYPE = f"{settings.STRIPE_DONATE_TAG_NAME}"
-DONATE_MEMBERSHIP_TAG_TYPE = f"{settings.STRIPE_DONATE_MEMBERSHIP_TAG_NAME}"
 
 
 def check_expired(expired_at):
@@ -19,23 +18,40 @@ def check_expired(expired_at):
 
 
 class Payment:
-    def __init__(self):
+    def __init__(self, is_membership: bool = True):
         self.stripe = stripe
         self.stripe.api_key = settings.STRIPE_SECRET_KEY
+        self.is_membership = is_membership
+
+    def create_donate_customer(self, user: User):
+        name = f"[USER(DONATE)] {user.id}: {user.username}"
+        if user.stripe_donate_customer_id:
+            return None
+        customer = self.stripe.Customer.create(
+            name=name,
+            description="dsbd-system",
+            metadata={
+                "user_id": user.id,
+                "is_donate": True,
+                "dsbd_payment_system": "v2",
+            },
+        )
+        user.stripe_donate_customer_id = customer.id
+        user.save()
+        return customer.id
 
     def create_customer(self, group_id: int, user_id: int):
         group = Group.objects.get(id=group_id)
         name = f"[GROUP] {group.id}: {group.name}"
-        if not group.stripe_customer_id:
+        if group.stripe_customer_id:
             return None
         customer = self.stripe.Customer.create(
             name=name,
-            description="doornoc_service",  # TODO: change description
+            description="dsbd-system",  # TODO: change description
             metadata={
-                "id": "doornoc_service",  # TODO: change description
                 "user_id": user_id,
                 "group_id": group.id,
-                "version": 2,
+                "dsbd_payment_system": "v2",
             },
         )
         group.stripe_customer_id = customer.id
@@ -46,36 +62,46 @@ def get_billing_portal(self, customer_id: str, group_id: int = 0):
         return_url = f"{settings.DOMAIN_URL}/group"
         if group_id != 0:
             return_url += f"/{group_id}/payment"
+        if not self.is_membership:
+            return_url = f"{settings.DOMAIN_URL}/donate"
         session = self.stripe.billing_portal.Session.create(customer=customer_id, return_url=return_url)
         return session.url
 
-    def checkout_membership(self, customer_id: str, price_id: str, group: Group, user: User):
-        payment_return_url = f"{settings.DOMAIN_URL}/group/{group.id}/payment"
-        session = self.stripe.checkout.Session.create(
-            mode="subscription",
-            line_items=[
+    def checkout(self, price_id: str, group: Group or None, user: User, is_subscription: bool = True):
+        return_url = f"{settings.DOMAIN_URL}/donate"
+        if self.is_membership:
+            return_url = f"{settings.DOMAIN_URL}/group/{group.id}/payment"
+        customer_id = user.stripe_donate_customer_id if not group else group.stripe_customer_id
+        log = f"[USER] {user.id}: {user.username}" if not group else f"[{group.id}] {group.name}"
+        session_data = {
+            "mode": "subscription" if is_subscription else "payment",
+            "line_items": [
                 {
                     "price": price_id,
                     "quantity": 1,
                 },
             ],
-            customer=customer_id,
-            success_url=payment_return_url,
-            cancel_url=payment_return_url,
-            expires_at=int(default_time.time() + (60 * 30)),
-            subscription_data={
-                "metadata": {
-                    "type": "membership",
-                    "user_id": user.id,
-                    "group_id": group.id,
-                    "log": f"[{group.id}] {group.name}",
-                }
-            },
-        )
+            "customer": customer_id,
+            "success_url": return_url,
+            "cancel_url": return_url,
+            "expires_at": int(default_time.time() + (60 * 30)),
+        }
+        metadata = {
+            "service_type": "donate" if not group else "membership",
+            "user_id": user.id,
+            "group_id": None if not group else group.id,
+            "log": log,
+            "dsbd_payment_system": "v2",
+        }
+        if is_subscription:
+            session_data["subscription_data"] = {"metadata": metadata}
+        else:
+            session_data["payment_intent_data"] = {"metadata": metadata}
+        session = self.stripe.checkout.Session.create(**session_data)
         return session.url
 
     def get_product(self, stripe_type: str):
-        products = self.stripe.Product.search(query=f"metadata['service_id']:'{stripe_type}'")
+        products = self.stripe.Product.search(query=f"metadata['service_type']:'{stripe_type}'")
         if not products["data"]:
             raise ValueError("Products not found")
         return products.data[0]
diff --git a/dsbd/settings.py b/dsbd/settings.py
index 8195808..7abcabe 100644
--- a/dsbd/settings.py
+++ b/dsbd/settings.py
@@ -209,7 +209,6 @@ def _import_ldap_group_type(group_type_name):
 STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "")
 STRIPE_WEBHOOK_SECRET_KEY = os.environ.get("STRIPE_WEBHOOK_SECRET_KEY", "")
 STRIPE_MEMBERSHIP_TAG_NAME = os.environ.get("STRIPE_MEMBERSHIP_TAG_NAME", "membership")
-STRIPE_DONATE_MEMBERSHIP_TAG_NAME = os.environ.get("STRIPE_DONATE_MEMBERSHIP_TAG_NAME", "donate_membership")
 STRIPE_DONATE_TAG_NAME = os.environ.get("STRIPE_DONATE_TAG_NAME", "donate")
 
 # Slack
diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index 230273d..6572fcb 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -233,10 +233,7 @@ <h2>Information</h2>
             <div class="card">
               <div class="card-body">
                 <h5 class="card-title">会員情報</h5>
-                <p class="card-text">This card has supporting text below
-                  as a natural lead-in to
-                  additional
-                  content.</p>
+{#                <p class="card-text">{{ group.get_membership_type_display }}#}
                 <p class="card-text"><small class="text-body-secondary">Last
                   updated 3 mins ago</small>
                 </p>
diff --git a/dsbd/templates/navbar2.html b/dsbd/templates/navbar2.html
index 4801671..e8b240b 100644
--- a/dsbd/templates/navbar2.html
+++ b/dsbd/templates/navbar2.html
@@ -102,14 +102,15 @@
           Services
         </a>
       </li>
-      {#            <li>#}
-      {#                <a href="#" class="nav-link text-white">#}
-      {#                    <svg class="bi me-2" width="16" height="16">#}
-      {#                        <use xlink:href="#people-circle"></use>#}
-      {#                    </svg>#}
-      {#                    Customers#}
-      {#                </a>#}
-      {#            </li>#}
+      <li>
+        {#TODO: href弄る#}
+        <a href="{% url 'donate' %}" class="nav-link text-white">
+          <svg class="bi me-2" width="16" height="16">
+            <use xlink:href="#wallet"></use>
+          </svg>
+          Donate
+        </a>
+      </li>
       <li class="nav-item">
         <a href="{% url 'ticket:index' %}" class="nav-link text-white"
            aria-current="page">
diff --git a/dsbd/templates/payment/donate.html b/dsbd/templates/payment/donate.html
new file mode 100644
index 0000000..8cfc86b
--- /dev/null
+++ b/dsbd/templates/payment/donate.html
@@ -0,0 +1,108 @@
+{% extends 'base2.html' %}
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="container py-4 mb-auto">
+        <div class="h-900 p-2 rounded-3">
+          <h2 class="card-title">Donation System</h2>
+          <br/>
+          <h3><b>こちらは寄付システムです。</b></h3>
+          <p><b>会費の支払いシステムとは異なりますのでご注意ください。「グループ一覧」ボタンから「支払い情報」でご確認いただけます。</b></p>
+          <a href="{% url 'custom_auth_group:index' %}" type="button"
+             class="btn btn-sm btn-primary">グループ一覧</a>
+          <br/>
+          <br/>
+          <div class="card">
+            <div class="card-body">
+              <h3 class="card-title">寄附一覧(One-time)</h3>
+              <br/>
+              <form method="post">
+                {% csrf_token %}
+                <input type="text" value="False" name="is_subscription" hidden>
+                <div class="row mb-3 text-center">
+                  {% for price in prices %}
+                    {% if not price.recurring.interval %}
+                      <div class="col-sm-4 mb-2 mb-sm-0">
+                        <div class="card mb-4 rounded-3 shadow-sm">
+                          <div class="card-header py-3">
+                            <h4 class="my-0 fw-normal">one-time</h4>
+                          </div>
+                          <div class="card-body">
+                            <h1 class="card-title pricing-card-title">{{ price.unit_amount }} {{ price.currency }}<small
+                                class="text-muted fw-light">/one-time</small>
+                            </h1>
+                            <button type="submit"
+                                    name="checkout"
+                                    value="{{ price.id }}"
+                                    class="w-100 btn btn-lg btn-outline-primary">
+                              会費支払い
+                            </button>
+                          </div>
+                        </div>
+                      </div>
+                    {% endif %}
+                  {% endfor %}
+                </div>
+              </form>
+            </div>
+          </div>
+          <br/>
+          <div class="card">
+            <div class="card-body">
+              <h3 class="card-title">寄附一覧(定期払い)</h3>
+              <p>
+                <b>寄附の定期支払いをキャンセルする場合は、「支払い履歴・情報・プラン変更」より可能です。</b>
+              </p>
+              <br/>
+              <form method="post">
+                {% csrf_token %}
+                <div class="row mb-3 text-center">
+                  {% for price in prices %}
+                    {% if price.recurring.interval %}
+                      <div class="col-sm-4 mb-2 mb-sm-0">
+                        <div class="card mb-4 rounded-3 shadow-sm">
+                          <div class="card-header py-3">
+                            <h4 class="my-0 fw-normal">{{ price.recurring.interval }}</h4>
+                          </div>
+                          <div class="card-body">
+                            <h1 class="card-title pricing-card-title">{{ price.unit_amount }} {{ price.currency }}<small
+                                class="text-muted fw-light">/{{ price.recurring.interval }}</small>
+                            </h1>
+                            <button type="submit"
+                                    name="checkout"
+                                    value="{{ price.id }}"
+                                    class="w-100 btn btn-lg btn-outline-primary">
+                              会費支払い{% if price.recurring.interval %}
+                              (定期払){% endif %}
+                            </button>
+                          </div>
+                        </div>
+                      </div>
+                    {% endif %}
+                  {% endfor %}
+                </div>
+              </form>
+            </div>
+          </div>
+          <br/>
+          <form method="post">
+            {% csrf_token %}
+            <p><b>支払い履歴やプラン変更などはこちらから確認可能です</b></p>
+            <button type="submit" class="btn btn-primary btn-sm"
+                    name="billing_portal">支払い履歴・情報・プラン変更
+            </button>
+            <p>履歴はサブスクリプション情報のみとなります。(stripeの仕様のため）</p>
+          </form>
+          <br/>
+          <p>
+            ご不明な場合などがありましたら、Supportチャットにてご連絡のほどお願いいたします。</p>
+          <br/>
+          <br/>
+          <a class="btn btn-primary"
+             href="{% url 'custom_auth_group:index' %}" role="button"
+             aria-expanded="false">ホームへ戻る</a>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/dsbd/urls.py b/dsbd/urls.py
index 67cd34d..f1d22c0 100644
--- a/dsbd/urls.py
+++ b/dsbd/urls.py
@@ -35,6 +35,7 @@
     path("group/", include("custom_auth.group_urls")),
     path("group/<int:group_id>/jpnic/", include("ip.jpnic_urls")),
     path("group/<int:group_id>/service/", include("service.group_urls")),
+    path("donate/", views.donate, name="donate"),
     path("services/", include("service.urls")),
     path("profile/", include("custom_auth.urls")),
     path("ticket/", include("ticket.urls")),
diff --git a/dsbd/views.py b/dsbd/views.py
index 77e80cf..0fe537e 100644
--- a/dsbd/views.py
+++ b/dsbd/views.py
@@ -1,4 +1,3 @@
-import time
 from datetime import datetime
 
 import stripe
@@ -23,6 +22,7 @@
 from custom_auth.models import Group, TOTPDevice, User, UserActivateToken, UserEmailVerify
 from dsbd.form import ForgetForm, LoginForm, NewSetPasswordForm, OTPForm, SignUpForm
 from dsbd.notify import notice_payment
+from dsbd.payment import DONATE_TAG_TYPE, Payment
 from notice.models import Notice
 
 
@@ -43,7 +43,6 @@ def sign_in(request):
         elif auth_type == "otp":
             form = OTPForm()
             auth_type = request.POST.get("otp_id", "auth_otp_email")
-            print(request.session.get("user"))
             if auth_type == "auth_otp_email":
                 user = User.objects.get(id=int(request.session.get("user")))
                 UserEmailVerify.objects.create_token(user=user)
@@ -79,10 +78,7 @@ def sign_in(request):
     else:
         form = LoginForm()
         request.session.clear()
-    context = {
-        "type": auth_type,
-        "form": form,
-    }
+    context = {"type": auth_type, "form": form}
     if invalid_code:
         context["invalid_code"] = "認証コードが一致しません"
     return render(request, "sign_in.html", context)
@@ -102,9 +98,7 @@ def sign_up(request):
         if form.is_valid():
             form.create_user()
             return redirect("sign_up_done")
-    context = {
-        "form": form,
-    }
+    context = {"form": form}
 
     return render(request, "sign_up.html", context)
 
@@ -218,67 +212,31 @@ def menu(request):
 
 
 @login_required
-def payment(request):
-    stripe.api_key = settings.STRIPE_SECRET_KEY
-
-    products = stripe.Product.search(
-        query="active:'true' AND metadata['id']:'corporate'",
-    )
-    prices = stripe.Price.search(
-        query="active:'true' AND product:'" + products.data[0].id + "'",
-    )
-    data = {"name": products.data[0].name, "prices": []}
-    index = 0
-    for price in prices:
-        tmp = [
-            {
-                "id": price.id,
-                "interval": price.recurring.interval,
-                "amount": price.unit_amount,
-                "description": price.nickname,
-            }
-        ]
-        if index == 0:
-            data["prices"] = tmp
-        else:
-            if price.recurring.interval == "year":
-                data["prices"] += tmp
-            elif price.recurring.interval == "month":
-                data["prices"] = tmp + data["prices"]
-        index += 1
-    # print(prices)
+def donate(request):
+    payment = Payment(is_membership=False)
+    donate_product_id = payment.get_product(stripe_type=DONATE_TAG_TYPE).id
+    prices = payment.get_prices(product_id=donate_product_id)
     if request.method == "POST":
-        id = request.POST.get("price_id", "")
-        is_exists = False
-        for price in data["prices"]:
-            if price["id"] == id:
-                is_exists = True
-                break
-        if is_exists and request.user.stripe_customer_id and not request.user.stripe_subscription_id:
-            session = stripe.checkout.Session.create(
-                mode="subscription",
-                line_items=[
-                    {
-                        "price": id,
-                        "quantity": 1,
-                    },
-                ],
-                customer=request.user.stripe_customer_id,
-                success_url=settings.DOMAIN_URL,
-                cancel_url=settings.DOMAIN_URL,
-                expires_at=int(time.time() + (60 * 30)),
-                subscription_data={
-                    "metadata": {
-                        "type": "user_membership",
-                        "user_id": request.user.id,
-                        "log": "[" + str(request.user.id) + "] " + request.user.username,
-                    }
-                },
-            )
-            return redirect(session.url, code=303)
-
-    context = {"data": data}
-    return render(request, "payment.html", context)
+        payment.create_donate_customer(request.user)
+        match request.POST:
+            case {"billing_portal": _}:
+                session_url = payment.get_billing_portal(customer_id=request.user.stripe_donate_customer_id)
+                return redirect(session_url, code=303)
+            case {"checkout": _}:
+                price_id = request.POST.get("checkout", None)
+                is_subscription = request.POST.get("is_subscription", "True") == "True"
+                if not price_id:
+                    return render(request, "error.html", {"text": "price_idが不正です"})
+                session_url = payment.checkout(
+                    price_id=price_id,
+                    group=None,
+                    user=request.user,
+                    is_subscription=is_subscription,
+                )
+                return redirect(session_url, code=303)
+
+    context = {"prices": prices}
+    return render(request, "payment/donate.html", context)
 
 
 @require_POST

From 2aed85578b7a746f99bc7701140a9759fd89298d Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Tue, 17 Sep 2024 05:04:06 +0900
Subject: [PATCH 33/36] =?UTF-8?q?#43=20=E6=96=87=E5=AD=97=E3=82=B5?=
 =?UTF-8?q?=E3=82=A4=E3=82=BA=E3=81=AE=E5=A4=89=E6=9B=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_auth/views.py                          | 14 ++++++++---
 dsbd/templates/custom_admin/ticket/index.html |  2 +-
 dsbd/templates/group/index.html               |  8 +++----
 dsbd/templates/home.html                      |  2 +-
 dsbd/templates/menu.html                      |  2 +-
 dsbd/templates/navbar1.html                   |  2 +-
 dsbd/templates/payment/donate.html            | 11 ++++-----
 dsbd/templates/payment/payment.html           |  2 +-
 dsbd/templates/service/index.html             |  2 +-
 dsbd/templates/ticket/index.html              |  8 ++++++-
 dsbd/templatetags/extra.py                    | 24 +++++++++----------
 11 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/custom_auth/views.py b/custom_auth/views.py
index d364a53..7b02403 100644
--- a/custom_auth/views.py
+++ b/custom_auth/views.py
@@ -121,7 +121,10 @@ def list_groups(request):
     groups = []
     for group in request.user.groups.all():
         groups.append(
-            {"data": group, "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()}
+            {
+                "data": group,
+                "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists(),
+            }
         )
 
     context = {"groups": groups}
@@ -131,9 +134,14 @@ def list_groups(request):
 @login_required
 def list_group(request, group_id: int):
     group = request.user.groups.get(id=group_id)
-    data = [{"group": group, "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists()}]
+    groups = [
+        {
+            "data": group,
+            "administrator": group.usergroup_set.filter(user=request.user, is_admin=True).exists(),
+        }
+    ]
 
-    context = {"data": data}
+    context = {"groups": groups}
     return render(request, "group/index.html", context)
 
 
diff --git a/dsbd/templates/custom_admin/ticket/index.html b/dsbd/templates/custom_admin/ticket/index.html
index 1d22b54..59ea748 100644
--- a/dsbd/templates/custom_admin/ticket/index.html
+++ b/dsbd/templates/custom_admin/ticket/index.html
@@ -4,7 +4,7 @@
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">チケット一覧(管理者側)</h2>
+          <h2 class="card-title"><b>チケット一覧(管理者側)</b></h2>
           <a class="btn btn-primary btn-sm disabled"
              href="{% url 'ticket:add' %}" role="button"
              aria-expanded="false">チケット追加</a>
diff --git a/dsbd/templates/group/index.html b/dsbd/templates/group/index.html
index 9f96ecb..f4e6b06 100644
--- a/dsbd/templates/group/index.html
+++ b/dsbd/templates/group/index.html
@@ -4,7 +4,7 @@
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">Group</h2>
+          <h2 class="card-title"><b>グループ一覧</b></h2>
           <br/>
           {% if request.user.allow_group_add %}
             <p><b>下記のより、新規申請してください。</b></p>
@@ -42,11 +42,11 @@ <h5 class="card-title">{{ group.data.name }}</h5>
                       <a class="btn btn-primary btn-sm"
                          href="{% url 'custom_auth_group:permission' group.data.id %}">権限設定</a>
                       <a class="btn btn-primary btn-sm"
-                         href="{% url 'custom_auth_group:payment' group.data.id %}">支払い情報</a>
+                         href="{% url 'custom_auth_group:payment' group.data.id %}">会費支払い情報</a>
                       <a class="btn btn-primary btn-sm"
-                         href="{{ group.data.id }}/service">サービス情報</a>
+                         href="{% url 'service:index' group.data.id %}">サービス情報</a>
                       <a class="btn btn-primary btn-sm"
-                         href="{{ group.data.id }}/jpnic">JPNIC情報</a>
+                         href="{% url 'jpnic:jpnic_index' group.data.id %}">JPNIC情報</a>
                       <br/>
                       <br/>
                       {% if e.administrator %}
diff --git a/dsbd/templates/home.html b/dsbd/templates/home.html
index 6572fcb..5051e89 100644
--- a/dsbd/templates/home.html
+++ b/dsbd/templates/home.html
@@ -16,7 +16,7 @@
       <div class="col-sm-8">
         <div class="container py-4 mb-auto">
           <div class="h-900 p-2 rounded-3">
-            <h2>お知らせ</h2>
+            <h2><b>お知らせ</b></h2>
             {% if not request.user.groups %}
               <div class="card text-bg-light mb-3">
                 <div class="card-body">
diff --git a/dsbd/templates/menu.html b/dsbd/templates/menu.html
index 9179c49..ef32390 100644
--- a/dsbd/templates/menu.html
+++ b/dsbd/templates/menu.html
@@ -3,7 +3,7 @@
   <section class="py-5 text-center container">
     <div class="row py-lg-5">
       <div class="col-lg-6 col-md-8 mx-auto">
-        <h1 class="fw-light">Welcome</h1>
+        <h1 class="fw-light"><b>Welcome</b></h1>
         <p class="lead text-body-secondary">AS59105 Service Online</p>
       </div>
     </div>
diff --git a/dsbd/templates/navbar1.html b/dsbd/templates/navbar1.html
index 36ff4c6..c459f7c 100644
--- a/dsbd/templates/navbar1.html
+++ b/dsbd/templates/navbar1.html
@@ -1,4 +1,4 @@
-{#{% load extra %}#}
+{% load extra %}
 <li class="nav-item">
 </li>
 <li class="nav-item">
diff --git a/dsbd/templates/payment/donate.html b/dsbd/templates/payment/donate.html
index 8cfc86b..a61d8dc 100644
--- a/dsbd/templates/payment/donate.html
+++ b/dsbd/templates/payment/donate.html
@@ -4,10 +4,10 @@
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">Donation System</h2>
+          <h2 class="card-title"><b>Donation System</b></h2>
           <br/>
           <h3><b>こちらは寄付システムです。</b></h3>
-          <p><b>会費の支払いシステムとは異なりますのでご注意ください。「グループ一覧」ボタンから「支払い情報」でご確認いただけます。</b></p>
+          <p><b>会費の支払いシステムとは異なりますのでご注意ください。「グループ一覧」ボタンから「会費支払い情報」でご確認いただけます。</b></p>
           <a href="{% url 'custom_auth_group:index' %}" type="button"
              class="btn btn-sm btn-primary">グループ一覧</a>
           <br/>
@@ -91,16 +91,13 @@ <h1 class="card-title pricing-card-title">{{ price.unit_amount }} {{ price.curre
             <button type="submit" class="btn btn-primary btn-sm"
                     name="billing_portal">支払い履歴・情報・プラン変更
             </button>
+            <br/><br/>
             <p>履歴はサブスクリプション情報のみとなります。(stripeの仕様のため）</p>
           </form>
           <br/>
+          <br/>
           <p>
             ご不明な場合などがありましたら、Supportチャットにてご連絡のほどお願いいたします。</p>
-          <br/>
-          <br/>
-          <a class="btn btn-primary"
-             href="{% url 'custom_auth_group:index' %}" role="button"
-             aria-expanded="false">ホームへ戻る</a>
         </div>
       </div>
     </div>
diff --git a/dsbd/templates/payment/payment.html b/dsbd/templates/payment/payment.html
index 550f01c..b80c5fb 100644
--- a/dsbd/templates/payment/payment.html
+++ b/dsbd/templates/payment/payment.html
@@ -4,7 +4,7 @@
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">会費のお支払い</h2>
+          <h2 class="card-title"><b>会費のお支払い</b></h2>
           <br/>
           <h5>会員種別: {{ group.get_membership_type_display }}</h5>
           {% if group.membership_expired_at and is_expired %}
diff --git a/dsbd/templates/service/index.html b/dsbd/templates/service/index.html
index fa78222..56a72b4 100644
--- a/dsbd/templates/service/index.html
+++ b/dsbd/templates/service/index.html
@@ -39,7 +39,7 @@
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2 class="card-title">Service</h2>
+          <h2 class="card-title"><b>サービス一覧</b></h2>
           {% if group_id %}
             <a href="/group/{{ group_id }}/service/add" type="button"
                class="btn btn-sm btn-primary">サービス登録
diff --git a/dsbd/templates/ticket/index.html b/dsbd/templates/ticket/index.html
index e3148e5..83ceff4 100644
--- a/dsbd/templates/ticket/index.html
+++ b/dsbd/templates/ticket/index.html
@@ -1,13 +1,19 @@
 {% extends 'base2.html' %}
+
 {% block content %}
   <div class="container">
     <div class="row">
       <div class="container py-4 mb-auto">
         <div class="h-900 p-2 rounded-3">
-          <h2>チケット一覧</h2>
+          <h2><b>チケット一覧</b></h2>
           <a class="btn btn-primary btn-sm" href="{% url 'ticket:add' %}"
              role="button"
              aria-expanded="false">チケット追加</a>
+          {% if is_admin_mode %}
+            <a class="btn btn-primary btn-sm" href="/custom_admin/ticket"
+               role="button"
+               aria-expanded="false">チケット追加(管理者モード)</a>
+          {% endif %}
           <div class="btn-group" role="group"
                aria-label="Basic mixed styles example">
             <a type="button"
diff --git a/dsbd/templatetags/extra.py b/dsbd/templatetags/extra.py
index d0778ea..77d1ace 100644
--- a/dsbd/templatetags/extra.py
+++ b/dsbd/templatetags/extra.py
@@ -7,12 +7,12 @@
 
 
 @register.simple_tag
-def markdown(value):
+def markdown(value) -> str:
     return md.markdown(value, extensions=["markdown.extensions.fenced_code"])
 
 
 @register.simple_tag
-def url_replace(request, **kwargs):
+def url_replace(request, **kwargs) -> str:
     params = request.GET.copy()
     for k, v in kwargs.items():
         params[k] = v
@@ -20,7 +20,7 @@ def url_replace(request, **kwargs):
 
 
 @register.simple_tag
-def time_to_str(time):
+def time_to_str(time) -> str:
     if time is None:
         return "無期限"
     time_format = "%Y/%m/%d %H:%M:%S"
@@ -28,48 +28,48 @@ def time_to_str(time):
 
 
 @register.simple_tag
-def to_int(value):
+def to_int(value) -> int:
     if not value:
         return None
     return int(value)
 
 
 @register.simple_tag
-def beta():
+def beta() -> bool:
     return settings.BETA
 
 
 @register.simple_tag
-def debug():
+def debug() -> bool:
     return settings.DEBUG
 
 
 @register.simple_tag
-def array_to_str(data):
+def array_to_str(data) -> str:
     return ", ".join(data)
 
 
 @register.simple_tag
-def get_version():
+def get_version() -> str:
     version = "develop"
     return version
 
 
 @register.simple_tag
-def get_usage_url():
+def get_usage_url() -> str:
     return settings.USAGE_URL
 
 
 @register.simple_tag
-def get_privacy_policy_url():
+def get_privacy_policy_url() -> str:
     return settings.PRIVACY_POLICY_URL
 
 
 @register.simple_tag
-def get_fee_url():
+def get_fee_url() -> str:
     return settings.FEE_URL
 
 
 @register.simple_tag
-def is_admin_mode():
+def is_admin_mode() -> bool:
     return settings.ADMIN_MODE

From c3f1614e7759c1327f7f58922f1c62a54092d58d Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Mon, 23 Sep 2024 18:32:52 +0900
Subject: [PATCH 34/36] =?UTF-8?q?#43=20=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pipfile.lock | 68 ++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 6c9f37c..d391ec9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -502,11 +502,11 @@
         },
         "setuptools": {
             "hashes": [
-                "sha256:25af69c809d9334cd8e653d385277abeb5a102dca255954005a7092d282575ea",
-                "sha256:791ae94f04f78c880b5e614e560dd32d4b4af5d151bd9e7483e3377846caf90a"
+                "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2",
+                "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==75.0.0"
+            "version": "==75.1.0"
         },
         "six": {
             "hashes": [
@@ -519,12 +519,12 @@
         },
         "slack-sdk": {
             "hashes": [
-                "sha256:af8fc4ef1d1cbcecd28d01acf6955a3bb5b13d56f0a43a1b1c7e3b212cc5ec5b",
-                "sha256:f35e85f2847e6c25cf7c2d1df206ca0ad75556263fb592457bf03cca68ef64bb"
+                "sha256:e328bb661d95db5f66b993b1d64288ac7c72201a745b4c7cf8848dafb7b74e40",
+                "sha256:ef93beec3ce9c8f64da02fd487598a05ec4bc9c92ceed58f122dbe632691cbe2"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==3.32.0"
+            "version": "==3.33.1"
         },
         "sqlparse": {
             "hashes": [
@@ -537,12 +537,12 @@
         },
         "stripe": {
             "hashes": [
-                "sha256:24300df559e547f58989e880c1f006460ed322d1c963d7b833562632b5eb956a",
-                "sha256:d18e1b498331fefd7738f7f72a8c0e852d7b933be9639604f81c8d575f44a1d7"
+                "sha256:0c79c1f3a844533c8d30cc283b43afb622aaa402539fca19167a9004fea3471c",
+                "sha256:5abec44548d3814bc1e070aa1852bcb3fc5cc029e947c0f733156eb1f8c87030"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==10.11.0"
+            "version": "==10.12.0"
         },
         "twisted": {
             "extras": [
@@ -636,11 +636,11 @@
         },
         "cattrs": {
             "hashes": [
-                "sha256:16e94a13f9aaf6438bd5be5df521e072b1b00481b4cf807bcb1acbd49f814c08",
-                "sha256:ec8ce8fdc725de9d07547cd616f968670687c6fa7a2e263b088370c46d834d97"
+                "sha256:67c7495b760168d931a10233f979b28dc04daf853b30752246f4f8471c6d68d0",
+                "sha256:8028cfe1ff5382df59dd36474a86e02d817b06eaf8af84555441bac915d2ef85"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==24.1.1"
+            "version": "==24.1.2"
         },
         "lsprotocol": {
             "hashes": [
@@ -668,37 +668,37 @@
         },
         "ruff": {
             "hashes": [
-                "sha256:005256d977021790cc52aa23d78f06bb5090dc0bfbd42de46d49c201533982ae",
-                "sha256:09c72a833fd3551135ceddcba5ebdb68ff89225d30758027280968c9acdc7810",
-                "sha256:381413ec47f71ce1d1c614f7779d88886f406f1fd53d289c77e4e533dc6ea200",
-                "sha256:3a8d42d11fff8d3143ff4da41742a98f8f233bf8890e9fe23077826818f8d680",
-                "sha256:3e42a57b58e3612051a636bc1ac4e6b838679530235520e8f095f7c44f706ff9",
-                "sha256:482c1e6bfeb615eafc5899127b805d28e387bd87db38b2c0c41d271f5e58d8cc",
-                "sha256:4d32d87fab433c0cf285c3683dd4dae63be05fd7a1d65b3f5bf7cdd05a6b96fb",
-                "sha256:51935067740773afdf97493ba9b8231279e9beef0f2a8079188c4776c25688e0",
-                "sha256:52e75a82bbc9b42e63c08d22ad0ac525117e72aee9729a069d7c4f235fc4d276",
-                "sha256:7291e64d7129f24d1b0c947ec3ec4c0076e958d1475c61202497c6aced35dd19",
-                "sha256:794ada3400a0d0b89e3015f1a7e01f4c97320ac665b7bc3ade24b50b54cb2972",
-                "sha256:7e4e308f16e07c95fc7753fc1aaac690a323b2bb9f4ec5e844a97bb7fbebd748",
-                "sha256:800c50371bdcb99b3c1551d5691e14d16d6f07063a518770254227f7f6e8c178",
-                "sha256:8e25ddd9cd63ba1f3bd51c1f09903904a6adf8429df34f17d728a8fa11174253",
-                "sha256:932cd69eefe4daf8c7d92bd6689f7e8182571cb934ea720af218929da7bd7d69",
-                "sha256:9ad7dfbd138d09d9a7e6931e6a7e797651ce29becd688be8a0d4d5f8177b4b0c",
-                "sha256:a50af6e828ee692fb10ff2dfe53f05caecf077f4210fae9677e06a808275754f",
-                "sha256:cf4d3fa53644137f6a4a27a2b397381d16454a1566ae5335855c187fbf67e4f5"
+                "sha256:02b083770e4cdb1495ed313f5694c62808e71764ec6ee5db84eedd82fd32d8f5",
+                "sha256:08277b217534bfdcc2e1377f7f933e1c7957453e8a79764d004e44c40db923f2",
+                "sha256:0c05fd37013de36dfa883a3854fae57b3113aaa8abf5dea79202675991d48624",
+                "sha256:17a86aac6f915932d259f7bec79173e356165518859f94649d8c50b81ff087e9",
+                "sha256:2f0b62056246234d59cbf2ea66e84812dc9ec4540518e37553513392c171cb18",
+                "sha256:44e52129d82266fa59b587e2cd74def5637b730a69c4542525dfdecfaae38bd5",
+                "sha256:525201b77f94d2b54868f0cbe5edc018e64c22563da6c5c2e5c107a4e85c1c0d",
+                "sha256:533d66b7774ef224e7cf91506a7dafcc9e8ec7c059263ec46629e54e7b1f90ab",
+                "sha256:590445eec5653f36248584579c06252ad2e110a5d1f32db5420de35fb0e1c977",
+                "sha256:6b1462fa56c832dc0cea5b4041cfc9c97813505d11cce74ebc6d1aae068de36b",
+                "sha256:8854450839f339e1049fdbe15d875384242b8e85d5c6947bb2faad33c651020b",
+                "sha256:9ba4efe5c6dbbb58be58dd83feedb83b5e95c00091bf09987b4baf510fee5c99",
+                "sha256:a0e1655868164e114ba43a908fd2d64a271a23660195017c17691fb6355d59bb",
+                "sha256:a939ca435b49f6966a7dd64b765c9df16f1faed0ca3b6f16acdf7731969deb35",
+                "sha256:b28f0d5e2f771c1fe3c7a45d3f53916fc74a480698c4b5731f0bea61e52137c8",
+                "sha256:b3f8822defd260ae2460ea3832b24d37d203c3577f48b055590a426a722d50ef",
+                "sha256:c6707a32e03b791f4448dc0dce24b636cbcdee4dd5607adc24e5ee73fd86c00a",
+                "sha256:f49c9caa28d9bbfac4a637ae10327b3db00f47d038f3fbb2195c4d682e925b14"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==0.6.5"
+            "version": "==0.6.7"
         },
         "ruff-lsp": {
             "hashes": [
-                "sha256:5d2622d22032944d54b0a0e84e16048d081d3c8716bf2bac5a155227ffe1d78a",
-                "sha256:96b2bea6e3cae75ad40bf470041cbeb06c0125a228e05d3aef47b8622a38b900"
+                "sha256:0b63007c415a85200a18815a1367f207ceba51a20653b2a7bc63fe6cb4925cb5",
+                "sha256:559b72ba460d0b90aab66ca11785b90ad8c6931509eb56db7dea2a8922bf41a8"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==0.0.56"
+            "version": "==0.0.57"
         },
         "typing-extensions": {
             "hashes": [

From 4c8d41fb498ded80d9ddeb1175673322104bd4e2 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sat, 23 Nov 2024 19:05:35 +0900
Subject: [PATCH 35/36] =?UTF-8?q?#43=20=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pipfile      |   6 +-
 Pipfile.lock | 463 ++++++++++++++++++++++++++-------------------------
 2 files changed, 243 insertions(+), 226 deletions(-)

diff --git a/Pipfile b/Pipfile
index 14893a3..8106717 100644
--- a/Pipfile
+++ b/Pipfile
@@ -16,7 +16,7 @@ constantly = "==23.*"
 cryptography = "==43.*"
 daphne = "==4.*"
 django = "==5.*"
-django-auth-ldap = "==4.*"
+django-auth-ldap = "==5.*"
 django-countries = "==7.*"
 django-debug-toolbar = "==4.*"
 django-qrcode = "==0.*"
@@ -34,13 +34,13 @@ pyotp = "==2.9.0"
 pypng = "==0.20220715.0"
 python-ldap = "==3.*"
 pytz = "==2024.*"
-qrcode = "==7.*"
+qrcode = "==8.*"
 requests = "==2.*"
 service-identity = "==24.*"
 six = "==1.*"
 slack-sdk = "==3.*"
 sqlparse = "==0.*"
-stripe = "==10.*"
+stripe = "==11.*"
 twisted = "==24.*"
 txaio = "==23.*"
 typing-extensions = "==4.*"
diff --git a/Pipfile.lock b/Pipfile.lock
index d391ec9..27d423f 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "acd94fdedbf8620e3e75cfc8125feb96f1376853e081750056fe48460d2a81e5"
+            "sha256": "a6791c2fbcc79e01494268cc4a75ba2302c2738dfb33e4616008c9f8d1980528"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -137,109 +137,124 @@
         },
         "channels": {
             "hashes": [
-                "sha256:a3c4419307f582c3f71d67bfb6eff748ae819c2f360b9b141694d84f242baa48",
-                "sha256:e0ed375719f5c1851861f05ed4ce78b0166f9245ca0ecd836cb77d4bb531489d"
+                "sha256:6b75bc8d6888fb7236e7e7bf1948520b72d296ad08216a242fc56b1db0ffde1a",
+                "sha256:d9e707487431ba5dbce9af982970dab3b0efd786580fadb99e45dca5e39fdd59"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.1.0"
+            "version": "==4.2.0"
         },
         "charset-normalizer": {
             "hashes": [
-                "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
-                "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
-                "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
-                "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
-                "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
-                "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
-                "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
-                "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
-                "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
-                "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
-                "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
-                "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
-                "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
-                "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
-                "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
-                "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
-                "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
-                "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
-                "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
-                "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
-                "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
-                "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
-                "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
-                "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
-                "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
-                "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
-                "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
-                "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
-                "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
-                "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
-                "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
-                "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
-                "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
-                "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
-                "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
-                "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
-                "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
-                "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
-                "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
-                "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
-                "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
-                "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
-                "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
-                "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
-                "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
-                "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
-                "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
-                "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
-                "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
-                "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
-                "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
-                "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
-                "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
-                "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
-                "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
-                "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
-                "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
-                "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
-                "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
-                "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
-                "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
-                "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
-                "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
-                "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
-                "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
-                "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
-                "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
-                "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
-                "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
-                "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
-                "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
-                "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
-                "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
-                "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
-                "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
-                "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
-                "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
-                "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
-                "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
-                "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
-                "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
-                "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
-                "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
-                "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
-                "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
-                "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
-                "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
-                "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
-                "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
-                "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
+                "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621",
+                "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6",
+                "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8",
+                "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912",
+                "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c",
+                "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b",
+                "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d",
+                "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d",
+                "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95",
+                "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e",
+                "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565",
+                "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64",
+                "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab",
+                "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be",
+                "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e",
+                "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907",
+                "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0",
+                "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2",
+                "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62",
+                "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62",
+                "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23",
+                "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc",
+                "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284",
+                "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca",
+                "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455",
+                "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858",
+                "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b",
+                "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594",
+                "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc",
+                "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db",
+                "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b",
+                "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea",
+                "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6",
+                "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920",
+                "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749",
+                "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7",
+                "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd",
+                "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99",
+                "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242",
+                "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee",
+                "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129",
+                "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2",
+                "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51",
+                "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee",
+                "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8",
+                "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b",
+                "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613",
+                "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742",
+                "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe",
+                "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3",
+                "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5",
+                "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631",
+                "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7",
+                "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15",
+                "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c",
+                "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea",
+                "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417",
+                "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250",
+                "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88",
+                "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca",
+                "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa",
+                "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99",
+                "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149",
+                "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41",
+                "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574",
+                "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0",
+                "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f",
+                "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d",
+                "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654",
+                "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3",
+                "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19",
+                "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90",
+                "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578",
+                "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9",
+                "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1",
+                "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51",
+                "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719",
+                "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236",
+                "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a",
+                "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c",
+                "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade",
+                "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944",
+                "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc",
+                "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6",
+                "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6",
+                "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27",
+                "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6",
+                "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2",
+                "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12",
+                "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf",
+                "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114",
+                "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7",
+                "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf",
+                "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d",
+                "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b",
+                "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed",
+                "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03",
+                "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4",
+                "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67",
+                "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365",
+                "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a",
+                "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748",
+                "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b",
+                "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079",
+                "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482"
             ],
             "index": "pypi",
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==3.3.2"
+            "version": "==3.4.0"
         },
         "constantly": {
             "hashes": [
@@ -252,37 +267,37 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494",
-                "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806",
-                "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d",
-                "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062",
-                "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2",
-                "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4",
-                "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1",
-                "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85",
-                "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84",
-                "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042",
-                "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d",
-                "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962",
-                "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2",
-                "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa",
-                "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d",
-                "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365",
-                "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96",
-                "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47",
-                "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d",
-                "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d",
-                "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c",
-                "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb",
-                "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277",
-                "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172",
-                "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034",
-                "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a",
-                "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289"
+                "sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362",
+                "sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4",
+                "sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa",
+                "sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83",
+                "sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff",
+                "sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805",
+                "sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6",
+                "sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664",
+                "sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08",
+                "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e",
+                "sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18",
+                "sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f",
+                "sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73",
+                "sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5",
+                "sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984",
+                "sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd",
+                "sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3",
+                "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e",
+                "sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405",
+                "sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2",
+                "sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c",
+                "sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995",
+                "sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73",
+                "sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16",
+                "sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7",
+                "sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd",
+                "sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==43.0.1"
+            "version": "==43.0.3"
         },
         "daphne": {
             "hashes": [
@@ -295,21 +310,21 @@
         },
         "django": {
             "hashes": [
-                "sha256:021ffb7fdab3d2d388bc8c7c2434eb9c1f6f4d09e6119010bbb1694dda286bc2",
-                "sha256:71603f27dac22a6533fb38d83072eea9ddb4017fead6f67f2562a40402d61c3f"
+                "sha256:8b38a9a12da3ae00cb0ba72da985ec4b14de6345046b1e174b1fd7254398f818",
+                "sha256:c0fa0e619c39325a169208caef234f90baa925227032ad3f44842ba14d75234a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.10'",
-            "version": "==5.1.1"
+            "version": "==5.1.3"
         },
         "django-auth-ldap": {
             "hashes": [
-                "sha256:4b4b944f3c28bce362f33fb6e8db68429ed8fd8f12f0c0c4b1a4344a7ef225ce",
-                "sha256:604250938ddc9fda619f247c7a59b0b2f06e53a7d3f46a156f28aa30dd71a738"
+                "sha256:9c607e8d9c53cf2a0ccafbe0acfc33eb1d1fd474c46ec52d30aee0dca1da9668",
+                "sha256:a5f7bdb54b2ab80e4e9eb080cd3e06e89e4c9d2d534ddb39b66cd970dd6d3536"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==4.8.0"
+            "markers": "python_version >= '3.9'",
+            "version": "==5.1.0"
         },
         "django-countries": {
             "hashes": [
@@ -390,19 +405,18 @@
         },
         "mysqlclient": {
             "hashes": [
-                "sha256:329e4eec086a2336fe3541f1ce095d87a6f169d1cc8ba7b04ac68bcb234c9711",
-                "sha256:33bc9fb3464e7d7c10b1eaf7336c5ff8f2a3d3b88bab432116ad2490beb3bf41",
-                "sha256:3c318755e06df599338dad7625f884b8a71fcf322a9939ef78c9b3db93e1de7a",
-                "sha256:4e80dcad884dd6e14949ac6daf769123223a52a6805345608bf49cdaf7bc8b3a",
-                "sha256:9d3310295cb682232cadc28abd172f406c718b9ada41d2371259098ae37779d3",
-                "sha256:9d4c015480c4a6b2b1602eccd9846103fc70606244788d04aa14b31c4bd1f0e2",
-                "sha256:ac44777eab0a66c14cb0d38965572f762e193ec2e5c0723bcd11319cc5b693c5",
-                "sha256:d43987bb9626096a302ca6ddcdd81feaeca65ced1d5fe892a6a66b808326aa54",
-                "sha256:e1ebe3f41d152d7cb7c265349fdb7f1eca86ccb0ca24a90036cde48e00ceb2ab"
+                "sha256:3da70a07753ba6be881f7d75e795e254f6a0c12795778034acc69769b0649d37",
+                "sha256:43c5b30be0675080b9c815f457d73397f0442173e7be83d089b126835e2617ae",
+                "sha256:794857bce4f9a1903a99786dd29ad7887f45a870b3d11585b8c51c4a753c4174",
+                "sha256:b0a5cddf1d3488b254605041070086cac743401d876a659a72d706a0d89c8ebb",
+                "sha256:c0b46d9b78b461dbb62482089ca8040fa916595b1b30f831ebbd1b0a82b43d53",
+                "sha256:e940b41d85dfd7b190fa47d52f525f878cfa203d4653bf6a35b271b3c3be125b",
+                "sha256:e94a92858203d97fd584bdb6d7ee8c56f2590db8d77fd44215c0dcf5e739bc37",
+                "sha256:f3efb849d6f7ef4b9788a0eda2e896b975e0ebf1d6bf3dcabea63fd698e5b0b5"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.4"
+            "version": "==2.2.6"
         },
         "pyasn1": {
             "hashes": [
@@ -475,12 +489,12 @@
         },
         "qrcode": {
             "hashes": [
-                "sha256:581dca7a029bcb2deef5d01068e39093e80ef00b4a61098a2182eac59d01643a",
-                "sha256:9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845"
+                "sha256:025ce2b150f7fe4296d116ee9bad455a6643ab4f6e7dce541613a4758cbce347",
+                "sha256:9fc05f03305ad27a709eb742cf3097fa19e6f6f93bb9e2f039c0979190f6f1b1"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==7.4.2"
+            "markers": "python_version >= '3.9' and python_version < '4.0'",
+            "version": "==8.0"
         },
         "requests": {
             "hashes": [
@@ -493,20 +507,20 @@
         },
         "service-identity": {
             "hashes": [
-                "sha256:6829c9d62fb832c2e1c435629b0a8c476e1929881f28bee4d20bc24161009221",
-                "sha256:a28caf8130c8a5c1c7a6f5293faaf239bbfb7751e4862436920ee6f2616f568a"
+                "sha256:6b047fbd8a84fd0bb0d55ebce4031e400562b9196e1e0d3e0fe2b8a59f6d4a85",
+                "sha256:b8683ba13f0d39c6cd5d625d2c5f65421d6d707b013b375c355751557cbe8e09"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==24.1.0"
+            "version": "==24.2.0"
         },
         "setuptools": {
             "hashes": [
-                "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2",
-                "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"
+                "sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6",
+                "sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==75.1.0"
+            "markers": "python_version >= '3.9'",
+            "version": "==75.6.0"
         },
         "six": {
             "hashes": [
@@ -519,42 +533,42 @@
         },
         "slack-sdk": {
             "hashes": [
-                "sha256:e328bb661d95db5f66b993b1d64288ac7c72201a745b4c7cf8848dafb7b74e40",
-                "sha256:ef93beec3ce9c8f64da02fd487598a05ec4bc9c92ceed58f122dbe632691cbe2"
+                "sha256:5e109847f6b6a22d227609226ba4ed936109dc00675bddeb7e0bee502d3ee7e0",
+                "sha256:9f30cb3c9c07b441c49d53fc27f9f1837ad1592a7e9d4ca431f53cdad8826cc6"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==3.33.1"
+            "version": "==3.33.4"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4",
-                "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"
+                "sha256:9e37b35e16d1cc652a2545f0997c1deb23ea28fa1f3eefe609eee3063c3b105f",
+                "sha256:e99bc85c78160918c3e1d9230834ab8d80fc06c59d03f8db2618f65f65dda55e"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==0.5.1"
+            "version": "==0.5.2"
         },
         "stripe": {
             "hashes": [
-                "sha256:0c79c1f3a844533c8d30cc283b43afb622aaa402539fca19167a9004fea3471c",
-                "sha256:5abec44548d3814bc1e070aa1852bcb3fc5cc029e947c0f733156eb1f8c87030"
+                "sha256:98e625d9ddbabcecf02666867169696e113d9eaba27979fb310a7a8dfd44097c",
+                "sha256:9d2e86943e1e4f325835d3860c4f58aa98d49229c9caf67588f9f9b2451e8e56"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==10.12.0"
+            "version": "==11.3.0"
         },
         "twisted": {
             "extras": [
                 "tls"
             ],
             "hashes": [
-                "sha256:5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394",
-                "sha256:734832ef98108136e222b5230075b1079dad8a3fc5637319615619a7725b0c81"
+                "sha256:02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e",
+                "sha256:67aa7c8aa94387385302acf44ade12967c747858c8bcce0f11d38077a11c5326"
             ],
             "index": "pypi",
             "markers": "python_full_version >= '3.8.0'",
-            "version": "==24.7.0"
+            "version": "==24.10.0"
         },
         "txaio": {
             "hashes": [
@@ -585,43 +599,46 @@
         },
         "zope.interface": {
             "hashes": [
-                "sha256:01e6e58078ad2799130c14a1d34ec89044ada0e1495329d72ee0407b9ae5100d",
-                "sha256:064ade95cb54c840647205987c7b557f75d2b2f7d1a84bfab4cf81822ef6e7d1",
-                "sha256:11fa1382c3efb34abf16becff8cb214b0b2e3144057c90611621f2d186b7e1b7",
-                "sha256:1bee1b722077d08721005e8da493ef3adf0b7908e0cd85cc7dc836ac117d6f32",
-                "sha256:1eeeb92cb7d95c45e726e3c1afe7707919370addae7ed14f614e22217a536958",
-                "sha256:21a207c6b2c58def5011768140861a73f5240f4f39800625072ba84e76c9da0b",
-                "sha256:2545d6d7aac425d528cd9bf0d9e55fcd47ab7fd15f41a64b1c4bf4c6b24946dc",
-                "sha256:2c4316a30e216f51acbd9fb318aa5af2e362b716596d82cbb92f9101c8f8d2e7",
-                "sha256:35062d93bc49bd9b191331c897a96155ffdad10744ab812485b6bad5b588d7e4",
-                "sha256:382d31d1e68877061daaa6499468e9eb38eb7625d4369b1615ac08d3860fe896",
-                "sha256:3aa8fcbb0d3c2be1bfd013a0f0acd636f6ed570c287743ae2bbd467ee967154d",
-                "sha256:3d4b91821305c8d8f6e6207639abcbdaf186db682e521af7855d0bea3047c8ca",
-                "sha256:3de1d553ce72868b77a7e9d598c9bff6d3816ad2b4cc81c04f9d8914603814f3",
-                "sha256:3fcdc76d0cde1c09c37b7c6b0f8beba2d857d8417b055d4f47df9c34ec518bdd",
-                "sha256:5112c530fa8aa2108a3196b9c2f078f5738c1c37cfc716970edc0df0414acda8",
-                "sha256:53d678bb1c3b784edbfb0adeebfeea6bf479f54da082854406a8f295d36f8386",
-                "sha256:6195c3c03fef9f87c0dbee0b3b6451df6e056322463cf35bca9a088e564a3c58",
-                "sha256:6d04b11ea47c9c369d66340dbe51e9031df2a0de97d68f442305ed7625ad6493",
-                "sha256:6dd647fcd765030638577fe6984284e0ebba1a1008244c8a38824be096e37fe3",
-                "sha256:799ef7a444aebbad5a145c3b34bff012b54453cddbde3332d47ca07225792ea4",
-                "sha256:7d92920416f31786bc1b2f34cc4fc4263a35a407425319572cbf96b51e835cd3",
-                "sha256:7e0c151a6c204f3830237c59ee4770cc346868a7a1af6925e5e38650141a7f05",
-                "sha256:84f8794bd59ca7d09d8fce43ae1b571be22f52748169d01a13d3ece8394d8b5b",
-                "sha256:95e5913ec718010dc0e7c215d79a9683b4990e7026828eedfda5268e74e73e11",
-                "sha256:9b9369671a20b8d039b8e5a1a33abd12e089e319a3383b4cc0bf5c67bd05fe7b",
-                "sha256:ab985c566a99cc5f73bc2741d93f1ed24a2cc9da3890144d37b9582965aff996",
-                "sha256:af94e429f9d57b36e71ef4e6865182090648aada0cb2d397ae2b3f7fc478493a",
-                "sha256:c96b3e6b0d4f6ddfec4e947130ec30bd2c7b19db6aa633777e46c8eecf1d6afd",
-                "sha256:cd2690d4b08ec9eaf47a85914fe513062b20da78d10d6d789a792c0b20307fb1",
-                "sha256:d3b7ce6d46fb0e60897d62d1ff370790ce50a57d40a651db91a3dde74f73b738",
-                "sha256:d976fa7b5faf5396eb18ce6c132c98e05504b52b60784e3401f4ef0b2e66709b",
-                "sha256:db6237e8fa91ea4f34d7e2d16d74741187e9105a63bbb5686c61fea04cdbacca",
-                "sha256:ecd32f30f40bfd8511b17666895831a51b532e93fc106bfa97f366589d3e4e0e",
-                "sha256:f418c88f09c3ba159b95a9d1cfcdbe58f208443abb1f3109f4b9b12fd60b187c"
+                "sha256:0de23bcb93401994ea00bc5c677ef06d420340ac0a4e9c10d80e047b9ce5af3f",
+                "sha256:179ad46ece518c9084cb272e4a69d266b659f7f8f48e51706746c2d8a426433e",
+                "sha256:190eeec67e023d5aac54d183fa145db0b898664234234ac54643a441da434616",
+                "sha256:1a2ed0852c25950cf430067f058f8d98df6288502ac313861d9803fe7691a9b3",
+                "sha256:1c4e1b4c06d9abd1037c088dae1566c85f344a3e6ae4350744c3f7f7259d9c67",
+                "sha256:1d0e23c6b746eb8ce04573cc47bcac60961ac138885d207bd6f57e27a1431ae8",
+                "sha256:2317e1d4dba68203a5227ea3057f9078ec9376275f9700086b8f0ffc0b358e1b",
+                "sha256:2d553e02b68c0ea5a226855f02edbc9eefd99f6a8886fa9f9bdf999d77f46585",
+                "sha256:3603ef82a9920bd0bfb505423cb7e937498ad971ad5a6141841e8f76d2fd5446",
+                "sha256:3defc925c4b22ac1272d544a49c6ba04c3eefcce3200319ee1be03d9270306dd",
+                "sha256:3e59f175e868f856a77c0a77ba001385c377df2104fdbda6b9f99456a01e102a",
+                "sha256:4284d664ef0ff7b709836d4de7b13d80873dc5faeffc073abdb280058bfac5e3",
+                "sha256:55c373becbd36a44d0c9be1d5271422fdaa8562d158fb44b4192297b3c67096c",
+                "sha256:5836b8fb044c6e75ba34dfaabc602493019eadfa0faf6ff25f4c4c356a71a853",
+                "sha256:5cdb7e7e5524b76d3ec037c1d81a9e2c7457b240fd4cb0a2476b65c3a5a6c81f",
+                "sha256:6650bd56ef350d37c8baccfd3ee8a0483ed6f8666e641e4b9ae1a1827b79f9e5",
+                "sha256:7395f13533318f150ee72adb55b29284b16e73b6d5f02ab21f173b3e83f242b8",
+                "sha256:7720322763aceb5e0a7cadcc38c67b839efe599f0887cbf6c003c55b1458c501",
+                "sha256:7cd5e3d910ac87652a09f6e5db8e41bc3b49cf08ddd2d73d30afc644801492cd",
+                "sha256:81744a7e61b598ebcf4722ac56a7a4f50502432b5b4dc7eb29075a89cf82d029",
+                "sha256:84e87eba6b77a3af187bae82d8de1a7c208c2a04ec9f6bd444fd091b811ad92e",
+                "sha256:8d0fe45be57b5219aa4b96e846631c04615d5ef068146de5a02ccd15c185321f",
+                "sha256:9595e478047ce752b35cfa221d7601a5283ccdaab40422e0dc1d4a334c70f580",
+                "sha256:99c14f0727c978639139e6cad7a60e82b7720922678d75aacb90cf4ef74a068c",
+                "sha256:9b1eed7670d564f1025d7cda89f99f216c30210e42e95de466135be0b4a499d9",
+                "sha256:9fad9bd5502221ab179f13ea251cb30eef7cf65023156967f86673aff54b53a0",
+                "sha256:ad339509dcfbbc99bf8e147db6686249c4032f26586699ec4c82f6e5909c9fe2",
+                "sha256:bcbeb44fc16e0078b3b68a95e43f821ae34dcbf976dde6985141838a5f23dd3d",
+                "sha256:c8e7b05dc6315a193cceaec071cc3cf1c180cea28808ccded0b1283f1c38ba73",
+                "sha256:ca95594d936ee349620900be5b46c0122a1ff6ce42d7d5cb2cf09dc84071ef16",
+                "sha256:d029fac6a80edae80f79c37e5e3abfa92968fe921886139b3ee470a1b177321a",
+                "sha256:d17e7fc814eaab93409b80819fd6d30342844345c27f3bc3c4b43c2425a8d267",
+                "sha256:d6821ef9870f32154da873fcde439274f99814ea452dd16b99fa0b66345c4b6b",
+                "sha256:e6503534b52bb1720ace9366ee30838a58a3413d3e197512f3338c8f34b5d89d",
+                "sha256:ed1df8cc01dd1e3970666a7370b8bfc7457371c58ba88c57bd5bca17ab198053",
+                "sha256:f1d52d052355e0c5c89e0630dd2ff7c0b823fd5f56286a663e92444761b35e25",
+                "sha256:f85b290e5b8b11814efb0d004d8ce6c9a483c35c462e8d9bf84abb93e79fa770"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==7.0.3"
+            "version": "==7.1.1"
         }
     },
     "develop": {
@@ -652,11 +669,11 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
-                "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
+                "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
+                "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==24.1"
+            "version": "==24.2"
         },
         "pygls": {
             "hashes": [
@@ -668,37 +685,37 @@
         },
         "ruff": {
             "hashes": [
-                "sha256:02b083770e4cdb1495ed313f5694c62808e71764ec6ee5db84eedd82fd32d8f5",
-                "sha256:08277b217534bfdcc2e1377f7f933e1c7957453e8a79764d004e44c40db923f2",
-                "sha256:0c05fd37013de36dfa883a3854fae57b3113aaa8abf5dea79202675991d48624",
-                "sha256:17a86aac6f915932d259f7bec79173e356165518859f94649d8c50b81ff087e9",
-                "sha256:2f0b62056246234d59cbf2ea66e84812dc9ec4540518e37553513392c171cb18",
-                "sha256:44e52129d82266fa59b587e2cd74def5637b730a69c4542525dfdecfaae38bd5",
-                "sha256:525201b77f94d2b54868f0cbe5edc018e64c22563da6c5c2e5c107a4e85c1c0d",
-                "sha256:533d66b7774ef224e7cf91506a7dafcc9e8ec7c059263ec46629e54e7b1f90ab",
-                "sha256:590445eec5653f36248584579c06252ad2e110a5d1f32db5420de35fb0e1c977",
-                "sha256:6b1462fa56c832dc0cea5b4041cfc9c97813505d11cce74ebc6d1aae068de36b",
-                "sha256:8854450839f339e1049fdbe15d875384242b8e85d5c6947bb2faad33c651020b",
-                "sha256:9ba4efe5c6dbbb58be58dd83feedb83b5e95c00091bf09987b4baf510fee5c99",
-                "sha256:a0e1655868164e114ba43a908fd2d64a271a23660195017c17691fb6355d59bb",
-                "sha256:a939ca435b49f6966a7dd64b765c9df16f1faed0ca3b6f16acdf7731969deb35",
-                "sha256:b28f0d5e2f771c1fe3c7a45d3f53916fc74a480698c4b5731f0bea61e52137c8",
-                "sha256:b3f8822defd260ae2460ea3832b24d37d203c3577f48b055590a426a722d50ef",
-                "sha256:c6707a32e03b791f4448dc0dce24b636cbcdee4dd5607adc24e5ee73fd86c00a",
-                "sha256:f49c9caa28d9bbfac4a637ae10327b3db00f47d038f3fbb2195c4d682e925b14"
+                "sha256:0e55cce9aa93c5d0d4e3937e47b169035c7e91c8655b0974e61bb79cf398d49c",
+                "sha256:295bb4c02d58ff2ef4378a1870c20af30723013f441c9d1637a008baaf928c8b",
+                "sha256:2dabfd05b96b7b8f2da00d53c514eea842bff83e41e1cceb08ae1966254a51df",
+                "sha256:3f4cd64916d8e732ce6b87f3f5296a8942d285bbbc161acee7fe561134af64f9",
+                "sha256:582891c57b96228d146725975fbb942e1f30a0c4ba19722e692ca3eb25cc9b4f",
+                "sha256:5fdb6efecc3eb60bba5819679466471fd7d13c53487df7248d6e27146e985468",
+                "sha256:780d5d8523c04202184405e60c98d7595bdb498c3c6abba3b6d4cdf2ca2af426",
+                "sha256:7b1f1c76b47c18fa92ee78b60d2d20d7e866c55ee603e7d19c1e991fad933a9a",
+                "sha256:812e2052121634cf13cd6fddf0c1871d0ead1aad40a1a258753c04c18bb71bbd",
+                "sha256:83a55679c4cb449fa527b8497cadf54f076603cc36779b2170b24f704171ce70",
+                "sha256:85e654f0ded7befe2d61eeaf3d3b1e4ef3894469cd664ffa85006c7720f1e4a2",
+                "sha256:87a8e86bae0dbd749c815211ca11e3a7bd559b9710746c559ed63106d382bd9c",
+                "sha256:a7ccfe6331bf8c8dad715753e157457faf7351c2b69f62f32c165c2dbcbacd44",
+                "sha256:ba93e6294e9a737cd726b74b09a6972e36bb511f9a102f1d9a7e1ce94dd206a6",
+                "sha256:c5c1466be2a2ebdf7c5450dd5d980cc87c8ba6976fb82582fea18823da6fa362",
+                "sha256:eb0d4f250a7711b67ad513fde67e8870109e5ce590a801c3722580fe98c33a99",
+                "sha256:facebdfe5a5af6b1588a1d26d170635ead6892d0e314477e80256ef4a8470cf3",
+                "sha256:fcb1bf2cc6706adae9d79c8d86478677e3bbd4ced796ccad106fd4776d395fea"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==0.6.7"
+            "version": "==0.8.0"
         },
         "ruff-lsp": {
             "hashes": [
-                "sha256:0b63007c415a85200a18815a1367f207ceba51a20653b2a7bc63fe6cb4925cb5",
-                "sha256:559b72ba460d0b90aab66ca11785b90ad8c6931509eb56db7dea2a8922bf41a8"
+                "sha256:16a094b9566f9e2c8a22183313f1439b4007f6fc2b747c80ac3874dfe8c348b3",
+                "sha256:340a9d42b6fbdbc09f6a5c6d641bd4fa1e7f51868427467109a1331955c52754"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==0.0.57"
+            "version": "==0.0.59"
         },
         "typing-extensions": {
             "hashes": [

From de6f31a1da4bdf19d8e6846de3451525c83c3106 Mon Sep 17 00:00:00 2001
From: yoneyan <contact@yoneyan.net>
Date: Sat, 21 Dec 2024 15:22:58 +0900
Subject: [PATCH 36/36] =?UTF-8?q?#43=20pip=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pipfile.lock | 178 +++++++++++++++++++++++++--------------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 27d423f..5fd4725 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -27,12 +27,12 @@
         },
         "attrs": {
             "hashes": [
-                "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
-                "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"
+                "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff",
+                "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==24.2.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==24.3.0"
         },
         "autobahn": {
             "hashes": [
@@ -54,12 +54,12 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
-                "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
+                "sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56",
+                "sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==2024.8.30"
+            "version": "==2024.12.14"
         },
         "cffi": {
             "hashes": [
@@ -310,12 +310,12 @@
         },
         "django": {
             "hashes": [
-                "sha256:8b38a9a12da3ae00cb0ba72da985ec4b14de6345046b1e174b1fd7254398f818",
-                "sha256:c0fa0e619c39325a169208caef234f90baa925227032ad3f44842ba14d75234a"
+                "sha256:236e023f021f5ce7dee5779de7b286565fdea5f4ab86bae5338e3f7b69896cf0",
+                "sha256:de450c09e91879fa5a307f696e57c851955c910a438a35e6b4c895e86bedc82a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.10'",
-            "version": "==5.1.3"
+            "version": "==5.1.4"
         },
         "django-auth-ldap": {
             "hashes": [
@@ -447,12 +447,12 @@
         },
         "pyopenssl": {
             "hashes": [
-                "sha256:4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95",
-                "sha256:967d5719b12b243588573f39b0c677637145c7a1ffedcd495a487e58177fbb8d"
+                "sha256:49f7a019577d834746bc55c5fce6ecbcec0f2b4ec5ce1cf43a9a173b8138bb36",
+                "sha256:e474f5a473cd7f92221cc04976e48f4d11502804657a08a989fb3be5514c904a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==24.2.1"
+            "version": "==24.3.0"
         },
         "pyotp": {
             "hashes": [
@@ -524,51 +524,51 @@
         },
         "six": {
             "hashes": [
-                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
+                "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274",
+                "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"
             ],
             "index": "pypi",
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.16.0"
+            "version": "==1.17.0"
         },
         "slack-sdk": {
             "hashes": [
-                "sha256:5e109847f6b6a22d227609226ba4ed936109dc00675bddeb7e0bee502d3ee7e0",
-                "sha256:9f30cb3c9c07b441c49d53fc27f9f1837ad1592a7e9d4ca431f53cdad8826cc6"
+                "sha256:c61f57f310d85be83466db5a98ab6ae3bb2e5587437b54fa0daa8fae6a0feffa",
+                "sha256:ff61db7012160eed742285ea91f11c72b7a38a6500a7f6c5335662b4bc6b853d"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==3.33.4"
+            "version": "==3.34.0"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:9e37b35e16d1cc652a2545f0997c1deb23ea28fa1f3eefe609eee3063c3b105f",
-                "sha256:e99bc85c78160918c3e1d9230834ab8d80fc06c59d03f8db2618f65f65dda55e"
+                "sha256:09f67787f56a0b16ecdbde1bfc7f5d9c3371ca683cfeaa8e6ff60b4807ec9272",
+                "sha256:cf2196ed3418f3ba5de6af7e82c694a9fbdbfecccdfc72e281548517081f16ca"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==0.5.2"
+            "version": "==0.5.3"
         },
         "stripe": {
             "hashes": [
-                "sha256:98e625d9ddbabcecf02666867169696e113d9eaba27979fb310a7a8dfd44097c",
-                "sha256:9d2e86943e1e4f325835d3860c4f58aa98d49229c9caf67588f9f9b2451e8e56"
+                "sha256:7ddd251b622d490fe57d78487855dc9f4d95b1bb113607e81fd377037a133d5a",
+                "sha256:8aa47a241de0355c383c916c4ef7273ab666f096a44ee7081e357db4a36f0cce"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.6'",
-            "version": "==11.3.0"
+            "version": "==11.4.1"
         },
         "twisted": {
             "extras": [
                 "tls"
             ],
             "hashes": [
-                "sha256:02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e",
-                "sha256:67aa7c8aa94387385302acf44ade12967c747858c8bcce0f11d38077a11c5326"
+                "sha256:695d0556d5ec579dcc464d2856b634880ed1319f45b10d19043f2b57eb0115b5",
+                "sha256:fe403076c71f04d5d2d789a755b687c5637ec3bcd3b2b8252d76f2ba65f54261"
             ],
             "index": "pypi",
             "markers": "python_full_version >= '3.8.0'",
-            "version": "==24.10.0"
+            "version": "==24.11.0"
         },
         "txaio": {
             "hashes": [
@@ -599,57 +599,57 @@
         },
         "zope.interface": {
             "hashes": [
-                "sha256:0de23bcb93401994ea00bc5c677ef06d420340ac0a4e9c10d80e047b9ce5af3f",
-                "sha256:179ad46ece518c9084cb272e4a69d266b659f7f8f48e51706746c2d8a426433e",
-                "sha256:190eeec67e023d5aac54d183fa145db0b898664234234ac54643a441da434616",
-                "sha256:1a2ed0852c25950cf430067f058f8d98df6288502ac313861d9803fe7691a9b3",
-                "sha256:1c4e1b4c06d9abd1037c088dae1566c85f344a3e6ae4350744c3f7f7259d9c67",
-                "sha256:1d0e23c6b746eb8ce04573cc47bcac60961ac138885d207bd6f57e27a1431ae8",
-                "sha256:2317e1d4dba68203a5227ea3057f9078ec9376275f9700086b8f0ffc0b358e1b",
-                "sha256:2d553e02b68c0ea5a226855f02edbc9eefd99f6a8886fa9f9bdf999d77f46585",
-                "sha256:3603ef82a9920bd0bfb505423cb7e937498ad971ad5a6141841e8f76d2fd5446",
-                "sha256:3defc925c4b22ac1272d544a49c6ba04c3eefcce3200319ee1be03d9270306dd",
-                "sha256:3e59f175e868f856a77c0a77ba001385c377df2104fdbda6b9f99456a01e102a",
-                "sha256:4284d664ef0ff7b709836d4de7b13d80873dc5faeffc073abdb280058bfac5e3",
-                "sha256:55c373becbd36a44d0c9be1d5271422fdaa8562d158fb44b4192297b3c67096c",
-                "sha256:5836b8fb044c6e75ba34dfaabc602493019eadfa0faf6ff25f4c4c356a71a853",
-                "sha256:5cdb7e7e5524b76d3ec037c1d81a9e2c7457b240fd4cb0a2476b65c3a5a6c81f",
-                "sha256:6650bd56ef350d37c8baccfd3ee8a0483ed6f8666e641e4b9ae1a1827b79f9e5",
-                "sha256:7395f13533318f150ee72adb55b29284b16e73b6d5f02ab21f173b3e83f242b8",
-                "sha256:7720322763aceb5e0a7cadcc38c67b839efe599f0887cbf6c003c55b1458c501",
-                "sha256:7cd5e3d910ac87652a09f6e5db8e41bc3b49cf08ddd2d73d30afc644801492cd",
-                "sha256:81744a7e61b598ebcf4722ac56a7a4f50502432b5b4dc7eb29075a89cf82d029",
-                "sha256:84e87eba6b77a3af187bae82d8de1a7c208c2a04ec9f6bd444fd091b811ad92e",
-                "sha256:8d0fe45be57b5219aa4b96e846631c04615d5ef068146de5a02ccd15c185321f",
-                "sha256:9595e478047ce752b35cfa221d7601a5283ccdaab40422e0dc1d4a334c70f580",
-                "sha256:99c14f0727c978639139e6cad7a60e82b7720922678d75aacb90cf4ef74a068c",
-                "sha256:9b1eed7670d564f1025d7cda89f99f216c30210e42e95de466135be0b4a499d9",
-                "sha256:9fad9bd5502221ab179f13ea251cb30eef7cf65023156967f86673aff54b53a0",
-                "sha256:ad339509dcfbbc99bf8e147db6686249c4032f26586699ec4c82f6e5909c9fe2",
-                "sha256:bcbeb44fc16e0078b3b68a95e43f821ae34dcbf976dde6985141838a5f23dd3d",
-                "sha256:c8e7b05dc6315a193cceaec071cc3cf1c180cea28808ccded0b1283f1c38ba73",
-                "sha256:ca95594d936ee349620900be5b46c0122a1ff6ce42d7d5cb2cf09dc84071ef16",
-                "sha256:d029fac6a80edae80f79c37e5e3abfa92968fe921886139b3ee470a1b177321a",
-                "sha256:d17e7fc814eaab93409b80819fd6d30342844345c27f3bc3c4b43c2425a8d267",
-                "sha256:d6821ef9870f32154da873fcde439274f99814ea452dd16b99fa0b66345c4b6b",
-                "sha256:e6503534b52bb1720ace9366ee30838a58a3413d3e197512f3338c8f34b5d89d",
-                "sha256:ed1df8cc01dd1e3970666a7370b8bfc7457371c58ba88c57bd5bca17ab198053",
-                "sha256:f1d52d052355e0c5c89e0630dd2ff7c0b823fd5f56286a663e92444761b35e25",
-                "sha256:f85b290e5b8b11814efb0d004d8ce6c9a483c35c462e8d9bf84abb93e79fa770"
+                "sha256:033b3923b63474800b04cba480b70f6e6243a62208071fc148354f3f89cc01b7",
+                "sha256:05b910a5afe03256b58ab2ba6288960a2892dfeef01336dc4be6f1b9ed02ab0a",
+                "sha256:086ee2f51eaef1e4a52bd7d3111a0404081dadae87f84c0ad4ce2649d4f708b7",
+                "sha256:0ef9e2f865721553c6f22a9ff97da0f0216c074bd02b25cf0d3af60ea4d6931d",
+                "sha256:1090c60116b3da3bfdd0c03406e2f14a1ff53e5771aebe33fec1edc0a350175d",
+                "sha256:144964649eba4c5e4410bb0ee290d338e78f179cdbfd15813de1a664e7649b3b",
+                "sha256:15398c000c094b8855d7d74f4fdc9e73aa02d4d0d5c775acdef98cdb1119768d",
+                "sha256:1909f52a00c8c3dcab6c4fad5d13de2285a4b3c7be063b239b8dc15ddfb73bd2",
+                "sha256:21328fcc9d5b80768bf051faa35ab98fb979080c18e6f84ab3f27ce703bce465",
+                "sha256:224b7b0314f919e751f2bca17d15aad00ddbb1eadf1cb0190fa8175edb7ede62",
+                "sha256:25e6a61dcb184453bb00eafa733169ab6d903e46f5c2ace4ad275386f9ab327a",
+                "sha256:27f926f0dcb058211a3bb3e0e501c69759613b17a553788b2caeb991bed3b61d",
+                "sha256:29caad142a2355ce7cfea48725aa8bcf0067e2b5cc63fcf5cd9f97ad12d6afb5",
+                "sha256:2ad9913fd858274db8dd867012ebe544ef18d218f6f7d1e3c3e6d98000f14b75",
+                "sha256:31d06db13a30303c08d61d5fb32154be51dfcbdb8438d2374ae27b4e069aac40",
+                "sha256:3e0350b51e88658d5ad126c6a57502b19d5f559f6cb0a628e3dc90442b53dd98",
+                "sha256:3f6771d1647b1fc543d37640b45c06b34832a943c80d1db214a37c31161a93f1",
+                "sha256:4893395d5dd2ba655c38ceb13014fd65667740f09fa5bb01caa1e6284e48c0cd",
+                "sha256:52e446f9955195440e787596dccd1411f543743c359eeb26e9b2c02b077b0519",
+                "sha256:550f1c6588ecc368c9ce13c44a49b8d6b6f3ca7588873c679bd8fd88a1b557b6",
+                "sha256:72cd1790b48c16db85d51fbbd12d20949d7339ad84fd971427cf00d990c1f137",
+                "sha256:7bd449c306ba006c65799ea7912adbbfed071089461a19091a228998b82b1fdb",
+                "sha256:7dc5016e0133c1a1ec212fc87a4f7e7e562054549a99c73c8896fa3a9e80cbc7",
+                "sha256:802176a9f99bd8cc276dcd3b8512808716492f6f557c11196d42e26c01a69a4c",
+                "sha256:80ecf2451596f19fd607bb09953f426588fc1e79e93f5968ecf3367550396b22",
+                "sha256:8b49f1a3d1ee4cdaf5b32d2e738362c7f5e40ac8b46dd7d1a65e82a4872728fe",
+                "sha256:8e7da17f53e25d1a3bde5da4601e026adc9e8071f9f6f936d0fe3fe84ace6d54",
+                "sha256:a102424e28c6b47c67923a1f337ede4a4c2bba3965b01cf707978a801fc7442c",
+                "sha256:a19a6cc9c6ce4b1e7e3d319a473cf0ee989cbbe2b39201d7c19e214d2dfb80c7",
+                "sha256:a71a5b541078d0ebe373a81a3b7e71432c61d12e660f1d67896ca62d9628045b",
+                "sha256:baf95683cde5bc7d0e12d8e7588a3eb754d7c4fa714548adcd96bdf90169f021",
+                "sha256:cab15ff4832580aa440dc9790b8a6128abd0b88b7ee4dd56abacbc52f212209d",
+                "sha256:ce290e62229964715f1011c3dbeab7a4a1e4971fd6f31324c4519464473ef9f2",
+                "sha256:d3a8ffec2a50d8ec470143ea3d15c0c52d73df882eef92de7537e8ce13475e8a",
+                "sha256:e204937f67b28d2dca73ca936d3039a144a081fc47a07598d44854ea2a106239",
+                "sha256:eb23f58a446a7f09db85eda09521a498e109f137b85fb278edb2e34841055398",
+                "sha256:f6dd02ec01f4468da0f234da9d9c8545c5412fef80bc590cc51d8dd084138a89"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==7.1.1"
+            "version": "==7.2"
         }
     },
     "develop": {
         "attrs": {
             "hashes": [
-                "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
-                "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"
+                "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff",
+                "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==24.2.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==24.3.0"
         },
         "cattrs": {
             "hashes": [
@@ -685,28 +685,28 @@
         },
         "ruff": {
             "hashes": [
-                "sha256:0e55cce9aa93c5d0d4e3937e47b169035c7e91c8655b0974e61bb79cf398d49c",
-                "sha256:295bb4c02d58ff2ef4378a1870c20af30723013f441c9d1637a008baaf928c8b",
-                "sha256:2dabfd05b96b7b8f2da00d53c514eea842bff83e41e1cceb08ae1966254a51df",
-                "sha256:3f4cd64916d8e732ce6b87f3f5296a8942d285bbbc161acee7fe561134af64f9",
-                "sha256:582891c57b96228d146725975fbb942e1f30a0c4ba19722e692ca3eb25cc9b4f",
-                "sha256:5fdb6efecc3eb60bba5819679466471fd7d13c53487df7248d6e27146e985468",
-                "sha256:780d5d8523c04202184405e60c98d7595bdb498c3c6abba3b6d4cdf2ca2af426",
-                "sha256:7b1f1c76b47c18fa92ee78b60d2d20d7e866c55ee603e7d19c1e991fad933a9a",
-                "sha256:812e2052121634cf13cd6fddf0c1871d0ead1aad40a1a258753c04c18bb71bbd",
-                "sha256:83a55679c4cb449fa527b8497cadf54f076603cc36779b2170b24f704171ce70",
-                "sha256:85e654f0ded7befe2d61eeaf3d3b1e4ef3894469cd664ffa85006c7720f1e4a2",
-                "sha256:87a8e86bae0dbd749c815211ca11e3a7bd559b9710746c559ed63106d382bd9c",
-                "sha256:a7ccfe6331bf8c8dad715753e157457faf7351c2b69f62f32c165c2dbcbacd44",
-                "sha256:ba93e6294e9a737cd726b74b09a6972e36bb511f9a102f1d9a7e1ce94dd206a6",
-                "sha256:c5c1466be2a2ebdf7c5450dd5d980cc87c8ba6976fb82582fea18823da6fa362",
-                "sha256:eb0d4f250a7711b67ad513fde67e8870109e5ce590a801c3722580fe98c33a99",
-                "sha256:facebdfe5a5af6b1588a1d26d170635ead6892d0e314477e80256ef4a8470cf3",
-                "sha256:fcb1bf2cc6706adae9d79c8d86478677e3bbd4ced796ccad106fd4776d395fea"
+                "sha256:0d5f89f254836799af1615798caa5f80b7f935d7a670fad66c5007928e57ace8",
+                "sha256:13e9ec6d6b55f6da412d59953d65d66e760d583dd3c1c72bf1f26435b5bfdbae",
+                "sha256:552fb6d861320958ca5e15f28b20a3d071aa83b93caee33a87b471f99a6c0835",
+                "sha256:58072f0c06080276804c6a4e21a9045a706584a958e644353603d36ca1eb8a60",
+                "sha256:6ddf5d654ac0d44389f6bf05cee4caeefc3132a64b58ea46738111d687352296",
+                "sha256:736272574e97157f7edbbb43b1d046125fce9e7d8d583d5d65d0c9bf2c15addf",
+                "sha256:8ef06f66f4a05c3ddbc9121a8b0cecccd92c5bf3dd43b5472ffe40b8ca10f0f8",
+                "sha256:9183dd615d8df50defa8b1d9a074053891ba39025cf5ae88e8bcb52edcc4bf08",
+                "sha256:97d9aefef725348ad77d6db98b726cfdb075a40b936c7984088804dfd38268a7",
+                "sha256:9f8402b7c4f96463f135e936d9ab77b65711fcd5d72e5d67597b543bbb43cf3f",
+                "sha256:ab78e33325a6f5374e04c2ab924a3367d69a0da36f8c9cb6b894a62017506111",
+                "sha256:bf197b98ed86e417412ee3b6c893f44c8864f816451441483253d5ff22c0e81e",
+                "sha256:c41319b85faa3aadd4d30cb1cffdd9ac6b89704ff79f7664b853785b48eccdf3",
+                "sha256:e248b1f0fa2749edd3350a2a342b67b43a2627434c059a063418e3d375cfe643",
+                "sha256:e4e56b3baa9c23d324ead112a4fdf20db9a3f8f29eeabff1355114dd96014604",
+                "sha256:e5fe710ab6061592521f902fca7ebcb9fabd27bc7c57c764298b1c1f15fff720",
+                "sha256:f21a1143776f8656d7f364bd264a9d60f01b7f52243fbe90e7670c0dfe0cf65d",
+                "sha256:ffb60904651c00a1e0b8df594591770018a0f04587f7deeb3838344fe3adabac"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==0.8.0"
+            "version": "==0.8.4"
         },
         "ruff-lsp": {
             "hashes": [