From 88104efc50138af52756b8ecebbed685c2ed53e7 Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Thu, 25 Jan 2024 10:02:06 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?=
 =?UTF-8?q?=EC=BB=A8=ED=85=90=EC=B8=A0=EA=B4=80=EB=A6=AC=20-=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=EA=B4=80=EB=A6=AC=EC=97=90=EC=84=9C=20=ED=8A=B9?=
 =?UTF-8?q?=EC=A0=95=20=ED=8C=9D=EC=97=85=20=EB=88=8C=EB=9F=AC=EC=84=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8B=9C,=20=EC=88=98=EC=A0=95=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20API=20=EC=B6=94=EA=B0=80=20=EA=B1=B4=20back-end?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/editor/RichTextEditor.js   |  7 +++--
 .../admin/contents/PopUp/PopupWriter.jsx      |  3 +-
 .../contents/popUp/model/UpdatePopupVO.java   | 31 +++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java

diff --git a/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js b/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js
index 2cebb9f..0ada6e7 100644
--- a/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js
+++ b/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js
@@ -14,15 +14,18 @@ const RichTextEditor = ({item, setText}) => {
     const modules = {
         toolbar: {
           container: [
-            [{ size: ["small", false, "large", "huge"] }],
+            [{ header: '1' }, { header: '2' }, { font: [] }],
+            [{ size: [] }],
             [{ color: [] }],
             ["bold", "italic", "underline", "strike", "blockquote"],
             [
               { list: "ordered" },
               { list: "bullet" },
+              { indent: '-1' },
+              { indent: '+1' },
               { align: [] }
             ],
-            ["image", "video"],
+            ["link", "image", "video"],
             ["clean"]
           ],
         //   handlers: { image: this.imageHandler }
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx
index 75a734b..d5e7f50 100644
--- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx
@@ -133,8 +133,9 @@ function PopupWriter(props) {
                 formData.append(key, popupDetail[key]);
             }
         }
-
+        
         //게시글 내용
+        formData.delete("contents");
         formData.append("contents", text);        
 
         if (formValidator(formData)) {
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java
new file mode 100644
index 0000000..c08d8ba
--- /dev/null
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java
@@ -0,0 +1,31 @@
+package com.dbnt.kcscbackend.admin.contents.popUp.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@ApiModel(value = "CreatePopupVO", description =
+        "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 팝업을 추가하는 API에 사용된다." + ""
+)
+@RequiredArgsConstructor
+@Getter
+@Setter
+@ToString
+public class CreatePopupVO implements Serializable {
+
+    private static final long serialVersionUID = 719256850119704956L;
+
+    @ApiModelProperty(value = "startDate")
+    private String startDate;
+    @ApiModelProperty(value = "endDate")
+    private String endDate;
+    @ApiModelProperty(value = "title")
+    private String	title;
+    @ApiModelProperty(value = "contents")
+    private String	contents;
+}