settings: add "note" type, shows as card

also comes with a "style" attribute, to apply a color to the aside it's shown in. Used in User Page/Messages to mention the customize button, and on User page w/ a critical color to mention the jellyfin login requirement.
userpage: show placeholder message card for admins
2024-11-09 20:00:12 +00:00 · 2023-06-21 12:28:52 +01:00 · 2023-06-21 11:27:51 +01:00 · 2023-06-21 11:05:38 +01:00
13 changed files with 340 additions and 204 deletions
--- a/2
+++ b/2
@ -178,4 +178,6 @@ clean:
 	-rm docs/docs.go docs/swagger.json docs/swagger.yaml
 	go clean

+quick: configuration typescript variants-html bundle-css inline-css copy compile
+
 all: configuration npm email typescript variants-html bundle-css inline-css swagger copy compile
--- a/api-userpage.go
+++ b/api-userpage.go
@ -28,6 +28,14 @@ func (app *appContext) MyDetails(gc *gin.Context) {
 	}
 	resp.Username = user.Name
 	resp.Admin = user.Policy.IsAdministrator
+	resp.AccountsAdmin = false
+	if !app.config.Section("ui").Key("allow_all").MustBool(false) {
+		adminOnly := app.config.Section("ui").Key("admin_only").MustBool(true)
+		if emailStore, ok := app.storage.GetEmailsKey(resp.Id); ok {
+			resp.AccountsAdmin = emailStore.Admin
+		}
+		resp.AccountsAdmin = resp.AccountsAdmin || (adminOnly && resp.Admin)
+	}
 	resp.Disabled = user.Policy.IsDisabled

 	if exp, ok := app.storage.users[user.ID]; ok {
--- a/api.go
+++ b/api.go
@ -268,7 +268,7 @@ func (app *appContext) GetConfig(gc *gin.Context) {
 			val := app.config.Section(sectName).Key(settingName)
 			s := resp.Sections[sectName].Settings[settingName]
 			switch setting.Type {
-			case "text", "email", "select", "password":
+			case "text", "email", "select", "password", "note":
 				s.Value = val.MustString("")
 			case "number":
 				s.Value = val.MustInt(0)
--- a/config/config-base.json
+++ b/config/config-base.json
@ -377,7 +377,7 @@
            "order": [],
            "meta": {
                "name": "User Page",
-                "description": "Settings for the user page, which provides useful info and tools to users directly. NOTE: Jellyfin Login must be enabled to use this feature.",
+                "description": "Settings for the user page, which provides useful info and tools to users directly.",
                "depends_true": "ui|jellyfin_login"
            },
            "settings": {
@ -387,6 +387,23 @@
                    "requires_restart": false,
                    "type": "bool",
                    "value": true
+                },
+                "jellyfin_login_note": {
+                    "name": "Note:",
+                    "type": "note",
+                    "value": "",
+                    "depends_true": "enabled",
+                    "required": "false",
+                    "description": "Jellyfin Login must be enabled to use this feature.",
+                    "style": "critical"
+                },
+                "edit_note": {
+                    "name": "Message Cards:",
+                    "type": "note",
+                    "value": "",
+                    "depends_true": "enabled",
+                    "required": "false",
+                    "description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user."
                }
            }
        },
@ -482,6 +499,14 @@
                    "type": "text",
                    "value": "Need help? contact me.",
                    "description": "Message displayed at bottom of emails."
+                },
+                "edit_note": {
+                    "name": "Customize Messages:",
+                    "type": "note",
+                    "value": "",
+                    "depends_true": "enabled",
+                    "required": "false",
+                    "description": "Click the edit icon next to the \"Messages/Notifications\" Setting to customize the messages sent to users with Markdown."
                }
            }
        },
--- a/html/login-modal.html
+++ b/html/login-modal.html
@ -2,7 +2,7 @@
    <div class="my-[10%] row items-stretch relative mx-auto w-[40%] lg:w-[60%]">
        {{ if index . "LoginMessageEnabled" }}
            {{ if .LoginMessageEnabled }}
-                <div class="card mx-2 flex-initial w-[100%] xl:w-[35%] mb-4 xl:mb-0 ~neutral @low content">
+                <div class="card mx-2 flex-initial w-[100%] xl:w-[35%] mb-4 xl:mb-0 dark:~d_neutral @low content">
                    {{ .LoginMessageContent }}
                </div>
            {{ end }}
--- a/html/user.html
+++ b/html/user.html
@ -85,7 +85,7 @@
                </div>
                {{ if index . "PageMessageEnabled" }}
                    {{ if .PageMessageEnabled }}
-                        <div class="card @low dark:~d_neutral content">
+                        <div class="card @low dark:~d_neutral content" id="card-message">
                            {{ .PageMessageContent }}
                        </div>
                    {{ end }}
--- a/lang/form/en-us.json
+++ b/lang/form/en-us.json
@ -23,7 +23,9 @@
        "welcomeUser": "Welcome, {user}!",
        "addContactMethod": "Add Contact Method",
        "editContactMethod": "Edit Contact Method",
-        "joinTheServer": "Join the server:"
+        "joinTheServer": "Join the server:",
+        "customMessagePlaceholderHeader": "Customize this card",
+        "customMessagePlaceholderContent": "Click the user page edit button in settings to customize this card, or show one on the login screen, and don't worry, the user can't see this."
    },
    "notifications": {
        "errorUserExists": "User already exists.",
--- a/models.go
+++ b/models.go
@ -215,6 +215,7 @@ type setting struct {
 	Options         [][2]string `json:"options,omitempty"`
 	DependsTrue     string      `json:"depends_true,omitempty"`  // If specified, this field is enabled when the specified bool setting is enabled.
 	DependsFalse    string      `json:"depends_false,omitempty"` // If specified, opposite behaviour of DependsTrue.
+	Style           string      `json:"style,omitempty"`
 }

 type section struct {
@ -380,6 +381,7 @@ type MyDetailsDTO struct {
 	Username      string                      `json:"username"`
 	Expiry        int64                       `json:"expiry"`
 	Admin         bool                        `json:"admin"`
+	AccountsAdmin bool                        `json:"accounts_admin"`
 	Disabled      bool                        `json:"disabled"`
 	Email         *MyDetailsContactMethodsDTO `json:"email,omitempty"`
 	Discord       *MyDetailsContactMethodsDTO `json:"discord,omitempty"`
--- a/package-lock.json
+++ b/package-lock.json
@ -15,7 +15,7 @@
        "any-date-parser": "^1.5.4",
        "browserslist": "^4.21.7",
        "cheerio": "^1.0.0-rc.12",
-        "esbuild": "^0.18.5",
+        "esbuild": "^0.18.6",
        "fs-cheerio": "^3.0.0",
        "inline-source": "^8.0.2",
        "jsdom": "^22.1.0",
@ -57,9 +57,9 @@
      }
    },
    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.5.tgz",
-      "integrity": "sha512-+8GXQzuASxGg/rb47Z5zJe3vjOfL7RRce/DILuk6kbB/8HO0p3CPo72CbR349P2K8YP1h5NvNqU+2GDRbNJylw==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.6.tgz",
+      "integrity": "sha512-J3lwhDSXBBppSzm/LC1uZ8yKSIpExc+5T8MxrYD9KNVZG81FOAu2VF2gXi/6A/LwDDQQ+b6DpQbYlo3VwxFepQ==",
      "cpu": [
        "arm"
      ],
@ -72,9 +72,9 @@
      }
    },
    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.5.tgz",
-      "integrity": "sha512-410IPUj7ZOxZ2dwK0B7o7Nibu7YEyaLBvYOfYBpuA1TpY0fOkDM5r4bwn+hT8Uma06DBI4RnYNN09fn55PYInQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.6.tgz",
+      "integrity": "sha512-pL0Ci8P9q1sWbtPx8CXbc8JvPvvYdJJQ+LO09PLFsbz3aYNdFBGWJjiHU+CaObO4Ames+GOFpXRAJZS2L3ZK/A==",
      "cpu": [
        "arm64"
      ],
@ -87,9 +87,9 @@
      }
    },
    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.5.tgz",
-      "integrity": "sha512-+fdfceCYwcz9OReheSWYOGaAAt03n0BnG5/UW9tyGyo15PjSOF14ylxfjvz+0atDx0S/RxyezMsH/mbnWhnC8w==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.6.tgz",
+      "integrity": "sha512-hE2vZxOlJ05aY28lUpB0y0RokngtZtcUB+TVl9vnLEnY0z/8BicSvrkThg5/iI1rbf8TwXrbr2heEjl9fLf+EA==",
      "cpu": [
        "x64"
      ],
@ -102,9 +102,9 @@
      }
    },
    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.5.tgz",
-      "integrity": "sha512-L7noeTaus5xEtgd5J7u/lGrZfSiYkvZb0gOD7rvKTuuWbdGM4bunz5DUFsWBbEIlloslpOO5PDy4Hnd6mZT20A==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.6.tgz",
+      "integrity": "sha512-/tuyl4R+QhhoROQtuQj9E/yfJtZNdv2HKaHwYhhHGQDN1Teziem2Kh7BWQMumfiY7Lu9g5rO7scWdGE4OsQ6MQ==",
      "cpu": [
        "arm64"
      ],
@ -117,9 +117,9 @@
      }
    },
    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.5.tgz",
-      "integrity": "sha512-eA39B8SxbxRdSSILD4AsePzvJiVao6ZaYrcTOJqg89jnnMEGR/EAh+ehV7E4GOx4WXQoWeJRP1P9JQSzIrROeg==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.6.tgz",
+      "integrity": "sha512-L7IQga2pDT+14Ti8HZwsVfbCjuKP4U213T3tuPggOzyK/p4KaUJxQFXJgfUFHKzU0zOXx8QcYRYZf0hSQtppkw==",
      "cpu": [
        "x64"
      ],
@ -132,9 +132,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.5.tgz",
-      "integrity": "sha512-Eg1UnkTZHfsphgcy1Wj/McNModSO/F+kqtWqvtvEZc9BAgvdwxAt11BESgBczU+Gti0G2dLvHs0Sfb3gavwhGg==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.6.tgz",
+      "integrity": "sha512-bq10jFv42V20Kk77NvmO+WEZaLHBKuXcvEowixnBOMkaBgS7kQaqTc77ZJDbsUpXU3KKNLQFZctfaeINmeTsZA==",
      "cpu": [
        "arm64"
      ],
@ -147,9 +147,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.5.tgz",
-      "integrity": "sha512-GNTMSJ55gl7Tf5VUqVRkMJhRGzH6vI9vFBfZCj4Zjm7RgfXCWxLnTyjMgZZKT8pOzW40KD2KlrGbqwnnJWyGWw==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.6.tgz",
+      "integrity": "sha512-HbDLlkDZqUMBQaiday0pJzB6/8Xx/10dI3xRebJBReOEeDSeS+7GzTtW9h8ZnfB7/wBCqvtAjGtWQLTNPbR2+g==",
      "cpu": [
        "x64"
      ],
@ -162,9 +162,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.5.tgz",
-      "integrity": "sha512-6R+vEIyfEvp+gOWKSc+m6hdnhWKQYzicqONQYiDGT6qepc6OGsLEZcyFwoz6BvFx5j233CBWMcJ69eXFrwXw9A==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.6.tgz",
+      "integrity": "sha512-C+5kb6rgsGMmvIdUI7v1PPgC98A6BMv233e97aXZ5AE03iMdlILFD/20HlHrOi0x2CzbspXn9HOnlE4/Ijn5Kw==",
      "cpu": [
        "arm"
      ],
@ -177,9 +177,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.5.tgz",
-      "integrity": "sha512-r08LmhqyPRj6FtuNPBTu8BliKh6h+oNEhMkWmmR/aWs4DWjDOivyDfLGznPdgtSThL23fk1QgSBUEbuCIzjA2A==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.6.tgz",
+      "integrity": "sha512-NMY9yg/88MskEZH2s4i6biz/3av+M8xY5ua4HE7CCz5DBz542cr7REe317+v7oKjnYBCijHpkzo5vU85bkXQmQ==",
      "cpu": [
        "arm64"
      ],
@ -192,9 +192,9 @@
      }
    },
    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.5.tgz",
-      "integrity": "sha512-ph6M9iEMc6BHgv2XuIE8qeQrQCH+2l116c8L9ysmmXYwpNXa3E7JNIu/O7hI0I9qDvh1P19AGbIh+/y0GAZijA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.6.tgz",
+      "integrity": "sha512-AXazA0ljvQEp7cA9jscABNXsjodKbEcqPcAE3rDzKN82Vb3lYOq6INd+HOCA7hk8IegEyHW4T72Z7QGIhyCQEA==",
      "cpu": [
        "ia32"
      ],
@ -207,9 +207,9 @@
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.5.tgz",
-      "integrity": "sha512-s6Nup5FMQ8R8OKJG2rSxtV40s8LRdfC73XGHGaFlGiC+2SeCyq4dl3MMfLdzLowYzyDjfc4GRrXWUNMX3kNxYA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.6.tgz",
+      "integrity": "sha512-JjBf7TwY7ldcPgHYt9UcrjZB03+WZqg/jSwMAfzOzM5ZG+tu5umUqzy5ugH/crGI4eoDIhSOTDp1NL3Uo/05Fw==",
      "cpu": [
        "loong64"
      ],
@ -222,9 +222,9 @@
      }
    },
    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.5.tgz",
-      "integrity": "sha512-DxW4nNDIGbivZxnJD01C5PlwKPpin8YgSwWtToCy4w4lNigT7Iaf5A+wcPT2laibdgbcgPKpPOXUg6RFGTt8xA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.6.tgz",
+      "integrity": "sha512-kATNsslryVxcH1sO3KP2nnyUWtZZVkgyhAUnyTVVa0OQQ9pmDRjTpHaE+2EQHoCM5wt/uav2edrAUqbwn3tkKQ==",
      "cpu": [
        "mips64el"
      ],
@ -237,9 +237,9 @@
      }
    },
    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.5.tgz",
-      "integrity": "sha512-BksOs2uYTafS+u75QiN4RoLbEMNjE192adJCBalncI3E2PWyR2i1kEs9rEghHK7pw0SD0uWgV9otRmV7G5b2lQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.6.tgz",
+      "integrity": "sha512-B+wTKz+8pi7mcWXFQV0LA79dJ+qhiut5uK9q0omoKnq8yRIwQJwfg3/vclXoqqcX89Ri5Y5538V0Se2v5qlcLA==",
      "cpu": [
        "ppc64"
      ],
@ -252,9 +252,9 @@
      }
    },
    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.5.tgz",
-      "integrity": "sha512-mGv8BOJXsV7bZyjyMdeDs55CDXZ5vrY3oKa58DNRz2vPn54dREyj4BhhyWuqSuzSURJhFg7pM/1fI2vnAHGkHw==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.6.tgz",
+      "integrity": "sha512-h44RBLVXFUSjvhOfseE+5UxQ/r9LVeqK2S8JziJKOm9W7SePYRPDyn7MhzhNCCFPkcjIy+soCxfhlJXHXXCR0A==",
      "cpu": [
        "riscv64"
      ],
@ -267,9 +267,9 @@
      }
    },
    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.5.tgz",
-      "integrity": "sha512-m4uIYyrl5znGnNHgiM/Zsw6I9Se513NqdTxeUxZ66/VDWbuUp8ACe1KOSpwF4NNxfYy6Q3W8beZsIdF4F85q8Q==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.6.tgz",
+      "integrity": "sha512-FlYpyr2Xc2AUePoAbc84NRV+mj7xpsISeQ36HGf9etrY5rTBEA+IU9HzWVmw5mDFtC62EQxzkLRj8h5Hq85yOQ==",
      "cpu": [
        "s390x"
      ],
@ -282,9 +282,9 @@
      }
    },
    "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.5.tgz",
-      "integrity": "sha512-R1C7X30YjXmOZYOzx4dJ/QvRNfrkK/sDCFfcGNhlHFX6B/iodJdk81h7EhnKVUQy+3BaARxF7udd91iSSzMlbQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.6.tgz",
+      "integrity": "sha512-Mc4EUSYwzLci77u0Kao6ajB2WbTe5fNc7+lHwS3a+vJISC/oprwURezUYu1SdWAYoczbsyOvKAJwuNftoAdjjg==",
      "cpu": [
        "x64"
      ],
@ -297,9 +297,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.5.tgz",
-      "integrity": "sha512-MABnKzjMcXjO0NEYyexOhqjcrgM6dE8BXnm+lctm2x2aPpYg5iL0Ew3aABSTZyp9dS3Z4VzFu5PPoOYEw8akTQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.6.tgz",
+      "integrity": "sha512-3hgZlp7NqIM5lNG3fpdhBI5rUnPmdahraSmwAi+YX/bp7iZ7mpTv2NkypGs/XngdMtpzljICxnUG3uPfqLFd3w==",
      "cpu": [
        "x64"
      ],
@ -312,9 +312,9 @@
      }
    },
    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.5.tgz",
-      "integrity": "sha512-aU7R0tLIUMaQuAgBjKrq02Z98rcY9Pxk76hynSqcGeld2C/ro1uBbS2i9rh7vdwBAY0rG08Og4wnDnlx5rU+fQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.6.tgz",
+      "integrity": "sha512-aEWTdZQHtSRROlDYn7ygB8yAqtnall/UnmoVIJVqccKitkAWVVSYocQUWrBOxLEFk8XdlRouVrLZe6WXszyviA==",
      "cpu": [
        "x64"
      ],
@ -327,9 +327,9 @@
      }
    },
    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.5.tgz",
-      "integrity": "sha512-ngm3fVv2VxufI8zH/Phk0mYkgvFjFGnS+l7uxxd20mmeLTNI/8OXDJpNqTUbvzJh3tqhI/Gof0N2+5xJbqEaxA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.6.tgz",
+      "integrity": "sha512-uxk/5yAGpjKZUHOECtI9W+9IcLjKj+2m0qf+RG7f7eRBHr8wP6wsr3XbNbgtOD1qSpPapd6R2ZfSeXTkCcAo5g==",
      "cpu": [
        "x64"
      ],
@ -342,9 +342,9 @@
      }
    },
    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.5.tgz",
-      "integrity": "sha512-XqpS89+MGLzR8YtQQkBYsLCfAv1ySflMb+FEH99rOp6kOPv/ORO+ujEB5ICDBZZbvYqB75uFrNELo1BVEQbS3g==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.6.tgz",
+      "integrity": "sha512-oXlXGS9zvNCGoAT/tLHAsFKrIKye1JaIIP0anCdpaI+Dc10ftaNZcqfLzEwyhdzFAYInXYH4V7kEdH4hPyo9GA==",
      "cpu": [
        "arm64"
      ],
@ -357,9 +357,9 @@
      }
    },
    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.5.tgz",
-      "integrity": "sha512-V3xj/nb9uie0I4mn1f8nPZSgHldtNJrqTKYjTyMPMBnHbMYF5Loz8ZHsp7+La8kI6NxIF1ClQ9XBV+G3RtSkww==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.6.tgz",
+      "integrity": "sha512-qh7IcAHUvvmMBmoIG+V+BbE9ZWSR0ohF51e5g8JZvU08kZF58uDFL5tHs0eoYz31H6Finv17te3W3QB042GqVA==",
      "cpu": [
        "ia32"
      ],
@ -372,9 +372,9 @@
      }
    },
    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.5.tgz",
-      "integrity": "sha512-gMxWvQeTQWDpa8ExPP41al+Ho7HyK24h7y41JdGKqE24KzXXQPxESUtrCoIES+HwF+OGq2smtibU9UvZ8WH3JQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.6.tgz",
+      "integrity": "sha512-9UDwkz7Wlm4N9jnv+4NL7F8vxLhSZfEkRArz2gD33HesAFfMLGIGNVXRoIHtWNw8feKsnGly9Hq1EUuRkWl0zA==",
      "cpu": [
        "x64"
      ],
@ -1647,9 +1647,9 @@
      }
    },
    "node_modules/esbuild": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.5.tgz",
-      "integrity": "sha512-ztF1Z53Mc8ijEo1ZWFduHZXIqRWufo76JHm1ikvhGjIzO1mj84LdKXSGmRzahfgvWSwky48MkT+o5yUIkQtDPA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.6.tgz",
+      "integrity": "sha512-5QgxWaAhU/tPBpvkxUmnFv2YINHuZzjbk0LeUUnC2i3aJHjfi5yR49lgKgF7cb98bclOp/kans8M5TGbGFfJlQ==",
      "hasInstallScript": true,
      "bin": {
        "esbuild": "bin/esbuild"
@ -1658,28 +1658,28 @@
        "node": ">=12"
      },
      "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.5",
-        "@esbuild/android-arm64": "0.18.5",
-        "@esbuild/android-x64": "0.18.5",
-        "@esbuild/darwin-arm64": "0.18.5",
-        "@esbuild/darwin-x64": "0.18.5",
-        "@esbuild/freebsd-arm64": "0.18.5",
-        "@esbuild/freebsd-x64": "0.18.5",
-        "@esbuild/linux-arm": "0.18.5",
-        "@esbuild/linux-arm64": "0.18.5",
-        "@esbuild/linux-ia32": "0.18.5",
-        "@esbuild/linux-loong64": "0.18.5",
-        "@esbuild/linux-mips64el": "0.18.5",
-        "@esbuild/linux-ppc64": "0.18.5",
-        "@esbuild/linux-riscv64": "0.18.5",
-        "@esbuild/linux-s390x": "0.18.5",
-        "@esbuild/linux-x64": "0.18.5",
-        "@esbuild/netbsd-x64": "0.18.5",
-        "@esbuild/openbsd-x64": "0.18.5",
-        "@esbuild/sunos-x64": "0.18.5",
-        "@esbuild/win32-arm64": "0.18.5",
-        "@esbuild/win32-ia32": "0.18.5",
-        "@esbuild/win32-x64": "0.18.5"
+        "@esbuild/android-arm": "0.18.6",
+        "@esbuild/android-arm64": "0.18.6",
+        "@esbuild/android-x64": "0.18.6",
+        "@esbuild/darwin-arm64": "0.18.6",
+        "@esbuild/darwin-x64": "0.18.6",
+        "@esbuild/freebsd-arm64": "0.18.6",
+        "@esbuild/freebsd-x64": "0.18.6",
+        "@esbuild/linux-arm": "0.18.6",
+        "@esbuild/linux-arm64": "0.18.6",
+        "@esbuild/linux-ia32": "0.18.6",
+        "@esbuild/linux-loong64": "0.18.6",
+        "@esbuild/linux-mips64el": "0.18.6",
+        "@esbuild/linux-ppc64": "0.18.6",
+        "@esbuild/linux-riscv64": "0.18.6",
+        "@esbuild/linux-s390x": "0.18.6",
+        "@esbuild/linux-x64": "0.18.6",
+        "@esbuild/netbsd-x64": "0.18.6",
+        "@esbuild/openbsd-x64": "0.18.6",
+        "@esbuild/sunos-x64": "0.18.6",
+        "@esbuild/win32-arm64": "0.18.6",
+        "@esbuild/win32-ia32": "0.18.6",
+        "@esbuild/win32-x64": "0.18.6"
      }
    },
    "node_modules/escalade": {
@ -6797,135 +6797,135 @@
      }
    },
    "@esbuild/android-arm": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.5.tgz",
-      "integrity": "sha512-+8GXQzuASxGg/rb47Z5zJe3vjOfL7RRce/DILuk6kbB/8HO0p3CPo72CbR349P2K8YP1h5NvNqU+2GDRbNJylw==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.6.tgz",
+      "integrity": "sha512-J3lwhDSXBBppSzm/LC1uZ8yKSIpExc+5T8MxrYD9KNVZG81FOAu2VF2gXi/6A/LwDDQQ+b6DpQbYlo3VwxFepQ==",
      "optional": true
    },
    "@esbuild/android-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.5.tgz",
-      "integrity": "sha512-410IPUj7ZOxZ2dwK0B7o7Nibu7YEyaLBvYOfYBpuA1TpY0fOkDM5r4bwn+hT8Uma06DBI4RnYNN09fn55PYInQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.6.tgz",
+      "integrity": "sha512-pL0Ci8P9q1sWbtPx8CXbc8JvPvvYdJJQ+LO09PLFsbz3aYNdFBGWJjiHU+CaObO4Ames+GOFpXRAJZS2L3ZK/A==",
      "optional": true
    },
    "@esbuild/android-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.5.tgz",
-      "integrity": "sha512-+fdfceCYwcz9OReheSWYOGaAAt03n0BnG5/UW9tyGyo15PjSOF14ylxfjvz+0atDx0S/RxyezMsH/mbnWhnC8w==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.6.tgz",
+      "integrity": "sha512-hE2vZxOlJ05aY28lUpB0y0RokngtZtcUB+TVl9vnLEnY0z/8BicSvrkThg5/iI1rbf8TwXrbr2heEjl9fLf+EA==",
      "optional": true
    },
    "@esbuild/darwin-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.5.tgz",
-      "integrity": "sha512-L7noeTaus5xEtgd5J7u/lGrZfSiYkvZb0gOD7rvKTuuWbdGM4bunz5DUFsWBbEIlloslpOO5PDy4Hnd6mZT20A==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.6.tgz",
+      "integrity": "sha512-/tuyl4R+QhhoROQtuQj9E/yfJtZNdv2HKaHwYhhHGQDN1Teziem2Kh7BWQMumfiY7Lu9g5rO7scWdGE4OsQ6MQ==",
      "optional": true
    },
    "@esbuild/darwin-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.5.tgz",
-      "integrity": "sha512-eA39B8SxbxRdSSILD4AsePzvJiVao6ZaYrcTOJqg89jnnMEGR/EAh+ehV7E4GOx4WXQoWeJRP1P9JQSzIrROeg==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.6.tgz",
+      "integrity": "sha512-L7IQga2pDT+14Ti8HZwsVfbCjuKP4U213T3tuPggOzyK/p4KaUJxQFXJgfUFHKzU0zOXx8QcYRYZf0hSQtppkw==",
      "optional": true
    },
    "@esbuild/freebsd-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.5.tgz",
-      "integrity": "sha512-Eg1UnkTZHfsphgcy1Wj/McNModSO/F+kqtWqvtvEZc9BAgvdwxAt11BESgBczU+Gti0G2dLvHs0Sfb3gavwhGg==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.6.tgz",
+      "integrity": "sha512-bq10jFv42V20Kk77NvmO+WEZaLHBKuXcvEowixnBOMkaBgS7kQaqTc77ZJDbsUpXU3KKNLQFZctfaeINmeTsZA==",
      "optional": true
    },
    "@esbuild/freebsd-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.5.tgz",
-      "integrity": "sha512-GNTMSJ55gl7Tf5VUqVRkMJhRGzH6vI9vFBfZCj4Zjm7RgfXCWxLnTyjMgZZKT8pOzW40KD2KlrGbqwnnJWyGWw==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.6.tgz",
+      "integrity": "sha512-HbDLlkDZqUMBQaiday0pJzB6/8Xx/10dI3xRebJBReOEeDSeS+7GzTtW9h8ZnfB7/wBCqvtAjGtWQLTNPbR2+g==",
      "optional": true
    },
    "@esbuild/linux-arm": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.5.tgz",
-      "integrity": "sha512-6R+vEIyfEvp+gOWKSc+m6hdnhWKQYzicqONQYiDGT6qepc6OGsLEZcyFwoz6BvFx5j233CBWMcJ69eXFrwXw9A==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.6.tgz",
+      "integrity": "sha512-C+5kb6rgsGMmvIdUI7v1PPgC98A6BMv233e97aXZ5AE03iMdlILFD/20HlHrOi0x2CzbspXn9HOnlE4/Ijn5Kw==",
      "optional": true
    },
    "@esbuild/linux-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.5.tgz",
-      "integrity": "sha512-r08LmhqyPRj6FtuNPBTu8BliKh6h+oNEhMkWmmR/aWs4DWjDOivyDfLGznPdgtSThL23fk1QgSBUEbuCIzjA2A==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.6.tgz",
+      "integrity": "sha512-NMY9yg/88MskEZH2s4i6biz/3av+M8xY5ua4HE7CCz5DBz542cr7REe317+v7oKjnYBCijHpkzo5vU85bkXQmQ==",
      "optional": true
    },
    "@esbuild/linux-ia32": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.5.tgz",
-      "integrity": "sha512-ph6M9iEMc6BHgv2XuIE8qeQrQCH+2l116c8L9ysmmXYwpNXa3E7JNIu/O7hI0I9qDvh1P19AGbIh+/y0GAZijA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.6.tgz",
+      "integrity": "sha512-AXazA0ljvQEp7cA9jscABNXsjodKbEcqPcAE3rDzKN82Vb3lYOq6INd+HOCA7hk8IegEyHW4T72Z7QGIhyCQEA==",
      "optional": true
    },
    "@esbuild/linux-loong64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.5.tgz",
-      "integrity": "sha512-s6Nup5FMQ8R8OKJG2rSxtV40s8LRdfC73XGHGaFlGiC+2SeCyq4dl3MMfLdzLowYzyDjfc4GRrXWUNMX3kNxYA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.6.tgz",
+      "integrity": "sha512-JjBf7TwY7ldcPgHYt9UcrjZB03+WZqg/jSwMAfzOzM5ZG+tu5umUqzy5ugH/crGI4eoDIhSOTDp1NL3Uo/05Fw==",
      "optional": true
    },
    "@esbuild/linux-mips64el": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.5.tgz",
-      "integrity": "sha512-DxW4nNDIGbivZxnJD01C5PlwKPpin8YgSwWtToCy4w4lNigT7Iaf5A+wcPT2laibdgbcgPKpPOXUg6RFGTt8xA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.6.tgz",
+      "integrity": "sha512-kATNsslryVxcH1sO3KP2nnyUWtZZVkgyhAUnyTVVa0OQQ9pmDRjTpHaE+2EQHoCM5wt/uav2edrAUqbwn3tkKQ==",
      "optional": true
    },
    "@esbuild/linux-ppc64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.5.tgz",
-      "integrity": "sha512-BksOs2uYTafS+u75QiN4RoLbEMNjE192adJCBalncI3E2PWyR2i1kEs9rEghHK7pw0SD0uWgV9otRmV7G5b2lQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.6.tgz",
+      "integrity": "sha512-B+wTKz+8pi7mcWXFQV0LA79dJ+qhiut5uK9q0omoKnq8yRIwQJwfg3/vclXoqqcX89Ri5Y5538V0Se2v5qlcLA==",
      "optional": true
    },
    "@esbuild/linux-riscv64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.5.tgz",
-      "integrity": "sha512-mGv8BOJXsV7bZyjyMdeDs55CDXZ5vrY3oKa58DNRz2vPn54dREyj4BhhyWuqSuzSURJhFg7pM/1fI2vnAHGkHw==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.6.tgz",
+      "integrity": "sha512-h44RBLVXFUSjvhOfseE+5UxQ/r9LVeqK2S8JziJKOm9W7SePYRPDyn7MhzhNCCFPkcjIy+soCxfhlJXHXXCR0A==",
      "optional": true
    },
    "@esbuild/linux-s390x": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.5.tgz",
-      "integrity": "sha512-m4uIYyrl5znGnNHgiM/Zsw6I9Se513NqdTxeUxZ66/VDWbuUp8ACe1KOSpwF4NNxfYy6Q3W8beZsIdF4F85q8Q==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.6.tgz",
+      "integrity": "sha512-FlYpyr2Xc2AUePoAbc84NRV+mj7xpsISeQ36HGf9etrY5rTBEA+IU9HzWVmw5mDFtC62EQxzkLRj8h5Hq85yOQ==",
      "optional": true
    },
    "@esbuild/linux-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.5.tgz",
-      "integrity": "sha512-R1C7X30YjXmOZYOzx4dJ/QvRNfrkK/sDCFfcGNhlHFX6B/iodJdk81h7EhnKVUQy+3BaARxF7udd91iSSzMlbQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.6.tgz",
+      "integrity": "sha512-Mc4EUSYwzLci77u0Kao6ajB2WbTe5fNc7+lHwS3a+vJISC/oprwURezUYu1SdWAYoczbsyOvKAJwuNftoAdjjg==",
      "optional": true
    },
    "@esbuild/netbsd-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.5.tgz",
-      "integrity": "sha512-MABnKzjMcXjO0NEYyexOhqjcrgM6dE8BXnm+lctm2x2aPpYg5iL0Ew3aABSTZyp9dS3Z4VzFu5PPoOYEw8akTQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.6.tgz",
+      "integrity": "sha512-3hgZlp7NqIM5lNG3fpdhBI5rUnPmdahraSmwAi+YX/bp7iZ7mpTv2NkypGs/XngdMtpzljICxnUG3uPfqLFd3w==",
      "optional": true
    },
    "@esbuild/openbsd-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.5.tgz",
-      "integrity": "sha512-aU7R0tLIUMaQuAgBjKrq02Z98rcY9Pxk76hynSqcGeld2C/ro1uBbS2i9rh7vdwBAY0rG08Og4wnDnlx5rU+fQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.6.tgz",
+      "integrity": "sha512-aEWTdZQHtSRROlDYn7ygB8yAqtnall/UnmoVIJVqccKitkAWVVSYocQUWrBOxLEFk8XdlRouVrLZe6WXszyviA==",
      "optional": true
    },
    "@esbuild/sunos-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.5.tgz",
-      "integrity": "sha512-ngm3fVv2VxufI8zH/Phk0mYkgvFjFGnS+l7uxxd20mmeLTNI/8OXDJpNqTUbvzJh3tqhI/Gof0N2+5xJbqEaxA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.6.tgz",
+      "integrity": "sha512-uxk/5yAGpjKZUHOECtI9W+9IcLjKj+2m0qf+RG7f7eRBHr8wP6wsr3XbNbgtOD1qSpPapd6R2ZfSeXTkCcAo5g==",
      "optional": true
    },
    "@esbuild/win32-arm64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.5.tgz",
-      "integrity": "sha512-XqpS89+MGLzR8YtQQkBYsLCfAv1ySflMb+FEH99rOp6kOPv/ORO+ujEB5ICDBZZbvYqB75uFrNELo1BVEQbS3g==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.6.tgz",
+      "integrity": "sha512-oXlXGS9zvNCGoAT/tLHAsFKrIKye1JaIIP0anCdpaI+Dc10ftaNZcqfLzEwyhdzFAYInXYH4V7kEdH4hPyo9GA==",
      "optional": true
    },
    "@esbuild/win32-ia32": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.5.tgz",
-      "integrity": "sha512-V3xj/nb9uie0I4mn1f8nPZSgHldtNJrqTKYjTyMPMBnHbMYF5Loz8ZHsp7+La8kI6NxIF1ClQ9XBV+G3RtSkww==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.6.tgz",
+      "integrity": "sha512-qh7IcAHUvvmMBmoIG+V+BbE9ZWSR0ohF51e5g8JZvU08kZF58uDFL5tHs0eoYz31H6Finv17te3W3QB042GqVA==",
      "optional": true
    },
    "@esbuild/win32-x64": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.5.tgz",
-      "integrity": "sha512-gMxWvQeTQWDpa8ExPP41al+Ho7HyK24h7y41JdGKqE24KzXXQPxESUtrCoIES+HwF+OGq2smtibU9UvZ8WH3JQ==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.6.tgz",
+      "integrity": "sha512-9UDwkz7Wlm4N9jnv+4NL7F8vxLhSZfEkRArz2gD33HesAFfMLGIGNVXRoIHtWNw8feKsnGly9Hq1EUuRkWl0zA==",
      "optional": true
    },
    "@jridgewell/gen-mapping": {
@ -7896,32 +7896,32 @@
      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
    },
    "esbuild": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.5.tgz",
-      "integrity": "sha512-ztF1Z53Mc8ijEo1ZWFduHZXIqRWufo76JHm1ikvhGjIzO1mj84LdKXSGmRzahfgvWSwky48MkT+o5yUIkQtDPA==",
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.6.tgz",
+      "integrity": "sha512-5QgxWaAhU/tPBpvkxUmnFv2YINHuZzjbk0LeUUnC2i3aJHjfi5yR49lgKgF7cb98bclOp/kans8M5TGbGFfJlQ==",
      "requires": {
-        "@esbuild/android-arm": "0.18.5",
-        "@esbuild/android-arm64": "0.18.5",
-        "@esbuild/android-x64": "0.18.5",
-        "@esbuild/darwin-arm64": "0.18.5",
-        "@esbuild/darwin-x64": "0.18.5",
-        "@esbuild/freebsd-arm64": "0.18.5",
-        "@esbuild/freebsd-x64": "0.18.5",
-        "@esbuild/linux-arm": "0.18.5",
-        "@esbuild/linux-arm64": "0.18.5",
-        "@esbuild/linux-ia32": "0.18.5",
-        "@esbuild/linux-loong64": "0.18.5",
-        "@esbuild/linux-mips64el": "0.18.5",
-        "@esbuild/linux-ppc64": "0.18.5",
-        "@esbuild/linux-riscv64": "0.18.5",
-        "@esbuild/linux-s390x": "0.18.5",
-        "@esbuild/linux-x64": "0.18.5",
-        "@esbuild/netbsd-x64": "0.18.5",
-        "@esbuild/openbsd-x64": "0.18.5",
-        "@esbuild/sunos-x64": "0.18.5",
-        "@esbuild/win32-arm64": "0.18.5",
-        "@esbuild/win32-ia32": "0.18.5",
-        "@esbuild/win32-x64": "0.18.5"
+        "@esbuild/android-arm": "0.18.6",
+        "@esbuild/android-arm64": "0.18.6",
+        "@esbuild/android-x64": "0.18.6",
+        "@esbuild/darwin-arm64": "0.18.6",
+        "@esbuild/darwin-x64": "0.18.6",
+        "@esbuild/freebsd-arm64": "0.18.6",
+        "@esbuild/freebsd-x64": "0.18.6",
+        "@esbuild/linux-arm": "0.18.6",
+        "@esbuild/linux-arm64": "0.18.6",
+        "@esbuild/linux-ia32": "0.18.6",
+        "@esbuild/linux-loong64": "0.18.6",
+        "@esbuild/linux-mips64el": "0.18.6",
+        "@esbuild/linux-ppc64": "0.18.6",
+        "@esbuild/linux-riscv64": "0.18.6",
+        "@esbuild/linux-s390x": "0.18.6",
+        "@esbuild/linux-x64": "0.18.6",
+        "@esbuild/netbsd-x64": "0.18.6",
+        "@esbuild/openbsd-x64": "0.18.6",
+        "@esbuild/sunos-x64": "0.18.6",
+        "@esbuild/win32-arm64": "0.18.6",
+        "@esbuild/win32-ia32": "0.18.6",
+        "@esbuild/win32-x64": "0.18.6"
      }
    },
    "escalade": {
--- a/package.json
+++ b/package.json
@ -23,7 +23,7 @@
    "any-date-parser": "^1.5.4",
    "browserslist": "^4.21.7",
    "cheerio": "^1.0.0-rc.12",
-    "esbuild": "^0.18.5",
+    "esbuild": "^0.18.6",
    "fs-cheerio": "^3.0.0",
    "inline-source": "^8.0.2",
    "jsdom": "^22.1.0",
--- a/scripts/generate_ini.py
+++ b/scripts/generate_ini.py
@ -21,6 +21,8 @@ def generate_ini(base_file, ini_file):
        if "meta" in config_base["sections"][section]:
            ini.set(section, fix_description(config_base["sections"][section]["meta"]["description"]))
        for entry in config_base["sections"][section]["settings"]:
+            if config_base["sections"][section]["settings"][entry]["type"] == "note":
+                continue
            if "description" in config_base["sections"][section]["settings"][entry]:
                ini.set(section, fix_description(config_base["sections"][section]["settings"][entry]["description"]))
            value = config_base["sections"][section]["settings"][entry]["value"]
--- a/ts/modules/settings.ts
+++ b/ts/modules/settings.ts
@ -453,6 +453,78 @@ class DOMSelect implements SSelect {
    asElement = (): HTMLDivElement => { return this._container; }
 }

+interface SNote extends Setting {
+    value: string;
+    style?: string;
+}
+class DOMNote implements SNote {
+    private _container: HTMLDivElement;
+    private _aside: HTMLElement;
+    private _name: HTMLElement;
+    private _description: HTMLElement;
+    type: string = "note";
+    private _style: string;
+
+    get name(): string { return this._name.textContent; }
+    set name(n: string) { this._name.textContent = n; }
+
+    get description(): string { return this._description.textContent; }
+    set description(d: string) { this._description.textContent = d; }
+
+    get value(): string { return ""; }
+    set value(v: string) { return; }
+    
+    get required(): boolean { return false; }
+    set required(v: boolean) { return; }
+    
+    get requires_restart(): boolean { return false; }
+    set requires_restart(v: boolean) { return; }
+
+    get style(): string { return this._style; }
+    set style(s: string) {
+        this._aside.classList.remove("~" + this._style);
+        this._style = s;
+        this._aside.classList.add("~" + this._style);
+    }
+    
+    constructor(setting: SNote, section: string) {
+        this._container = document.createElement("div");
+        this._container.classList.add("setting");
+        this._container.innerHTML = `
+        <aside class="aside my-2">
+            <span class="font-bold setting-name"></span>
+            <span class="content setting-description">
+        </aside>
+        `;
+        this._name = this._container.querySelector(".setting-name");
+        this._description = this._container.querySelector(".setting-description");
+        this._aside = this._container.querySelector("aside");
+
+        if (setting.depends_false || setting.depends_true) {
+            let dependant = splitDependant(section, setting.depends_true || setting.depends_false);
+            let state = true;
+            if (setting.depends_false) { state = false; }
+            document.addEventListener(`settings-${dependant[0]}-${dependant[1]}`, (event: settingsBoolEvent) => {
+                if (Boolean(event.detail) !== state) {
+                    this._container.classList.add("unfocused");
+                } else {
+                    this._container.classList.remove("unfocused");
+                }
+            });
+        }
+
+        this.update(setting);
+    }
+
+    update = (s: SNote) => {
+        this.name = s.name;
+        this.description = s.description;
+        this.style = ("style" in s && s.style) ? s.style : "info";
+    };
+    
+    asElement = (): HTMLDivElement => { return this._container; }
+}
+
 interface Section {
    meta: Meta;
    order: string[];
@ -502,13 +574,18 @@ class sectionPanel {
                    case "select":
                        setting = new DOMSelect(setting as SSelect, this._sectionName, name);
                        break;
+                    case "note":
+                        setting = new DOMNote(setting as SNote, this._sectionName);
+                        break;
                }
+                if (setting.type != "note") {
                    this.values[name] = ""+setting.value;
                    document.addEventListener(`settings-${this._sectionName}-${name}`, (event: CustomEvent) => {
                        // const oldValue = this.values[name];
                        this.values[name] = ""+event.detail;
                        document.dispatchEvent(new CustomEvent("settings-section-changed"));
                    });
+                }
                this._section.appendChild(setting.asElement());
                this._settings[name] = setting;
            }
--- a/ts/user.ts
+++ b/ts/user.ts
@ -62,6 +62,7 @@ interface MyDetails {
    username: string;
    expiry: number;
    admin: boolean;
+    accounts_admin: boolean;
    disabled: boolean;
    email?: MyDetailsContactMethod;
    discord?: MyDetailsContactMethod;
@ -388,6 +389,23 @@ document.addEventListener("details-reload", () => {
            }

            expiryCard.expiry = details.expiry;
+
+
+            if (details.accounts_admin) {
+                let messageCard = document.getElementById("card-message")
+                if (typeof(messageCard) == "undefined" || messageCard == null) {
+                    messageCard = document.createElement("div");
+                    messageCard.classList.add("card", "@low", "dark:~d_neutral", "content");
+                    messageCard.id = "card-message";
+                    contactCard.parentElement.appendChild(messageCard);
+                }
+                if (!messageCard.textContent) {
+                    messageCard.innerHTML = `
+                    <span class="heading mb-2">${window.lang.strings("customMessagePlaceholderHeader")} ✏️ </span>
+                    <span class="block">${window.lang.strings("customMessagePlaceholderContent")}</span>
+                    `;
+                }
+            }
        }
    });
 });
Author	SHA1	Message	Date
Harvey Tindall	920161b920	settings: add "note" type, shows as card also comes with a "style" attribute, to apply a color to the aside it's shown in. Used in User Page/Messages to mention the customize button, and on User page w/ a critical color to mention the jellyfin login requirement.	2023-06-21 12:28:52 +01:00
Harvey Tindall	e7f7dcbb78	userpage: show placeholder message card for admins	2023-06-21 11:27:51 +01:00
Harvey Tindall	cc4a97db28	userpage: fix card color in light mode	2023-06-21 11:05:38 +01:00