pinokiod 3.9.16 → 3.9.17

package/kernel/loader.js

@@ -12,7 +12,6 @@ class Loader {
     clearModule(_path)
 
     let exists = await this.exists(_path)
-    console.log({ exists, _path })
     if (!exists) {
       return { resolved: null, dirname: path.dirname(_path), }
     }
@@ -20,31 +19,24 @@ class Loader {
     if (/\.json$/i.test(_path)) {
       resolved = await this.requireJSON(_path)
       dirname = path.dirname(_path)
-      console.log("#1", { resolved, dirname })
     } else if (/\.js$/i.test(_path)) {
       resolved = await this.requireJS(_path)
       dirname = path.dirname(_path)
-      console.log("#2", { resolved, dirname })
 //    } else if (/\.(csv|txt)$/i.test(_path)) {
 //      resolved = await this.requireCSV(_path)
 //    } else if (/\.(yaml|yml)$/.test(_path)) {
 //      resolved = await this.requireYAML(_path)
     } else {
-      console.log("#3", { resolved, dirname })
       // load JS if directory
       try {
         let stat = await fs.promises.stat(_path)
-        console.log({ stat, _path })
         if (stat.isDirectory()) {
-          console.log("isDirectory")
           resolved = await this.requireJS(_path)
           dirname = _path
         } else {
-          console.log("isNotDirectory")
           resolved = null
         }
       } catch (e) {
-        console.log("3Error", e)
         resolved = null
       }
     }

package/kernel/shell.js

@@ -955,7 +955,6 @@ class Shell {
     }
   }
   kill(message, force, cb) {
-    console.log("KILL")
 
     this.done = true
     this.ready = false
@@ -987,7 +986,6 @@ class Shell {
         this.kernel.shell.rm(this.id)
         this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
         this.ondata({ raw: "", type: "shell.kill" })
-        console.log("before cb 1")
         cb()
       } else {
         kill(this.ptyProcess.pid, "SIGKILL", true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.9.16",
+  "version": "3.9.17",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -4244,8 +4244,10 @@ class Server {
         */
 
         let formData = req.body
+        console.log("req.files", req.files)
         for(let key in req.files) {
           let file = req.files[key]
+          console.log({ key, file })
           formData[file.fieldname] = file.buffer
         }
         console.log({ formData })

package/server/public/fseditor.js

@@ -38,6 +38,7 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
   </div>
 </div>`
   }
+  let meta_class = ((copy || move) ? 'hidden' : '')
   let result = await Swal.fire({
     title: title_label,
     html: `<div class='filepond-wrapper'>
@@ -46,11 +47,11 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
 </div>
 <div class='folder-rows'>
   ${folderpath_html}
-  <div class='folder-row'>
+  <div class='folder-row ${meta_class}'>
     <label for='new-folder-title'>Title</label>
     <input id="new-folder-title" class="swal2-input" placeholder="Folder Name" value="${title}" />
   </div>
-  <div class='folder-row'>
+  <div class='folder-row ${meta_class}'>
     <label for='new-folder-description'>Description</label>
     <textarea id="new-folder-description" class="swal2-input" placeholder="Folder Description">${description}</textarea>
   </div>
@@ -87,13 +88,15 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
           allowImageEdit: true,
           allowImageTransform: true,
 
+          credits: false,
+
 
           labelIdle: `Drag & Drop your picture or <span class="filepond--label-action">Browse</span>`,
-          imagePreviewHeight: 170,
+//          imagePreviewHeight: 170,
           imageCropAspectRatio: '1:1',
           imageResizeTargetWidth: 200,
           imageResizeTargetHeight: 200,
-          stylePanelLayout: 'compact circle',
+//          stylePanelLayout: 'compact circle',
           instantUpload: false,
           server: {
 //            process: {
@@ -101,7 +104,8 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
             process: async (fieldName, file, metadata, load, error, progress, abort) => {
               const formData = new FormData();
 
-              console.log("upload", { dirty })
+              console.log("upload", { dirty, file })
+              formData.append('avatar', file)
               if (dirty) {
                 formData.append("icon_dirty", true)
               }
@@ -120,6 +124,7 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
                 path = old_path
                 formData.append("new_path", old_path)
               }
+              debugger
               if (mode === "copy") {
                 formData.append("copy", true)
               } else if (mode === "move") {
@@ -157,6 +162,7 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
           },
           onaddfile(error, file) {
             console.log({ file, initial_file })
+            debugger
             if (initial_file) {
               compare(initial_file.file, file.file).then((same) => {
                 if (same) {
@@ -176,16 +182,17 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
           },
 //          onprocessfile(error, file) {
 //            console.log("onprocessfile")
-//            if (error) {
-//              alert(error.body)
-//            } else {
-//              Swal.close()
-//              if (new_path) {
-//                location.href = redirect(new_path)
-//              } else {
-//                location.href = location.href
-//              }
-//            }
+//            debugger
+////            if (error) {
+////              alert(error.body)
+////            } else {
+////              Swal.close()
+////              if (new_path) {
+////                location.href = redirect(new_path)
+////              } else {
+////                location.href = location.href
+////              }
+////            }
 //          },
           files: [
             {

package/server/views/app.ejs

@@ -303,7 +303,7 @@ body.dark .app-info-card > * {
   color: var(--dark-color);
 }
 .app-info-title {
-  padding: 10px;
+  padding: 15px 0;
 }
 .footer {
 /*
@@ -792,22 +792,24 @@ body.dark .appcanvas {
               <i class='fa-solid fa-bolt'></i> Initialize
             </div>
           </a>
+          <!--
           <a class='btn header-item frame-link' href="/prototype?type=extension&path=<%=path%>">
             <div class='tab'>
               <i class='fa-solid fa-puzzle-piece'></i> Extensions
             </div>
           </a>
+          -->
           <div class='btn header-item frame-link' id='edit'>
-            <div class='tab'><i class="fa-solid fa-pencil"></i> Edit info</div>
+            <div class='tab'><i class="fa-solid fa-pencil"></i> Edit</div>
           </div>
           <div class='btn header-item frame-link' id='move'>
-            <div class='tab'><i class="fa-solid fa-right-to-bracket"></i> Move folder</div>
+            <div class='tab'><i class="fa-solid fa-right-to-bracket"></i> Move</div>
           </div>
           <div class='btn header-item frame-link' id='copy'>
-            <div class='tab'><i class="fa-solid fa-copy"></i> Copy folder</div>
+            <div class='tab'><i class="fa-solid fa-copy"></i> Copy</div>
           </div>
           <div class='btn header-item frame-link' id='delete' data-name="<%=name%>">
-            <div class='tab'><i class="fa-solid fa-trash-can"></i> Delete folder</div>
+            <div class='tab'><i class="fa-solid fa-trash-can"></i> Delete</div>
           </div>
         </div>
       </div>
@@ -1473,7 +1475,7 @@ body.dark .appcanvas {
       move: true,
       edit: true,
       redirect: (new_path) => {
-        return new_path
+        return "./" + new_path
       }
     })
   })
@@ -1488,7 +1490,7 @@ body.dark .appcanvas {
       iconpath: `<%=config.iconpath%>`,
       edit: true,
       redirect: (new_path) => {
-        return new_path
+        return "./" + new_path
       }
     })
   })
@@ -1504,7 +1506,7 @@ body.dark .appcanvas {
       copy: true,
       edit: true,
       redirect: (new_path) => {
-        return new_path
+        return "./" + new_path
       }
     })
     /*