pinokiod 3.144.0 → 3.146.0

package/package.json

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

package/server/index.js

@@ -467,8 +467,6 @@ class Server {
     if (cfg.menu) {
       ({ menu, ...c } = cfg)
     }
-    console.log("Menu", menu)
-    console.log("c", c)
     if (index_exists) {
       return Object.assign({
         title: name, 

package/server/public/style.css

@@ -287,13 +287,8 @@ body.dark .navheader2 .btn {
   background: rgba(0,0,0,0.4);
 }
 .navheader2 {
-/*
-  padding: 15px 10px;
-  */
-  /*
-  padding: 10px 0;
-  */
-  padding: 0 0 5px;
+  margin-top: 1px;
+  padding: 5px 0;
   /*
   background: white;
   */

package/server/views/app.ejs

@@ -149,6 +149,7 @@ body.dark .appcanvas_filler {
   border: none;
 }
 .appcanvas_filler {
+  display: none;
   height: 5px;
   background: #F1F1F1 !important;
 }
@@ -1327,6 +1328,7 @@ body.dark #fs-status {
 #fs-status {
   padding: 5px;
   background: #F1F1F1 !important;
+  margin-bottom: 1px;
   gap: 4px;
   box-sizing: border-box;
   /*
@@ -2160,6 +2162,7 @@ body.dark {
 .pinokio-modal-body {
   background: var(--pinokio-modal-body-bg);
   color: var(--pinokio-modal-body-text-color);
+  padding: 10px;
 }
 
 .pinokio-modal-body--history {
@@ -2287,6 +2290,7 @@ body.dark {
   align-items: center;
   gap: 8px;
   font-size: 0.85rem;
+  border: 1px solid silver;
 }
 
 .pinokio-fork-checkbox-row label {
@@ -2332,10 +2336,12 @@ body.dark {
   font-size: 0.9rem;
 }
 
+body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-remote {
+  color: rgba(255, 255, 255, 0.6);
+}
 .pinokio-fork-dropdown-remote,
 .pinokio-publish-dropdown-remote {
   font-size: 0.75rem;
-  color: rgba(255, 255, 255, 0.6);
   word-break: break-word;
   white-space: normal;
   overflow-wrap: anywhere;
@@ -2368,14 +2374,13 @@ body.dark {
   width: 100%;
   height: 100%;
   border: none;
-  border-radius: 18px;
   background: var(--pinokio-modal-body-iframe-bg);
 }
 
 .pinokio-modal-form {
   display: flex;
   flex-direction: column;
-  gap: 18px;
+  gap: 10px;
 }
 
 .pinokio-modal-label {
@@ -2389,7 +2394,7 @@ body.dark {
 .pinokio-modal-input {
   width: 100%;
   padding: 10px 14px;
-  border-radius: 12px;
+  border-radius: 5px;
   border: 1px solid var(--pinokio-modal-input-border);
   background: var(--pinokio-modal-input-bg);
   color: var(--pinokio-modal-input-text);
@@ -2406,7 +2411,7 @@ body.dark {
 .pinokio-modal-checkbox-row {
   display: flex;
   align-items: center;
-  gap: 10px;
+  gap: 5px;
   font-size: 13px;
   color: var(--pinokio-modal-checkbox-color);
 }
@@ -2416,6 +2421,7 @@ body.dark {
   height: 16px;
   accent-color: #3a82ff;
   border-radius: 5px;
+  border: 1px solid silver;
 }
 
 .pinokio-commit-message-container {
@@ -2961,17 +2967,9 @@ body.dark {
         </div>
         -->
         <div class='fs-status-dropdown'>
-          <button type='button' class='fs-status-btn revealer' data-group='#fs-settings-menu'>
+          <a target="/env/api/<%=name%>" href="/env/api/<%=name%>" class='fs-status-btn frame-link selected' data-index="3" data-mode="refresh" data-type="n">
             <span class='fs-status-label'><i class='fa-solid fa-gear'></i> Settings</span>
-          </button>
-          <div class='fs-dropdown-menu submenu hidden' id='fs-settings-menu'>
-            <a target="/share/<%=name%>" href="/share/<%=name%>" class="fs-dropdown-item frame-link" data-index="2" data-mode="refresh" data-type="n">
-              <i class="fa-solid fa-wifi"></i> Share
-            </a>
-            <a target="/env/api/<%=name%>" href="/env/api/<%=name%>" class="fs-dropdown-item frame-link" data-index="3" data-mode="refresh" data-type="n">
-              <i class="fa-solid fa-gear"></i> Configure
-            </a>
-          </div>
+          </a>
         </div>
         <div class='fs-status-dropdown git-changes'>
           <button id='fs-changes-btn' class='fs-status-btn revealer' data-group='#fs-changes-menu' type='button'>
@@ -6724,6 +6722,22 @@ body.dark {
       publishMenu.append(messageEl)
     }
 
+    const reloadOnModalClose = (promise, predicate) => {
+      if (!promise || typeof promise.then !== 'function') {
+        return promise
+      }
+      promise.then((result) => {
+        let shouldReload = true
+        if (typeof predicate === 'function') {
+          shouldReload = predicate(result)
+        }
+        if (shouldReload) {
+          setTimeout(() => window.location.reload(), 350)
+        }
+      })
+      return promise
+    }
+
     const renderForkDropdown = (repos, options = {}) => {
       if (!forkMenu) {
         return
@@ -7858,7 +7872,7 @@ body.dark {
       `
 
       const lifecycle = createPublishModalLifecycle()
-      Swal.fire({
+      const publishModalPromise = Swal.fire({
         html: modalHtml,
         customClass: {
           popup: 'pinokio-modern-modal',
@@ -7874,6 +7888,8 @@ body.dark {
         didOpen: lifecycle.didOpen,
         willClose: lifecycle.willClose
       })
+
+      reloadOnModalClose(publishModalPromise)
     }
 
     const showCreateModal = () => {
@@ -7915,7 +7931,7 @@ body.dark {
         </div>
       `
 
-      Swal.fire({
+      const remoteSelectionPromise = Swal.fire({
         html: modalHtml,
         customClass: {
           popup: 'pinokio-modern-modal',
@@ -7944,7 +7960,11 @@ body.dark {
           
           return { remote: selectedRemote, name: repoName }
         }
-      }).then((result) => {
+      })
+
+      reloadOnModalClose(remoteSelectionPromise, (result) => !result || result.isDismissed)
+
+      remoteSelectionPromise.then((result) => {
         if (result.isConfirmed) {
           const { remote, name } = result.value
           showFinalPublishModal(pushUri, remote, name)
@@ -7960,7 +7980,7 @@ body.dark {
       const finalUri = `${pushUri}${pushUri.includes('?') ? '&' : '?'}${urlParams.toString()}`
       
       const lifecycle = createPublishModalLifecycle()
-      Swal.fire({
+      const forkShellModalPromise = Swal.fire({
         html: `
           <div class="pinokio-modal-surface">
             <div class="pinokio-modal-header">
@@ -7992,6 +8012,8 @@ body.dark {
         didOpen: lifecycle.didOpen,
         willClose: lifecycle.willClose
       })
+
+      reloadOnModalClose(forkShellModalPromise)
     }
 
     const showCreateRepoModal = () => {
@@ -8019,7 +8041,7 @@ body.dark {
         </div>
       `
 
-      Swal.fire({
+      const createRepoModalPromise = Swal.fire({
         html: modalHtml,
         customClass: {
           popup: 'pinokio-modern-modal',
@@ -8048,7 +8070,11 @@ body.dark {
           
           return { name: repoName, isPrivate: isPrivate }
         }
-      }).then((result) => {
+      })
+
+      reloadOnModalClose(createRepoModalPromise, (result) => !result || result.isDismissed)
+
+      createRepoModalPromise.then((result) => {
         if (result.isConfirmed) {
           const { name, isPrivate } = result.value
           showCreateRepoIframeModal(name, isPrivate)
@@ -8074,7 +8100,7 @@ body.dark {
       
       const finalUri = `${createUri}${createUri.includes('?') ? '&' : '?'}${urlParams.toString()}`
       
-      Swal.fire({
+      const createRepoIframePromise = Swal.fire({
         html: `
           <div class="pinokio-modal-surface">
             <div class="pinokio-modal-header">
@@ -8101,6 +8127,8 @@ body.dark {
         buttonsStyling: false,
         focusConfirm: false
       })
+
+      reloadOnModalClose(createRepoIframePromise)
     }
 
     async function showForkModalForRepo(repoParam) {
@@ -8187,7 +8215,7 @@ body.dark {
         </div>
       `
 
-      Swal.fire({
+      const forkModalPromise = Swal.fire({
         html: modalHtml,
         customClass: {
           popup: 'pinokio-modern-modal',
@@ -8279,7 +8307,11 @@ body.dark {
             }
           }
         }
-      }).then((result) => {
+      })
+
+      reloadOnModalClose(forkModalPromise, (result) => !result || result.isDismissed)
+
+      forkModalPromise.then((result) => {
         if (result.isConfirmed && result.value && result.value.job) {
           showForkShellModal(result.value.job)
         }
@@ -8311,7 +8343,7 @@ body.dark {
         subtitleParts.push(`Org: ${escapeHtml(job.org)}`)
       }
       const subtitleHtml = subtitleParts.join(' · ')
-      Swal.fire({
+      const forkShellModalPromise = Swal.fire({
         html: `
           <div class="pinokio-modal-surface">
             <div class="pinokio-modal-header">
@@ -8343,7 +8375,11 @@ body.dark {
         focusConfirm: false,
         didOpen: lifecycle.didOpen,
         willClose: lifecycle.willClose
-      }).then(() => {
+      })
+
+      reloadOnModalClose(forkShellModalPromise)
+
+      forkShellModalPromise.then(() => {
         setTimeout(() => {
           updateForkButton()
           check_git()

package/server/views/d.ejs

@@ -304,8 +304,15 @@ header h1 {
 h4 {
   margin: 0 0 5px;
 }
+body.dark form.search {
+  background: rgba(255,255,255,0.07);
+}
 form.search {
   padding: 10px;
+  background: #F1F1F1;
+}
+form.search input[type=search] {
+  background: white;
 }
 body.dark .btn.file-open {
   background: rgba(255,255,255,0.1) !important;

package/server/views/env_editor.ejs

@@ -162,6 +162,7 @@ a#customize {
 }
 body {
   display: block;
+  padding: 10px;
 }
 .card {
   display: flex;

package/server/views/tools.ejs

@@ -921,7 +921,7 @@ body.dark .pinokio-modal-subtitle code {
 .pinokio-modal-body {
   background: var(--pinokio-modal-body-bg);
   border-top: 1px solid var(--pinokio-modal-body-border);
-  padding: 0;
+  padding: 10px;
 }
 .pinokio-modal-body--iframe {
   height: 520px;