重构Blog

nffish · Feb 24, 2018 · b25dd1e · b25dd1e
1 parent 928b294
commit b25dd1e
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 29 deletions.
diff --git a/blog/admin.py b/blog/admin.py
@@ -1,8 +1,8 @@
 from django.contrib import admin
-from .models import BlogArticles
+from .models import Article
 
 
-class BlogArticlesAdmin(admin.ModelAdmin):
+class ArticleAdmin(admin.ModelAdmin):
     list_display = ('title', 'author', 'publish',)
     list_filter = ('publish', 'author',)
     search_fields = ('title', 'body',)
@@ -11,4 +11,4 @@ class BlogArticlesAdmin(admin.ModelAdmin):
     ordering = ['publish', 'author']
 
 
-admin.site.register(BlogArticles, BlogArticlesAdmin)
+admin.site.register(Article, ArticleAdmin)
diff --git a/blog/models.py b/blog/models.py
@@ -3,10 +3,10 @@
 from django.contrib.auth.models import User
 
 
-class BlogArticles(models.Model):
-    title = models.CharField(max_length=300)
+class Article(models.Model):
+    title = models.CharField(max_length=300, default='Title')
     author = models.ForeignKey(User, related_name="blog_posts")
-    body = models.TextField()
+    content = models.TextField(null=True)
     publish = models.DateTimeField(default=timezone.now)
 
     class Meta:

diff --git a/blog/templates/base.html b/blog/templates/base.html
diff --git a/blog/templates/blog/index.html b/blog/templates/blog/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+{% for article in articles %}
+    <h1>{{ article.title }}</h1>
+    <p>{{ article.author }}  {{ article.publish }}</p>
+    <h3>{{ article.content }}</h3>
+    <br/>
+{% endfor %}
+</body>
+</html>
diff --git a/blog/urls.py b/blog/urls.py
@@ -7,5 +7,7 @@
 
 app_name = 'blog'
 urlpatterns = [
-    url(r'^$', views.IndexView.as_view(), name='index')
+    url(r'^$', views.index),
+    url(r'^index/', views.index),
+
 ]
diff --git a/blog/views.py b/blog/views.py
@@ -1,7 +1,8 @@
 from django.shortcuts import render
-from .models import BlogArticles
+from .models import Article
+from django.http import HttpResponse
 
 
-def blog_title(request):
-    articles = BlogArticles.objects.all()
-    return render(request, 'blog/titles.html', {'blog': articles})
+def index(request):
+    articles = Article.objects.all()
+    return render(request, 'blog/index.html', {'articles': articles})
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/mysite/settings.py b/mysite/settings.py
@@ -105,7 +105,7 @@
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'zh-hans'
 
 TIME_ZONE = 'UTC'
 

diff --git a/mysite/urls.py b/mysite/urls.py
@@ -17,6 +17,7 @@
 from django.contrib import admin
 
 urlpatterns = [
+    url(r'^$', include('blog.urls', namespace='blog')),
     url(r'^blog/', include('blog.urls', namespace='blog')),
     url(r'^polls/', include('polls.urls', namespace='polls')),
     url(r'^admin/', admin.site.urls),