Merge pull request #5 from zhenyong97/FIX-#4

Fix #4

.gitignore

@@ -15,7 +15,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

README.md

@@ -2,8 +2,8 @@
 [![ENV](https://img.shields.io/badge/release-v0.1-blue.svg)](https://github.com/pylixm/django-mdeditor)
 [![ENV](https://img.shields.io/badge/pypi-v0.1-blue.svg)](https://pypi.org/project/Flask-MDEditor/)
 [![ENV](https://img.shields.io/badge/中文-v0.1-blue.svg)](./README_CN.md)
-[![ENV](https://img.shields.io/badge/python-3.7x-green.svg)]()
-[![ENV](https://img.shields.io/badge/flask-1.0+-green.svg)]()
+[![ENV](https://img.shields.io/badge/python-3.7+-green.svg)]()
+[![ENV](https://img.shields.io/badge/flask-2.0+-green.svg)]()
 [![LICENSE](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE)
 
 ![](./flask_and_mdeditor.png)
@@ -97,7 +97,7 @@ The more configuration options available are listed below:
 |MDEDITOR_THEME|default|editor main theme|×|dark / default|
 |MDEDITOR_PREVIEW_THEME|default|preview area theme|×| default / dark
 |MDEDITOR_EDITOR_THEME|default|edit area theme|×| pastel-on-dark / default
-|MDEDITOR_LANGUAGE|zh|editor language|×|zh / en
+|MDEDITOR_LANGUAGE|en|editor language|×|zh / en
 
 ## TODO
 * Unit Testing

demo/flask_test/.flaskenv

@@ -1,2 +1,3 @@
 FLASK_APP=app.py
-FLASK_ENV=development
+FLASK_ENV=development
+FLASK_DEBUG=1

demo/flask_test/README.md

@@ -0,0 +1,8 @@
+# Use Demo
+
+```
+pip install -r requirements.txt
+
+flask run
+```
+

demo/flask_test/app.py

@@ -23,7 +23,8 @@ class PostForm(FlaskForm):
 
 @app.route('/')
 def hello():
-    return render_template('index.html')
+    articles = Article.query.all()
+    return render_template('index.html', articles=articles)
 
 @app.route('/post', methods=['GET', 'POST'])
 def post():
@@ -59,14 +60,13 @@ def save():
 @app.route('/get/<int:aritlce_id>')
 def get_article(aritlce_id):
     article = Article.query.get_or_404(aritlce_id)
-    mk = mistune.Markdown()
-    output = mk(article.content)
+    output = mistune.html(article.content)
     return render_template('detail.html', article=article, content=output)
 
 
 @app.cli.command()
 def initdb():
-    """创建数据库表"""
+    """init testdb"""
     import models
     db.create_all()
 

demo/flask_test/requirements.txt

@@ -0,0 +1,15 @@
+blinker==1.7.0
+click==8.1.7
+Flask==3.0.0
+Flask-SQLAlchemy==3.1.1
+Flask-WTF==1.2.1
+greenlet==3.0.3
+itsdangerous==2.1.2
+Jinja2==3.1.3
+MarkupSafe==2.1.3
+mistune==3.0.2
+python-dotenv==1.0.0
+SQLAlchemy==2.0.25
+typing_extensions==4.9.0
+Werkzeug==3.0.1
+WTForms==3.1.2

demo/flask_test/templates/index.html

@@ -17,6 +17,13 @@ <h1>Index Page</h1>
             </ul>
         {% endif %}
     {% endwith %}
+    {% if articles %}
+        <ol>
+        {% for article in articles %}
+            <li><a href="{{ url_for('get_article', aritlce_id=article.id) }}">article.title - {{ article.id }}</a></li>
+        {% endfor %}
+        </ol>
+    {% endif %}
 
 </body>
 </html>

flask_mdeditor/__init__.py

@@ -5,8 +5,9 @@
     :copyright: (c) 2020 by Zisc Li
     :license: MIT, see LICENSE for more details.
 """
-from flask import current_app, Markup, request, Blueprint, url_for, render_template_string, render_template, request
+from flask import current_app, request, Blueprint, url_for, render_template_string, render_template
 from flask import send_from_directory, jsonify
+from markupsafe import Markup
 import os
 from flask_mdeditor.utils import random_filename
 
@@ -48,7 +49,7 @@ def config(self):
             'task_list': False,
             'flow_chart': True,
             'sequence': True,
-            'language': current_app.config.get("MDEDITOR_LANGUAGE",'zh'),  # zh / en
+            'language': current_app.config.get("MDEDITOR_LANGUAGE",'en'),  # zh / en
             'watch': True,  # Live preview
             'lineWrapping': current_app.config.get('MDEDITOR_WRAPPING','False'),  # lineWrapping
             'lineNumbers': False  # lineNumbers