treewide: convert simple Lua controllers to declarative JSON

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

2 files changed, 30 insertions, 14 deletions

diff --git a/applications/luci-app-nextdns/luasrc/controller/nextdns.lua b/applications/luci-app-nextdns/luasrc/controller/nextdns.lua
deleted file mode 100644
index bfa4887b0..000000000
--- a/applications/luci-app-nextdns/luasrc/controller/nextdns.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- Copyright 2019 Olivier Poitrey (rs@nextdns.io)
--- This is free software, licensed under the Apache License, Version 2.0
-
-module("luci.controller.nextdns", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/nextdns") then
-		return
-	end
-
-	entry({"admin", "services", "nextdns"}, firstchild(), _("NextDNS"), 60).dependent = false
-	entry({"admin", "services", "nextdns", "overview"}, view("nextdns/overview"), _("Overview"), 10).leaf = true
-	entry({"admin", "services", "nextdns", "log"}, view("nextdns/logread"), _("Logs"), 30).leaf = true
-end
diff --git a/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json b/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json
new file mode 100644
index 000000000..18255ced9
--- /dev/null
+++ b/applications/luci-app-nextdns/root/usr/share/luci/menu.d/luci-app-nextdns.json
@@ -0,0 +1,30 @@
+{
+	"admin/services/nextdns": {
+		"title": "NextDNS",
+		"order": 60,
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"uci": { "nextdns": true }
+		}
+	},
+
+	"admin/services/nextdns/overview": {
+		"title": "Overview",
+		"order": 1,
+		"action": {
+			"type": "view",
+			"path": "nextdns/overview"
+		}
+	},
+
+	"admin/services/nextdns/log": {
+		"title": "Configuration",
+		"order": 2,
+		"action": {
+			"type": "view",
+			"path": "nextdns/logread"
+		}
+	}
+}