diff --git a/butler/templates/butler/_unarchived_landing.html b/butler/templates/butler/_unarchived_landing.html new file mode 100644 index 0000000..39e9dc8 --- /dev/null +++ b/butler/templates/butler/_unarchived_landing.html @@ -0,0 +1,13 @@ +{% extends "components/base.html" %} + +{% block title %}Landing Page{% endblock %} + +{% block main_area %} +
+

Welcome!

+

IT Infra 및 DevOps 자원관리 도구

+ * IP리스트 관리기능 제공
+ * Public NHN Cloud API 기능 일부 제공 +

계속 기능 구현 중 입니다.

+
+{% endblock %} \ No newline at end of file diff --git a/butler/templates/butler/landing.html b/butler/templates/butler/landing.html index 39e9dc8..67f8c15 100644 --- a/butler/templates/butler/landing.html +++ b/butler/templates/butler/landing.html @@ -3,11 +3,46 @@ {% block title %}Landing Page{% endblock %} {% block main_area %} -
-

Welcome!

-

IT Infra 및 DevOps 자원관리 도구

- * IP리스트 관리기능 제공
- * Public NHN Cloud API 기능 일부 제공 -

계속 기능 구현 중 입니다.

-
+
+
+ +
+

Latest Notices

+
+ {% for notice in notices %} +
+
+
+
{{ notice.title }}
+

{{ notice.content|truncatewords:20 }}

+ View Notice +
+
+
+ {% empty %} +

No notices available.

+ {% endfor %} +
+
+ +
+

Latest Blog Posts

+
+ {% for post in blog_posts %} +
+
+
+
{{ post.title }}
+

{{ post.summary|truncatewords:20 }}

+ Read More +
+
+
+ {% empty %} +

No blog posts available.

+ {% endfor %} +
+
+
+
{% endblock %} \ No newline at end of file diff --git a/butler/urls.py b/butler/urls.py index fa24850..d27a261 100644 --- a/butler/urls.py +++ b/butler/urls.py @@ -4,7 +4,10 @@ from . import views app_name = 'butler' urlpatterns = [ - path('', views.hello_view, name='landing'), # 루트 경로에서 hello_view 호출 + # path('', views.hello_view, name='landing'), # 루트 경로에서 hello_view 호출 + # Landing Page + path('', views.LandingPageView.as_view(), name='landing'), # 클래스 기반 뷰(CBV) 호출 + path('notice', views.notice_list, name='notice_list'), path('create_notice/', views.create_notice, name='create_notice'), # 포스트 작성 path('notice//', views.notice_detail_view, name='notice_detail'), diff --git a/butler/views.py b/butler/views.py index 20d8ce5..926518a 100644 --- a/butler/views.py +++ b/butler/views.py @@ -1,18 +1,23 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.auth.decorators import login_required +from django.views.generic import TemplateView from pathlib import Path import markdown import os from .models import NoticeBoard, IPManagementRecord +from blog.models import Post from .forms import PostForm from django.db.models import Q -def hello_view(request): - return render( - request, - "butler/landing.html", - ) +class LandingPageView(TemplateView): + template_name = "butler/landing.html" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['blog_posts'] = Post.objects.order_by('-created_at')[:3] + context['notices'] = NoticeBoard.objects.order_by('-created_at')[:3] + return context # --- notice --- @login_required diff --git a/components/templates/components/_sidebar.html b/components/templates/components/_sidebar.html index 1885a96..520a1e0 100644 --- a/components/templates/components/_sidebar.html +++ b/components/templates/components/_sidebar.html @@ -9,6 +9,7 @@ +