From 60a307f5628a4ce499ecac1935162bf03e93ed4c Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Fri, 10 Sep 2021 17:38:34 +0200 Subject: [PATCH] feat: input basic data for ZeroNSd setup Updated Network page Updated save on db.json --- backend/services/network.js | 12 ++++ .../NetworkSettings/NetworkSettings.jsx | 69 ++++++++++++++++--- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/backend/services/network.js b/backend/services/network.js index c2a0958..da1f64a 100644 --- a/backend/services/network.js +++ b/backend/services/network.js @@ -62,6 +62,9 @@ async function createNetworkAdditionalData(nwid) { additionalConfig: { description: "", rulesSource: constants.defaultRulesSource, + dnsEnable: false, + dnsDomain: "", + dnsWildcard: false, }, members: [], }; @@ -79,6 +82,15 @@ async function updateNetworkAdditionalData(nwid, data) { if (data.hasOwnProperty("rulesSource")) { additionalData.rulesSource = data.rulesSource; } + if (data.hasOwnProperty("dnsEnable")) { + additionalData.dnsEnable = data.dnsEnable; + } + if (data.hasOwnProperty("dnsDomain")) { + additionalData.dnsDomain = data.dnsDomain; + } + if (data.hasOwnProperty("dnsWildcard")) { + additionalData.dnsWildcard = data.dnsWildcard; + } if (additionalData) { db.get("networks") diff --git a/frontend/src/components/NetworkSettings/NetworkSettings.jsx b/frontend/src/components/NetworkSettings/NetworkSettings.jsx index 9378a35..54ff624 100644 --- a/frontend/src/components/NetworkSettings/NetworkSettings.jsx +++ b/frontend/src/components/NetworkSettings/NetworkSettings.jsx @@ -8,6 +8,7 @@ import { Typography, TextField, Select, + List, } from "@material-ui/core"; import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; @@ -27,18 +28,18 @@ function NetworkSettings({ network, setNetwork }) { } }; - const handleChange = (key1, key2, mode = "text", additionalData = null) => ( - event - ) => { - const value = parseValue(event, mode, additionalData); + const handleChange = + (key1, key2, mode = "text", additionalData = null) => + (event) => { + const value = parseValue(event, mode, additionalData); - let updatedNetwork = replaceValue({ ...network }, key1, key2, value); - setNetwork(updatedNetwork); + let updatedNetwork = replaceValue({ ...network }, key1, key2, value); + setNetwork(updatedNetwork); - let data = setValue({}, key1, key2, value); + let data = setValue({}, key1, key2, value); - sendReq(data); - }; + sendReq(data); + }; return ( @@ -89,6 +90,56 @@ function NetworkSettings({ network, setNetwork }) { + + ZeroDNS setup + + + + Enable DNS + + + + + + + + + Use wildcards + +