pinokiod 2.1.27 → 2.1.28

package/package.json

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

package/server/index.js

@@ -1827,7 +1827,6 @@ class Server {
     }
   }
   async start(options) {
-    console.log("** start", options)
     this.debug = false
     if (options) {
       this.debug = options.debug
@@ -2365,10 +2364,21 @@ class Server {
     }))
     this.app.get("/api/*", ex(async (req, res) => {
       let pathComponents = req.params[0].split("/")
-      try {
-        await this.render(req, res, pathComponents)
-      } catch (e) {
-        res.status(404).send(e.message)
+      console.log("req.query", req.query)
+      if (req.query && 'fs' in req.query) {
+        // open in file system
+        let full_filepath = this.kernel.path("api", ...pathComponents)
+        console.log("openfs", full_filepath)
+        Util.openfs(full_filepath)
+        res.render("fs", {
+          path: full_filepath
+        })
+      } else {
+        try {
+          await this.render(req, res, pathComponents)
+        } catch (e) {
+          res.status(404).send(e.message)
+        }
       }
     }))
     this.app.get("/pinokio/sidebar/:name", ex(async (req, res) => {

package/server/views/500.ejs

@@ -1,5 +1,7 @@
 <html>
 <head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <style>
 body {
   width: 100%;

package/server/views/browser-experimental.ejs

@@ -296,19 +296,21 @@ body.dark .grid-btns {
   border-top: 1px solid rgba(0,0,0,0.04);
   border-bottom: 1px solid rgba(0,0,0,0.04);
   display: grid;
+  /*
   grid-template-columns: repeat(2, 1fr);
   grid-template-rows: repeat(2, 1fr);
-  /*
+  */
   grid-template-columns: repeat(3, 1fr);
   grid-template-rows: repeat(1, 1fr);
-  */
   box-sizing: border-box;
 }
 .grid-btns .btn2 {
-  padding: 10px; 
+  padding: 20px 10px; 
   color: var(--light-color);
   border-radius: 0;
   cursor: pointer;
+  font-family: Menlo, monaco,monospace; 
+  font-size: 11px;
 }
 body.dark .grid-btns .btn2 {
 /*
@@ -589,9 +591,8 @@ body.dark .loader-container {
   </div>
   -->
   <div class='grid-btns'>
-    <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
-    <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
     <a class='btn2' href="/"><div><i class="fa-solid fa-house"></i></div><div>Home</div></a>
+    <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-face-smile-beam"></i></div><div>Community</div></a>
     <button class='btn2' id='new-window' title='open a new window'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
   </div>
   <!--

package/server/views/explore.ejs

@@ -114,11 +114,14 @@ body main iframe {
 }
 </style>
 <script src="/hotkeys.min.js"></script>
+<script src="/nav.js"></script>
 </head>
 <body class='<%=theme%>'>
 <header class='navheader grabbable'>
 <h1>
 <a class='home' href="/"><i class="fa-solid fa-house"></i></a>
+<button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
+<button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
 <% paths.forEach((path) => { %>
   <% if (path.action) { %>
     <a class='path nav-button' id="<%=path.id%>" onclick="<%=path.action%>"><%-path.name%></a>
@@ -126,15 +129,16 @@ body main iframe {
     <a class='path' href="<%=path.path%>"><%-path.name%></a>
   <% } %>
 <% }) %>
-<!--
-<form class='search'>
-  <% if (display.includes("form")) { %>
-  <input type='search' placeholder='enter git url'>
-  <button class='btn clone'><i class="fa-solid fa-download"></i> Download</button>
-  <% } %>
-</form>
--->
 <div class='flexible'></div>
+<div class='nav-btns'>
+  <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
+  <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
+  <% if (agent === "electron") { %>
+    <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</div></a>
+  <% } %>
+  <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
+  <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
+</div>
 <!--
 <div class='nav-btns'>
   <a class='btn2' href='https://discord.gg/TQdNwadtE4' target="_blank"><div><i class="fa-brands fa-discord"></i></div><div>Discord</div></a>
@@ -173,6 +177,17 @@ document.querySelector("form").addEventListener("submit", (e) => {
   }
 })
 */
+document.querySelector("#explore").addEventListener("click", async (e) => {
+  e.preventDefault()
+  e.stopPropagation()
+  location.href = "/?mode=explore"
+})
+document.querySelector("#back").addEventListener("click", (e) => {
+  history.back()
+})
+document.querySelector("#forward").addEventListener("click", (e) => {
+  history.forward()
+})
 </script>
 </body>
 </html>

package/server/views/fs.ejs

@@ -0,0 +1,36 @@
+<html>
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<style>
+body {
+  width: 100%;
+  margin: 0;
+  background: white;
+  color: black;
+  box-sizing: border-box;
+  font-family: sans-serif;
+  font-size: 14px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+main {
+}
+h1 {
+  font-size: 40px;
+  letter-spacing: -1px;
+}
+</style>
+<link href="/css/fontawesome.min.css" rel="stylesheet">
+<link href="/css/solid.min.css" rel="stylesheet">
+<link href="/css/regular.min.css" rel="stylesheet">
+<link href="/css/brands.min.css" rel="stylesheet">
+</head>
+<body>
+<main>
+<h1><i class="fa-regular fa-folder-closed"></i> File System</h1>
+<div>Opened <strong><%=path%></strong></div>
+</main>
+</body>
+</html>

package/server/views/help.ejs

@@ -252,10 +252,21 @@ body.dark .item .tile .badge {
 <script src="/report.js"></script>
 </head>
 <body class='<%=theme%>'>
-<header class='grabbable'>
+<header class='navheader grabbable'>
 <h1>
 <a class='home' href="/"><i class="fa-solid fa-house"></i></a>
+<button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
+<button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
 <div class='flexible'></div>
+<div class='nav-btns'>
+  <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
+  <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
+  <% if (agent === "electron") { %>
+    <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</div></a>
+  <% } %>
+  <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
+  <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
+</div>
 </h1>
 </header>
 <main>
@@ -297,6 +308,17 @@ body.dark .item .tile .badge {
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
   //Reporter()
+  document.querySelector("#explore").addEventListener("click", async (e) => {
+    e.preventDefault()
+    e.stopPropagation()
+    location.href = "/?mode=explore"
+  })
+  document.querySelector("#back").addEventListener("click", (e) => {
+    history.back()
+  })
+  document.querySelector("#forward").addEventListener("click", (e) => {
+    history.forward()
+  })
 
   document.querySelector("#genlog").addEventListener("click", (e) => {
     e.preventDefault()

package/server/views/index.ejs

@@ -164,6 +164,8 @@ body.dark .browser-options-row {
 <h1>
 <% if (ishome) { %>
 <a class='home' href="/"><i class="fa-solid fa-house"></i></a>
+<button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
+<button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
 <% } %>
 <% paths.forEach((path) => { %>
   <% if (path.action) { %>
@@ -181,7 +183,7 @@ body.dark .browser-options-row {
 <% if (ishome) { %>
   <div class='nav-btns'>
     <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
-    <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
+    <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-face-smile-beam"></i></div><div>Community</div></a>
     <% if (agent === "electron") { %>
       <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</div></a>
     <% } %>
@@ -1002,6 +1004,12 @@ if (document.querySelector("#cloudflare")) {
   })
 }
 <% } %>
+document.querySelector("#back").addEventListener("click", (e) => {
+  history.back()
+})
+document.querySelector("#forward").addEventListener("click", (e) => {
+  history.forward()
+})
 
 </script>
 </body>

package/server/views/install.ejs

@@ -226,10 +226,10 @@ document.addEventListener("DOMContentLoaded", async () => {
       }
     })
   })
-  let ok = confirm("Install Complete! Click OK to Proceed.")
-  if (ok) {
+//  let ok = confirm("Install Complete! Click OK to Proceed.")
+//  if (ok) {
     location.href = document.querySelector("#callback").value
-  }
+//  }
 })
 </script>
 </body>

package/server/views/settings.ejs

@@ -222,6 +222,8 @@ hr {
 <header class='navheader grabbable'>
 <h1>
 <a class='home' href="/"><i class="fa-solid fa-house"></i></a>
+<button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
+<button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
 <% paths.forEach((path) => { %>
   <% if (path.action) { %>
     <a class='path nav-button' id="<%=path.id%>" onclick="<%=path.action%>"><%-path.name%></a>
@@ -230,6 +232,15 @@ hr {
   <% } %>
 <% }) %>
 <div class='flexible'></div>
+<div class='nav-btns'>
+  <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
+  <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
+  <% if (agent === "electron") { %>
+    <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</div></a>
+  <% } %>
+  <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
+  <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
+</div>
 <!--
 <div class='nav-btns'>
   <button class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></button>
@@ -442,6 +453,17 @@ document.addEventListener("DOMContentLoaded", async () => {
 //    let sep = "<%=platform === 'win32' ? '\\' : '/'%>" 
 //    document.querySelector("[name=drive]").value = e.target.value + sep + "drive"
 //  })
+  document.querySelector("#back").addEventListener("click", (e) => {
+    history.back()
+  })
+  document.querySelector("#forward").addEventListener("click", (e) => {
+    history.forward()
+  })
+  document.querySelector("#explore").addEventListener("click", async (e) => {
+    e.preventDefault()
+    e.stopPropagation()
+    location.href = "/?mode=explore"
+  })
   document.querySelector("form").addEventListener("submit", async (e) => {
     e.preventDefault()
     e.stopPropagation()