From ebc1fe86848276a2d0c7ffe6aa706c278c18ff8b Mon Sep 17 00:00:00 2001
From: Yuki-jpn20 <densei5954@gmail.com>
Date: Tue, 16 May 2023 12:44:11 +0900
Subject: [PATCH 1/2] Resolve merge conflicts between PR #67 and commit 7970668

---
 app/views/tasks/_form.html.erb | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb
index 6cab2c70..a25e9fe4 100644
--- a/app/views/tasks/_form.html.erb
+++ b/app/views/tasks/_form.html.erb
@@ -99,9 +99,20 @@
     <%= form.text_field :content, class: "form-control", placeholder: "タスクの内容を入力してください", required: true %>
   </div>
 
-  <div class="mb-4">
-    <%= form.label :description, "説明", class: "form-label fw-bold" %>
-    <%= form.text_area :description, class: "form-control", rows: 10, placeholder: "タスクの説明を入力してください" %>
+  <div class="tabs">
+    <input id="write" type="radio" name="tab_item" checked>
+    <label class="tab_item" for="write">Write</label>
+    <input id="preview" type="radio" name="tab_item">
+    <label class="tab_item" for="preview">Preview</label>
+    <div class="tab_content" id="write_content">
+      <%= form.text_area :description, class: "border-2 w-full", rows: 10, id: "write-area", placeholder: "内容を入力してください" %>
+    </div>
+    <div class="tab_content" id="preview_content">
+      <div style="height: 300px" class="overflow-y-scroll">
+        <div id="preview-area" class="markdown-body p-12 list-style-none">
+        </div>
+      </div>
+    </div>
   </div>
 
   <div class="d-grid">

From eed4ae2ffbbae03fc8ed156e1473c06809cbb71f Mon Sep 17 00:00:00 2001
From: bear-KU <pl4k3aju@s.okayama-u.ac.jp>
Date: Thu, 23 Oct 2025 17:57:28 +0900
Subject: [PATCH 2/2] Enable description preview in task edit view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rails 7 では `javascript_pack_tag` が使えないため，インラインスクリプトで記述するように変更した．
---
 app/views/tasks/_form.html.erb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb
index a25e9fe4..13e34352 100644
--- a/app/views/tasks/_form.html.erb
+++ b/app/views/tasks/_form.html.erb
@@ -105,7 +105,7 @@
     <input id="preview" type="radio" name="tab_item">
     <label class="tab_item" for="preview">Preview</label>
     <div class="tab_content" id="write_content">
-      <%= form.text_area :description, class: "border-2 w-full", rows: 10, id: "write-area", placeholder: "内容を入力してください" %>
+      <%= form.text_area :description, class: "border-2 w-full", rows: 10, id: "write-area", placeholder: "タスクの説明を入力してください" %>
     </div>
     <div class="tab_content" id="preview_content">
       <div style="height: 300px" class="overflow-y-scroll">
@@ -119,5 +119,19 @@
     <%= form.submit "保存", class: "btn btn-danger" %>
   </div>
 
+  <script>
+    document.getElementById('preview').onchange=function(){
+    const text = document.getElementById("write-area").value
+    const preview = document.getElementById("preview-area")
+    const obj = {text: text};
+    const method = "POST";
+    const body = JSON.stringify(obj);
+    const headers = {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json'
+    };
+    fetch("/documents/api_markdown", {method, headers, body}).then((res)=> res.json()).then((obj) => {preview.innerHTML=obj.text}).catch(console.error);}
+  </script>
+
   <%= javascript_include_tag 'prevent_transition_in_editing' %>
 <% end %>