pinokiod 3.19.2 → 3.19.4

package/server/views/partials/dynamic.ejs

@@ -38,15 +38,16 @@
         <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>' <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%>>
           <div class='tab'><%-item.btn%></div>
           <% if (item.running) { %>
-            <!--
-            <div class='loader shutdown online'>
-            </div>
-            -->
-            <div class='loader shutdown'>
-              <button class='btn'>
-              <i class="fa-solid fa-square"></i> Stop
-              </button>
-            </div>
+            <% if (item.online) { %>
+              <div class='loader shutdown online'>
+              </div>
+            <% } else { %>
+              <div class='loader shutdown'>
+                <button class='btn'>
+                <i class="fa-solid fa-square"></i> Stop
+                </button>
+              </div>
+            <% } %>
           <% } else { %>
             <i class="fa-solid fa-angle-right"></i>
           <% } %>

package/server/views/prototype/init.ejs

@@ -221,6 +221,7 @@ textarea, input[type="url"], input[type="text"] {
     padding: 10px;
     border: none;
     font-family: inherit;
+    background: rgba(0,0,0,0.03);
 }
 
 textarea {
@@ -1342,7 +1343,6 @@ document.addEventListener('DOMContentLoaded', function() {
           type: "folder",
         }
       }, async (packet) => {
-        console.log('packet', packet)
         if (packet.type === "result") {
           if (packet.data.paths.length > 0) {
             let p = packet.data.paths[0]

package/server/views/shell.ejs

@@ -185,7 +185,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       this.dirty = true
     }
     finished() {
-      debugger
     /*
       n.Noty({
         text: `[Success] All steps complete`,
@@ -327,7 +326,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               this.write("\r\n")
             }
             if (packet.data.type === "shell.kill") {
-              debugger
               this.socket.close()
             }
             if (packet.data.type === "emit2") {
@@ -346,7 +344,6 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".starting-btn").classList.add("hidden")
             document.querySelector(".stop-btn").classList.remove("hidden")
           } else if (packet.type === 'disconnect') {
-            debugger
             console.log("refreshParent", packet)
             refreshParent(packet)
             this.term.write("\r\nDisconnected...\r\n")
@@ -617,7 +614,6 @@ document.addEventListener("DOMContentLoaded", async () => {
           document.querySelector(".play-btn").classList.remove("hidden")
           document.querySelector(".stop-btn").classList.add("hidden")
           document.querySelector(".stopped-btn").classList.add("hidden")
-          debugger
           <% if (kill_message) { %>
             n.Noty({
               text: "<%-kill_message%>",
@@ -674,6 +670,10 @@ document.addEventListener("DOMContentLoaded", async () => {
           selectionBackground: "red",
           selectionForeground: "white"
         })
+        console.log({ theme })
+        <% if (theme !== "dark") { %>
+          theme.foreground = "black"
+        <% } %>
 
         let config = {
           scrollback: 9999999,
@@ -810,7 +810,6 @@ document.addEventListener("DOMContentLoaded", async () => {
     document.querySelector(".play-btn").classList.remove("hidden")
     document.querySelector(".stop-btn").classList.add("hidden")
   })
-    debugger
   <% if (running) { %>
     // if running, connect
     rpc.run("listen").then(() => {

package/server/views/terminal.ejs

@@ -181,16 +181,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       this.buffer = []
     }
     write(text) {
-//      console.log(text)
-//      this.buffer += text;
-//      if (!this.timeout) {
-//        this.timeout = setTimeout(() => {
-//          console.log("write", this.buffer)
-//          this.term.write(this.buffer);
-//          this.buffer = "";
-//          this.timeout = null;
-//        }, 50);
-//      }
       if (text !== "\u0007") {
         this.term.write(text)
       }
@@ -207,7 +197,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       document.querySelector(".run .starting").classList.add("hidden")
     }
     stop() {
-      console.log("STOP")
       this.socket.run({
         method: "kernel.api.stop",
         params: {
@@ -309,7 +298,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               shell_id = packet.data.id
             }
             if (packet.data.raw) {
-//              console.log({ packet })
               this.write(packet.data.raw)
             } else if (packet.data.json) {
               this.write(JSON.stringify(packet.data.json).replace(/\n/g, "\r\n"))
@@ -320,7 +308,6 @@ document.addEventListener("DOMContentLoaded", async () => {
             }
             if (packet.data.type === "emit2") {
               // long text => still posting to the shell => show progress
-              console.log("emit2", packet.data)
               document.querySelector("#status-window").innerHTML = `<strong>Pasting... (${Math.floor(100 * packet.data.i/packet.data.total)}%)</strong>`
               let percent = Math.floor(100 * packet.data.i/packet.data.total)
               document.querySelector("#progress-window").classList.remove("hidden")
@@ -469,7 +456,6 @@ document.addEventListener("DOMContentLoaded", async () => {
 
             refreshParent()
             let params = packet.data
-            console.log("Web open", params)
             open_url(params.uri, params.target, params.features)
 //            window.open(
 //              params.uri,
@@ -685,11 +671,13 @@ document.addEventListener("DOMContentLoaded", async () => {
           selectionBackground: "red",
           selectionForeground: "white"
         })
-
+        <% if (theme !== "dark") { %>
+          theme.foreground = "black"
+        <% } %>
         let config = {
           scrollback: 9999999,
           //fontSize: 12,
-          fontSize: 14,
+          //fontSize: 14,
           theme,
           //theme: xtermTheme.FrontEndDelight
           //theme: xtermTheme.Afterglow
@@ -721,8 +709,6 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
           if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
             navigator.clipboard.readText().then((text) => {
-              console.log({ text })
-
               this.socket.run({
                 //key: "\x1b[200~" + text + "\x1b[201~",
                 key: text,