pinokiod 2.15.89 → 2.15.91

package/package.json

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

package/server/index.js

@@ -164,8 +164,10 @@ class Server {
       } else {
         browser_url = "/pinokio/browser/" + x.name
       }
+      let browser_browse_url = browser_url + "/browse"
       return {
         icon,
+        running: x.running ? true : false,
         run: x.run,
         menu: x.menu,
         shortcuts: x.shortcuts,
@@ -178,6 +180,9 @@ class Server {
         description,
         url: p + "/" + x.name,
         browser_url,
+        url: browser_url,
+        path: uri,
+        browse_url: browser_browse_url,
       }
     })
   }
@@ -305,7 +310,7 @@ class Server {
     }
     const env = await this.kernel.env("api/" + name)
 
-    res.render("browser", {
+    res.render("app", {
       env,
       mode,
       port: this.port,
@@ -1225,6 +1230,9 @@ class Server {
       running = this.getItems(running, meta, p)
       notRunning = this.getItems(notRunning, meta, p)
 
+      console.log(JSON.stringify({ running, notRunning }, null, 2))
+
+
       // check running for each
       // running_items
       items = items.map((x) => {
@@ -1320,6 +1328,8 @@ class Server {
       }
 
       if (meta) {
+        items = running.concat(notRunning)
+        console.log({ items })
         res.render("index", {
           home_url: `http://localhost:${this.port}`,
           proxy: home_proxy,

package/server/views/{browser.ejs → app.ejs}

@@ -10,16 +10,6 @@
 <link href="/markdown.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
 <link href="/style.css" rel="stylesheet"/>
-<link href="/browser.css" rel="stylesheet"/>
-<script src="/hotkeys.min.js"></script>
-<script src="/sweetalert2.js"></script>
-<script src="/nav.js"></script>
-<script src="/opener.js"></script>
-<script src="/report.js"></script>
-<script src="/normalize.js"></script>
-<script src="/Socket.js"></script>
-<script src="/noty.js"></script>
-<script src="/notyq.js"></script>
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
@@ -547,6 +537,16 @@ body.dark .loader-container {
   }
 }
 </style>
+<link href="/app.css" rel="stylesheet"/>
+<script src="/hotkeys.min.js"></script>
+<script src="/sweetalert2.js"></script>
+<script src="/nav.js"></script>
+<script src="/opener.js"></script>
+<script src="/report.js"></script>
+<script src="/normalize.js"></script>
+<script src="/Socket.js"></script>
+<script src="/noty.js"></script>
+<script src="/notyq.js"></script>
 </head>
 <body class='<%=theme%>' data-platform="<%=platform%>">
 <aside class='active'>