blog/forms.py

@@ -5,10 +5,10 @@ from .models import Post
 class PostForm(forms.ModelForm):
     class Meta:
         model = Post
-        fields = ['title', 'contents', 'summary', 'tags']
+        fields = ['title', 'content', 'summary', 'tags']
         widgets = {
             'title': forms.TextInput(attrs={'class': 'form-control'}),
-            'contents': forms.Textarea(attrs={'class': 'form-control', 'id': 'markdown-editor'}),
+            'content': forms.Textarea(attrs={'class': 'form-control', 'id': 'markdown-editor'}),
             'summary': forms.TextInput(attrs={'class': 'form-control'}),
             'tags': TagWidget(attrs={'class': 'form-control', 'placeholder': 'Add tags'}),
         }

blog/migrations/0005_rename_content_post_contents.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.14 on 2025-01-17 15:36
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0004_remove_post_tags_post_tags'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='post',
-            old_name='content',
-            new_name='contents',
-        ),
-    ]

blog/models.py

@@ -5,7 +5,7 @@ from taggit.managers import TaggableManager
 
 class Post(models.Model):
     title = models.CharField(max_length=200)  # 제목
-    contents = models.TextField()  # 본문 (마크다운 저장)
+    content = models.TextField()  # 본문 (마크다운 저장)
     summary = models.CharField(max_length=2000, blank=True, null=True)  # 요약
     created_at = models.DateTimeField(auto_now_add=True)  # 작성일
     updated_at = models.DateTimeField(auto_now=True)  # 수정일
@@ -15,7 +15,7 @@ class Post(models.Model):
     def render_markdown(self):
         """마크다운을 HTML로 변환"""
         md = MarkdownIt()
-        return md.render(self.contents)
+        return md.render(self.content)
 
     def __str__(self):
         return self.title

blog/templates/blog/create_post.html

@@ -25,7 +25,7 @@
           <h2>contents</h2>
 
           <div class="col-md-12">
-            {{ form.contents }}
+            {{ form.content }}
           </div>
           <!-- 버튼 -->
           <div class="d-flex justify-content-end mt-4">

butler/forms.py

@@ -1,11 +0,0 @@
-from django import forms
-from .models import NoticeBoard
-
-class PostForm(forms.ModelForm):
-    class Meta:
-        model = NoticeBoard
-        fields = ['title', 'contents']
-        widgets = {
-            'title': forms.TextInput(attrs={'class': 'form-control'}),
-            'contents': forms.Textarea(attrs={'class': 'form-control', 'id': 'markdown-editor'}),
-        }

butler/templates/butler/create_notice.html

@@ -1,50 +0,0 @@
-{% extends "components/base.html" %}
-{% block title %}Create Notice{% endblock %}
-
-{% block main_area %}
-  <h1 class="pt-3">Create New Notice</h1>
-  <div class="container">
-    <div class="row">
-      <div class="col-md-6">
-        <form method="POST" id="post-form">
-          {% csrf_token %}
-          <div class="mb-3">
-            {{ form.title.label_tag }}
-            {{ form.title }}
-          </div>
-
-          <!-- 마크다운 에디터 -->
-          <h2>contents</h2>
-
-          <div class="col-md-12">
-            {{ form.contents }}
-          </div>
-          <!-- 버튼 -->
-          <div class="d-flex justify-content-end mt-4">
-            <button type="submit" class="btn btn-primary me-2">Create Post</button>
-            <a href="{% url 'butler:notice_list' %}" class="btn btn-secondary">Cancel</a>
-          </div>
-        </form>
-      </div>
-      <div class="col-md-6">
-        <div id="preview" class="border p-3 bg-light h-100 overflow-auto"></div>
-      </div>
-    </div>
-
-    <!-- 마크다운 파서 및 스크립트 -->
-    <script src="https://cdn.jsdelivr.net/npm/markdown-it/dist/markdown-it.min.js"></script>
-    <script>
-      // 마크다운 파서 초기화
-      const md = window.markdownit();
-
-      // content 필드와 미리보기 연결
-      const textarea = document.getElementById("markdown-editor");
-      const preview = document.getElementById("preview");
-
-      // 실시간 미리보기 업데이트
-      textarea.addEventListener("input", function () {
-        const markdownContent = textarea.value; // textarea 내용 가져오기
-        preview.innerHTML = md.render(markdownContent); // 마크다운 -> HTML 변환
-      });
-    </script>
-  {% endblock %}

butler/templates/butler/notice.html

@@ -3,10 +3,7 @@
 {% block title %}Notice{% endblock %}
 
 {% block main_area %}
-  <h2 class="fw-bold pt-3 pb-2 d-flex justify-content-between">
+  <h2 class="fw-bold pt-3 pb-2">공지사항</h2>
-    공지사항
-    
-  </h2>
   <!-- 공지사항 목록 -->
 
   {% if records %}
@@ -35,10 +32,4 @@
   {% else %}
     <p class="text-muted">현재 공지사항이 없습니다.</p>
   {% endif %}
-  {% if request.user.is_authenticated %}
-  <!-- 버튼 컨테이너 -->
-  <div class="d-flex justify-content-between align-items-center mb-3">
-    <a href="{% url 'butler:create_notice' %}" class="btn btn-primary">Create Notice</a>
-  </div>
-  {% endif %}
 {% endblock %}

butler/templates/butler/notice_detail.html

@@ -15,5 +15,5 @@
     {{ notice.created_at|date:"Y-m-d H:i" }}</p>
   <p class="text-muted">수정일:
     {{ notice.updated_at|date:"Y-m-d H:i" }}</p>
-  <a href="{% url 'butler:notice_list' %}" class="btn btn-secondary mt-3">Back to Notices</a>
+  <a href="{% url 'butler:notice' %}" class="btn btn-secondary mt-3">Back to Notices</a>
 {% endblock %}

butler/urls.py

@@ -5,8 +5,7 @@ app_name = 'butler'
 
 urlpatterns = [
     path('', views.hello_view, name='landing'),  # 루트 경로에서 hello_view 호출
-    path('notice', views.notice_list, name='notice_list'),
+    path('notice', views.notice_view, name='notice'),
-    path('create_notice/', views.create_notice, name='create_notice'),        # 포스트 작성
     path('notice/<int:pk>/', views.notice_detail_view, name='notice_detail'),
     path('ip_mgmt', views.ip_mgmt_view, name='ip_mgmt'),
     path('ip-mgmt/add/', views.add_ip_record, name='ip_mgmt_add'),  # 데이터 추가 경로

butler/views.py

@@ -1,10 +1,8 @@
 from django.shortcuts import render, redirect, get_object_or_404
-from django.contrib.auth.decorators import login_required
 from pathlib import Path
 import markdown
 import os
 from .models import NoticeBoard, IPManagementRecord
-from .forms import PostForm
 from django.db.models import Q
 
 
@@ -14,24 +12,11 @@ def hello_view(request):
         "butler/landing.html",
     )
 
-# --- notice ---
-@login_required
-def create_notice(request):
-    if request.method == 'POST':
-        form = PostForm(request.POST)
-        if form.is_valid():
-            post = form.save(commit=False)
-            post.author = request.user  # 작성자 정보 추가
-            post.save()
-            form.save_m2m()
-            return redirect('butler:notice_list')
-    else:
-        form = PostForm()
-    return render(request, 'butler/create_notice.html', {'form': form})
 
-def notice_list(request):
+# --- notice ---
+def notice_view(request):
     records = NoticeBoard.objects.all()
-    return render(request, "butler/notice_list.html", {"records": records})
+    return render(request, "butler/notice.html", {"records": records})
 
 
 def notice_detail_view(request, pk):

version

@@ -1 +1 @@
-dev_0.0.22
+dev_0.0.21_r1