pinokiod 3.19.81 → 3.19.83

package/kernel/scripts/git/push

@@ -1,20 +1,10 @@
 {
   "run": [{
-    "method": "input",
-    "params": {
-      "form": [{
-        "key": "commit",
-        "title": "Commit message"
-      }]
-    }
-  }, {
     "method": "shell.run",
     "params": {
-      "chain": true,
+      "chain": "*",
       "path": "{{args.cwd}}",
       "message": [
-        "git add .",
-        "git commit -am {{input.commit}}",
         "git push"
       ]
     }

package/kernel/util.js

@@ -185,12 +185,9 @@ const log = async (filepath, str, session) => {
     const regex = new RegExp(pattern, 'gi')
     let stripped = str.replaceAll(regex, '');
     let logpath = path.resolve(filepath, session)
-    console.log("> write log", logpath)
     await fs.promises.writeFile(logpath, stripped)
     let latest_logpath = path.resolve(filepath, "latest")
-    console.log("> write latest log", latest_logpath)
     await fs.promises.writeFile(latest_logpath, stripped)
-    console.log("> all logs written")
   }
 }
 const run = (cmd, cwd, kernel) => {

package/package.json

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

package/server/index.js

@@ -4438,6 +4438,7 @@ class Server {
       console.log("hosts", hosts)
 
       let connected = (hosts.length > 0)
+      console.log({ connected })
 
 
       let remote = null
@@ -4465,6 +4466,7 @@ class Server {
               changes.push({
                 webpath,
                 file: filepath,
+                path: fullPath,
                 //status: `${head}${workdir}${stage}`,
                 status: Util.classifyChange(head, workdir, stage),
                 binary: true,
@@ -4497,7 +4499,7 @@ class Server {
               const diffs = diff.diffLines(normalize(oldContent), normalize(newContent));
 
               const summarized = Util.diffLinesWithContext(diffs, 5);
-              changes.push({ webpath, file: filepath, status: Util.classifyChange(head, workdir, stage)/*`${head}${workdir}${stage}`*/, diff: summarized, binary: false, });
+              changes.push({ webpath, file: filepath, path: fullPath, status: Util.classifyChange(head, workdir, stage)/*`${head}${workdir}${stage}`*/, diff: summarized, binary: false, });
             }
           }
         }
@@ -4506,6 +4508,8 @@ class Server {
         console.log("git status matrix error", err)
       }
 
+
+
       res.render("git", {
         connected,
         changes,

package/server/public/opener.js

@@ -38,6 +38,7 @@ document.addEventListener("click", async (e) => {
     }
   }
   if (el) {
+    debugger
     e.preventDefault()
     e.stopPropagation()
     let filepath = el.getAttribute("data-filepath")

package/server/views/app.ejs

@@ -873,7 +873,7 @@ body.dark .appcanvas {
     <% if (type === "browse") { %>
       <div class='nested-menu selected git blue'>
         <div class='btn header-item frame-link reveal'>
-          <div class='tab'><i class="fa-solid fa-cloud"></i> Git</div>
+          <div class='tab'><i class="fa-brands fa-github"></i> Publish</div>
           <div class='loader'><i class="fa-solid fa-angle-down"></i><i class="fa-solid fa-angle-up hidden"></i></div>
         </div>
         <div class='submenu' id='git-repos'>

package/server/views/git.ejs

@@ -4,6 +4,7 @@
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">
 <link href="/css/brands.min.css" rel="stylesheet">
+<script src="/hotkeys.min.js"></script>
 <script src="/opener.js"></script>
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
@@ -36,7 +37,7 @@ aside .item {
   text-decoration: none;
   color: royalblue;
   padding: 10px;
-  background: rgba(0,0,0,0.1);
+  background: rgba(0,0,0,0.04);
 }
 nav {
   padding: 10px;
@@ -63,6 +64,9 @@ label {
 body.dark nav {
   background: rgba(0,0,0,0.4);
 }
+nav {
+  background: rgba(0,0,0,0.06);
+}
 nav label {
   display: block;
   padding: 10px;
@@ -81,7 +85,7 @@ main img {
   width: 100%;
 }
 main h2 {
-  padding: 20px 10px;
+  padding: 10px;
   margin: 0;
   font-size: 16px;
 }
@@ -148,6 +152,8 @@ body.dark main h3 {
   color: white;
 }
 main h3 {
+  display: flex;
+  align-items: center;
   margin: 0;
   background: rgba(0, 0, 0, 0.04);
   padding: 15px;
@@ -157,7 +163,7 @@ body.dark .chunk {
   border: 10px solid white;
 }
 .chunk {
-  border: 10px solid silver;
+  border: 10px solid rgba(0,0,0,0.04);
   margin-bottom: 10px;
 }
 .filler {
@@ -170,12 +176,16 @@ body.dark .chunk {
 .add    { background: #e6ffed; color: green; }
 .del    { background: #ffeef0; color: red; }
 .context { background: #f8f8f8; }
+
+.changes .btn {
+  padding: 5px 15px;
+  margin: 0;
+}
 .btn {
   margin-right: 10px;
   cursor: pointer;
   border: none;
   text-decoration: none;
-  padding: 10px;
   border-radius: 3px;
   background: black;
   color: white;
@@ -187,10 +197,16 @@ body.dark .empty {
 }
 .empty {
   text-align: center;
-  padding: 200px 40px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
   opacity: 0.5;
   background: rgba(0,0,0,0.04);
 }
+.flexible {
+  flex-grow: 1;
+}
 </style>
 </head>
 <body class='<%=theme%>' data-platform="<%=platform%>" data-agent="<%=agent%>">
@@ -199,7 +215,7 @@ body.dark .empty {
     <% if (connected) { %>
       <a href="/run/scripts/git/push.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-brands fa-github"></i> Publish to GitHub</a>
     <% } else { %>
-      <a class='btn' href="/github" target="_blank">Publish to GitHub</a>
+      <a class='btn' data-redirect="/github" target="_blank">Publish to GitHub</a>
     <% } %>
     <a href="/run/scripts/git/commit.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-solid fa-floppy-disk"></i> Commit (Save the current version)</a>
     <a href="<%=remote%>" target="_blank"><%=remote%></a>
@@ -207,25 +223,23 @@ body.dark .empty {
     <% if (connected) { %>
       <a href="/run/scripts/git/create.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-brands fa-github"></i> Create on GitHub</a>
     <% } else { %>
-      <a class='btn' href="/github" target="_blank">Create on GitHub</a>
+      <a class='btn' data-redirect="/github" target="_blank">Create on GitHub</a>
     <% } %>
     <a href="/run/scripts/git/commit.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-solid fa-floppy-disk"></i> Commit (Save the current version)</a>
   <% } %>
 </nav>
 <main>
-  <aside>
-    <h2><i class="fa-solid fa-code-compare"></i> Changes</h2>
-    <% if (changes && changes.length > 0) { %>
+  <% if (changes && changes.length > 0) { %>
+    <aside>
+      <h2><i class="fa-solid fa-code-compare"></i> Changes</h2>
       <% changes.forEach(({ file, status, binary, diff, webpath }) => { %>
         <a class='item' data-selector="<%=file%>" href="#<%=file%>"><%=file%></a>
       <% }) %>
-    <% } %>
-  </aside>
-  <div class='changes'>
-    <% if (changes && changes.length > 0) { %>
-      <% changes.forEach(({ file, status, binary, diff, webpath }) => { %>
+    </aside>
+    <div class='changes'>
+      <% changes.forEach(({ file, status, binary, diff, webpath, path }) => { %>
         <div id="<%=file%>" class='chunk' data-selection="<%=file%>">
-          <h3>[<%= status %>] <%= file %></h3>
+          <h3><div class='flexible'>[<%= status %>] <%= file %></div><a class='btn' data-filepath="<%=path%>"><i class="fa-solid fa-arrow-up-right-from-square"></i> Open</a></h3>
           <% if (binary) { %>
             <div class="binary-notice">[Binary file <%= status %>]</div>
             <iframe src="<%=webpath%>"></iframe>
@@ -243,14 +257,16 @@ body.dark .empty {
         </div>
       <% }); %>
       <div class='filler'></div>
-    <% } else { %>
+    </div>
+  <% } else { %>
+    <div class='changes'>
       <div class='empty'>No changes</div>
-    <% } %>
-  </div>
+    </div>
+  <% } %>
 </main>
 <script>
 document.querySelector("nav").addEventListener("click", (e) => {
-  let redirect = e.target.getAttribute("href")
+  let redirect = e.target.getAttribute("[data-redirect]")
   if (redirect) {
     const c = confirm("Please connect with GitHub first")
     if (c) {

package/server/views/github.ejs

@@ -142,7 +142,7 @@ body.dark .setup-items pre, body.dark .setup-items .pre {
 }
 .setup-items pre, .setup-items .pre {
   box-sizing: border-box;
-  margin: 10px 0 20px;
+  margin: 10px 0;
   width: 100%;
   padding: 20px;
   background: rgba(0,0,0,0.04) !important;
@@ -251,11 +251,12 @@ ol {
 </header>
 <main>
   <div class='head'>
-    <h3><i class="fa-brands fa-github"></i><br><br>Connect with Github</h3>
+    <h3><i class="fa-brands fa-git-alt"></i><br><br>Configure Git</h3>
   </div>
   <div class='cols'>
     <div class='column'>
-      <h1>GitHub</h1>
+      <h1><i class="fa-brands fa-github"></i> GitHub</h1>
+      <div>Connect with GitHub to publish projects to GitHub.</div>
       <div class='setup-items'>
         <% if (hosts.length > 0) { %>
           <pre><%=hosts%></pre>
@@ -275,7 +276,8 @@ ol {
       </div>
     </div>
     <div class='column'>
-      <h1>Git Config</h1>
+      <h1><i class="fa-brands fa-square-git"></i> Git Config</h1>
+      <div>These credentials will show up on every commit.</div>
       <div class='setup-items'>
         <form class='gitconfig'>
           <div class='pre'>