josef
/
NotiFrame
1
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

added JSON capabilities to webserver

Browse Source
redesign
Josef Dabrowski 7 years ago
parent 35efd69424
commit 4fc0329d3f
2 changed files with 137 additions and 74 deletions
Show Stats Download Patch File Download Diff File

55
notiframe/webserver/templates/home.html
Unescape View File

@ -8,7 +8,7 @@
<body> <body>
<div> <div>
<form action="/home" method="post"> <form action="/home" class='form' method="post">
{% for n in range(widgLists| length) %} {% for n in range(widgLists| length) %}
<h4>Widget {{n}}</h4> <h4>Widget {{n}}</h4>
{% for key, value in widgLists[n].iteritems() %} {% for key, value in widgLists[n].iteritems() %}
@ -24,10 +24,61 @@
<br> <br>
{% endfor %} {% endfor %}
<br> <br>
<input type="submit" value="Submit"> <input type="submit" value="Submit">
</form> </form>
</div> </div>
<script>
/**
* Retrieves input data from a form and returns it as a JSON object.
* @param {HTMLFormControlsCollection} elements the form elements
* @return {Object} form data as an object literal
*/
const isValidElement = element => {
return element.name && element.value;
};
const formToJSON = elements => [].reduce.call(elements, (data, element) => {
if (isValidElement(element)) {
data[element.name] = element.value;
}
return data;
}, {});
const handleFormSubmit = event => {
// Stop the form from submitting since we’re handling that with AJAX.
event.preventDefault();
// Call our function to get the form data.
const data = formToJSON(form.elements);
/**
// Demo only: print the form data onscreen as a formatted JSON object.
const dataContainer = document.getElementsByClassName('results__display')[0];
// Use `JSON.stringify()` to make the output valid, human-readable JSON.
dataContainer.textContent = JSON.stringify(data, null, " ");
// ...this is where we’d actually do something with the form data...
**/
var textContent = JSON.stringify(data, null, " ");
var request = new XMLHttpRequest();
request.open('POST', '/home', true);
request.setRequestHeader('Content-Type', 'application/json');
request.send(textContent);
};
/*
* This is where things actually get started. We find the form element using
* its class name, then attach the `handleFormSubmit()` function to the
* `submit` event.
*/
const form = document.getElementsByClassName('form')[0];
form.addEventListener('submit', handleFormSubmit);
</script>
</body> </body>
</html> </html>

36
notiframe/webserver/webserver.py
Unescape View File

@ -9,10 +9,12 @@ mydir = os.path.dirname(os.path.abspath(__file__))
mydir = os.path.join(mydir, '../') mydir = os.path.join(mydir, '../')
# print(mydir) # print(mydir)
essentials = {'type': None, 'height': None, 'width': None, 'posX': None, 'posY': None} essentials = {'type': None, 'height': None,
'width': None, 'posX': None, 'posY': None}
trello_options = {'board': None, 'list': None} trello_options = {'board': None, 'list': None}
image_options = {'filename': None, 'scaleMode': None, 'bwStyle': None} image_options = {'filename': None, 'scaleMode': None, 'bwStyle': None}
def convert(input): def convert(input):
if isinstance(input, dict): if isinstance(input, dict):
return dict((convert(key), convert(value)) for key, value in input.iteritems()) return dict((convert(key), convert(value)) for key, value in input.iteritems())
@ -25,18 +27,25 @@ def convert(input):
# HOMEPAGE # HOMEPAGE
@app.route('/home', methods=['GET', 'POST']) @app.route('/home', methods=['GET', 'POST'])
def home(): def home(): # Toml config passed to html page via two dicts.
# Form data passed back to webserver as JSON.
config = read_config() config = read_config()
widgLists, sysList = prep_dict_for_web(config) widgLists, sysList = prep_dict_for_web(config)
if request.method == 'POST': if request.method == 'POST':
jsonData = request.get_json()
print(jsonData)
jsonData = convert(jsonData)
# update system variables # update system variables
for key in sysList: for key in sysList:
if request.form[key]: print("%" + jsonData[key] + "$")
if isInt(request.form[key]): if jsonData[key]:
if isInt(jsonData[key]):
#print(request.form[key] + " is int") #print(request.form[key] + " is int")
sysList[key] = int(request.form[key]) sysList[key] = int(jsonData[key])
else: else:
sysList[key] = request.form[key] sysList[key] = jsonData[key]
# update widget variables # update widget variables
# for i in range(len(widgLists)): # for i in range(len(widgLists)):
# for key in widgLists[i]: # for key in widgLists[i]:
@ -45,19 +54,18 @@ def home():
for i in range(len(widgLists)): for i in range(len(widgLists)):
for key in widgLists[i]: for key in widgLists[i]:
# print(request.form[key+str(i)]) # print(request.form[key+str(i)])
if isInt(request.form[key+str(i)]): if jsonData[key + str(i)]:
if isInt(jsonData[key + str(i)]):
#print(request.form[key+str(i)] + " is int") #print(request.form[key+str(i)] + " is int")
widgLists[i][key] = int(request.form[key+str(i)]) widgLists[i][key] = int(jsonData[key + str(i)])
else: else:
widgLists[i][key] = request.form[key+str(i)] widgLists[i][key] = jsonData[key + str(i)]
#print(widgLists)
#print(sysList)
update_config(widgLists, sysList) update_config(widgLists, sysList)
return render_template('home.html', title='Overview', widgLists=widgLists, sysList=sysList) return render_template('home.html', title='Overview', widgLists=widgLists, sysList=sysList)
def isInt(s): def isInt(s):
try: try:
int(s) int(s)
@ -65,6 +73,7 @@ def isInt(s):
except ValueError: except ValueError:
return False return False
def prep_dict_for_web(config): def prep_dict_for_web(config):
widgLists = config['widgets'] # list of dicts widgLists = config['widgets'] # list of dicts
sysList = {} # dict sysList = {} # dict
@ -73,6 +82,7 @@ def prep_dict_for_web(config):
sysList[key] = config[key] sysList[key] = config[key]
return widgLists, sysList return widgLists, sysList
def read_config(): def read_config():
uni_config = toml.load(os.path.join(mydir, 'config.toml')) uni_config = toml.load(os.path.join(mydir, 'config.toml'))
config = convert(uni_config) config = convert(uni_config)
@ -84,6 +94,7 @@ def read_config():
# ], 'cellsHeight': 3, 'resHeight': 384, 'resWidth': 640, 'cellsWidth': 3} # ], 'cellsHeight': 3, 'resHeight': 384, 'resWidth': 640, 'cellsWidth': 3}
return config return config
def update_config(widgLists, sysList): def update_config(widgLists, sysList):
config = {'widgets': widgLists} config = {'widgets': widgLists}
for key in sysList: for key in sysList:
@ -93,5 +104,6 @@ def update_config(widgLists, sysList):
with open(path, "w+") as config_file: with open(path, "w+") as config_file:
config_file.write(toml.dumps(config)) config_file.write(toml.dumps(config))
if __name__ == '__main__': if __name__ == '__main__':
app.run(debug=True, host='0.0.0.0') app.run(debug=True, host='0.0.0.0')
Write Preview
Loading…
Cancel
Save