210719 collection list editing

backstage/collections/routes.py

@@ -1,10 +1,11 @@
-from flask import render_template, Blueprint, request, redirect, url_for
+from flask import render_template, Blueprint, request, redirect, url_for, jsonify
 import requests
 from backstage.collections.forms import CollectionCreateForm
 from backstage.utils import get_now_time
 from backstage.utils.routes import create_content, remove_content, get_trans_title_url_name
 from backstage.config import PORTAL_SERVER
 
+
 collections_app = Blueprint('collections', __name__)
 
 
@@ -12,6 +13,8 @@ collections_app = Blueprint('collections', __name__)
 def collection_list():
     response = requests.get('{}contents?url=/collection'.format(PORTAL_SERVER))
     if response.status_code == 200:
+        print(response.json()[1])
+        print(url_for('collections.create'))
         return render_template('collections.html',
                                title='家具規劃作品',
                                legend='家具規劃作品列表',
@@ -35,7 +38,7 @@ description: "{}"\n\
               get_now_time(),
               'false',
               'collection',
-              '/collection/{}'.format(get_trans_title_url_name(form.title.data)),
+              '/collection/{}'.format(form.title.data),
               form.image.data.filename,
               form.description.data)
     data = {'frontMatter': front_matter,

backstage/static/js/editor.js

@@ -5,6 +5,7 @@ const contentApiUrl = `${PORTAL_SERVER}contents?url=${(JSON.parse(document.getEl
 
 aa = "";
 frontMatters = [];
+contentMatters = [];
 editorBlocks = [];
 //postData = { content: "", url: "" };
 var editor;
@@ -15,6 +16,7 @@ axios.get(contentApiUrl).then(({ data }) => {
   var blockArray = [{ title: '', data: [] }];
   var blockCount = 0;
   blocks = parseMd(content);
+  aa = new MDParser(content);
   editor_block = document.getElementById('editor_block');
   //alert(blocks[0]['text']);
 
@@ -126,7 +128,7 @@ axios.get(contentApiUrl).then(({ data }) => {
         }
       }
       ,
-      // code: CodeTool,
+      table: Table,
       delimiter: Delimiter,
       embed: Embed,
     }
@@ -168,8 +170,8 @@ submitButton.onclick = function () {
     mdContent += 'url: "' + $('#curl').val() + '"\n';
     mdContent += 'image: "' + $('#cimage').val() + '"\n';
     mdContent += 'description: "' + $('#cdescription').val() + '"\n';
-    mdContent += 'weight: ' + $('#cweight').val() + '\n';
-    mdContent += 'tag: "' + $('#ctag').val() + '"\n';
+    mdContent += 'weight: ' + ($('#cweight').val() == 'undefined' ? "" : $('#cweight').val())+ '\n';
+    mdContent += 'tag: "' + ($('#ctag').val() == 'undefined' ? "" : $('#ctag').val()) + '"\n';
     mdContent += '---\n\n';
 
     for (i = 0; i < outputData.blocks.length; i++) {

backstage/static/js/yo.js

@@ -28,6 +28,16 @@ function parseMd(content) {
             if (line.includes('draft: ')) {
                 //alert(line);
                 $('#cdraft').val(line.replace('draft: ','').replaceAll('\"',''));
+                console.log($('#cdraft').val());
+                $('#cdraft').removeAttr('checked');
+                if($('#cdraft').val() == 'false')
+                    $('#cdraft').prop('checked',true);
+                /*
+                if($('#cdraft').val() == 'true') 
+                    $('#cdraft').removeAttr('checked');
+                else
+                    $('#cdraft').attr('checked','true');
+                    */
             }
             if (line.includes('type: ')) {
                 //alert(line);
@@ -59,7 +69,7 @@ function parseMd(content) {
             }
             continue;
         }
-
+        contentMatters.push(line)
 /*         if (line.toString().trim() == "") {
             blocks.push({ 'type': 'br', 'text': line });
             continue;
@@ -138,3 +148,20 @@ const parseAmpImg = line => {
         const layoutParameter = line.replace(/ |layout=|"|>/g, '');
     }
 }
+
+class MDParser
+{
+
+    constructor(MDtext)
+    {
+        this.headerText = "";
+        this.contentText = "";
+        for (var line of MDtext.split('\n')) {
+            console.log(line);
+        }
+    }
+
+
+}
+
+

backstage/templates/collections.html

@@ -1,17 +1,19 @@
 {% extends "tables/editor_table.html" %}
 {% block table_body %}
-{% for idx in range(0, length) %}
+{% for idx in range(1, length) %}
     <tbody>
       <tr>
         <td class="table__data">{{ idx }}</td>
         <td class="table__data">{{ collections[idx].title }}</td>
-        <td class="table__data">1</td>
-        <td class="table__data">on</td>
+        <td class="table__data">{{ collections[idx].date }}</td>
+        <!-- <td class="table__data">1</td> -->
+        <td class="table__data"><input type="checkbox" disabled {{ 'checked' if (collections[idx].draft.lower()=='false') }} /></td>
         <td>
           <div class="d-flex justify-content-center">
+            <button onclick="getHeader('{{ collections[idx].url }}');" >編輯檔頭</button>
             <a class="m-1 btn__edit" href="{{ url_for('editor.editor', url=collections[idx].url) }}"><i class="fas fa-edit"></i></a>
             <form action="{{ url_for('collections.remove', url=collections[idx].url) }}" method="POST" method="POST" class="m-1 inline_block">
-              <button class="btn__delete" type="submit" value="delete"><i class="fas fa-trash-alt"></i></button>
+              <button class="btn__delete" type="submit" value="delete" onclick=" return confirm('確定刪除?');"><i class="fas fa-trash-alt"></i></button>
             </form>
           </div>
         </td>

backstage/templates/editor.html

@@ -25,6 +25,8 @@
         <input id="ctype" type="text" /><br />
         <input id="curl" type="text" /><br />
         <input id="cimage" type="text" /><br />
+        <input id="cweight" type="text" /><br />
+        <input id="ctag" type="text" /><br />
       </div>
       
       <!-- <div class="mb-2"> -->
@@ -82,6 +84,7 @@
 
 <script type="text/javascript" src="{{url_for('static', filename='js/yo.js')}}"></script>
 <script type="text/javascript" src="{{url_for('static', filename='js/editor.js')}}"></script>
+<script type="text/javascript" src="{{url_for('static', filename='js/table.js')}}"></script>
 <script>//alert('yo');</script>
 </div>
 {% endblock main %}

backstage/templates/tables/editor_table.html

@@ -1,36 +1,112 @@
 {% extends "layout.html" %}
 {% block main %}
-  <h1 class="h3"><i class="far fa-newspaper mr-3"></i>{{ title }}</h1>
-  <table id="example" class="table" cellspacing="0" width="60%">
-    <thead>
-      <tr>
-        <th class="table__head">順序</th>
-        <th class="table__head">標題</th>
-        <th class="table__head">順序</th>
-        <th class="table__head">顯示</th>
-        <th style="width:150px;" class="table__head">
-          <button type="button" class="btn__add m-1" data-toggle="modal" data-target="#createModal"><i class="fas fa-plus"></i></button>
-        </th>
-      </tr>
-    </thead>
-    {% block table_body %}{% endblock %}
-  </table>
-  <!-- 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-content">
-        <div class="modal-header border-0">
-          <h5 class="modal-title modal__title" id="createModalLabel">新增文章</h5>
-          <button type="button" class="close modal__close" data-dismiss="modal" aria-label="Close">
-            <span class="modal__close__back">
-              <span aria-hidden="true">&times;</span>
-            </span>
-          </button>
-        </div>
-        <div class="modal-body">
-          {% block modal_body %}{% endblock %}
-        </div>
+<h1 class="h3"><i class="far fa-newspaper mr-3"></i>{{ title }}</h1>
+<table id="example" class="table" cellspacing="0" width="60%">
+  <thead>
+    <tr>
+      <th class="table__head">編號</th>
+      <th class="table__head">標題</th>
+      <th class="table__head">日期</th>
+      <!-- <th class="table__head">順序</th> -->
+      <th class="table__head">顯示</th>
+      <th style="width:150px;" class="table__head">
+        <button type="button" class="btn__add m-1" data-toggle="modal" data-target="#createModal"><i
+            class="fas fa-plus"></i></button>
+      </th>
+    </tr>
+  </thead>
+  {% block table_body %}{% endblock %}
+</table>
+<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+<link rel="stylesheet" href="https://jqueryui.com/resources/demos/style.css">
+<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script type="text/javascript" src="{{url_for('static', filename='config.js')}}"></script>
+<script type="text/javascript" src="{{url_for('static', filename='js/yo.js')}}"></script>
+<div id="dialog-form">
+  <input id="ctitle" type="text" /><br />
+  <input id="cdate" type="text" /><br />
+  <input id="cdraft" type="checkbox" checked="true" /><br />
+  <input id="ctype" type="text" /><br />
+  <input id="curl" type="text" /><br />
+  <input id="cimage" type="text" /><br />
+  <input id="cdescription" type="text" /><br />
+  <input id="cweight" type="text" /><br />
+  <input id="ctag" type="text" /><br />
+  <button onclick="updateHeader();location.reload();">完成修改</button>
+</div>
+<script>
+  editTarget = "";
+  frontMatters = [];
+  contentMatters = [];
+  const contentApiUrl = `${PORTAL_SERVER}contents?url=`;
+  function getHeader(url) {
+    axios.get(contentApiUrl + url).then(({ data }) => {
+      aa = data[0]['content'];
+      const content = _.get(data, '0.content', '');
+      blocks = parseMd(content);
+      $("#dialog-form").dialog();
+      editTarget = url;
+      //console.log(frontMatters);
+    });
+  }
+  function updateHeader() {
+
+    mdContent = "";
+    mdContent += '---\n';
+    mdContent += 'title: "' + $('#ctitle').val() + '"\n';
+    mdContent += 'date: ' + $('#cdate').val() + '\n';
+    mdContent += 'draft: ' + (!$("#cdraft").is(':checked')).toString() + '\n';
+    mdContent += 'type: "' + $('#ctype').val() + '"\n';
+    mdContent += 'url: "' + $('#curl').val() + '"\n';
+    mdContent += 'image: "' + $('#cimage').val() + '"\n';
+    mdContent += 'description: "' + $('#cdescription').val() + '"\n';
+    mdContent += 'weight: ' + ($('#cweight').val() == 'undefined' ? "" : $('#cweight').val())+ '\n';
+    mdContent += 'tag: "' + ($('#ctag').val() == 'undefined' ? "" : $('#ctag').val()) + '"\n';
+    mdContent += '---\n';
+    mdContent += contentMatters.join("\n");
+    //console.log(contentMatters);
+    postData = {
+      content: mdContent,
+      url: editTarget
+    };
+    //console.log(mdContent);
+    axios.post(contentApiUrl + editTarget, json = postData);
+  }
+  function htmlDecode(input) {
+    var e = document.createElement('textarea');
+    e.innerHTML = input;
+    // handle case of empty input
+    return e.childNodes.length === 0 ? "" : e.childNodes[0].nodeValue;
+  }
+
+  $(function () {
+
+    $("#dialog-form").hide();
+
+  });
+  //allObjs = JSON.parse(htmlDecode('{{ collections }}'));
+  //console.log(htmlDecode('{{ collections }}'));
+
+</script>
+
+<!-- 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-content">
+      <div class="modal-header border-0">
+        <h5 class="modal-title modal__title" id="createModalLabel">新增文章</h5>
+        <button type="button" class="close modal__close" data-dismiss="modal" aria-label="Close">
+          <span class="modal__close__back">
+            <span aria-hidden="true">&times;</span>
+          </span>
+        </button>
+      </div>
+      <div class="modal-body">
+        {% block modal_body %}{% endblock %}
       </div>
     </div>
   </div>
-{% endblock main %}
+</div>
+{% endblock main %}

backstage/upload/routes.py

@@ -1,4 +1,4 @@
-from backstage.config import PORTAL_SERVER, BHOUSE_SERVER
+from backstage.config import UPLOAD_PATH_MAP
 import os
 from flask import render_template, Blueprint, request, redirect, url_for
 import flask
@@ -10,8 +10,6 @@ from PIL import Image
 from urllib.parse import urlparse
 import uuid
 
-UPLOAD_PATH_MAP = [["C:\\Users\\yukyo\\Desktop\\bhouseWeb\\content\\規劃作品集\\",
-                    "http://localhost:1313/collection/"]]
 
 #from backstage.utils.routes import update_manage_table
 
@@ -130,7 +128,7 @@ def get_image(filepath):
     image_object = Image.open(requests.get(request.get_json()['url'], stream=True).raw)
     image_object.save(owpath+owfname, oimgtypeName)
     if image_object.size[0] > 1000:
-        image_object.thumbnail(size=((800, 800)))
+        image_object.thumbnail(size=((1600, 1600)))
     image_object.save(wpath+wfname, 'webp')
     image_object.save(sitepath+wfname, 'webp')
     # send_file()

backstage/utils/routes.py

@@ -18,7 +18,7 @@ def create_content(data, image_data):
                 PORTAL_SERVER, data.get('type'), image_data.filename), files={'image': image_data})
         sleep(1)  # sleep for waiting for new_content API generating content successfully.
         return redirect(url_for('editor.editor', url='/{}/{}'.format(
-            data.get('type'), get_trans_title_url_name(data.get('name')))))
+            data.get('type'), data.get('name'))))
     else:
         flash('新增文章失敗', 'danger')
         return redirect(url_for(TYPE_URL_FOR.get(data.get('type'))))