General housekeeping such as adding package.json for Node server, bash script for launching a celery worker and updating the readme to assist with launching the DEMOS2 app. Updated some models to include UI helper functions. Main work done is around event preparation - with a Celery worker running and the Node server, trustees are now emailed a link to prepare events. The event detail page has also had a bit of an overhaul to include additional information and to make it easier to use
This commit is contained in:
parent
de9eaa7881
commit
f82a380fa4
21 changed files with 337 additions and 696 deletions
64
allauthdemo/polls/crypto_rpc.py
Executable file
64
allauthdemo/polls/crypto_rpc.py
Executable file
|
@ -0,0 +1,64 @@
|
|||
import os
|
||||
import shlex
|
||||
import subprocess
|
||||
import json
|
||||
import urllib2
|
||||
|
||||
'''
|
||||
|
||||
All functions in this file have been re-implemenented by Thomas Smith
|
||||
|
||||
File then updated by Vincent de Almeida. Changes include:
|
||||
-Update filename to 'crypto_rpc' to reflect the RPC nature of the methods
|
||||
|
||||
'''
|
||||
def param():
|
||||
url = 'http://localhost:8080/param' # RPC URL
|
||||
jsondict = json.load(urllib2.urlopen(url))
|
||||
return json.dumps(jsondict)
|
||||
|
||||
def combpk(amount, pks):
|
||||
url = 'http://localhost:8080/cmpkstring' # RPC URL
|
||||
querystring = '?number='+str(amount)
|
||||
for pk in pks:
|
||||
querystring += '&PK='+pk
|
||||
|
||||
print(url+querystring)
|
||||
jsondict = json.load(urllib2.urlopen(url+querystring))
|
||||
print(json.dumps(jsondict))
|
||||
return json.dumps(jsondict)
|
||||
|
||||
def addec(amount, ciphers):
|
||||
url = 'http://localhost:8080/addec' # RPC URL
|
||||
querystring = '?number='+str(amount)
|
||||
c1s = ciphers['c1s']
|
||||
c2s = ciphers['c2s']
|
||||
for i, value in enumerate(c1s):
|
||||
querystring += "&C1="+str(c1s[i])
|
||||
querystring += "&C2="+str(c2s[i])
|
||||
|
||||
print(url+querystring)
|
||||
jsondict = json.load(urllib2.urlopen(url+querystring))
|
||||
print(json.dumps(jsondict))
|
||||
return json.dumps(jsondict)
|
||||
|
||||
def tally(amount, param, decs, cipher):
|
||||
url = 'http://localhost:8080/tally' # RPC URL
|
||||
querystring = '?number='+str(amount)
|
||||
querystring += '¶m='+urllib2.quote(str(param))
|
||||
|
||||
testquerystring = '?number='+str(amount)
|
||||
testquerystring += '¶m='+str(param)
|
||||
|
||||
for i, value in enumerate(decs):
|
||||
querystring += "&decs="+str(value)
|
||||
testquerystring += "&decs="+str(value)
|
||||
|
||||
querystring += '&cipher=' + urllib2.quote(str(cipher))
|
||||
testquerystring += '&cipher=' + str(cipher)
|
||||
|
||||
print(url+querystring)
|
||||
print(url+testquerystring)
|
||||
jsondict = json.load(urllib2.urlopen(url+querystring))
|
||||
print('tally: ' + str(jsondict['M']))
|
||||
return str(jsondict['M'])
|
Reference in a new issue