pinokiod 0.1.37 → 0.1.39

package/package.json

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

package/server/index.js

@@ -187,13 +187,15 @@ class Server {
     }]
     paths = []
     for(let pathComponent of pathComponents) {
-      p = p + "/" + pathComponent
+      //p = p + "/" + pathComponent
+      _p = _p + "/" + pathComponent
       //let pn = (pathComponent.startsWith("0x") ? Buffer.from(pathComponent.slice(2), "hex").toString() : "/ " + pathComponent)
       let pn =  "/ " + pathComponent
       paths.push({
         //name: "/ " + pathComponent,
         name: pn,
-        path: p
+        //path: p
+        path: _p
       })
     }
     let gitRemote = ""
@@ -787,7 +789,7 @@ class Server {
             let p = path.resolve(filepath, file.name)
             let md = await fs.promises.readFile(p, "utf8")
             readme = marked.parse(md, {
-              baseUrl: req._parsedUrl.pathname.replace(/^\/api/, "/raw/") + "/"
+              baseUrl: req._parsedUrl.pathname.replace(/^\/_api/, "/raw/") + "/"
               //baseUrl: req.originalUrl + "/"
             })
           }
@@ -961,8 +963,8 @@ class Server {
       console.log("ITEMS", items)
 
 
-      let U = `${_p}/${pathComponents.join("/")}`
-      console.log("*******", { filepath, pathComponents, U })
+ //     let U = `${_p}/${pathComponents.join("/")}`
+ //     console.log("*******", { filepath, pathComponents, U })
 
 
       res.render("index", {
@@ -1018,8 +1020,8 @@ class Server {
             //description: x.path,
             description,
             //url: p + "/" + x.name,
-//            url: _p + "/" + x.name,
-            url: `${U}/${x.name}`,
+            url: _p + "/" + x.name,
+//            url: `${U}/${x.name}`,
             browser_url: "/pinokio/browser/" + x.name
           }
         }),

package/server/public/nav.js

@@ -12,7 +12,9 @@ document.addEventListener("DOMContentLoaded", () => {
   //    forward.classList.add("disabled")
   //  }
   //}
-  document.querySelector("#new-window").addEventListener("click", (e) => {
-    window.open("/", "_blank", "self")
-  })
+  if (document.querySelector("#new-window")) {
+    document.querySelector("#new-window").addEventListener("click", (e) => {
+      window.open("/", "_blank", "self")
+    })
+  }
 })

package/server/public/style.css

@@ -1295,6 +1295,7 @@ body.dark #new-window {
   */
 }
 #new-window {
+  cursor: pointer;
   padding: 10px;
   background: none;
   border: none;
@@ -1427,4 +1428,5 @@ body.dark header .home {
 header .home {
   color: var(--light-color); 
   padding: 10px;
+  cursor: pointer;
 }

package/server/views/editor.ejs

@@ -738,11 +738,9 @@ const reloadMemory = async () => {
       <!--
       <button class='btn' id='source' data-editor-url="<%=editorUrl%>">Navigate</button>
       -->
-      <!--
       <div id='save' class='btn disabled'>
         <span class='save'><i class="fa-solid fa-check"></i> Save</span>
       </div>
-      -->
       <% if (memory.length > 0) { %>
         <div class='memory'>
           <table>

package/server/views/frame.ejs

@@ -45,7 +45,7 @@ main iframe {
 }
 </style>
 </head>
-<body>
+<body class='columns <%=theme%>'>
 <header>
 <h1>
 <% paths.forEach((path) => { %>

package/server/views/index.ejs

@@ -100,13 +100,13 @@
     <a class='btn2' href='https://twitter.com/cocktailpeanut' target="_blank"><div><i class="fa-brands fa-twitter"></i></div><div>Twitter</div></a>
     <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
   </div>
+  <button id='new-window' title='open a new window'><i class="fa-solid fa-plus"></i></button>
 <% } %>
 <!--
 <a class='nav-button path' href='https://discord.gg/TQdNwadtE4' target="_blank"><i class="fa-brands fa-discord"></i></a>
 <a class='nav-button path' href='https://twitter.com/cocktailpeanut' target="_blank"><i class="fa-brands fa-twitter"></i></a>
 <a class='nav-button path' href="/?mode=settings"><i class="fa-solid fa-gear"></i></a>
 -->
-<button id='new-window' title='open a new window'><i class="fa-solid fa-plus"></i></button>
 </h1>
 <% if (false) { %>
   <% if (paths.length > 3) { %>