now the name and swear are stored and displayed as well

2 files changed, 15 insertions, 4 deletions

diff --git a/app.py b/app.py
index 3115339..4248243 100644
--- a/app.py
+++ b/app.py
@@ -22,16 +22,23 @@ def index(filename=None):
 def sig(id='home'):
     url = CLOUDANT_BASE + id
     r = requests.get(url, auth=CLOUDANT_AUTH)
-    sig = json.loads(r.content)['s']
-    return template('index.html', sig=sig)
+    sig   = json.loads(r.content)['s']
+    name  = json.loads(r.content)['name']
+    swear = json.loads(r.content)['swear']
+    
+    return template('index.html', sig=sig, name=name, swear=swear)
 
 @post('/s')
 def sig():
     id = ''.join(random.choice(string.ascii_lowercase + string.digits) for x in range(6))
-    data = json.dumps({ 's' : request.POST['output'] })
+    data = {}
+    data["name"] = request.POST['name']
+    data["swear"] = request.POST['swear']
+    data["s"] = request.POST['output']
+    
     url = CLOUDANT_BASE + id
     headers = { 'content-type' : 'application/json' }
-    r = requests.put(url, auth=CLOUDANT_AUTH, data=data, headers=headers)
+    r = requests.put(url, auth=CLOUDANT_AUTH, data=json.dumps(data), headers=headers)
     redirect('/s/%s' % json.loads(r.content)['id'])
 
 run(host='localhost', port=8000)
diff --git a/index.html b/index.html
index cec8b23..05815a7 100755
--- a/index.html
+++ b/index.html
@@ -54,6 +54,10 @@
         %if sig:
           sig.regenerate({{!sig}});
         %end
+        %setdefault("name", "")
+        $("#name").val("{{name}}");
+        %setdefault("swear", "")
+        $("#swear").val("{{swear}}");
       });
     </script>
     <script src="/js/json2.min.js"></script>