From f2fb55ea3330c8ab2dbc51f20c0baa94fd4e57c3 Mon Sep 17 00:00:00 2001 From: PV Tejas Date: Sun, 1 Mar 2026 20:32:48 +0530 Subject: [PATCH 1/5] Working code, failing test --- flaskr/__init__.py | 2 +- flaskr/blog.py | 22 ++++++++++++++++++++++ flaskr/templates/blog/firehose.html | 28 ++++++++++++++++++++++++++++ flaskr/templates/blog/index.html | 1 - flaskr/templates/blog/post.html | 19 +++++++++++++++++++ tests/test_blog.py | 19 +++++++++++++++++++ 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 flaskr/templates/blog/firehose.html create mode 100644 flaskr/templates/blog/post.html diff --git a/flaskr/__init__.py b/flaskr/__init__.py index 7d7ec81..33779f8 100644 --- a/flaskr/__init__.py +++ b/flaskr/__init__.py @@ -8,7 +8,7 @@ def create_app(test_config=None): app.config.from_mapping( SECRET_KEY='dev', DATABASE=os.path.join(app.instance_path, 'flaskr.sqlite'), - ALLOW_REGISTER=False, + ALLOW_REGISTER=True, ) app.wsgi_app = ProxyFix( diff --git a/flaskr/blog.py b/flaskr/blog.py index 523cfaf..6bf9b55 100644 --- a/flaskr/blog.py +++ b/flaskr/blog.py @@ -28,6 +28,23 @@ def index(): posts.append(post) return render_template('blog/index.html', posts=posts) +@bp.route('/firehose') +def firehose(): + db = get_db() + db_posts = db.execute( + 'SELECT p.id, title, body, created, author_id, username' + ' FROM post p JOIN user u ON p.author_id = u.id' + ' ORDER BY created DESC' + ).fetchall() + posts = [] + for post in db_posts: + if post['created'] > datetime.datetime.utcnow(): + continue + post = dict(post) + post['body'] = markdown.markdown(post['body']) + posts.append(post) + return render_template('blog/firehose.html', posts=posts) + @bp.route('/create',methods=('GET', 'POST')) @login_required def create(): @@ -69,6 +86,11 @@ def get_post(id, check_author=True): return post +@bp.route('/') +def individual_post(id): + post = get_post(id, False) + return render_template('blog/post.html', post=post) + @bp.route('//update', methods=('GET', 'POST')) @login_required def update(id): diff --git a/flaskr/templates/blog/firehose.html b/flaskr/templates/blog/firehose.html new file mode 100644 index 0000000..21e3178 --- /dev/null +++ b/flaskr/templates/blog/firehose.html @@ -0,0 +1,28 @@ +{% extends 'base.html' %} + +{% block header %} +

{% block title %}Posts{% endblock %}

+ {% if g.user %} + New + {% endif %} +{% endblock %} + +{% block content %} + {% for post in posts %} +
+
+
+

{{ post['title'] }}

+
by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}
+
+ {% if g.user['id'] == post['author_id'] %} + Edit + {% endif %} +
+

{{ post['body']|safe }}

+
+ {% if not loop.last %} +
+ {% endif %} + {% endfor %} +{% endblock %} diff --git a/flaskr/templates/blog/index.html b/flaskr/templates/blog/index.html index ffd9fbc..7f1e4e8 100644 --- a/flaskr/templates/blog/index.html +++ b/flaskr/templates/blog/index.html @@ -19,7 +19,6 @@ Edit {% endif %} -

{{ post['body']|safe }}

{% if not loop.last %}
diff --git a/flaskr/templates/blog/post.html b/flaskr/templates/blog/post.html new file mode 100644 index 0000000..c2a612c --- /dev/null +++ b/flaskr/templates/blog/post.html @@ -0,0 +1,19 @@ +{% extends 'base.html' %} + +{% block header %} +

{% block title %}{{ post['title'] }}{% endblock %}

+{% endblock %} + +{% block content %} +
+
+
+
by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}
+
+ {% if g.user['id'] == post['author_id'] %} + Edit + {% endif %} +
+

{{ post['body']|safe }}

+
+{% endblock %} diff --git a/tests/test_blog.py b/tests/test_blog.py index 810ade1..175e5b5 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -6,6 +6,19 @@ def test_index(client, auth): assert b"Log In" not in response.data assert b"Register" not in response.data + auth.login() + response = client.get('/') + assert b'Log Out' in response.data + assert b'test title' in response.data + assert b'by test on 2018-01-01' in response.data + assert b'test\nbody' not in response.data + assert b'href="/1/update"' in response.data + +def test_firehose(client, auth): + response = client.get('/') + assert b"Log In" not in response.data + assert b"Register" not in response.data + auth.login() response = client.get('/') assert b'Log Out' in response.data @@ -14,6 +27,12 @@ def test_index(client, auth): assert b'test\nbody' in response.data assert b'href="/1/update"' in response.data +def test_individual_page(client, auth): + response = client.get('/1') + assert b'test title' in response.data + assert b'by test on 2018-01-01' in response.data + assert b'test\nbody' in response.data + @pytest.mark.parametrize('path', ( '/create', '/1/update', From 13bdcaef9edb85d7b56f234f129d76a83659d7f2 Mon Sep 17 00:00:00 2001 From: PV Tejas Date: Wed, 11 Mar 2026 20:25:52 +0530 Subject: [PATCH 2/5] Fix bad test --- tests/test_blog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_blog.py b/tests/test_blog.py index 175e5b5..4913045 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -20,7 +20,7 @@ def test_firehose(client, auth): assert b"Register" not in response.data auth.login() - response = client.get('/') + response = client.get('/firehose') assert b'Log Out' in response.data assert b'test title' in response.data assert b'by test on 2018-01-01' in response.data From 89622db6c939c50599aa9addc5e348b6a18f0001 Mon Sep 17 00:00:00 2001 From: PV Tejas Date: Wed, 11 Mar 2026 20:27:06 +0530 Subject: [PATCH 3/5] End individual post url in / --- flaskr/blog.py | 5 +++-- tests/test_blog.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flaskr/blog.py b/flaskr/blog.py index 6bf9b55..8082d2f 100644 --- a/flaskr/blog.py +++ b/flaskr/blog.py @@ -86,9 +86,10 @@ def get_post(id, check_author=True): return post -@bp.route('/') +@bp.route('//') def individual_post(id): - post = get_post(id, False) + post = dict(get_post(id, False)) + post['body'] = markdown.markdown(post['body']) return render_template('blog/post.html', post=post) @bp.route('//update', methods=('GET', 'POST')) diff --git a/tests/test_blog.py b/tests/test_blog.py index 4913045..7249e1b 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -28,7 +28,7 @@ def test_firehose(client, auth): assert b'href="/1/update"' in response.data def test_individual_page(client, auth): - response = client.get('/1') + response = client.get('/1/') assert b'test title' in response.data assert b'by test on 2018-01-01' in response.data assert b'test\nbody' in response.data From 44a49e5aeefff4ad29134ecf0b34e24b6e04cb67 Mon Sep 17 00:00:00 2001 From: PV Tejas Date: Wed, 11 Mar 2026 20:27:32 +0530 Subject: [PATCH 4/5] Add link to individual post in index --- flaskr/templates/blog/index.html | 2 +- tests/test_blog.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/flaskr/templates/blog/index.html b/flaskr/templates/blog/index.html index 7f1e4e8..f50de7f 100644 --- a/flaskr/templates/blog/index.html +++ b/flaskr/templates/blog/index.html @@ -12,7 +12,7 @@
-

{{ post['title'] }}

+

{{ post['title'] }}

by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}
{% if g.user['id'] == post['author_id'] %} diff --git a/tests/test_blog.py b/tests/test_blog.py index 7249e1b..548363a 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -13,6 +13,7 @@ def test_index(client, auth): assert b'by test on 2018-01-01' in response.data assert b'test\nbody' not in response.data assert b'href="/1/update"' in response.data + assert b'href="/1/"' in response.data def test_firehose(client, auth): response = client.get('/') From 4927b6f2da2e40165f090c203827359d3c5e96e8 Mon Sep 17 00:00:00 2001 From: pvtejas Date: Wed, 11 Mar 2026 20:45:56 +0530 Subject: [PATCH 5/5] Remove padding around title --- flaskr/static/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flaskr/static/style.css b/flaskr/static/style.css index 63f3f5b..89c7015 100644 --- a/flaskr/static/style.css +++ b/flaskr/static/style.css @@ -12,7 +12,7 @@ nav { background: lightgray; display: flex; align-items: center; padding: 0 0.5r nav h1 { flex: auto; margin: 0; } nav h1 a { text-decoration: none; padding: 0.25rem 0.5rem; } nav ul { display: flex; list-style: none; margin: 0; padding: 0; } -nav ul li a, nav ul li span, header .action { display: block; padding: 0.5rem; } +nav ul li a, nav ul li span, header .action { display: block;} .content { padding: 0 1rem 1rem; } .content > header { border-bottom: 1px solid lightgray; display: flex; align-items: flex-end; } .content > header h1 { flex: auto; margin: 1rem 0 0.25rem 0; }