From 4b6c565a6559b0a211f569928c5961a78e8d3c6e Mon Sep 17 00:00:00 2001 From: Boting Li Date: Mon, 24 Oct 2016 23:43:32 -0400 Subject: [PATCH 1/8] try it --- squawker/schema.sql | 5 ++++- squawker/server.py | 22 ++++++++++++++++++---- squawker/templates/index.html | 18 ++++++++++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 squawker/templates/index.html diff --git a/squawker/schema.sql b/squawker/schema.sql index 5e67ffb..fd7f7aa 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,3 +1,6 @@ -- TODO change this DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id integer); +CREATE TABLE squawks ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + twit VARCHAR(140), + time_stamp DATETIME); diff --git a/squawker/server.py b/squawker/server.py index 6ff24ba..23f5b6f 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,6 +1,6 @@ from flask import Flask, g import sqlite3 - +import time # -- leave these lines intact -- app = Flask(__name__) @@ -21,6 +21,8 @@ def init_db(): db.cursor().executescript(f.read()) db.commit() +init_db() + @app.cli.command('initdb') def initdb_command(): @@ -37,12 +39,24 @@ def close_connection(exception): # ------------------------------ + @app.route('/') +def root(): def root(): conn = get_db() - # TODO change this - return "Hello World!" - + cursor = conn.cursor() + if request.method == "POST": + msg = request.form["content"] + if len(msg) <= 140: + query = "INSERT INTO squawks (twit, time_stamp) VALUES (?, ?)" + time = datetime.datetime.now() + cursor.execute(query, (msg, time)) + conn.commit() + else: + abort(400) + cursor.execute("SELECT squawk FROM squawks ORDER BY time_stamp DESC") + res = cursor.fetchall() + return render_template("index.html", squawks=res) if __name__ == '__main__': app.run() diff --git a/squawker/templates/index.html b/squawker/templates/index.html new file mode 100644 index 0000000..8f21df4 --- /dev/null +++ b/squawker/templates/index.html @@ -0,0 +1,18 @@ + + + + + Squawker + + + +

My Squawker

+
+ + +

Post your squawks here

+ {% for s in squawks %} +

{{s[0]}}

+ {% endfor %} +
+ \ No newline at end of file From e2a5faf08d47bacbbd3c34b77466fa6ba907417b Mon Sep 17 00:00:00 2001 From: Boting Li Date: Mon, 24 Oct 2016 23:45:03 -0400 Subject: [PATCH 2/8] try it --- squawker/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index 23f5b6f..5df337c 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -41,7 +41,6 @@ def close_connection(exception): @app.route('/') -def root(): def root(): conn = get_db() cursor = conn.cursor() From 24ff0696b0bba158e0cf65dbe3e136fa36ea49e6 Mon Sep 17 00:00:00 2001 From: Boting Li Date: Mon, 24 Oct 2016 23:50:42 -0400 Subject: [PATCH 3/8] try it again --- squawker/schema.sql | 2 +- squawker/server.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/squawker/schema.sql b/squawker/schema.sql index fd7f7aa..fd1d300 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,5 +1,5 @@ -- TODO change this -DROP TABLE IF EXISTS mytable; +DROP TABLE IF EXISTS squawks; CREATE TABLE squawks ( id INTEGER PRIMARY KEY AUTOINCREMENT, twit VARCHAR(140), diff --git a/squawker/server.py b/squawker/server.py index 5df337c..9fb1edd 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,6 +1,7 @@ -from flask import Flask, g +from flask import Flask, request, g, abort, render_template import sqlite3 -import time +import os +import datetime # -- leave these lines intact -- app = Flask(__name__) @@ -53,7 +54,7 @@ def root(): conn.commit() else: abort(400) - cursor.execute("SELECT squawk FROM squawks ORDER BY time_stamp DESC") + cursor.execute("SELECT twit FROM squawks ORDER BY time_stamp DESC") res = cursor.fetchall() return render_template("index.html", squawks=res) From a76154f8142117d1fa5c88bb294b1b195895cfb3 Mon Sep 17 00:00:00 2001 From: Boting Li Date: Mon, 24 Oct 2016 23:52:01 -0400 Subject: [PATCH 4/8] try it again --- squawker/server.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 9fb1edd..95868e3 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -22,8 +22,6 @@ def init_db(): db.cursor().executescript(f.read()) db.commit() -init_db() - @app.cli.command('initdb') def initdb_command(): From efcee0949a0b33605f134c3477570fd29584d90f Mon Sep 17 00:00:00 2001 From: Boting Li Date: Mon, 24 Oct 2016 23:53:12 -0400 Subject: [PATCH 5/8] try it again --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index 95868e3..d7860c9 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -38,7 +38,6 @@ def close_connection(exception): # ------------------------------ - @app.route('/') def root(): conn = get_db() @@ -56,5 +55,6 @@ def root(): res = cursor.fetchall() return render_template("index.html", squawks=res) + if __name__ == '__main__': app.run() From a1366da7cc70b2752794de36fcc945e91e4464f7 Mon Sep 17 00:00:00 2001 From: Boting Li Date: Tue, 25 Oct 2016 00:01:34 -0400 Subject: [PATCH 6/8] try it again --- squawker/templates/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 8f21df4..98a4ca2 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -15,4 +15,5 @@

Post your squawks here

{{s[0]}}

{% endfor %} - \ No newline at end of file + + From 60e4edfe153896e9dc006b5723b9ec92371f1799 Mon Sep 17 00:00:00 2001 From: Boting Li Date: Tue, 25 Oct 2016 00:04:25 -0400 Subject: [PATCH 7/8] try it againnnnn --- squawker/schema.sql | 3 +-- squawker/server.py | 8 ++++---- squawker/templates/index.html | 6 +++--- tests/test_squawker.py | 1 - 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/squawker/schema.sql b/squawker/schema.sql index fd1d300..d535d63 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,6 +1,5 @@ --- TODO change this DROP TABLE IF EXISTS squawks; CREATE TABLE squawks ( id INTEGER PRIMARY KEY AUTOINCREMENT, - twit VARCHAR(140), + squawk VARCHAR(140), time_stamp DATETIME); diff --git a/squawker/server.py b/squawker/server.py index d7860c9..59c439e 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,6 +1,6 @@ -from flask import Flask, request, g, abort, render_template import sqlite3 import os +from flask import Flask, request, g, abort, render_template import datetime # -- leave these lines intact -- @@ -38,20 +38,20 @@ def close_connection(exception): # ------------------------------ -@app.route('/') +@app.route('/', methods=['POST', 'GET']) def root(): conn = get_db() cursor = conn.cursor() if request.method == "POST": msg = request.form["content"] if len(msg) <= 140: - query = "INSERT INTO squawks (twit, time_stamp) VALUES (?, ?)" + query = "INSERT INTO squawks (squawk, time_stamp) VALUES (?, ?)" time = datetime.datetime.now() cursor.execute(query, (msg, time)) conn.commit() else: abort(400) - cursor.execute("SELECT twit FROM squawks ORDER BY time_stamp DESC") + cursor.execute("SELECT squawk FROM squawks ORDER BY time_stamp DESC") res = cursor.fetchall() return render_template("index.html", squawks=res) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 98a4ca2..b36ba4e 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -6,14 +6,14 @@ -

My Squawker

+

Squawker!

-

Post your squawks here

+

Your squawks

{% for s in squawks %}

{{s[0]}}

{% endfor %}
- + diff --git a/tests/test_squawker.py b/tests/test_squawker.py index b31bc14..87ed9ad 100644 --- a/tests/test_squawker.py +++ b/tests/test_squawker.py @@ -7,7 +7,6 @@ import string import tempfile import time -from . import flaskclient_fix URL = '/' From 5b2522c1d2f7449bdb2909a8fdd1b9866a166603 Mon Sep 17 00:00:00 2001 From: Boting Li Date: Tue, 25 Oct 2016 00:13:37 -0400 Subject: [PATCH 8/8] how about this --- squawker/server.py | 2 +- squawker/templates/index.html | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 59c439e..9a9bfe7 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,6 +1,6 @@ +from flask import Flask, request, g, abort, render_template import sqlite3 import os -from flask import Flask, request, g, abort, render_template import datetime # -- leave these lines intact -- diff --git a/squawker/templates/index.html b/squawker/templates/index.html index b36ba4e..64eb7b8 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -1,4 +1,3 @@ - @@ -6,11 +5,11 @@ -

Squawker!

+

Enter Squawkers Here

-

Your squawks

+

Your squawks:

{% for s in squawks %}

{{s[0]}}

{% endfor %}