diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..d7cc192 Binary files /dev/null and b/.DS_Store differ diff --git a/squawker/.DS_Store b/squawker/.DS_Store new file mode 100644 index 0000000..338d736 Binary files /dev/null and b/squawker/.DS_Store differ diff --git a/squawker/schema.sql b/squawker/schema.sql index 5e67ffb..2d76a3a 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,3 +1,5 @@ -- TODO change this -DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id integer); +DROP TABLE IF EXISTS squawktable; +CREATE TABLE squawktable (id INTEGER PRIMARY KEY AUTOINCREMENT, + message VARCHAR(140) DEFAULT NULL, + createTime TIMESTAMP DEFAULT CURRENT_TIMESTAMP); diff --git a/squawker/server.py b/squawker/server.py index 6ff24ba..70407a3 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,4 +1,4 @@ -from flask import Flask, g +from flask import Flask, g, request, render_template import sqlite3 @@ -37,11 +37,20 @@ def close_connection(exception): # ------------------------------ -@app.route('/') +@app.route('/', methods=["POST", "GET"]) def root(): conn = get_db() - # TODO change this - return "Hello World!" + if request.method == "POST": + newmsg = request.form["user_post"] + if len(newmsg) > 140: + return "Post length error", 400 + else: + conn.execute("INSERT INTO squawktable (message) VALUES(?)", [newmsg]) + conn.commit() + c = conn.cursor() + c.execute("SELECT * FROM squawktable ORDER BY createTime DESC") + msgPool = c.fetchall() + return render_template("squawker.html", msgPool=msgPool) if __name__ == '__main__': diff --git a/squawker/templates/squawker.html b/squawker/templates/squawker.html new file mode 100644 index 0000000..26713c4 --- /dev/null +++ b/squawker/templates/squawker.html @@ -0,0 +1,25 @@ + + + + + Squawker + + +
+
+ + +
+
+ +
+
+
+ +
+ +