pinokiod 3.17.3 → 3.17.5

package/package.json

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

package/server/index.js

@@ -719,6 +719,10 @@ class Server {
         key: "theme",
         val: this.theme,
         options: ["light", "dark"]
+      }, {
+        key: "mode",
+        val: this.mode,
+        options: ["full", "minimal"]
       }, {
         key: "HTTP_PROXY",
         val: (system_env.HTTP_PROXY || ""),
@@ -1570,7 +1574,7 @@ class Server {
       if (config.hasOwnProperty("icon")) {
         config.html = `<i class="${config.icon}"></i> ${config.text}` 
       } else if (config.hasOwnProperty("image")) {
-        let imagePath = `${base.path}/${config.image}`
+        let imagePath = `${base.web_path}/${config.image}`
         config.html = `<img class='menu-item-image' src='${imagePath}' /> ${config.text}`
       } else {
         config.html = `${config.text}` 
@@ -1587,7 +1591,8 @@ class Server {
     */
     if (keypath) {
       config.href = base.href + "/" + keypath.join("/") + "?path=" + base.cwd
-      config.script_id = this.kernel.path(keypath) + "?cwd=" + base.cwd
+      //config.script_id = this.kernel.path(keypath) + "?cwd=" + base.cwd
+      config.script_id = path.resolve(base.path, config.href) + "?cwd=" + base.cwd
     }
     return config
   }
@@ -2116,6 +2121,7 @@ class Server {
 
     // 1. THEME
     this.theme = this.kernel.store.get("theme") || "light"
+    this.mode = this.kernel.store.get("mode") || "app"
     if (this.theme === "dark") {
       this.colors = {
         color: "rgb(27, 28, 29)",
@@ -2212,6 +2218,7 @@ class Server {
   async setConfig(config) {
     let home = this.kernel.store.get("home")
     let theme = this.kernel.store.get("theme")
+    let mode = this.kernel.store.get("mode")
 //    let drive = this.kernel.store.get("drive")
 
     // 1. Handle THEME
@@ -2243,6 +2250,14 @@ class Server {
       }
 
     }
+
+    let mode_changed = false
+    if (config.mode) {
+      if (config.mode !== mode) {
+        mode_changed = true
+      }
+      this.kernel.store.set("mode", config.mode)
+    }
 //    // 3. Handle Drive
 //    if (config.drive) {
 //      // if the home is different from the existing home, go forward
@@ -2293,6 +2308,13 @@ class Server {
     this.kernel.store.set("HTTP_PROXY", config.HTTP_PROXY)
     this.kernel.store.set("HTTPS_PROXY", config.HTTPS_PROXY)
     this.kernel.store.set("NO_PROXY", config.NO_PROXY)
+
+    if (mode_changed) {
+      return {
+        title: "Restart Required",
+        text: "Please restart the app"
+      }
+    }
   }
   async startLogging(homedir) {
     if (!this.debug) {
@@ -2671,6 +2693,10 @@ class Server {
           key: "theme",
           val: this.theme,
           options: ["light", "dark"]
+        }, {
+          key: "mode",
+          val: this.mode,
+          options: ["full", "minimal"]
         }, {
           key: "HTTP_PROXY",
           val: (system_env.HTTP_PROXY || ""),
@@ -3788,10 +3814,12 @@ class Server {
       }
 
       let config = structuredClone(this.kernel.proto.config)
+      console.log(">>>>>>>> config", config)
       config = this.renderMenu2(config, {
         cwd: req.query.path,
         href: "/prototype/show",
-        path: "/asset/prototype/system"
+        path: this.kernel.path("prototype/system"),
+        web_path: "/asset/prototype/system"
       })
 
 //    {
@@ -4899,8 +4927,8 @@ class Server {
 
     this.app.post("/config", ex(async (req, res) => {
       try {
-        await this.setConfig(req.body)
-        res.json({ success: true })
+        let message = await this.setConfig(req.body)
+        res.json({ success: true, message })
       } catch (e) {
         res.json({ error: e.stack })
       }

package/server/views/settings.ejs

@@ -244,6 +244,12 @@ body.dark .keys pre {
   margin: 20px 0;
   background: rgba(0,0,100,0.04) !important;
 }
+.swal2-actions {
+  justify-content: center !important;
+}
+.swal2-title {
+  text-align: center !important;
+}
 </style>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
@@ -631,26 +637,40 @@ console.log("body", body)
       return res.json()
     })
     if (r.success) {
-      //alert("Successfully updated the pinokio home to " + val)
-      fetch("/restart", {
-        method: "post"
-      }, () => {
-      })
-      setInterval(async () => {
-        try {
-          let res = await fetch("/check").then((res) => {
-            return res.json()
-          })
-          if (res.success) {
-            document.querySelector(".loading").classList.add("hidden")
-            setTimeout(() => {
-              location.href = "/"
-            }, 1000)
+      if (r.message) {
+        Swal.fire({
+          title: r.message.title,
+          text: r.message.text,
+          allowOutsideClick: false,
+          allowEscapeKey: false,
+          allowEnterKey: false,
+          showConfirmButton: false,
+          didOpen: () => {
+            Swal.showLoading();
           }
-        } catch (e) {
-          console.log(e)
-        }
-      }, 1000)
+        });
+      } else {
+        //alert("Successfully updated the pinokio home to " + val)
+        fetch("/restart", {
+          method: "post"
+        }, () => {
+        })
+        setInterval(async () => {
+          try {
+            let res = await fetch("/check").then((res) => {
+              return res.json()
+            })
+            if (res.success) {
+              document.querySelector(".loading").classList.add("hidden")
+              setTimeout(() => {
+                location.href = "/"
+              }, 1000)
+            }
+          } catch (e) {
+            console.log(e)
+          }
+        }, 1000)
+      }
     } else if (r.error) {
       alert(r.error)
       location.href = location.href