add blog-tag and update modal size

backstage/static/js/editor.js

@@ -26,7 +26,12 @@ axios.get(contentApiUrl).then(({ data }) => {
     //li = document.createElement('li');
     //odiv = document.createElement('div');
     //odiv.style.border = 'inset 1px gray';
-    if (blocks[i]["type"] == "para") {
+    if (blocks[i]["text"].includes('br-tag')) {
+      editorBlocks.push({
+        type: "delimiter",
+        data: { text: blocks[i]["text"] },
+      });
+    } else if (blocks[i]["type"] == "para") {
       editorBlocks.push({
         type: "paragraph",
         data: { text: blocks[i]["text"] },
@@ -440,7 +445,8 @@ function editorSave() {
             mdContent += "\n\n";
           } else if (block.type == "delimiter") {
             // mdContent += "\n---\n";
-            mdContent += "<br>";
+            // 放 <br> 會有跑版問題
+            mdContent += "\n<span class='br-tag'></span>\n";
           } else if (block.type == "embed") {
             mdContent +=
               "\n<iframe src=" +

backstage/static/js/htmleditor.js

@@ -1355,7 +1355,7 @@ You should have received a copy of the GNU General Public License along with thi
 								              "aria-labelledby":"h3_"+modalId,
 								              "aria-hidden":"true"
 								          }).append($('<div>',{
-								            	class:"modal-dialog"
+								            	class:"modal-dialog modal-lg"
 								         		}).append($('<div>',{
 							            			class:"modal-content"
 									         		}).append($('<div>',{

backstage/static/js/yo.js

@@ -426,14 +426,13 @@ function parseMd(content) {
         );
       }
 
-      // if (line.includes("blog_tags: ")) {
-      //   console.log('blog_tags line',line);
-      //   $("#cblogtags").val(
-      //     line.replace("blog_tags: ", "").replaceAll('"', "")
-      //   );
-      // }
+      if (line.includes("blog_tag: ")) {
+        $("#cblogtags").val(
+          line.replace("blog_tag: ", "").replaceAll('[', "").replaceAll(']', "")
+        );
+      }
 
-      //for collections
+      // for collections
       if (line.includes("banner_img_text: ")) {
         $("#ccoverimgtxt").val(
           line.replace("banner_img_text: ", "").replaceAll('"', "")
@@ -814,7 +813,12 @@ function GetMdHeader(result = []) {
       'introduction: "' +
       $("#cintroduction").val().replace(/\r?\n/g, "<br>") +
       '"\n';
-    rContent += 'question_box_intro: "' + $("#cquestionboxintro").val() + '"\n';
+      rContent += 'question_box_intro: "' + $("#cquestionboxintro").val() + '"\n';
+      // rContent += 'blog_tag: [' + $("#cblogtags").val() + ']\n';
+      if ($("#cblogtags").val()) {
+        let tagVal= $("#cblogtags").val();
+        rContent += 'blog_tag: [' + tagVal.replaceAll("，", ",") + ']\n';
+      }
   }
   rContent += "---\n";
   console.log("rContent", rContent);

backstage/static/styles/main.css

@@ -151,8 +151,8 @@
 }
 
 .btn__add:hover {
-  width: 4rem;
-  border-radius: 10px;
+  width: 5rem;
+  border-radius: 30px;
 }
 
 .btn__add::after {
@@ -160,7 +160,7 @@
   content: "新增";
   opacity: 0;
   top: 0.7rem;
-  left: 20%;
+  left: 30%;
   width: 3rem;
 }
 
@@ -527,4 +527,8 @@ a.bg-dark:hover, a.bg-dark:active, a.bg-dark:focus {
 
 .btn:hover {
   background-color: rgb(211, 211, 211);
+}
+
+.table-bordered td, .table-bordered th {
+  vertical-align: middle;
 }

backstage/templates/blogs.html

@@ -36,7 +36,7 @@
 {% block modal_body %}
 <form action="{{ url_for('blogs.create') }}" method="POST" enctype="multipart/form-data">
   <div class="form-group">
-    {{ form.title.label(class="form-control-label modal__label mb-1") }} <span class="text-danger">（建議字數：15 字內）</span>
+    {{ form.title.label(class="form-control-label modal__label mb-1") }}
     {{ form.title(class="form-control form-control-lg") }}
     {{ form.image.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議尺寸/比例:
       寬2664px * 高956px)</span>
@@ -53,7 +53,7 @@
 
 {% block main_info_modal_body %}
 <div class="modal fade" id="myModal">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <div class="modal-content">
 
       <div class="modal-header">
@@ -69,7 +69,7 @@
                 <h4>標題</h4>
               </td>
               <td><input class="form-control" id="ctitle" type="text" />
-                <div class="mt-1 text-danger">（建議字數：15 字內）</div>
+                <!-- <div class="mt-1 text-danger">（建議字數：15 字內）</div> -->
               </td>
             </tr>
             <tr>
@@ -99,7 +99,7 @@
               </td>
               <td>
                 <input class="form-control" id="cfile" type="file" />
-                <div class="mt-1 text-danger">(建議尺寸/比例: 寬2664px * 高956px)</div>
+                <div class="mt-1 text-danger">（建議尺寸/比例: 寬2664px * 高956px）</div>
               </td>
             </tr>
             <tr>
@@ -108,7 +108,7 @@
                 <h4>文章分類</h4>
               </td>
               <td><textarea class="form-control" rows="1" id="ccategories"></textarea>
-                <div class="mt-1 text-danger">（建議字數：15 字內）</div>
+                <div class="mt-1 text-danger">（請輸入英文分類名稱）</div>
               </td>
             </tr>
             <tr>

backstage/templates/collections.html

@@ -122,7 +122,7 @@
 
 {% block main_info_modal_body %}
 <div class="modal fade" id="myModal">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <div class="modal-content">
 
       <div class="modal-header">

backstage/templates/contact_us.html

@@ -10,7 +10,7 @@
         <tr>
          
             <!-- <td class="table__data">修改聯絡EMAIL</td> -->
-            修改聯絡EMAIL <span class="text-danger">(若輸入多數EMAIL，請以逗號 (,) 或分號 (;) 分隔，逗號或分號後請勿加空格)</span>
+            修改聯絡 Email <span class="text-danger">（若輸入多數 Email，請以逗號 (,) 或分號 (;) 分隔，逗號或分號後請勿加空格）</span>
             <td class="table__data"><input class="form-control" id="newEmail" type="text" style="width: 600px;" placeholder="修改聯絡EMAIL" /></td>
             <td class="table__data"></td>
             <!-- <td class="table__data">1</td> -->

backstage/templates/editor.html

@@ -43,6 +43,7 @@
         <input id="ccaturl" type="text" /><br />
         <input id="ccol1" type="text" /><br />
         <input id="ccol2" type="text" /><br />
+        <input id="cblogtags" type="text" />
       </div>
 
       <!-- <div class="mb-2"> -->

backstage/templates/home.html

@@ -1 +1 @@
-{% extends "tables/manage_table.html" %}
+{% extends "tables/manage_table.html" %}

backstage/templates/layout.html

@@ -73,7 +73,7 @@
           <a href="{{ url_for('blogs.edit_solid_wood_furniture') }}"
             class="bg-dark list-group-item list-group-item-action">
             <div class="d-flex w-100 justify-content-start align-items-center">
-              <i class="far fa-newspaper mr-3"></i>
+              <i class="fas fa-couch mr-3"></i>
               <span class="menu-collapsed">單品家具</span>
             </div>
           </a>
@@ -85,7 +85,7 @@
           </a>-->
           <a href="{{ url_for('blogs.edit_news') }}" class="bg-dark list-group-item list-group-item-action">
             <div class="d-flex w-100 justify-content-start align-items-center">
-              <i class="far fa-newspaper mr-3"></i>
+              <i class="fas fa-regular fa-newspaper mr-3"></i>
               <span class="menu-collapsed">最新消息</span>
             </div>
           </a>
@@ -117,7 +117,7 @@
           </a> -->
           <a href="{{ url_for('blogs.edit_contact_us') }}" class="bg-dark list-group-item list-group-item-action">
             <div class="d-flex w-100 justify-content-start align-items-center">
-              <i class="far fa-newspaper mr-3"></i>
+              <i class="fas fa-solid fa-envelope mr-3"></i>
               <span class="menu-collapsed">聯絡我們</span>
             </div>
           </a>
@@ -131,7 +131,7 @@
           <a href="#" data-toggle="sidebar-colapse"
             class="bg-dark list-group-item list-group-item-action d-flex align-items-center">
             <div class="d-flex w-100 justify-content-start align-items-center">
-              <span id="collapse-icon" class="fa fa-2x mr-3"></span>
+              <span id="collapse-icon" class="fas fa-solid fa-chevron-left mr-3"></span>
               <span id="collapse-text" class="menu-collapsed">收合</span>
             </div>
           </a>

backstage/templates/news.html

@@ -46,7 +46,7 @@
 
 {% block main_info_modal_body %}
 <div class="modal fade" id="myModal">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <div class="modal-content">
 
       <div class="modal-header">

backstage/templates/solid_wood_furniture.html

@@ -96,7 +96,7 @@
     }
 </style>
 <div class="modal fade" id="myModal">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
 
             <div class="modal-header">

backstage/templates/store_location.html

@@ -60,7 +60,7 @@
                   <button class="btn__delete m-1" type="submit" value="delete"><i class="fas fa-trash-alt"></i></button>
                 </form>
                 <div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="updateModalLabel" aria-hidden="true">
-                  <div class="modal-dialog" role="document">
+                  <div class="modal-dialog modal-lg" role="document">
                     <div class="modal-content">
                       <div class="modal-header border-0">
                         <h5 class="modal-title modal__title" id="createModalLabel">新增據點</h5>
@@ -105,7 +105,7 @@
 {% endfor %}
 <!-- Modal -->
 <div class="modal fade" id="createModal" tabindex="-1" role="dialog" aria-labelledby="createModalLabel" aria-hidden="true">
-  <div class="modal-dialog" role="document">
+  <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header border-0">
         <h5 class="modal-title modal__title" id="createModalLabel">新增據點</h5>

backstage/templates/system_furniture.html

@@ -90,7 +90,7 @@
     }
 </style>
 <div class="modal fade" id="myModal">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
 
             <div class="modal-header">

backstage/templates/tables/editor_table.html

@@ -26,7 +26,7 @@
 
 {% block main_info_modal_body %}{% endblock %}
 <!-- <div class="modal fade" id="myModal">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <div class="modal-content">
 
       <div class="modal-header">
@@ -132,7 +132,7 @@
 <!-- Modal -->
 <div class="modal fade" id="createModal" tabindex="-1" role="dialog" aria-labelledby="createModalLabel"
   aria-hidden="true">
-  <div class="modal-dialog" role="document">
+  <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header border-0">
         <h5 class="modal-title modal__title" id="createModalLabel">新增</h5>

backstage/templates/tables/editor_table_news.html

@@ -27,7 +27,7 @@
 
 {% block main_info_modal_body %}{% endblock %}
 <!-- <div class="modal fade" id="myModal">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <div class="modal-content">
 
       <div class="modal-header">
@@ -133,7 +133,7 @@
 <!-- Modal -->
 <div class="modal fade" id="createModal" tabindex="-1" role="dialog" aria-labelledby="createModalLabel"
   aria-hidden="true">
-  <div class="modal-dialog" role="document">
+  <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header border-0">
         <h5 class="modal-title modal__title" id="createModalLabel">新增</h5>

backstage/templates/tables/manage_table.html

@@ -34,7 +34,7 @@
                           <i class="fas fa-edit"></i>
                         </button>
                         <div class="modal fade" id="manage_modal" tabindex="-1" role="dialog" aria-labelledby="Label" aria-hidden="true">
-                          <div class="modal-dialog" role="document">
+                          <div class="modal-dialog modal-lg" role="document">
                             <div class="modal-content">
                               <div class="modal-header border-0">
                                 <h5 class="modal-title modal__title" id="exampleModalLabel">編輯</h5>
@@ -72,7 +72,7 @@
                           <i class="fas fa-edit"></i>
                         </button>
                         <div class="modal fade" id="manage_modal" tabindex="-1" role="dialog" aria-labelledby="Label" aria-hidden="true">
-                          <div class="modal-dialog" role="document">
+                          <div class="modal-dialog modal-lg" role="document">
                             <div class="modal-content">
                               <div class="modal-header border-0">
                                 <h5 class="modal-title modal__title" id="exampleModalLabel">編輯</h5>
@@ -108,7 +108,7 @@
                         <i class="fas fa-edit"></i>
                       </button>
                       <div class="modal fade" id="manage_modal" tabindex="-1" role="dialog" aria-labelledby="Label" aria-hidden="true">
-                        <div class="modal-dialog" role="document">
+                        <div class="modal-dialog modal-lg" role="document">
                           <div class="modal-content">
                             <div class="modal-header border-0">
                               <h5 class="modal-title modal__title" id="exampleModalLabel">編輯</h5>

models/contents/routes.py

@@ -53,7 +53,10 @@ def _get_data(file_dir):
             result['tags'] = s
         elif 'categories: ' in line:
             s = line.replace('categories: ', '').strip()
-            result['categories'] = s    
+            result['categories'] = s  
+        elif 'blog_tag: ' in line:
+            s = line.replace('blog_tag: ', '').strip()
+            result['blog_tag'] = s
         elif 'image: ' in line:
             s = line.replace('image: ', '').strip()
             s = s.replace('"', '').strip()