add section28

Author: chaingng

section26/application/flask_blog/__init__.py

@@ -6,8 +6,4 @@
 
 db = SQLAlchemy(app)
 
-from flask_blog.views.entries import entry
-
-app.register_blueprint(entry, url_prefix='/users')
-
-from flask_blog.views import views
+from flask_blog.views import views, entries

section26/application/flask_blog/flask_blog.db

@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
-<form action="{{ url_for('entry.update_entry', id=entry.id) }}" method=post class=add-entry>
+<form action="{{ url_for('update_entry', id=entry.id) }}" method=post class=add-entry>
     <div class="form-group">
         <label for="InputTitle">タイトル</label>
         <input type="text" class="form-control" id="InputTitle" name=title value={{ entry.title }}>

section26/application/flask_blog/templates/entries/edit.html

@@ -6,7 +6,7 @@
 <div class="card">
     <div class="card-body">
         <h5 class="card-title">{{ entry.title }}</h5>
-        <a href="{{ url_for('entry.show_entry', id=entry.id) }}" class="card-link">続きを読む</a>
+        <a href="{{ url_for('show_entry', id=entry.id) }}" class="card-link">続きを読む</a>
         </div>
         </div>
         {% else %}

section26/application/flask_blog/templates/entries/index.html

@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
-<form action="{{ url_for('entry.add_entry') }}" method=post class=add-entry>
+<form action="{{ url_for('add_entry') }}" method=post class=add-entry>
 <div class="form-group">
     <label for="InputTitle">タイトル</label>
     <input type="text" class="form-control" id="InputTitle" name=title>

section26/application/flask_blog/templates/entries/new.html

@@ -11,11 +11,11 @@ <h2>{{ entry.title }}</h2>
 
 
 <div class="btn-group">
-<form action="{{ url_for('entry.edit_entry', id=entry.id) }}" method="get">
+<form action="{{ url_for('edit_entry', id=entry.id) }}" method="get">
     <button type="submit" class="btn btn-secondary">編集</button>
     </form>
 
-    <form action="{{ url_for('entry.delete_entry', id=entry.id) }}" method="post">
+    <form action="{{ url_for('delete_entry', id=entry.id) }}" method="post">
     <button type="submit" class="btn btn-danger" style="margin-left:5px">削除</button>
     </form>
     </div>

section26/application/flask_blog/templates/entries/show.html

@@ -11,7 +11,7 @@
 
 <div class="container">
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
-        <a class="navbar-brand" href="{{ url_for('entry.show_entries') }}">Flask Blog</a>
+        <a class="navbar-brand" href="{{ url_for('show_entries') }}">Flask Blog</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false"
             aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
@@ -25,7 +25,7 @@
                 </li>
                 {% else %}
                 <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('entry.new_entry') }}">新規投稿</a>
+                    <a class="nav-link" href="{{ url_for('new_entry') }}">新規投稿</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" href="{{ url_for('logout') }}">ログアウト</a>

section26/application/flask_blog/templates/layout.html

@@ -3,18 +3,15 @@
 from flask_blog import db
 from flask_blog.models.entries import Entry
 from flask_blog.views.views import login_required
-from flask import Blueprint
 
-entry = Blueprint('entry', __name__)
-
-@entry.route('/')
+@app.route('/')
 @login_required
 def show_entries():
     entries = Entry.query.order_by(Entry.id.desc()).all()
     return render_template('entries/index.html', entries=entries)
 
 
-@entry.route('/entries', methods=['POST'])
+@app.route('/entries', methods=['POST'])
 @login_required
 def add_entry():
     entry = Entry(
@@ -24,30 +21,30 @@ def add_entry():
     db.session.add(entry)
     db.session.commit()
     flash('新しく記事が作成されました')
-    return redirect(url_for('entry.show_entries'))
+    return redirect(url_for('show_entries'))
 
 
-@entry.route('/entries/new', methods=['GET'])
+@app.route('/entries/new', methods=['GET'])
 @login_required
 def new_entry():
     return render_template('entries/new.html')
 
 
-@entry.route('/entries/<int:id>', methods=['GET'])
+@app.route('/entries/<int:id>', methods=['GET'])
 @login_required
 def show_entry(id):
     entry = Entry.query.get(id)
     return render_template('entries/show.html', entry=entry)
 
 
-@entry.route('/entries/<int:id>/edit', methods=['GET'])
+@app.route('/entries/<int:id>/edit', methods=['GET'])
 @login_required
 def edit_entry(id):
     entry = Entry.query.get(id)
     return render_template('entries/edit.html', entry=entry)
 
 
-@entry.route('/entries/<int:id>/update', methods=['POST'])
+@app.route('/entries/<int:id>/update', methods=['POST'])
 @login_required
 def update_entry(id):
     entry = Entry.query.get(id)
@@ -56,14 +53,14 @@ def update_entry(id):
     db.session.merge(entry)
     db.session.commit()
     flash('記事が更新されました')
-    return redirect(url_for('entry.show_entries'))
+    return redirect(url_for('show_entries'))
 
 
-@entry.route('/entries/<int:id>/delete', methods=['POST'])
+@app.route('/entries/<int:id>/delete', methods=['POST'])
 @login_required
 def delete_entry(id):
     entry = Entry.query.get(id)
     db.session.delete(entry)
     db.session.commit()
     flash('投稿が削除されました')
-    return redirect(url_for('entry.show_entries'))
+    return redirect(url_for('show_entries'))

section26/application/flask_blog/views/entries.py

@@ -23,16 +23,12 @@ def login():
         else:
             session['logged_in'] = True
             flash('ログインしました')
-            return redirect(url_for('entry.show_entries'))
+            return redirect(url_for('show_entries'))
     return render_template('login.html')
 
 
 @app.route('/logout')
 def logout():
     session.pop('logged_in', None)
     flash('ログアウトしました')
-    return redirect(url_for('entry.show_entries'))
-
-@app.errorhandler(404)
-def non_existant_route(error):
-   return redirect(url_for('login'))
+    return redirect(url_for('show_entries'))

section26/application/flask_blog/views/views.py

@@ -0,0 +1,21 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+flask = "*"
+flask-sqlalchemy = "*"
+flask-script = "*"
+
+
+[dev-packages]
+
+
+
+[requires]
+
+python_version = "3.6"