Compare commits
6 commits
remove-reg
...
production
| Author | SHA1 | Date | |
|---|---|---|---|
| 4927b6f2da | |||
| 44a49e5aee | |||
| 89622db6c9 | |||
| 13bdcaef9e | |||
| f2fb55ea33 | |||
| 39243beff4 |
8 changed files with 94 additions and 7 deletions
|
|
@ -8,7 +8,7 @@ def create_app(test_config=None):
|
||||||
app.config.from_mapping(
|
app.config.from_mapping(
|
||||||
SECRET_KEY='dev',
|
SECRET_KEY='dev',
|
||||||
DATABASE=os.path.join(app.instance_path, 'flaskr.sqlite'),
|
DATABASE=os.path.join(app.instance_path, 'flaskr.sqlite'),
|
||||||
ALLOW_REGISTER=False,
|
ALLOW_REGISTER=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
app.wsgi_app = ProxyFix(
|
app.wsgi_app = ProxyFix(
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,23 @@ def index():
|
||||||
posts.append(post)
|
posts.append(post)
|
||||||
return render_template('blog/index.html', posts=posts)
|
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'))
|
@bp.route('/create',methods=('GET', 'POST'))
|
||||||
@login_required
|
@login_required
|
||||||
def create():
|
def create():
|
||||||
|
|
@ -69,6 +86,12 @@ def get_post(id, check_author=True):
|
||||||
|
|
||||||
return post
|
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'))
|
@bp.route('/<int:id>/update', methods=('GET', 'POST'))
|
||||||
@login_required
|
@login_required
|
||||||
def update(id):
|
def update(id):
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ nav { background: lightgray; display: flex; align-items: center; padding: 0 0.5r
|
||||||
nav h1 { flex: auto; margin: 0; }
|
nav h1 { flex: auto; margin: 0; }
|
||||||
nav h1 a { text-decoration: none; padding: 0.25rem 0.5rem; }
|
nav h1 a { text-decoration: none; padding: 0.25rem 0.5rem; }
|
||||||
nav ul { display: flex; list-style: none; margin: 0; padding: 0; }
|
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 { padding: 0 1rem 1rem; }
|
||||||
.content > header { border-bottom: 1px solid lightgray; display: flex; align-items: flex-end; }
|
.content > header { border-bottom: 1px solid lightgray; display: flex; align-items: flex-end; }
|
||||||
.content > header h1 { flex: auto; margin: 1rem 0 0.25rem 0; }
|
.content > header h1 { flex: auto; margin: 1rem 0 0.25rem 0; }
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,6 @@
|
||||||
{% if g.user %}
|
{% if g.user %}
|
||||||
<li><span>{{ g.user['username'] }}</span>
|
<li><span>{{ g.user['username'] }}</span>
|
||||||
<li><a href="{{ url_for('auth.logout') }}">Log Out</a>
|
<li><a href="{{ url_for('auth.logout') }}">Log Out</a>
|
||||||
{% else %}
|
|
||||||
<li><a href="{{ url_for('auth.login') }}">Log In</a>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
||||||
28
flaskr/templates/blog/firehose.html
Normal file
28
flaskr/templates/blog/firehose.html
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
{% 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 %}
|
||||||
|
|
@ -12,14 +12,13 @@
|
||||||
<article class="post">
|
<article class="post">
|
||||||
<header>
|
<header>
|
||||||
<div>
|
<div>
|
||||||
<h1>{{ post['title'] }}</h1>
|
<h1><a class="action" href="{{ url_for('blog.individual_post', id=post['id']) }}">{{ post['title'] }}</a></h1>
|
||||||
<div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
|
<div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
|
||||||
</div>
|
</div>
|
||||||
{% if g.user['id'] == post['author_id'] %}
|
{% if g.user['id'] == post['author_id'] %}
|
||||||
<a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
|
<a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</header>
|
</header>
|
||||||
<p class="body">{{ post['body']|safe }}</p>
|
|
||||||
</article>
|
</article>
|
||||||
{% if not loop.last %}
|
{% if not loop.last %}
|
||||||
<hr>
|
<hr>
|
||||||
|
|
|
||||||
19
flaskr/templates/blog/post.html
Normal file
19
flaskr/templates/blog/post.html
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
{% 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 %}
|
||||||
|
|
@ -3,7 +3,7 @@ from flaskr.db import get_db
|
||||||
|
|
||||||
def test_index(client, auth):
|
def test_index(client, auth):
|
||||||
response = client.get('/')
|
response = client.get('/')
|
||||||
assert b"Log In" in response.data
|
assert b"Log In" not in response.data
|
||||||
assert b"Register" not in response.data
|
assert b"Register" not in response.data
|
||||||
|
|
||||||
auth.login()
|
auth.login()
|
||||||
|
|
@ -11,9 +11,29 @@ def test_index(client, auth):
|
||||||
assert b'Log Out' in response.data
|
assert b'Log Out' in response.data
|
||||||
assert b'test title' in response.data
|
assert b'test title' in response.data
|
||||||
assert b'by test on 2018-01-01' 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'test\nbody' in response.data
|
||||||
assert b'href="/1/update"' 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', (
|
@pytest.mark.parametrize('path', (
|
||||||
'/create',
|
'/create',
|
||||||
'/1/update',
|
'/1/update',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue