add housetype

backstage/collections/routes.py

@@ -44,10 +44,10 @@ def create():
     csliderimg = []
     csliderimgfilename = []
     form.image.data.filename = processImgFile(form.image.data.filename)
-    for file in form.collectionslider.data:
-        file.filename = processImgFile(file.filename)
-        csliderimg.append(file)
-        csliderimgfilename.append(file.filename)
+    # for file in form.collectionslider.data:
+    #     file.filename = processImgFile(file.filename)
+    #     csliderimg.append(file)
+    #     csliderimgfilename.append(file.filename)
 
     eng_name = get_trans_title_url_name(form.title.data)
     front_matter = '''---

backstage/static/js/editor.js

@@ -17,7 +17,6 @@ axios.get(contentApiUrl).then(({ data }) => {
   blocks = parseMd(content);
   aa = new MDParser(content);
   editor_block = document.getElementById("editor_block");
-  //alert(blocks[0]['text']);
 
   //ul = document.createElement('ul');
   //ul.id = "sortable";
@@ -41,8 +40,6 @@ axios.get(contentApiUrl).then(({ data }) => {
       //odiv.appendChild(tmp);
     } else if (blocks[i]["type"] == "img") {
       ampimg = blocks[i]["text"];
-      //alert(ampimg.indexOf("width=\"",84));
-      //alert(ampimg.substr(ampimg.indexOf("alt=\"") + 5, ampimg.indexOf("\"", ampimg.indexOf("alt=\"") + 5) - ampimg.indexOf("alt=\"") - 5));
       tmpsrc =
         BHOUSE_SERVER +
         JSON.parse(document.getElementById("url").textContent).url +
@@ -90,7 +87,6 @@ axios.get(contentApiUrl).then(({ data }) => {
           withBackground: false,
         },
       });
-      //alert(ampimg.substr(ampimg.indexOf("height=\"") + 8, ampimg.indexOf("\"", ampimg.indexOf("height=\"") + 8) - ampimg.indexOf("height=\"") - 8));
       //img = document.createElement('img');
       //img.style.width = '100%';
       //img.src = tmpsrc;
@@ -136,13 +132,10 @@ axios.get(contentApiUrl).then(({ data }) => {
       //tmp.innerHTML = blocks[i]['text'];
       //odiv.appendChild(tmp);
     } else if (blocks[i]["type"] == "hr") {
-      //alert('yo');
       editorBlocks.push({ type: "paragraph", data: { text: "---" } });
     } else if (blocks[i]["type"] == "mt5") {
-      //alert('yo');
       editorBlocks.push({ type: "delimiter", data: {} });
     } else if (blocks[i]["type"] == "table") {
-      //alert('yo');
       editorBlocks.push({
         type: "table",
         data: { content: tableTextToArray(blocks[i]["text"]) },
@@ -155,9 +148,7 @@ axios.get(contentApiUrl).then(({ data }) => {
   //$("#sortable").sortable();
   //$("#sortable").disableSelection();
   $("#editor_block").css({ display: "none" });
-  //alert(JSON.parse(document.getElementById('url').textContent).url);
   $("#editorjs")[0].innerHTML = "";
-  //alert(JSON.stringify(editorBlocks));
   editor = new EditorJS({
     readOnly: false,
     holder: "editorjs",
@@ -207,54 +198,18 @@ axios.get(contentApiUrl).then(({ data }) => {
       //console.log('something changed', block);
     },
   });
-
-  /*   for (var blockData of preBlockArray) {
-      blockCount = loadDataToBlock(blockArray, blockCount, blockData);
-    }
-    titleButton.onclick = function () {
-      blockCount = loadDataToBlock(blockArray, blockCount);
-    } */
 });
 
 function editorSave() {
   editor
     .save()
     .then((outputData) => {
-      //console.log('Article data: ', outputData);
-      //var mdContent = GetMdHeader();
-      //var mdContent = frontMatters.join('\n');
-      //console.log(mdContent);
-      //console.log(frontMatters.join('\n'));
-      //mdContent = mdContent.replace('draft: ' + (!$('#cdraft').is(':checked')), 'draft: ' + $('#cdraft').val())
-      //alert(mdContent);
-      /*
-    for (var frontMatter of frontMatters) {
-      mdContent += frontMatter + '\n';
-    }
-    
-    //alert($('#cdescription').val());
-    mdContent += '---\n';
-    mdContent += 'title: "' + $('#ctitle').val() + '"\n';
-    mdContent += 'date: ' + $('#cdate').val() + '\n';
-    mdContent += 'draft: ' + $('#cdraft').val() + '\n';
-    mdContent += 'type: "' + $('#ctype').val() + '"\n';
-    mdContent += 'url: "' + $('#curl').val() + '"\n';
-    mdContent += 'image: "' + $('#cimage').val() + '"\n';
-    mdContent += 'description: "' + $('#cdescription').val().replace(/\r?\n/g, '<br>') + '"\n';
-    mdContent += 'weight: ' + ($('#cweight').val() == 'undefined' ? "" : $('#cweight').val()) + '\n';
-    mdContent += 'tag: "' + ($('#ctag').val() == 'undefined' ? "" : $('#ctag').val()) + '"\n';
-    mdContent += '---\n\n';
-    */
-
-      //var articleinfo = frontMatters.join('\n');
       var articleinfo = GetMdHeader();
       var mdContent = '<div class="container-fluid blog_article p-0">\n\n';
-      //var headings = new Array();
 
       for (i = 0; i < outputData.blocks.length; i++) {
         var paragraphdata = "";
 
-        //alert(block.type);
         block = outputData.blocks[i];
         if (block.type == "header") {
           mdContent += "## " + block.data.text + "\n";
@@ -266,11 +221,8 @@ function editorSave() {
             mdContent += paragraphdata + "\n\n";
           }
         } else if (block.type == "hr") {
-          //alert('hr');
           mdContent += "\n---\n";
         } else if (block.type == "image") {
-          //console.log(block.data.file.url);
-          //console.log(JSON.parse(document.getElementById('url').textContent).url);
           iurl = block.data.file.url.split("/");
           mdContent +=
             '<img class="img-fluid" alt="' +
@@ -297,12 +249,9 @@ function editorSave() {
             block.data.height +
             '"></iframe>\n\n';
         } else if (block.type == "table") {
-          //alert(tableArrayToHtml(block.data).length);
           mdContent += "\n" + tableArrayToHtml(block.data.content) + "\n\n";
-          //console.log(tableArrayToHtml(block.data.content));
         }
       }
-      //alert(mdContent);
 
       var mdData = articleinfo + "\n\n" + mdContent;
 
@@ -317,51 +266,5 @@ function editorSave() {
     .catch((error) => {
       console.log("Saving failed: ", error);
     });
-
-  /*   var mdContent = '';
-    for (var frontMatter of frontMatters) {
-      mdContent += frontMatter + '\n';
-    } */
-
-  //alert(bb);
-  /*     for(var eBlock in outputData.blocks)
-      {
-        alert(eBlock.type);
-      } */
-  /* 
-for (var idx = 0; idx < blockArray.length; idx++) {
- if (_.get(blockArray[idx], 'title', '').includes('敘述')) {
-   mdContent += `\n<!-- ### **${_.get(blockArray[idx], 'title', '')}**-->\n`
- } else {
-   mdContent += `\n### **${_.get(blockArray[idx], 'title', '')}**\n`
- }
- for (var data of _.get(blockArray[idx], 'data', [])) {
-   if (_.get(_.keys(data), 0) === 'description') {
-     if (_.get(data, 'description.text', '').includes('\n')) {
-       for (const line of _.get(data, 'description.text', '').split('\n')) {
-         mdContent += `\n${line}    `;
-       }
-     } else {
-       mdContent += `\n${_.get(data, 'description.text', '')}`;
-     }
-   } else if (_.get(_.keys(data), 0) === 'image') {
-     ampImgForm = `\n<amp-img\
-\n  alt="${_.get(data, 'image.alt', '小寶優居')}"\
-\n  src="${_.get(data, 'image.src', '')}"\
-\n  height="${_.get(data, 'image.height', 300)}"\
-\n  width="${_.get(data, 'image.width', 400)}"\
-\n  layout="${_.get(data, 'image.layout', 'responsive')}">\
-\n</amp-img>\n`;
-     mdContent += ampImgForm;
-   }
- }
-}
-*/
-  /* const postData = {
-    content: mdContent,
-    url: (JSON.parse(document.getElementById('url').textContent)).url
-  }; */
-
-  //axios.post(contentApiUrl, json = postData);
 }
 submitButton.onclick = editorSave;

backstage/templates/collections.html

@@ -38,7 +38,7 @@
   <div class="form-group">
     {{ form.title.label(class="form-control-label modal__label mb-1") }} <span class="text-danger">(建議字數: 15字內)</span>
     {{ form.title(class="form-control form-control-lg") }}
-    
+
     {{ form.description.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議字數:
       50字內)</span>
     {{ form.description(class="form-control form-control-lg textarea") }}
@@ -55,8 +55,8 @@
     {{ form.image(class="form-control form-control-lg modal__file") }}
 
     {{ form.tags.label(class="form-control-label modal__label mb-1") }}
-    {{ form.tags(class="form-control form-control-lg") }}    
-    
+    {{ form.tags(class="form-control form-control-lg") }}
+
     {{ form.coverimg.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議尺寸/比例:
       寬____px * 高____px)</span>
     {{ form.coverimg(class="form-control form-control-lg modal__file") }}
@@ -64,7 +64,7 @@
     {{ form.bannerimgtext.label(class="form-control-label modal__label mt-3 mb-1") }}
     {{ form.bannerimgtext(class="form-control form-control-lg") }}
 
-    {{ form.homeowner.label(class="form-control-label modal__label mt-3 mb-1") }} 
+    {{ form.homeowner.label(class="form-control-label modal__label mt-3 mb-1") }}
     {{ form.homeowner(class="form-control form-control-lg") }}
 
     {{ form.size.label(class="form-control-label modal__label mt-3 mb-1") }}
@@ -93,7 +93,7 @@
 
     {{ form.comment.label(class="form-control-label modal__label mt-3 mb-1") }}
     {{ form.comment(class="form-control form-control-lg modal__file") }}
-    
+
   </div>
   <div class="modal-footer  pb-0 border-0">
     <button type="button" class="btn btn__cancel" data-dismiss="modal">取消</button>
@@ -228,9 +228,10 @@
               <td>
                 <h4>類型</h4>
               </td>
-              <td><select id="thousetype">
+              <td><select id="chousetype">
+                  <option value="">類型</option>
                   <option value="大樓">大樓</option>
-                  <option value="透天">透天</option>                  
+                  <option value="透天">透天</option>
                 </select></td>
             </tr>
             <tr>
@@ -254,7 +255,7 @@
                   <option value="新北">新北</option>
                   <option value="基隆">基隆</option>
                   <option value="桃園">桃園</option>
-                  <option value="新竹">新竹</option>                  
+                  <option value="新竹">新竹</option>
                   <option value="苗栗">苗栗</option>
                   <option value="台中">台中</option>
                   <option value="南投">南投</option>
@@ -289,7 +290,7 @@
               <h4>作品集圖片集1</h4>
             </td>
             <td>
-                <div class="form-control" id="editorjs1" style='border:inset 1px;'></div>
+              <div class="form-control" id="editorjs1" style='border:inset 1px;'></div>
             </td>
             <tr>
               <td>

backstage/templates/editorcollection.html

@@ -12,5 +12,6 @@
         <input id="ccollname" type="text" /><br />
         <input id="ccollslider" type="text" /><br />
         <input id="ccomment" type="text" /><br />
+        <input id="chousetype" type="text" /><br />
       </div>
 {% endblock extras %}