From 565111bbe4f6c0eebdcd673061e50d3f539a07a9 Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Tue, 1 Nov 2016 21:34:11 +0000 Subject: [PATCH 01/10] first test --- squawker/schema.sql | 6 +++++- squawker/server.py | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/squawker/schema.sql b/squawker/schema.sql index 5e67ffb..de0e2d7 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,3 +1,7 @@ -- TODO change this DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id integer); +CREATE TABLE mytable ( + id integer primary key autoincrement, + phrase varchar(140) NOT NULL, + time datetime NOT NULL +); diff --git a/squawker/server.py b/squawker/server.py index 6ff24ba..d7efbe6 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -41,8 +41,23 @@ def close_connection(exception): def root(): conn = get_db() # TODO change this - return "Hello World!" + cur = conn.execute('select title, text from entries order by id desc') + entries = cur.fetchall() + return render_template('show_entries.html', entries=entries) +@app.route('/add', methods=['POST']) +def add_entry(): + conn = get_db() + conn.execute('insert into entries (title, text) values (?,?)', + [request.form['title'], request.form['text']]) + conn.commit() + flash('new entry was successfully posted') + return redirect(url_for('show_entries')) + if __name__ == '__main__': app.run() + + + + From 1d81a1d00259ea221d42a2c02f162a37950ebba2 Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:23:06 +0000 Subject: [PATCH 02/10] second version --- squawker/.DS_Store | Bin 0 -> 6148 bytes squawker/layout.html | 7 +++++++ squawker/schema.sql | 9 ++++----- squawker/server.py | 18 ++++++++++-------- squawker/show_entries.html | 17 +++++++++++++++++ 5 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 squawker/.DS_Store create mode 100644 squawker/layout.html create mode 100644 squawker/show_entries.html diff --git a/squawker/.DS_Store b/squawker/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 +KSA55 Squawker + +
+

ksa55's squawks

+ {% block body %}{% endblock %} +
\ No newline at end of file diff --git a/squawker/schema.sql b/squawker/schema.sql index de0e2d7..904a58d 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,7 +1,6 @@ -- TODO change this -DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable ( +DROP TABLE IF EXISTS entries; +CREATE TABLE entries ( id integer primary key autoincrement, - phrase varchar(140) NOT NULL, - time datetime NOT NULL -); + squawk varchar(140) NOT NULL +); \ No newline at end of file diff --git a/squawker/server.py b/squawker/server.py index d7efbe6..2f3f9ac 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,4 +1,4 @@ -from flask import Flask, g +from flask import Flask, g, request, redirect, url_for, abort, render_template import sqlite3 @@ -39,20 +39,22 @@ def close_connection(exception): @app.route('/') def root(): - conn = get_db() + db = get_db() # TODO change this - cur = conn.execute('select title, text from entries order by id desc') + cur = db.execute('select title, text from entries order by id desc') entries = cur.fetchall() return render_template('show_entries.html', entries=entries) @app.route('/add', methods=['POST']) def add_entry(): - conn = get_db() - conn.execute('insert into entries (title, text) values (?,?)', - [request.form['title'], request.form['text']]) - conn.commit() - flash('new entry was successfully posted') + squawk = request.form['text'] + if len(squawk) > 140: + abort(400) + return + db = get_db() + db.execute('INSERT INTO entries (squawk) VALUES (?)', [squawk]) + db.commit() return redirect(url_for('show_entries')) if __name__ == '__main__': diff --git a/squawker/show_entries.html b/squawker/show_entries.html new file mode 100644 index 0000000..09c4649 --- /dev/null +++ b/squawker/show_entries.html @@ -0,0 +1,17 @@ +{% extends "layout.html" %} +{% block body %} +
+
+
Text: +
+
+
+
+
    + {% for entry in entries %} +

  • {{ entry[1]|safe }}

    + {% else %} +
  • Nada.. + {% endfor %} +
+{% endblock %} \ No newline at end of file From 0df2a8612ce6c48832eda80a1293ebffbf11d05c Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:24:27 +0000 Subject: [PATCH 03/10] second version 2 --- squawker/server.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 2f3f9ac..d88850b 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -58,8 +58,4 @@ def add_entry(): return redirect(url_for('show_entries')) if __name__ == '__main__': - app.run() - - - - + app.run() \ No newline at end of file From f27c76e51cb23d579627d1316d0e2c248efe548d Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:28:14 +0000 Subject: [PATCH 04/10] v4 --- squawker/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index d88850b..98091cc 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -58,4 +58,5 @@ def add_entry(): return redirect(url_for('show_entries')) if __name__ == '__main__': - app.run() \ No newline at end of file + app.run() + \ No newline at end of file From 21f312a43be27258f0f1b0c8272fbcd3499b3ecd Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:30:05 +0000 Subject: [PATCH 05/10] v4 --- squawker/server.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 98091cc..49dc677 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,7 +1,5 @@ from flask import Flask, g, request, redirect, url_for, abort, render_template import sqlite3 - - # -- leave these lines intact -- app = Flask(__name__) @@ -36,7 +34,6 @@ def close_connection(exception): db.close() # ------------------------------ - @app.route('/') def root(): db = get_db() @@ -45,7 +42,6 @@ def root(): entries = cur.fetchall() return render_template('show_entries.html', entries=entries) - @app.route('/add', methods=['POST']) def add_entry(): squawk = request.form['text'] @@ -58,5 +54,4 @@ def add_entry(): return redirect(url_for('show_entries')) if __name__ == '__main__': - app.run() - \ No newline at end of file + app.run() \ No newline at end of file From 6da5ce2465d4c88ef25a5aab009eb18338cea51f Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:31:30 +0000 Subject: [PATCH 06/10] v5 --- squawker/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index 49dc677..dff07b2 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -34,6 +34,7 @@ def close_connection(exception): db.close() # ------------------------------ + @app.route('/') def root(): db = get_db() @@ -42,6 +43,7 @@ def root(): entries = cur.fetchall() return render_template('show_entries.html', entries=entries) + @app.route('/add', methods=['POST']) def add_entry(): squawk = request.form['text'] @@ -54,4 +56,4 @@ def add_entry(): return redirect(url_for('show_entries')) if __name__ == '__main__': - app.run() \ No newline at end of file + app.run() From 79f8d38a527bd620f7a928638431cfd3d939e14c Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:34:06 +0000 Subject: [PATCH 07/10] v6 --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index dff07b2..baaecf3 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -39,7 +39,7 @@ def close_connection(exception): def root(): db = get_db() # TODO change this - cur = db.execute('select title, text from entries order by id desc') + cur = db.execute('SELECT id, squawk FROM entries ORDER BY id DESC') entries = cur.fetchall() return render_template('show_entries.html', entries=entries) From e7a1a429dc725fb55f99da8fc7e4a30f541b2cb0 Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:36:11 +0000 Subject: [PATCH 08/10] v7 --- squawker/.DS_Store | Bin 6148 -> 6148 bytes squawker/{ => templates}/layout.html | 0 squawker/{ => templates}/show_entries.html | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename squawker/{ => templates}/layout.html (100%) rename squawker/{ => templates}/show_entries.html (100%) diff --git a/squawker/.DS_Store b/squawker/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..d5429b1acd562c516cc24dff39cc1e0d909abed7 100644 GIT binary patch literal 6148 zcmeHKOKQVF43*MQ61vH<%h`3)O>Qs*_XN2>iyhiRj15WlK4cHnrw^g7CtZ~iiUgWB z9!Vbgjj=2u;?1d96Rn770TrArF%(4Xq7#|$})3AjHu~2NHo+1YW5HK<@2y9kle#WxdfcX^DW_AvK4xj>{$am(+{342+ UKzW7)kiy9(Jj$D6L{=~Z02rPQkN^Mx diff --git a/squawker/layout.html b/squawker/templates/layout.html similarity index 100% rename from squawker/layout.html rename to squawker/templates/layout.html diff --git a/squawker/show_entries.html b/squawker/templates/show_entries.html similarity index 100% rename from squawker/show_entries.html rename to squawker/templates/show_entries.html From 023e874a65849f9a7e29a9c8b9353fca2ccb6e8b Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:38:31 +0000 Subject: [PATCH 09/10] fixed build_url to / from show_entries --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index baaecf3..69b8053 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -53,7 +53,7 @@ def add_entry(): db = get_db() db.execute('INSERT INTO entries (squawk) VALUES (?)', [squawk]) db.commit() - return redirect(url_for('show_entries')) + return redirect(url_for('/')) if __name__ == '__main__': app.run() From 4959af4b86d4f56c8d4b0070e2d79208deb27018 Mon Sep 17 00:00:00 2001 From: kuljotanand Date: Thu, 3 Nov 2016 04:40:58 +0000 Subject: [PATCH 10/10] fixed build_url to / from show_entries --- squawker/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 69b8053..8e4a05b 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -36,7 +36,7 @@ def close_connection(exception): @app.route('/') -def root(): +def show_entries(): db = get_db() # TODO change this cur = db.execute('SELECT id, squawk FROM entries ORDER BY id DESC') @@ -53,7 +53,7 @@ def add_entry(): db = get_db() db.execute('INSERT INTO entries (squawk) VALUES (?)', [squawk]) db.commit() - return redirect(url_for('/')) + return redirect(url_for('show_entries')) if __name__ == '__main__': app.run()