Merge feature/markdown into develop
This commit is contained in:
@@ -1,6 +1,24 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from .models import Post
|
from .models import Post
|
||||||
|
from django.db import models
|
||||||
|
from martor.widgets import AdminMartorWidget
|
||||||
|
|
||||||
# Register your models here.
|
|
||||||
|
|
||||||
admin.site.register(Post)
|
class PostAdmin(admin.ModelAdmin):
|
||||||
|
# 使用Martor Markdown编辑器替换默认的Textarea
|
||||||
|
formfield_overrides = {
|
||||||
|
models.TextField: {'widget': AdminMartorWidget},
|
||||||
|
}
|
||||||
|
|
||||||
|
# 设置列表显示字段
|
||||||
|
list_display = ('title', 'publish_date', 'created_at')
|
||||||
|
# 设置搜索字段
|
||||||
|
search_fields = ('title', 'content')
|
||||||
|
# 设置日期层级过滤器
|
||||||
|
date_hierarchy = 'publish_date'
|
||||||
|
# 设置可编辑字段
|
||||||
|
list_editable = ('publish_date',)
|
||||||
|
|
||||||
|
|
||||||
|
# 注册自定义的PostAdmin
|
||||||
|
admin.site.register(Post, PostAdmin)
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
import markdown
|
||||||
|
from django.utils.safestring import mark_safe
|
||||||
|
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
@@ -13,3 +15,6 @@ class Post(models.Model):
|
|||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.title} ({self.publish_date.strftime('%Y-%m-%d')})"
|
return f"{self.title} ({self.publish_date.strftime('%Y-%m-%d')})"
|
||||||
|
|
||||||
|
def get_markdown_content(self):
|
||||||
|
return mark_safe(markdown.markdown(self.content))
|
||||||
|
|||||||
@@ -6,16 +6,16 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<!-- 添加样式使整个页面内容居中显示 -->
|
<!-- 添加样式使整个页面内容居中显示 -->
|
||||||
<div style="max-width: 800px; margin: 0 auto; padding: 0 20px; text-align: center;">
|
<div style="max-width: 800px; margin: 0 auto; padding: 0 20px;">
|
||||||
<!-- 添加网站标题 -->
|
<h1 style="text-align: center;">{{ post.title }}</h1>
|
||||||
<h1>{{ post.title }}</h1>
|
<p>发布时间:{{ post.publish_date|date:"Y年n月j日 H:i" }}</p>
|
||||||
<p>{{ post.publish_date }}</p>
|
<!-- 使用get_markdown_content方法渲染Markdown内容 -->
|
||||||
<div>{{ post.content|linebreaks }}</div>
|
<div>{{ post.get_markdown_content|safe }}</div>
|
||||||
<p><a href="/">← 返回首页</a></p>
|
<br>
|
||||||
|
<a href="{% url 'index' %}">返回首页</a>
|
||||||
</div>
|
</div>
|
||||||
<footer style="position: fixed; bottom: 0; width: 100%; text-align: center; font-size: 12px; color: #999; background-color: white; padding: 5px 0;">
|
<footer style="position: fixed; bottom: 0; width: 100%; text-align: center; font-size: 12px; color: #999; background-color: white; padding: 5px 0;">
|
||||||
<a href="https://beian.miit.gov.cn/" target="_blank">闽ICP备2023010767号-2</a>
|
<a href="https://beian.miit.gov.cn/" target="_blank">闽ICP备2023010767号-2</a>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from .models import Post
|
|||||||
# Create your views here.
|
# Create your views here.
|
||||||
|
|
||||||
def index(request):
|
def index(request):
|
||||||
posts = Post.objects.order_by('-created_at')
|
posts = Post.objects.order_by('created_at')
|
||||||
return render(request, 'blog/index.html', {'posts': posts})
|
return render(request, 'blog/index.html', {'posts': posts})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ INSTALLED_APPS = [
|
|||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
|
'blog',
|
||||||
'blog'
|
'martor',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
|
|||||||
@@ -17,7 +17,11 @@ Including another URLconf
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.urls import path, include
|
from django.urls import path, include
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
|
# 添加martor的URL配置以支持Markdown编辑器
|
||||||
|
path('martor/', include('martor.urls')),
|
||||||
|
# 包含blog应用的URL
|
||||||
path('', include('blog.urls')),
|
path('', include('blog.urls')),
|
||||||
]
|
]
|
||||||
|
|||||||
41
myblog/requirements.txt
Normal file
41
myblog/requirements.txt
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
asgiref==3.9.1
|
||||||
|
asttokens==3.0.0
|
||||||
|
bleach==6.2.0
|
||||||
|
certifi==2025.7.14
|
||||||
|
charset-normalizer==3.4.2
|
||||||
|
click==8.2.1
|
||||||
|
decorator==5.2.1
|
||||||
|
Django==5.2.4
|
||||||
|
executing==2.2.0
|
||||||
|
gunicorn==23.0.0
|
||||||
|
h11==0.16.0
|
||||||
|
idna==3.10
|
||||||
|
ipython==9.4.0
|
||||||
|
ipython_pygments_lexers==1.1.1
|
||||||
|
jedi==0.19.2
|
||||||
|
Markdown==3.5.2
|
||||||
|
martor==1.6.45
|
||||||
|
matplotlib-inline==0.1.7
|
||||||
|
numpy==2.3.2
|
||||||
|
packaging==25.0
|
||||||
|
pandas==2.3.1
|
||||||
|
parso==0.8.4
|
||||||
|
pexpect==4.9.0
|
||||||
|
prompt_toolkit==3.0.51
|
||||||
|
psycopg2-binary==2.9.10
|
||||||
|
ptyprocess==0.7.0
|
||||||
|
pure_eval==0.2.3
|
||||||
|
Pygments==2.19.2
|
||||||
|
python-dateutil==2.9.0.post0
|
||||||
|
pytz==2025.2
|
||||||
|
requests==2.32.4
|
||||||
|
six==1.17.0
|
||||||
|
sqlparse==0.5.3
|
||||||
|
stack-data==0.6.3
|
||||||
|
traitlets==5.14.3
|
||||||
|
tzdata==2025.2
|
||||||
|
urllib3==2.5.0
|
||||||
|
uv==0.8.3
|
||||||
|
uvicorn==0.35.0
|
||||||
|
wcwidth==0.2.13
|
||||||
|
webencodings==0.5.1
|
||||||
Reference in New Issue
Block a user