pinokiod 2.1.5 → 2.1.7

package/kernel/api/index.js

@@ -38,7 +38,6 @@ class Api {
     }
   }
   async startProxy(scriptPath, uri, name, options) {
-    console.log("startProxy", { scriptPath, uri, name, options })
     this.checkProxy({ uri, name })
     // if the name exists, throw error
     // if the uri exists, throw error
@@ -58,13 +57,10 @@ class Api {
       // stop all proxies for the script
       if (this.proxies[config.script]) {
         for(let p of this.proxies[config.script]) {
-          console.log("stopProxy", p.target)
           this.stopProxy({ uri: p.target })
         }
       }
     } else if (config.uri) {
-      console.log("stopProxy uri", config)
-      console.log("this.proxies = ", this.proxies)
 
       // stop the proxy
       this.lproxy.stop(config.uri)
@@ -109,7 +105,6 @@ class Api {
     // 2. stream a message closing the socket
 
 
-    console.log("stop params", req.params)
 
     let requestPath = this.filePath(req.params.uri)
 
@@ -353,7 +348,6 @@ class Api {
     return modpath
   }
   filePath(uri, cwd) {
-    console.log({ uri, cwd })
     let modpath
     if (uri.startsWith("http")) {
       // git url
@@ -1115,7 +1109,7 @@ class Api {
           rawrpc: request
         })
       } catch (e) {
-        console.log("ERROR", e)
+        console.log("E1112", e)
         this.ondata({
           kernel: true,
           id: request.method,

package/package.json

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

package/server/index.js

@@ -259,7 +259,6 @@ class Server {
     }
 
     const env = await this.kernel.env("api/" + name)
-    console.log(">> ENV", env)
 
     //res.render("browser", {
     res.render("browser-experimental", {
@@ -2204,7 +2203,6 @@ class Server {
     this.app.post("/env", async (req, res) => {
       let fullpath = path.resolve(this.kernel.homedir, req.body.filepath, "ENVIRONMENT")
       let updated = req.body.vals
-      console.log("updated", updated)
       await Util.update_env(fullpath, updated)
       res.json({})
     })
@@ -2219,6 +2217,7 @@ class Server {
 
 
       res.render("env_editor", {
+        home: true,
         config: null,
         name: null,
         init: null,
@@ -2250,6 +2249,7 @@ class Server {
       }
 
       res.render("env_editor", {
+        home: null,
         config,
         name,
         init: req.query ? req.query.init : null,

package/server/views/env_editor.ejs

@@ -91,7 +91,13 @@ td.key {
   }
 <% } %>
 
-header .runner {
+header .btn {
+  font-family: Sans-serif;
+  display: block;
+  margin-left: 10px;
+  font-style: normal;
+  font-size: 14px;
+  font-weight: normal;
 }
 .disabled {
   opacity: 0.7;
@@ -179,11 +185,27 @@ footer {
   background: none;
   padding: 0;
   text-align: right;
-  display: block;
-  margin-bottom: 20px;
+  display: flex;
+  margin: 10px 0 20px 0;
 }
 footer .btn {
   margin-left: 10px;
+  display: inline-block;
+  -webkit-appearance: button;
+  -moz-appearance: button;
+  appearance: button;
+
+}
+footer .btn.go-home {
+  margin-left: 0px;
+}
+.btn.home-button {
+  background: none !important;
+  margin: 0 !important;
+  font-size: 16px !important;
+}
+#editor {
+  height: auto;
 }
 </style>
 <script>
@@ -246,6 +268,8 @@ document.addEventListener("DOMContentLoaded", async () => {
           </div>
         <% } %>
         <footer>
+          <a href="/" class='btn go-home'><i class='fa-solid fa-home'></i> home</a>
+          <div class='flexible'></div>
           <button id='customize' class='btn'><i class="fa-solid fa-gear"></i> Customize</button>
           <div id='save' class='btn'>
             <span class='save'><i class="fa-solid fa-check"></i> Install</span>
@@ -254,17 +278,25 @@ document.addEventListener("DOMContentLoaded", async () => {
       </div>
     <% } else { %>
       <header class='navheader grabbable'>
-      <div class='runner'>
-        <div id='save' class='btn'>
-          <span class='save'><i class="fa-solid fa-check"></i> Save</span>
-        </div>
-        <a class='btn' href="<%=editorpath%>"><i class="fa-solid fa-pen-to-square"></i> Edit file</a>
-        <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> Open in File Explorer</button>
-      </div>
+        <h1>
+          <% if (home) { %>
+            <a class='home-button btn' href="/"><i class='fa-solid fa-home'></i></a>
+          <% } %>
+          <div class='flexible'></div>
+          <div class='nav-btns'>
+            <a class='btn' href="<%=editorpath%>"><i class="fa-solid fa-pen-to-square"></i> Edit file</a>
+            <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> Open in File Explorer</button>
+            <div id='save' class='btn'>
+              <span class='save'><i class="fa-solid fa-check"></i> Save</span>
+            </div>
+          </div>
+        </h1>
       </header>
     <% } %>
     <div id='editor' class='<%=init ? "hidden" : ''%>'>
+      <!--
       <h1>Configure</h1>
+      -->
       <% items.forEach((item) => { %>
         <% if (item.type === "comment") { %>
           <div class='comment'><%=item.val.replaceAll(/^[ #]+/g, "")%></div>

package/server/views/index.ejs

@@ -290,6 +290,9 @@ body.dark .browser-options-row {
                 <button class='btn browse' data-src="<%=item.browser_url%>/browse">
                   <i class='fa-regular fa-folder-open'></i>
                 </button>
+                <button class='btn del' data-src="<%=item.url%>">
+                  <i class="fa-solid fa-trash-can"></i>
+                </button>
                 <% if (item.running_scripts) { %>
                   <% item.running_scripts.forEach((s) => { %>
                       <button class='btn shutdown' data-src="<%=s.path%>">
@@ -340,6 +343,9 @@ body.dark .browser-options-row {
               <button class='btn browse' data-src="<%=item.browser_url%>/browse">
                 <i class='fa-regular fa-folder-open'></i>
               </button>
+              <button class='btn del' data-src="<%=item.url%>">
+                <i class="fa-solid fa-trash-can"></i>
+              </button>
               <% if (item.shortcuts && item.shortcuts.length > 0) { %>
                 <div class='btns'>
                   <% item.shortcuts.forEach((btn) => { %>
@@ -722,7 +728,7 @@ document.addEventListener("keydown", (e) => {
     }
   }
 });
-document.addEventListener("click", (e) => {
+document.addEventListener("click", async (e) => {
 
   let target
 
@@ -776,6 +782,56 @@ document.addEventListener("click", (e) => {
   }
 
 
+  // delete
+  if (e.target.classList.contains("del")) {
+    target = e.target
+  } else {
+    target = e.target.closest(".del")
+  }
+  if (target) {
+    e.preventDefault()
+    e.stopPropagation()
+    let confirmed = confirm("Are you sure you want to delete the folder? All files in the folder will be gone.")
+    if (confirmed) {
+      let itemEl = target.closest(".line[data-uri]")
+      let name = itemEl.getAttribute("data-uri")
+      console.log("delete", name)
+      Swal.fire({
+        html: '<i class="fa-solid fa-circle-notch fa-spin"></i> Deleting',
+        customClass: {
+          container: "loader-container",
+          popup: "loader-popup",
+          htmlContainer: "loader-dialog",
+          footer: "hidden",
+          actions: "hidden"
+        }
+      });
+      debugger
+      let res = await fetch("/pinokio/delete", {
+        method: "post",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ name })
+      }).then((res) => {
+        return res.json()
+      })
+      console.log("res", res)
+      Swal.close()
+      if (res) {
+        if (res.success) {
+          location.href = "/"
+        } else if (res.error) {
+          alert(res.error)
+        }
+      }
+    } else {
+    }
+    return
+  }
+
+
+
   if (document.querySelector(".container")) {
     document.querySelector(".container").addEventListener("click", async (e) => {
       let el = e.target.closest(".menu-btn")