Merge branch 'beta'

api.py

 from flask import jsonify, render_template
 import sqlite3
+from makeqr import makeQR
 
-def apiGet(request, url_scheme):
+def apiGet(request, url_scheme, s, sAPI):
     try:
         userID = sAPI.dumps(s.loads(request.cookies.get('userID')))
     except:
@@ -9,10 +10,11 @@ def apiGet(request, url_scheme):
 
     return render_template("apiDocs.html", apikey=userID, domain=request.headers['Host'], url_scheme=url_scheme)
 
-def apiPost(request, domain):
+def apiPost(request, url_scheme, domain, sAPI):
     username = "error"
     try:
         username = sAPI.loads(request.form['apikey'])
+        print(username)
     except:
         pass
 
@@ -55,7 +57,6 @@ def apiPost(request, domain):
                 'INSERT INTO WEB_URL (LONG_URL, SHORT_URL, USERNAME) VALUES (?, ?, ?)',
                 [longURL, short, username]
             )
-
             try:
                 request.form['qr']
                 qr64 = "data:image/jpeg;base64," + makeQR(url_scheme + "://" + short)

main.py

@@ -170,12 +170,12 @@ def makeQrCode():
 
 @app.route('/user/api', methods=['POST'])
 def api():
-    return apiPost(request, domain)
+    return apiPost(request, url_scheme, domain, sAPI)
 
 
 @app.route('/user/api', methods=['GET'])
 def apiDocs():
-    return apiGet(request, url_scheme)
+    return apiGet(request, url_scheme, s, sAPI)
 
     
 if __name__ == '__main__':

templates/editEntries.html

@@ -14,7 +14,7 @@
       <div class="login-page">
          <div class="form">
             {{content | safe}}
-            <p><a href="/">back</a></p>
+            <p><a href="/user/api">API</a> <a href="/">back to main page</a></p>
          </div>
       </div>
       <!-- ui-dialog -->

userprofile.py

@@ -21,7 +21,7 @@ def userProfile(request, cookieNotice, s):
                     calls = str(cursor2.execute('SELECT CALLS FROM ANALYTICS WHERE SHORT_URL=?', [entries[1]]).fetchone()[0])
                 except:
                     calls = "0"
-                response = response + "<tr>\n<td>" + entries[0] + "</td>\n<td>" + entries[1] + '</td>\n<td>' + calls + '</td>\n<td><a id="red" href="/user/delete?link=' + escape(entries[1]) + '">delete</a> <a href="#" id="dialog-link" onclick="buttonListener(\'' + entries[1] + '\', this)">QR</a></tr>\n'
+                response = response + "<tr>\n<td>" + entries[0] + "</td>\n<td><a href=\"" + entries[1] + '">' + entries[1] + '</a></td>\n<td>' + calls + '</td>\n<td><a id="red" href="/user/delete?link=' + escape(entries[1]) + '">delete</a> <a href="#" id="dialog-link" onclick="buttonListener(\'' + entries[1] + '\', this)">QR</a></tr>\n'
             response = response + "</table>" #Close the table
             if(len(entriesList) == 0): response = 'you have no shorten links.' #If user has no shorten links make this message
         except: