Added ability to subscribe to topics

sestriel · Apr 12, 2024 · 59b4d88 · 59b4d88
1 parent 96cca9d
commit 59b4d88
Show file tree

Hide file tree

Showing 17 changed files with 431 additions and 107 deletions.
diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -1,5 +1,6 @@
 {
     "serverURL": "URL zum Ntfy-Server",
+    "defaultSettingsHeader": "Standard Topic Einstellungen",
     "defaultTopic": "Standard Topic",
     "defaultUsername": "Standard-Benutzername",
     "defaultPassword": "Standard-Passwort",
@@ -9,5 +10,17 @@
     "defaultTopicAuth": "Standard-Topic-Authentifizierung",
     "defaultTopicAuthNone": "Keine Authentifikation",
     "defaultTopicAuthUser": "Benutzer/Passwort",
-    "defaultTopicAuthToken": "Zugangstoken"
+    "defaultTopicAuthToken": "Zugangstoken",
+    "defaultSubscribed": "Standard-Topic abonnieren",
+    "presetTopicName": "Thema",
+    "presetTopicAuth": "Themenauthentifizierung",
+    "presetTopicAuthNone": "Keine Authentifikation",
+    "presetTopicAuthUser": "Benutzerauthentifizierung",
+    "presetTopicAuthToken": "Zugangstoken",
+    "presetTopicUsername": "Standardbenutzername",
+    "presetTopicPassword": "Standard-Passwort",
+    "presetTopicAccessToken": "Standardzugriffstoken",
+    "presetSettingsHeader": "Zusätzliche Voreinstellungen",
+    "presetTopicSubsribed": "Abonnieren",
+    "presetTopicSubscribed": "Abonnieren"
 }
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -1,13 +1,26 @@
 {
   "serverURL": "URL zum Ntfy-Server",
+  "helpServerURL": "URL without Topic - https://ntfy-server.sh",
+  "defaultSettingsHeader": "Default Topic Settings",
   "defaultTopic": "Default Topic",
   "defaultUsername": "Default Username",
   "defaultPassword": "Default Password",
   "defaultAccessToken": "Default Access Token",
-  "helpServerURL": "URL without Topic - https://ntfy-server.sh",
   "helpDefaultAccessToken": "Only if username/password is not used",
   "defaultTopicAuth": "Default Topic Authentication",
   "defaultTopicAuthNone": "No Authentication",
   "defaultTopicAuthUser": "User Authentication",
-  "defaultTopicAuthToken": "Access Token"
+  "defaultTopicAuthToken": "Access Token",
+  "defaultSubscribed": "Subscribe to default Topic",
+
+  "presetSettingsHeader": "Additional Presets",
+  "presetTopicName": "Topic",
+  "presetTopicSubscribed": "Subscribe",
+  "presetTopicAuth": "Topic Authentication",
+  "presetTopicAuthNone": "No Authentication",
+  "presetTopicAuthUser": "User Authentication",
+  "presetTopicAuthToken": "Access Token",
+  "presetTopicUsername": "Username",
+  "presetTopicPassword": "Password",
+  "presetTopicAccessToken": "Access Token"
 }
diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Autenticación de tema predeterminada",
     "defaultTopicAuthNone": "Sin autenticacion",
     "defaultTopicAuthUser": "Autenticacion de usuario",
-    "defaultTopicAuthToken": "Token de acceso"
+    "defaultTopicAuthToken": "Token de acceso",
+    "defaultSettingsHeader": "Configuración de tema predeterminada",
+    "defaultSubscribed": "Suscríbete al tema predeterminado",
+    "presetTopicName": "Tema",
+    "presetTopicAuth": "Autenticación de tema",
+    "presetTopicAuthNone": "Sin autenticacion",
+    "presetTopicAuthUser": "Autenticacion de usuario",
+    "presetTopicAuthToken": "Token de acceso",
+    "presetTopicUsername": "Nombre de usuario predeterminado",
+    "presetTopicPassword": "Contraseña predeterminada",
+    "presetTopicAccessToken": "Token de acceso predeterminado",
+    "presetSettingsHeader": "Presets adicionales",
+    "presetTopicSubsribed": "Suscribir",
+    "presetTopicSubscribed": "Suscribir"
 }
diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Authentification du sujet par défaut",
     "defaultTopicAuthNone": "Pas d'authentification",
     "defaultTopicAuthUser": "Authentification d'utilisateur",
-    "defaultTopicAuthToken": "Jeton d'accès"
+    "defaultTopicAuthToken": "Jeton d'accès",
+    "defaultSettingsHeader": "Paramètres de sujet par défaut",
+    "defaultSubscribed": "Abonnez-vous au sujet par défaut",
+    "presetTopicName": "Sujet",
+    "presetTopicAuth": "Authentification du sujet",
+    "presetTopicAuthNone": "Pas d'authentification",
+    "presetTopicAuthUser": "Authentification d'utilisateur",
+    "presetTopicAuthToken": "Jeton d'accès",
+    "presetTopicUsername": "Nom d'utilisateur par défaut",
+    "presetTopicPassword": "Mot de passe par défaut",
+    "presetTopicAccessToken": "Jeton d'accès par défaut",
+    "presetSettingsHeader": "Préréglages supplémentaires",
+    "presetTopicSubsribed": "S'abonner",
+    "presetTopicSubscribed": "S'abonner"
 }
diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Autenticazione argomento predefinita",
     "defaultTopicAuthNone": "Nessuna autenticazione",
     "defaultTopicAuthUser": "Autenticazione utente",
-    "defaultTopicAuthToken": "Token di accesso"
+    "defaultTopicAuthToken": "Token di accesso",
+    "defaultSettingsHeader": "Impostazioni argomento predefinite",
+    "defaultSubscribed": "Iscriviti all'argomento predefinito",
+    "presetTopicName": "Argomento",
+    "presetTopicAuth": "Autenticazione dell'argomento",
+    "presetTopicAuthNone": "Nessuna autenticazione",
+    "presetTopicAuthUser": "Autenticazione utente",
+    "presetTopicAuthToken": "Token di accesso",
+    "presetTopicUsername": "Nome utente predefinito",
+    "presetTopicPassword": "Password predefinita",
+    "presetTopicAccessToken": "Token di accesso predefinito",
+    "presetSettingsHeader": "Preimpostazioni aggiuntive",
+    "presetTopicSubsribed": "sottoscrivi",
+    "presetTopicSubscribed": "sottoscrivi"
 }
diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Standaard onderwerpverificatie",
     "defaultTopicAuthNone": "Geen authenticatie",
     "defaultTopicAuthUser": "Gebruikersverificatie",
-    "defaultTopicAuthToken": "Toegangstoken"
+    "defaultTopicAuthToken": "Toegangstoken",
+    "defaultSettingsHeader": "Standaard onderwerpinstellingen",
+    "defaultSubscribed": "Abonneer u op het standaardonderwerp",
+    "presetTopicName": "Onderwerp",
+    "presetTopicAuth": "Onderwerpauthenticatie",
+    "presetTopicAuthNone": "Geen authenticatie",
+    "presetTopicAuthUser": "Gebruikersverificatie",
+    "presetTopicAuthToken": "Toegangstoken",
+    "presetTopicUsername": "Standaard gebruikersnaam",
+    "presetTopicPassword": "Standaard wachtwoord",
+    "presetTopicAccessToken": "Standaardtoegangstoken",
+    "presetSettingsHeader": "Extra voorinstellingen",
+    "presetTopicSubsribed": "Abonneren",
+    "presetTopicSubscribed": "Abonneren"
 }
diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Domyślne uwierzytelnianie tematu",
     "defaultTopicAuthNone": "Brak autoryzacji",
     "defaultTopicAuthUser": "Uwierzytelnianie użytkownika",
-    "defaultTopicAuthToken": "Token dostępu"
+    "defaultTopicAuthToken": "Token dostępu",
+    "defaultSettingsHeader": "Domyślne ustawienia tematu",
+    "defaultSubscribed": "Subskrybuj domyślny temat",
+    "presetTopicName": "Temat",
+    "presetTopicAuth": "Uwierzytelnianie tematu",
+    "presetTopicAuthNone": "Brak autoryzacji",
+    "presetTopicAuthUser": "Uwierzytelnianie użytkownika",
+    "presetTopicAuthToken": "Token dostępu",
+    "presetTopicUsername": "Domyślna nazwa użytkownika",
+    "presetTopicPassword": "Domyślne hasło",
+    "presetTopicAccessToken": "Domyślny token dostępu",
+    "presetSettingsHeader": "Dodatkowe ustawienia wstępne",
+    "presetTopicSubsribed": "Subskrybuj",
+    "presetTopicSubscribed": "Subskrybuj"
 }
diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Autenticação de tópico padrão",
     "defaultTopicAuthNone": "Sem autenticação",
     "defaultTopicAuthUser": "Autenticação de usuário",
-    "defaultTopicAuthToken": "Token de acesso"
+    "defaultTopicAuthToken": "Token de acesso",
+    "defaultSettingsHeader": "Configurações de tópico padrão",
+    "defaultSubscribed": "Inscrever-se no tópico padrão",
+    "presetTopicName": "Tema",
+    "presetTopicAuth": "Autenticação de tópico",
+    "presetTopicAuthNone": "Sem autenticação",
+    "presetTopicAuthUser": "Autenticação de usuário",
+    "presetTopicAuthToken": "Token de acesso",
+    "presetTopicUsername": "Nome de usuário padrão",
+    "presetTopicPassword": "Senha padrão",
+    "presetTopicAccessToken": "Token de acesso padrão",
+    "presetSettingsHeader": "Predefinições adicionais",
+    "presetTopicSubsribed": "Se inscrever",
+    "presetTopicSubscribed": "Se inscrever"
 }
diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Аутентификация темы по умолчанию",
     "defaultTopicAuthNone": "Нет аутентификации",
     "defaultTopicAuthUser": "Аутентификация пользователя",
-    "defaultTopicAuthToken": "Токен доступа"
+    "defaultTopicAuthToken": "Токен доступа",
+    "defaultSettingsHeader": "Настройки темы по умолчанию",
+    "defaultSubscribed": "Подписаться на тему по умолчанию",
+    "presetTopicName": "Тема",
+    "presetTopicAuth": "Аутентификация темы",
+    "presetTopicAuthNone": "Нет аутентификации",
+    "presetTopicAuthUser": "Аутентификация пользователя",
+    "presetTopicAuthToken": "Токен доступа",
+    "presetTopicUsername": "Имя пользователя по умолчанию",
+    "presetTopicPassword": "Пароль по умолчанию",
+    "presetTopicAccessToken": "Токен доступа по умолчанию",
+    "presetSettingsHeader": "Дополнительные пресеты",
+    "presetTopicSubsribed": "Подписаться",
+    "presetTopicSubscribed": "Подписаться"
 }
diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "Автентифікація теми за замовчуванням",
     "defaultTopicAuthNone": "Без автентифікації",
     "defaultTopicAuthUser": "Автентифікація користувача",
-    "defaultTopicAuthToken": "Маркер доступу"
+    "defaultTopicAuthToken": "Маркер доступу",
+    "defaultSettingsHeader": "Параметри теми за умовчанням",
+    "defaultSubscribed": "Підписатися на тему за замовчуванням",
+    "presetTopicName": "Тема",
+    "presetTopicAuth": "Автентифікація теми",
+    "presetTopicAuthNone": "Без автентифікації",
+    "presetTopicAuthUser": "Автентифікація користувача",
+    "presetTopicAuthToken": "Маркер доступу",
+    "presetTopicUsername": "Ім'я користувача за замовчуванням",
+    "presetTopicPassword": "Пароль за умовчанням",
+    "presetTopicAccessToken": "Маркер доступу за умовчанням",
+    "presetSettingsHeader": "Додаткові пресети",
+    "presetTopicSubsribed": "Підпишіться",
+    "presetTopicSubscribed": "Підпишіться"
 }
diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -9,5 +9,18 @@
     "defaultTopicAuth": "默认主题认证",
     "defaultTopicAuthNone": "无需验证",
     "defaultTopicAuthUser": "用户认证",
-    "defaultTopicAuthToken": "访问令牌"
+    "defaultTopicAuthToken": "访问令牌",
+    "defaultSettingsHeader": "默认主题设置",
+    "defaultSubscribed": "订阅默认主题",
+    "presetTopicName": "话题",
+    "presetTopicAuth": "主题认证",
+    "presetTopicAuthNone": "无需验证",
+    "presetTopicAuthUser": "用户认证",
+    "presetTopicAuthToken": "访问令牌",
+    "presetTopicUsername": "默认用户名",
+    "presetTopicPassword": "默认密码",
+    "presetTopicAccessToken": "默认访问令牌",
+    "presetSettingsHeader": "附加预设",
+    "presetTopicSubsribed": "订阅",
+    "presetTopicSubscribed": "订阅"
 }
diff --git a/admin/jsonConfig.json b/admin/jsonConfig.json
@@ -10,7 +10,7 @@
         },
         "defaultSettingsHeader": {
             "type": "header",
-            "text": "Default Settings Header",
+            "text": "defaultSettingsHeader",
             "size": 4
         },
         "defaultTopic": {
@@ -42,6 +42,13 @@
             "md": 6,
             "lg": 3
         },
+        "defaultSubscribed": {
+            "type": "checkbox",
+            "label": "defaultSubscribed",
+            "sm": 12,
+            "md": 6,
+            "lg": 3
+        },
         "defaultUsername": {
             "type": "text",
             "label": "defaultUsername",
@@ -68,58 +75,66 @@
             "md": 6,
             "lg": 3
         },
-        "presetTopicsDivider": {
-            "type": "divider"
+        "presetTopicsHeader": {
+            "type": "header",
+            "text": "presetSettingsHeader",
+            "size": 4
         },
         "presetTopics": {
             "type": "table",
             "sm": 12,
             "items": [
                 {
                     "type": "text",
-                    "width": "20%",
                     "attr": "presetTopicName",
-                    "title": "TopicName"
+                    "title": "presetTopicName"
+                },
+                {
+                    "type": "checkbox",
+                    "attr": "presetTopicSubscribed",
+                    "title": "presetTopicSubscribed",
+                    "style": {
+                        "width": "auto",
+                        "textAlign": "center"
+                    }
                 },
                 {
                     "type": "select",
-                    "width": "20%",
                     "attr": "presetTopicAuth",
-                    "title": "TopicAuth",
+                    "title": "presetTopicAuth",
                     "options": [
                         {
-                            "label": "defaultTopicAuthNone",
+                            "label": "presetTopicAuthNone",
                             "value": 0
                         },
                         {
-                            "label": "defaultTopicAuthUser",
+                            "label": "presetTopicAuthUser",
                             "value": 1
                         },
                         {
-                            "label": "defaultTopicAuthToken",
+                            "label": "presetTopicAuthToken",
                             "value": 2
                         }
                     ]
                 },
                 {
                     "type": "text",
-                    "width": "20%",
                     "attr": "presetTopicUsername",
-                    "title": "TopicUsername"
+                    "title": "presetTopicUsername"
                 },
                 {
                     "type": "password",
-                    "width": "20%",
                     "attr": "presetTopicPassword",
-                    "title": "TopicPassword",
-                    "visible": true
+                    "title": "presetTopicPassword",
+                    "visible": true,
+                    "style": {}
                 },
                 {
                     "type": "password",
-                    "width": "20%",
                     "attr": "presetTopicAccessToken",
-                    "title": "TopicAccessToken",
-                    "visible": true
+                    "title": "presetTopicAccessToken",
+                    "visible": true,
+                    "style": {}
                 }
             ]
         },