From 87e063e03ef5027d3eb815b1028fcb16b4e398e1 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Tue, 12 Jul 2022 00:09:58 +0900
Subject: [PATCH] =?UTF-8?q?fix,refac:=20=ED=9A=8C=EC=9D=98=EC=8B=A4?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A4=84=20=EB=B0=94=EA=BF=88=EC=9D=B4=20?=
 =?UTF-8?q?=ED=91=9C=EA=B8=B0=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/PageBoard.vue               | 191 +++++++++++++----------------
 hwe/ts/components/BoardArticle.vue |   6 +-
 hwe/ts/components/BoardComment.vue |  15 +--
 3 files changed, 94 insertions(+), 118 deletions(-)

diff --git a/hwe/ts/PageBoard.vue b/hwe/ts/PageBoard.vue
index 6247da2a..e5ff5da5 100644
--- a/hwe/ts/PageBoard.vue
+++ b/hwe/ts/PageBoard.vue
@@ -32,7 +32,7 @@
     </div>
     <div id="board">
       <template v-if="articles && articles.length">
-        <board-article
+        <BoardArticle
           v-for="article in articles"
           :key="article.no"
           :article="article"
@@ -46,8 +46,8 @@
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, onMounted, reactive, ref } from "vue";
+<script setup lang="ts">
+import { onMounted, reactive, ref } from "vue";
 import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
 import BoardArticle from "@/components/BoardArticle.vue";
@@ -55,7 +55,6 @@ import { convertFormData } from "@util/convertFormData";
 import axios from "axios";
 import type { InvalidResponse } from "@/defs";
 import { autoResizeTextarea } from "@util/autoResizeTextarea";
-import { unwrap } from "@util/unwrap";
 export type BoardResponse = {
   result: true;
   articles: Record<number, BoardArticleItem>;
@@ -85,108 +84,88 @@ export type BoardCommentItem = {
   text: string;
 };
 
-export default defineComponent({
-  name: "PageBoard",
-  components: {
-    TopBackBar,
-    BottomBar,
-    BoardArticle,
-  },
-  props: {
-    isSecretBoard: {
-      type: Boolean,
-      required: true,
-    },
-  },
-
-  setup(props) {
-    const newArticleTextForm = ref<HTMLInputElement>();
-    const articles = reactive<BoardArticleItem[]>([]);
-
-    const reloadArticles = async () => {
-      let boardResponse: BoardResponse;
-
-      try {
-        const response = await axios({
-          url: "j_board_get_articles.php",
-          responseType: "json",
-          method: "post",
-          data: convertFormData({
-            isSecret: props.isSecretBoard,
-          }),
-        });
-        const result: InvalidResponse | BoardResponse = response.data;
-        if (!result.result) {
-          throw result.reason;
-        }
-        boardResponse = result;
-      } catch (e) {
-        console.error(e);
-        alert(`에러: ${e}`);
-        return;
-      }
-
-      articles.length = 0;
-      articles.push(...Object.values(boardResponse.articles));
-      articles.reverse();
-    };
-
-    onMounted(async () => {
-      await reloadArticles();
-    });
-
-    return {
-      newArticleTextForm,
-      articles,
-      reloadArticles,
-    };
-  },
-  data() {
-    return {
-      title: this.isSecretBoard ? "기밀실" : "회의실",
-      newArticle: {
-        title: "",
-        text: "",
-      },
-    };
-  },
-  methods: {
-    autoResizeTextarea,
-    async submitArticle() {
-      const { title, text } = this.newArticle;
-      if (!title && !text) {
-        return;
-      }
-
-      let result: InvalidResponse;
-
-      try {
-        const response = await axios({
-          url: "j_board_article_add.php",
-          method: "post",
-          responseType: "json",
-          data: convertFormData({
-            isSecret: this.isSecretBoard,
-            title,
-            text,
-          }),
-        });
-        result = response.data;
-        if (!result.result) {
-          throw result.reason;
-        }
-      } catch (e) {
-        console.error(e);
-        alert(`실패했습니다. :${e}`);
-        return;
-      }
-
-      this.newArticle = { title: "", text: "" };
-      const newArticleTextForm = unwrap(this.newArticleTextForm);
-      newArticleTextForm.style.height = "auto";
-
-      await this.reloadArticles();
-    },
+const props = defineProps({
+  isSecretBoard: {
+    type: Boolean,
+    required: true,
   },
 });
+
+const newArticleTextForm = ref<HTMLInputElement>();
+const articles = reactive<BoardArticleItem[]>([]);
+
+const reloadArticles = async () => {
+  let boardResponse: BoardResponse;
+
+  try {
+    const response = await axios({
+      url: "j_board_get_articles.php",
+      responseType: "json",
+      method: "post",
+      data: convertFormData({
+        isSecret: props.isSecretBoard,
+      }),
+    });
+    const result: InvalidResponse | BoardResponse = response.data;
+    if (!result.result) {
+      throw result.reason;
+    }
+    boardResponse = result;
+  } catch (e) {
+    console.error(e);
+    alert(`에러: ${e}`);
+    return;
+  }
+
+  articles.length = 0;
+  articles.push(...Object.values(boardResponse.articles));
+  articles.reverse();
+};
+
+onMounted(async () => {
+  await reloadArticles();
+});
+
+const title = ref(props.isSecretBoard ? "기밀실" : "회의실");
+const newArticle = ref({
+  title: "",
+  text: "",
+});
+
+async function submitArticle() {
+  const { title, text } = newArticle.value;
+  if (!title && !text) {
+    return;
+  }
+
+  let result: InvalidResponse;
+
+  try {
+    const response = await axios({
+      url: "j_board_article_add.php",
+      method: "post",
+      responseType: "json",
+      data: convertFormData({
+        isSecret: props.isSecretBoard,
+        title,
+        text,
+      }),
+    });
+    result = response.data;
+    if (!result.result) {
+      throw result.reason;
+    }
+  } catch (e) {
+    console.error(e);
+    alert(`실패했습니다. :${e}`);
+    return;
+  }
+
+  newArticle.value = { title: "", text: "" };
+  if (newArticleTextForm.value !== undefined) {
+    newArticleTextForm.value.style.height = "auto";
+  }
+
+  await reloadArticles();
+}
 </script>
diff --git a/hwe/ts/components/BoardArticle.vue b/hwe/ts/components/BoardArticle.vue
index 311b96cc..1a8e11e3 100644
--- a/hwe/ts/components/BoardArticle.vue
+++ b/hwe/ts/components/BoardArticle.vue
@@ -20,7 +20,7 @@
       </div>
     </div>
     <div class="commentList">
-      <board-comment v-for="comment in article.comment" :key="comment.no" :comment="comment" />
+      <BoardComment v-for="comment in article.comment" :key="comment.no" :comment="comment" />
     </div>
     <div class="row gx-0">
       <div class="bg2 inputCommentHeader center d-grid">
@@ -98,8 +98,8 @@ async function submitComment() {
 }
 </script>
 
-<style>
-td.text {
+<style scoped>
+.text {
   white-space: pre;
 }
 </style>
diff --git a/hwe/ts/components/BoardComment.vue b/hwe/ts/components/BoardComment.vue
index f49ade58..dee8c685 100644
--- a/hwe/ts/components/BoardComment.vue
+++ b/hwe/ts/components/BoardComment.vue
@@ -15,17 +15,14 @@
     </div>
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import type { BoardCommentItem } from "@/PageBoard.vue";
-import { defineComponent, type PropType } from "vue";
+import type { PropType } from "vue";
 
-export default defineComponent({
-  name: "BoardComment",
-  props: {
-    comment: {
-      type: Object as PropType<BoardCommentItem>,
-      required: true,
-    },
+defineProps({
+  comment: {
+    type: Object as PropType<BoardCommentItem>,
+    required: true,
   },
 });
 </script>