flaskr/__init__.py

@@ -8,7 +8,6 @@ def create_app(test_config=None):
     app.config.from_mapping(
         SECRET_KEY='dev',
         DATABASE=os.path.join(app.instance_path, 'flaskr.sqlite'),
-        ALLOW_REGISTER=True,
     )
 
     app.wsgi_app = ProxyFix(

flaskr/auth.py

@@ -1,7 +1,7 @@
 import functools
 
 from flask import (
-    Blueprint, flash, g, redirect, render_template, request, session, url_for, current_app
+    Blueprint, flash, g, redirect, render_template, request, session, url_for
 )
 from werkzeug.security import check_password_hash, generate_password_hash
 
@@ -11,8 +11,7 @@ bp = Blueprint('auth', __name__, url_prefix='/auth')
 
 @bp.route('/register', methods=('GET', 'POST'))
 def register():
-    if not current_app.config["ALLOW_REGISTER"]:
-        return "Admin only", 403
+    # return "Admin only", 403
     if request.method == 'POST':
         username = request.form['username']
         password = request.form['password']

flaskr/blog.py

@@ -28,23 +28,6 @@ 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():
@@ -86,12 +69,6 @@ def get_post(id, check_author=True):
 
     return post
 
-@bp.route('/<int:id>/')
-def individual_post(id):
-    post = dict(get_post(id, False))
-    post['body'] = markdown.markdown(post['body'])
-    return render_template('blog/post.html', post=post)
-
 @bp.route('/<int:id>/update', methods=('GET', 'POST'))
 @login_required
 def update(id):

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;}
+nav ul li a, nav ul li span, header .action { display: block; padding: 0.5rem; }
 .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; }

flaskr/templates/base.html

@@ -8,6 +8,9 @@
     {% if g.user %}
       <li><span>{{ g.user['username'] }}</span>
       <li><a href="{{ url_for('auth.logout') }}">Log Out</a>
+    {% else %}
+      <li><a href="{{ url_for('auth.register') }}">Register</a>
+      <li><a href="{{ url_for('auth.login') }}">Log In</a>
     {% endif %}
   </ul>
 </nav>

flaskr/templates/blog/firehose.html

@@ -1,28 +0,0 @@
-{% extends 'base.html' %}
-
-{% block header %}
-  <h1>{% block title %}Posts{% endblock %}</h1>
-  {% if g.user %}
-    <a class="action" href="{{ url_for('blog.create') }}">New</a>
-  {% endif %}
-{% endblock %}
-
-{% block content %}
-  {% for post in posts %}
-    <article class="post">
-      <header>
-	<div>
-	  <h1>{{ post['title'] }}</h1>
-	  <div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
-	</div>
-	{% if g.user['id'] == post['author_id'] %}
-	  <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
-	  {% endif %}
-      </header>
-      <p class="body">{{ post['body']|safe }}</p>
-    </article>
-    {% if not loop.last %}
-      <hr>
-    {% endif %}
-  {% endfor %}
-{% endblock %}

flaskr/templates/blog/index.html

@@ -12,13 +12,14 @@
     <article class="post">
       <header>
 	<div>
-	  <h1><a class="action" href="{{ url_for('blog.individual_post', id=post['id']) }}">{{ post['title'] }}</a></h1>
+	  <h1>{{ post['title'] }}</h1>
 	  <div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
 	</div>
 	{% if g.user['id'] == post['author_id'] %}
 	  <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
 	  {% endif %}
       </header>
+      <p class="body">{{ post['body']|safe }}</p>
     </article>
     {% if not loop.last %}
       <hr>

flaskr/templates/blog/post.html

@@ -1,19 +0,0 @@
-{% extends 'base.html' %}
-
-{% block header %}
-  <h1>{% block title %}{{ post['title'] }}{% endblock %}</h1>
-{% endblock %}
-
-{% block content %}
-  <article class="post">
-    <header>
-  <div>
-    <div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
-  </div>
-  {% if g.user['id'] == post['author_id'] %}
-  <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
-    {% endif %}
-    </header>
-    <p class="body">{{ post['body']|safe }}</p>
-  </article>
-{% endblock %}

tests/conftest.py

@@ -15,7 +15,6 @@ def app():
     app = create_app({
         'TESTING': True,
         'DATABASE': db_path,
-        'ALLOW_REGISTER': True,
     })
 
     with app.app_context():

tests/test_auth.py

@@ -14,10 +14,6 @@ def test_register(client, app):
             "SELECT * FROM user WHERE USERNAME = 'a'",
         ).fetchone() is not None
 
-    app.config["ALLOW_REGISTER"] = False
-    response = client.get('/auth/register')
-    assert b"Admin only" in response.data
-
 @pytest.mark.parametrize(('username', 'password', 'message'), (
     ('', '', b'Username is required.'),
     ('a', '', b'Password is required.'),

tests/test_blog.py

@@ -3,37 +3,17 @@ from flaskr.db import get_db
 
 def test_index(client, auth):
     response = client.get('/')
-    assert b"Log In" not in response.data
-    assert b"Register" not in response.data
+    assert b"Log In" in response.data
+    assert b"Register" 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
-    assert b'href="/1/"' 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('/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
     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',