pinokiod 3.9.2 → 3.9.12

package/server/views/settings.ejs

@@ -52,30 +52,42 @@
 .btn {
   margin-right: 5px;
   font-weight: normal;
+  padding: 5px 15px;
+  min-width: 100px;
+  text-align: center;
+  background: rgba(0,0,0,0.9);
+  border: 1px solid rgba(0,0,0,0.9);
 }
 .items {
   max-width: 600px;
   margin: 50px auto;
 }
+body.dark .item {
+  border-left: 5px solid rgba(255,255,255,0.06);
+}
 .item {
   margin: 0;
   /*
   border-top: 1px solid rgba(255,255,255,0.1);
   border-bottom: 1px solid rgba(255,255,255,0.1);
   */
-  padding: 20px 0;
+  padding: 10px;
+  border-left: 5px solid rgba(0,0,0,0.06);
+}
+.titleview {
+  margin: 0;
+  padding: 25px;
+  max-width: 600px;
 }
 .titleview h1 {
   word-break: break-word;
-  font-size: 50px;
-  letter-spacing: -1px;
+  font-size: 30px;
+  letter-spacing: 0px;
+  margin-bottom: 10px;
 }
 .item > .d {
   padding-bottom: 10px;
 }
-.item button {
-  padding: 10px 20px;
-}
 .item label {
   display: block;
   text-transform: capitalize;
@@ -83,12 +95,13 @@
   font-weight: bold;
   padding-bottom: 5px;
 }
+body.dark .item .explanation {
+  color: rgba(240, 0, 0,1);
+}
 .item .explanation {
   padding-top: 5px;
-  color: brown;
+  color: rgba(210,0,0,0.8);
   font-size: 12px;
-  font-weight: bold;
-  font-family: verdana;
 }
 body.dark .item input[type=text] {
   background: rgba(255,255,255,0.1);
@@ -106,9 +119,11 @@ body.dark .item select {
   width: 100%;
 }
 .item select {
+/*
   -webkit-appearance: none;
   -moz-appearance:    none;
   appearance:         none;
+  */
 
   background: rgba(0,0,0,0.05);
   padding: 10px;
@@ -139,9 +154,13 @@ body.dark .item select {
 .timestamp {
   color: rgba(0,0,0,0.5);
 }
+body.dark .loading {
+  background: rgba(255,255,255,0.06);
+}
 .loading {
-  padding: 10px 20px;
+  padding: 20px;
   text-align: center;
+  background: rgba(0,0,0,0.06);
 }
 body.dark .btn {
   color: white;
@@ -178,7 +197,7 @@ body.dark hr {
 hr {
   opacity: 0.03;
   background: black;
-  margin: 50px 0;
+  margin: 30px 0;
   height: 1px;
   border: none;
 }
@@ -202,7 +221,7 @@ hr {
 }
 .keys pre {
   padding: 20px;
-  margin-top: 20px;
+  margin: 20px 0;
   background: rgba(0,0,200,0.1) !important;
 }
 </style>
@@ -274,8 +293,6 @@ hr {
 <div class='container'>
 <div class='titleview'>
   <h1>Settings</h1>
-  <br>
-  <br>
   <div>
     <div class='item'>
       <label>Version</label>
@@ -318,9 +335,10 @@ hr {
         <% } %>
       </div>
     <% }) %>
-    <br>
-    <button id='save' class='btn disabled'>Save</button>
-    <a id='proxy'>Running behind proxy?</a>
+    <div class='item'>
+      <button id='save' class='btn disabled'>Save</button>
+      <a id='proxy'>Running behind proxy?</a>
+    </div>
   </form>
   <div class='loading hidden'>
     <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
@@ -329,10 +347,8 @@ hr {
     <hr/>
     <div id='troubleshoot' class='troubleshoot'>
       <h1>Troubleshoot</h1>
-      <br>
-      <br>
       <div class='item'>
-        <label><i class="fa-solid fa-folder-open"></i> bin</label>
+        <label>bin</label>
         <div class='d'>Reset the bin folder and start fresh from scratch</div>
         <div class='reset-bin-loading hidden'>
           <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
@@ -343,7 +359,7 @@ hr {
         </div>
       </div>
       <div class='item'>
-        <label><i class="fa-solid fa-folder-open"></i> server cache</label>
+        <label>server cache</label>
         <div class='d'>Reset the pinokio server cache folder and start fresh from scratch</div>
         <div class='reset-cache-loading hidden'>
           <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
@@ -354,7 +370,7 @@ hr {
         </div>
       </div>
       <div class='item'>
-        <label><i class="fa-solid fa-folder-open"></i> environment variables</label>
+        <label>environment variables</label>
         <div class='d'>Reset the pinokio environment variables and start fresh from scratch (Resets the ~/pinokio/ENVIRONMENT file)</div>
         <div class='reset-env-loading hidden'>
           <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
@@ -366,7 +382,7 @@ hr {
       </div>
       <% if (agent === "electron") { %>
         <div class='item'>
-          <label><i class="fa-solid fa-folder-open"></i> browser cache</label>
+          <label>browser cache</label>
           <div class='d'>Reset the pinokio browser cache</div>
           <div class='reset-browser-cache-loading hidden'>
             <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
@@ -377,7 +393,7 @@ hr {
         </div>
       <% } %>
       <div class='item'>
-        <label><i class="fa-solid fa-folder-open"></i> drive</label>
+        <label>drive</label>
         <div class='d'>Shared virtual drives</div>
         <div>
           <button class='btn' data-filepath="<%=drive%>"><i class="fa-solid fa-up-right-from-square"></i> View Folder</button>
@@ -387,29 +403,28 @@ hr {
     <hr/>
     <div class='keys'>
       <h1>Keys</h1>
-      <br>
-      <br>
-      <div>Keys are array values stored for unique host names, stored at <code>~/pinokio/key.json</code>, and can be set through <code>pre</code> attributes in pinokio scripts. Here's an example:</div>
-      <pre>{
-  "openai.com": [
-    "sk-proj-2najBvCGFx18belpjf13T3BlbkFJIAR5KXK031n41WzAsPEn"
-  ],
-  "x.com": [
-    "12345678-FAKEaccesstoken1234567890abcdef",
-    "FAKEaccesstokensecret0987654321abcdef"
-  ]
-}</pre>
-      <br>
-      <a class='btn' href="/keys"><i class="fa-solid fa-key"></i> Edit Keys</a>
+      <div class='item'>
+        <div>Keys are array values stored for unique host names, stored at <code>~/pinokio/key.json</code>, and can be set through <code>pre</code> attributes in pinokio scripts. Here's an example:</div>
+        <pre>{
+    "openai.com": [
+      "sk-proj-2najBvCGFx18belpjf13T3BlbkFJIAR5KXK031n41WzAsPEn"
+    ],
+    "x.com": [
+      "12345678-FAKEaccesstoken1234567890abcdef",
+      "FAKEaccesstokensecret0987654321abcdef"
+    ]
+  }</pre>
+        <a class='btn' href="/keys"><i class="fa-solid fa-key"></i> Edit Keys</a>
+      </div>
     </div>
     <hr/>
     <div class='advanced'>
       <h1>Advanced Settings</h1>
-      <br>
-      <br>
-      <div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
-      <br>
-      <a class='btn' href="/env"><i class="fa-regular fa-pen-to-square"></i> Edit ENVIRONMENT</a>
+      <div class='item'>
+        <div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
+        <br>
+        <a class='btn' href="/env"><i class="fa-regular fa-pen-to-square"></i> Edit ENVIRONMENT</a>
+      </div>
     </div>
     <hr/>
   <% } %>

package/server/views/terminal.ejs

@@ -177,6 +177,9 @@ document.addEventListener("DOMContentLoaded", async () => {
       this.socket.run({
         method: "kernel.api.stop",
         params: {
+          <% if (script_id) { %>
+            id: "<%=script_id%>",
+          <% } %>
           //uri: "<%-uri%>",
           //uri: location.pathname.slice(1).replace("api/", ""),
           <% if (script_path) { %>
@@ -223,6 +226,9 @@ document.addEventListener("DOMContentLoaded", async () => {
 
         this.socket.run({
           //uri: location.pathname.slice(1).replace("api/", ""),
+          <% if (script_id) { %>
+            id: "<%=script_id%>",
+          <% } %>
           <% if (script_path) { %>
             uri: "<%=script_path%>",
             cwd: "<%=cwd%>",