Merge feature/Category into develop

myblog/blog/templates/blog/detail.html

@@ -9,29 +9,41 @@
             margin: 0;
             padding: 0;
         }
+
         .container {
             display: flex;
             max-width: 1200px;
             margin: 0 auto;
             padding: 20px;
+        / / 修改: 确保容器支持sticky定位 min-height: 100 vh;
         }
+
         .sidebar {
             width: 250px;
             padding-right: 20px;
             border-right: 1px solid #eee;
+        / / 修改: 添加侧边栏固定定位相关样式 position: -webkit-sticky;
+            position: sticky;
+            top: 20px;
+            align-self: flex-start;
+            height: fit-content;
         }
+
         .sidebar h3 {
             color: #333;
             border-bottom: 2px solid #007cba;
             padding-bottom: 10px;
         }
+
         .sidebar ul {
             list-style: none;
             padding: 0;
         }
+
         .sidebar ul li {
             margin: 10px 0;
         }
+
         .sidebar ul li a {
             text-decoration: none;
             color: #666;
@@ -40,14 +52,17 @@
             border-radius: 4px;
             transition: all 0.3s;
         }
+
         .sidebar ul li a:hover,
         .sidebar ul li a.active {
             background-color: #007cba;
             color: white;
         }
+
         .search-box {
             margin-bottom: 20px;
         }
+
         .search-box input[type="text"] {
             width: 100%;
             padding: 8px;
@@ -55,6 +70,7 @@
             border-radius: 4px;
             box-sizing: border-box;
         }
+
         .search-box input[type="submit"] {
             width: 100%;
             padding: 8px;
@@ -65,35 +81,43 @@
             cursor: pointer;
             margin-top: 5px;
         }
+
         .search-box input[type="submit"]:hover {
             background-color: #005a87;
         }
+
         .search-type {
             margin: 10px 0;
         }
+
         .search-type label {
             display: block;
             margin: 5px 0;
             font-size: 14px;
             color: #666;
         }
+
         .search-type input[type="radio"] {
             margin-right: 5px;
         }
+
         .main-content {
             flex: 1;
             padding-left: 20px;
         }
+
         .main-content h1 {
             color: #333;
             border-bottom: 2px solid #eee;
             padding-bottom: 10px;
         }
+
         .post-meta {
             font-size: 14px;
             color: #999;
             margin-bottom: 20px;
         }
+
         .post-content img {
             max-width: 100%;
             height: auto;
@@ -124,6 +148,7 @@
             border-radius: 0;
             font-size: 0.9em;
         }
+
         footer {
             position: fixed;
             bottom: 0;
@@ -147,7 +172,6 @@
         <div class="search-box">
             <form method="get" action="{% url 'index' %}">
                 <input type="text" name="q" placeholder="搜索文章..." value="{{ query|default:'' }}">
-                
                 <div class="search-type">
                     <label>
                         <input type="radio" name="search_type" value="all" checked>
@@ -162,17 +186,17 @@
                         内容搜索
                     </label>
                 </div>
-                
+
                 <input type="submit" value="搜索">
             </form>
         </div>
-        
+
         <h3>文章分类</h3>
         <ul>
             <li><a href="{% url 'index' %}" {% if not post.category %}class="active"{% endif %}>全部文章</a></li>
             {% for category in categories %}
                 <li>
-                    <a href="{% url 'index' %}?category={{ category.id }}" 
+                    <a href="{% url 'index' %}?category={{ category.id }}"
                        {% if post.category and post.category.id == category.id %}class="active"{% endif %}>
                         {{ category.name }}
                     </a>
@@ -180,7 +204,7 @@
             {% endfor %}
         </ul>
     </div>
-    
+
     <div class="main-content">
         <h1 style="text-align: center;">{{ post.title }}</h1>
         <div class="post-meta">

myblog/blog/templates/blog/index.html

@@ -9,29 +9,41 @@
             margin: 0;
             padding: 0;
         }
+
         .container {
             display: flex;
             max-width: 1200px;
             margin: 0 auto;
             padding: 20px;
+            min-height: 100vh;
         }
+
         .sidebar {
             width: 250px;
             padding-right: 20px;
             border-right: 1px solid #eee;
+            position: -webkit-sticky;
+            position: sticky;
+            top: 20px;
+            align-self: flex-start;
+            height: fit-content;
         }
+
         .sidebar h3 {
             color: #333;
             border-bottom: 2px solid #007cba;
             padding-bottom: 10px;
         }
+
         .sidebar ul {
             list-style: none;
             padding: 0;
         }
+
         .sidebar ul li {
             margin: 10px 0;
         }
+
         .sidebar ul li a {
             text-decoration: none;
             color: #666;
@@ -40,14 +52,17 @@
             border-radius: 4px;
             transition: all 0.3s;
         }
+
         .sidebar ul li a:hover,
         .sidebar ul li a.active {
             background-color: #007cba;
             color: white;
         }
+
         .search-box {
             margin-bottom: 20px;
         }
+
         .search-box input[type="text"] {
             width: 100%;
             padding: 8px;
@@ -55,6 +70,7 @@
             border-radius: 4px;
             box-sizing: border-box;
         }
+
         .search-box input[type="submit"] {
             width: 100%;
             padding: 8px;
@@ -65,54 +81,67 @@
             cursor: pointer;
             margin-top: 5px;
         }
+
         .search-box input[type="submit"]:hover {
             background-color: #005a87;
         }
+
         .search-type {
             margin: 10px 0;
         }
+
         .search-type label {
             display: block;
             margin: 5px 0;
             font-size: 14px;
             color: #666;
         }
+
         .search-type input[type="radio"] {
             margin-right: 5px;
         }
+
         .main-content {
             flex: 1;
             padding-left: 20px;
         }
+
         .main-content h1 {
             color: #333;
             border-bottom: 2px solid #eee;
             padding-bottom: 10px;
         }
+
         .posts-list {
             list-style: none;
             padding: 0;
         }
+
         .posts-list li {
             padding: 15px 0;
             border-bottom: 1px solid #eee;
         }
+
         .posts-list li:last-child {
             border-bottom: none;
         }
+
         .post-title {
             font-size: 18px;
             font-weight: bold;
             margin-bottom: 8px;
         }
+
         .post-title a {
             text-decoration: none;
             color: #007cba;
         }
+
         .post-meta {
             font-size: 14px;
             color: #999;
         }
+
         .post-category {
             display: inline-block;
             background-color: #f0f0f0;
@@ -121,11 +150,13 @@
             font-size: 12px;
             margin-top: 5px;
         }
+
         .post-summary {
             margin: 10px 0;
             line-height: 1.6;
             color: #666;
         }
+
         footer {
         }
     </style>
@@ -141,32 +172,35 @@
         <div class="search-box">
             <form method="get">
                 <input type="text" name="q" placeholder="搜索文章..." value="{{ query|default:'' }}">
-                
+
                 <div class="search-type">
                     <label>
-                        <input type="radio" name="search_type" value="all" {% if search_type != 'title' and search_type != 'content' %}checked{% endif %}>
+                        <input type="radio" name="search_type" value="all"
+                               {% if search_type != 'title' and search_type != 'content' %}checked{% endif %}>
                         全文搜索
                     </label>
                     <label>
-                        <input type="radio" name="search_type" value="title" {% if search_type == 'title' %}checked{% endif %}>
+                        <input type="radio" name="search_type" value="title"
+                               {% if search_type == 'title' %}checked{% endif %}>
                         标题搜索
                     </label>
                     <label>
-                        <input type="radio" name="search_type" value="content" {% if search_type == 'content' %}checked{% endif %}>
+                        <input type="radio" name="search_type" value="content"
+                               {% if search_type == 'content' %}checked{% endif %}>
                         内容搜索
                     </label>
                 </div>
-                
+
                 <input type="submit" value="搜索">
             </form>
         </div>
-        
+
         <h3>文章分类</h3>
         <ul>
             <li><a href="{% url 'index' %}" {% if not selected_category %}class="active"{% endif %}>全部文章</a></li>
             {% for category in categories %}
                 <li>
-                    <a href="?category={{ category.id }}" 
+                    <a href="?category={{ category.id }}"
                        {% if selected_category == category.id|stringformat:"s" %}class="active"{% endif %}>
                         {{ category.name }}
                     </a>
@@ -174,7 +208,7 @@
             {% endfor %}
         </ul>
     </div>
-    
+
     <div class="main-content">
         <ul class="posts-list">
             {% for post in posts %}

myblog/requirements.txt

@@ -1,31 +0,0 @@
-asgiref==3.9.1
-asttokens==3.0.0
-click==8.2.1
-configparser==7.2.0
-decorator==5.2.1
-executing==2.2.0
-h11==0.16.0
-ipython==9.4.0
-ipython_pygments_lexers==1.1.1
-jedi==0.19.2
-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
-psutil==7.0.0
-ptyprocess==0.7.0
-pure_eval==0.2.3
-Pygments==2.19.2
-python-dateutil==2.9.0.post0
-pytz==2025.2
-six==1.17.0
-sqlparse==0.5.3
-stack-data==0.6.3
-traitlets==5.14.3
-tzdata==2025.2
-uv==0.8.3
-uvicorn==0.35.0
-wcwidth==0.2.13

requirements.txt

@@ -5,9 +5,9 @@ certifi==2025.7.14
 charset-normalizer==3.4.2
 click==8.2.1
 decorator==5.2.1
-Django==5.2.4
+Django==5.1
 django-mdeditor==0.1.20
-django-summernote==0.8.20.0
+emoji==2.14.1
 executing==2.2.0
 gunicorn==23.0.0
 h11==0.16.0
@@ -15,7 +15,7 @@ idna==3.10
 ipython==9.4.0
 ipython_pygments_lexers==1.1.1
 jedi==0.19.2
-Markdown
+Markdown==3.5.2
 martor==1.6.45
 matplotlib-inline==0.1.7
 numpy==2.3.2