From 3137ce8bd00ef8d04f74f57c50c68c8a0a08dbca Mon Sep 17 00:00:00 2001 From: noopurP Date: Thu, 3 Nov 2016 11:32:29 -0400 Subject: [PATCH 1/5] first --- squawker/server.py | 37 ++++++++++++++++++++++++++------ squawker/templates/Homepage.html | 35 ++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 squawker/templates/Homepage.html diff --git a/squawker/server.py b/squawker/server.py index 6ff24ba..90058ea 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,6 +1,5 @@ -from flask import Flask, g -import sqlite3 - +from flask import Flask, g, render_template, request +import sqlite3, time, datetime, random, webbrowser # -- leave these lines intact -- app = Flask(__name__) @@ -37,12 +36,36 @@ def close_connection(exception): # ------------------------------ -@app.route('/') +@app.route('/', methods=['GET', 'POST']) def root(): - conn = get_db() - # TODO change this - return "Hello World!" + conn = get_db() + c = conn.cursor() + c.execute('CREATE TABLE IF NOT EXISTS allSquawksIEverMade(datestamp TEXT, squawk TEXT)') + s = [] + c.execute('SELECT * FROM allSquawksIEverMade') + for row in c.fetchall(): + s.append(row[1]) + t = [] + for i in reversed(s): + t.append(i) + return render_template('Homepage.html', s=t) +@app.route('/send', methods=['GET', 'POST']) +def send(): + conn = get_db() + c = conn.cursor() + if request.method == 'POST': + data = str(request.form['squawk']) + if len(data) > 140: + s = [] + s.append('Error Code 400: Input correct form details') + return render_template('Homepage.html', s=s) + unix = time.time() + timestamp = str(datetime.datetime.fromtimestamp(unix).strftime('%Y-%m-%d %H:%M:%S')) + c.execute("INSERT INTO allSquawksIEverMade (datestamp, squawk) VALUES (?, ?)", (timestamp, data)) + conn.commit() + webbrowser.open('http://localhost:5000/') + return 'all Ok' if __name__ == '__main__': app.run() diff --git a/squawker/templates/Homepage.html b/squawker/templates/Homepage.html new file mode 100644 index 0000000..00f8420 --- /dev/null +++ b/squawker/templates/Homepage.html @@ -0,0 +1,35 @@ + + + + Squawker Flask + + + + + + +
+

Squawks Today

+ {% for squawk in s %} + {{ squawk }}
+ {% endfor %} +
+ +
+
+
+ +
+ +
+
+ + + \ No newline at end of file From 45ea186d8d54b6e254e8d0d9c886eb0e45d33bc0 Mon Sep 17 00:00:00 2001 From: noopurP Date: Thu, 3 Nov 2016 11:41:23 -0400 Subject: [PATCH 2/5] Update server.py --- squawker/server.py | 54 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 90058ea..6a9eb2b 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,4 +1,5 @@ -from flask import Flask, g, render_template, request +from flask import Flask +import g, render_template, request import sqlite3, time, datetime, random, webbrowser # -- leave these lines intact -- @@ -20,7 +21,6 @@ def init_db(): db.cursor().executescript(f.read()) db.commit() - @app.cli.command('initdb') def initdb_command(): """Creates the database tables.""" @@ -38,34 +38,34 @@ def close_connection(exception): @app.route('/', methods=['GET', 'POST']) def root(): - conn = get_db() - c = conn.cursor() - c.execute('CREATE TABLE IF NOT EXISTS allSquawksIEverMade(datestamp TEXT, squawk TEXT)') - s = [] - c.execute('SELECT * FROM allSquawksIEverMade') - for row in c.fetchall(): - s.append(row[1]) - t = [] - for i in reversed(s): - t.append(i) - return render_template('Homepage.html', s=t) + conn = get_db() + c = conn.cursor() + c.execute('CREATE TABLE IF NOT EXISTS allSquawksIEverMade(datestamp TEXT, squawk TEXT)') + s = [] + c.execute('SELECT * FROM allSquawksIEverMade') + for row in c.fetchall(): + s.append(row[1]) + t = [] + for i in reversed(s): + t.append(i) + return render_template('Homepage.html', s=t) @app.route('/send', methods=['GET', 'POST']) def send(): - conn = get_db() - c = conn.cursor() - if request.method == 'POST': - data = str(request.form['squawk']) - if len(data) > 140: - s = [] - s.append('Error Code 400: Input correct form details') - return render_template('Homepage.html', s=s) - unix = time.time() - timestamp = str(datetime.datetime.fromtimestamp(unix).strftime('%Y-%m-%d %H:%M:%S')) - c.execute("INSERT INTO allSquawksIEverMade (datestamp, squawk) VALUES (?, ?)", (timestamp, data)) - conn.commit() - webbrowser.open('http://localhost:5000/') - return 'all Ok' + conn = get_db() + c = conn.cursor() + if request.method == 'POST': + data = str(request.form['squawk']) + if len(data) > 140: + s = [] + s.append('Error Code 400: Input correct form details') + return render_template('Homepage.html', s=s) + unix = time.time() + timestamp = str(datetime.datetime.fromtimestamp(unix).strftime('%Y-%m-%d %H:%M:%S')) + c.execute("INSERT INTO allSquawksIEverMade (datestamp, squawk) VALUES (?, ?)", (timestamp, data)) + conn.commit() + webbrowser.open('http://localhost:5000/') + return 'all Ok' if __name__ == '__main__': app.run() From 0cba51c58dbf791b5fbf1372f09e342e4ec9a033 Mon Sep 17 00:00:00 2001 From: noopurP Date: Thu, 3 Nov 2016 11:46:28 -0400 Subject: [PATCH 3/5] Update server.py --- squawker/server.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 6a9eb2b..324dbc5 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,6 +1,10 @@ from flask import Flask -import g, render_template, request -import sqlite3, time, datetime, random, webbrowser +from flask import g +from flask import render_template +from flask import request +import sqlite3, time +import datetime, random +import webbrowser # -- leave these lines intact -- app = Flask(__name__) @@ -21,6 +25,7 @@ def init_db(): db.cursor().executescript(f.read()) db.commit() + @app.cli.command('initdb') def initdb_command(): """Creates the database tables.""" @@ -50,6 +55,7 @@ def root(): t.append(i) return render_template('Homepage.html', s=t) + @app.route('/send', methods=['GET', 'POST']) def send(): conn = get_db() @@ -67,5 +73,6 @@ def send(): webbrowser.open('http://localhost:5000/') return 'all Ok' + if __name__ == '__main__': app.run() From a2f3265abe86d5194a70ab43c2776aad96c76737 Mon Sep 17 00:00:00 2001 From: noopurP Date: Thu, 3 Nov 2016 11:49:17 -0400 Subject: [PATCH 4/5] Update server.py --- squawker/server.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 324dbc5..e229f57 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -2,8 +2,10 @@ from flask import g from flask import render_template from flask import request -import sqlite3, time -import datetime, random +import sqlite3 +import time +import datetime +import random import webbrowser # -- leave these lines intact -- @@ -25,7 +27,7 @@ def init_db(): db.cursor().executescript(f.read()) db.commit() - + @app.cli.command('initdb') def initdb_command(): """Creates the database tables.""" From e56971985cacb4653f33c78ad089308b3e877e06 Mon Sep 17 00:00:00 2001 From: noopurP Date: Thu, 3 Nov 2016 11:50:36 -0400 Subject: [PATCH 5/5] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index e229f57..928c7e9 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -27,7 +27,7 @@ def init_db(): db.cursor().executescript(f.read()) db.commit() - + @app.cli.command('initdb') def initdb_command(): """Creates the database tables."""