Skip to content

Commit 79a2ffb

Browse files
committed
Front-end to post using wget and curl.
Ref #143
1 parent e1175e5 commit 79a2ffb

File tree

2 files changed

+48
-24
lines changed

2 files changed

+48
-24
lines changed

res/web/js/form.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ function getForm(lat, lng) {
9090
form += '<button class="btn btn-small btn-primary" href="#" onclick="next(5); return false;">Next</button></div></div></div>';
9191
form += '<div class="tab" id="five"><div class="row">';
9292
form += '<div class="col col-xs-12">';
93-
form += '<label>Submit via curl</label>';
93+
form += '<label>Submit via curl&nbsp;<button class="btn btn-mini btn-success" href="#" onclick="updateData(\'curl\'); return false;">Update</button></label>';
9494
form += '<input type="text" class="form-control" placeholder="Curl Data" id="curl">';
95-
form += '<label>Submit via wget</label>';
95+
form += '<label>Submit via wget&nbsp;<button class="btn btn-mini btn-success" href="#" onclick="updateData(\'wget\'); return false;">Update</button></label>';
9696
form += '<br/><input type="text" class="form-control" placeholder="Wget Data" id="wget">';
9797
form += '<br/></div></div>';
9898
form += '<div class="row"><div class="col col-xs-6 text-center">';

res/web/js/node.js

+46-22
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,50 @@ function addError(fadewhat, err) {
2525
});
2626
}
2727

28-
function insertUser() {
28+
function updateData(cmd) {
29+
30+
var c = (cmd == 'wget') ? 'wget -qO-' : 'curl -s';
31+
var d = (cmd == 'wget') ? ' --post-data ' : ' -d ';
32+
33+
var address = $("#address").val();
34+
var lat = $("#latitude").val();
35+
var lon = $("#longitude").val();
36+
var name = $("#name").val();
37+
var email = $("#email").val();
38+
var contact = $("#contact").val();
39+
var details = $("#details").val()
40+
var pgp = $("#pgp").val()
41+
var status = getSTATUS();
42+
43+
var data = c + d + '"address=' + address + '"' + d + '"latitude=' + lat + '"' +
44+
d + '"longitude=' + lon + '"' + d + '"name=' + name + '"' + d + '"email=' + email + '"' +
45+
d + '"contact=' + contact + '"' + d + '"details=' + details + '"' +
46+
d + '"pgp=' + pgp + '"' + d + '"status=' + status + '"' + ' "' +
47+
window.location.protocol + '//' + window.location.host + '/api/node"';
48+
49+
$('#'+cmd).val(data);
50+
}
51+
52+
function insertUser() {
2953
var address = $("#address").val();
3054
var name = $("#name").val();
3155
var email = $("#email").val();
32-
56+
3357
if (name.length == 0) {
3458
addError('#inputform', 'a name is required');
3559
return false;
3660
}
37-
61+
3862
if (email.length == 0) {
3963
addError('#inputform', 'an email is required');
4064
return false;
4165
}
42-
66+
4367
if (address.length == 0) {
4468
addError('#inputform', 'an address is required');
4569
return false;
4670
}
47-
71+
4872
$('#inputform').fadeOut(500, function() {
4973
$.getJSON('/api/token', function(token){
5074
var dataObject = {
@@ -107,12 +131,12 @@ function nodeInfoClick(e, on) {
107131
if (on) html = e;
108132
else html = e.layer._popup._content;
109133
$('#wrap').append(html);
110-
$('.node').hide();
134+
$('.node').hide();
111135
$('.node').fadeIn(500);
112136
var name = html.substring(html.indexOf('<h4>')+4, html.indexOf('</h4>'));
113137
ipv6 = html.substring(html.indexOf('a href')+14);
114138
ipv6 = ipv6.substring(0, ipv6.indexOf('"'));
115-
139+
116140
// CLOSE NODE
117141
$('#closeNode').bind('click', function() {
118142
$('.node').fadeOut(500, function() {
@@ -124,7 +148,7 @@ function nodeInfoClick(e, on) {
124148
$('#edit').bind('click', function() {
125149
edit(e, ipv6, m);
126150
});
127-
151+
128152
// SEND MESSAGE
129153
$('#sendMessage').bind('click', function() {
130154
message(name, ipv6);
@@ -133,13 +157,13 @@ function nodeInfoClick(e, on) {
133157

134158
function getSTATUS() {
135159
var active = 0, residential = 0, internet = 0, wireless = 0, wired = 0;
136-
137-
if ($("#active").is(':checked')) active = STATUS_ACTIVE;
160+
161+
if ($("#active").is(':checked')) active = STATUS_ACTIVE;
138162
if ($("#residential").is(':checked')) residential = STATUS_PHYSICAL;
139163
if ($("#internet").is(':checked')) internet = STATUS_INTERNET;
140164
if ($("#wireless").is(':checked')) wireless = STATUS_WIRELESS;
141165
if ($("#wired").is(':checked')) wired = STATUS_WIRED;
142-
166+
143167
return (active|residential|internet|wireless|wired);
144168
}
145169

@@ -221,7 +245,7 @@ function edit(e, ipv6, m) {
221245
$('.node').remove();
222246
$('#wrap').append(getForm(e.layer.getLatLng().lat, e.layer.getLatLng().lng));
223247
$('#submitatlas').prop('onclick', '');
224-
248+
225249
// Now we want to set shit that is already there.
226250
$.getJSON('/api/node?address='+ipv6, function(response) {
227251
$('#name').val(response.data.OwnerName);
@@ -232,24 +256,24 @@ function edit(e, ipv6, m) {
232256
$('#details').val(response.data.Details);
233257
$('#pgp').val(response.data.PGP);
234258
$('#contact').val(response.data.Contact);
235-
259+
236260
var STATUS = response.data.Status;
237-
261+
238262
if ((STATUS&STATUS_ACTIVE) > 0) $('#active').prop('checked', true);
239263
else $('#active').prop('checked', false);
240-
264+
241265
if ((STATUS&STATUS_PHYSICAL) > 0) $('#residential').prop('checked', true);
242266
else $('#residential').prop('checked', false);
243-
267+
244268
if ((STATUS&STATUS_INTERNET) > 0) $('#internet').prop('checked', true);
245269
else $('#internet').prop('checked', false);
246-
270+
247271
if ((STATUS&STATUS_WIRELESS) > 0) $('#wireless').prop('checked', true);
248272
else $('#wireless').prop('checked', false);
249-
273+
250274
if ((STATUS&STATUS_WIRED) > 0) $('#wired').prop('checked', true);
251275
else $('#wired').prop('checked', false);
252-
276+
253277
// Click submit
254278
$('#submitatlas').bind('click', function() {
255279
$('#inputform').fadeOut(500);
@@ -299,12 +323,12 @@ function edit(e, ipv6, m) {
299323
});
300324
$('#inputform').fadeIn(500);
301325
$('#name').focus();
302-
326+
303327
// DELETE NODE
304328
$('#delete').bind('click', function() {
305329
deleteNode(ipv6);
306330
});
307-
331+
308332
// REPOSITON NODE
309333
$('#reposition').bind('click', function() {
310334
repositionNode(m);
@@ -375,4 +399,4 @@ function deleteNode(ipv6) {
375399
});
376400
});
377401
});
378-
}
402+
}

0 commit comments

Comments
 (0)