pinokiod 3.237.0 → 3.239.0

package/kernel/bin/git.js

@@ -21,99 +21,14 @@ class Git {
         `conda install -y -c conda-forge ${this.cmd()}`
       ]
     }, ondata)
-    await fs.promises.mkdir(this.kernel.path("config/gh"), { recursive: true }).catch((e) => { })
-
-    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-    // check if gitconfig exists
-    let exists = await this.kernel.api.exists(gitconfig_path)
-    // if not, create one
-    if (!exists) {
-      await fs.promises.copyFile(
-        path.resolve(__dirname, "..", "gitconfig_template"),
-        gitconfig_path
-      )
-    }
-
-    await fs.promises.mkdir(this.kernel.path("scripts/git"), { recursive: true }).catch((e) => { })
-
-    let gitfork_path = path.resolve(this.kernel.homedir, "scripts/git/fork.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/fork"),
-      gitfork_path
-    )
-
-    let gitpush_path = path.resolve(this.kernel.homedir, "scripts/git/push.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/push"),
-      gitpush_path
-    )
-
-    let gitcreate_path = path.resolve(this.kernel.homedir, "scripts/git/create.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/create"),
-      gitcreate_path
-    )
-
-    let gitcommit_path = path.resolve(this.kernel.homedir, "scripts/git/commit.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/commit"),
-      gitcommit_path
-    )
-
-    let gitcheckout_path = path.resolve(this.kernel.homedir, "scripts/git/checkout.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/checkout"),
-      gitcheckout_path
-    )
-
-    let gitreset_commit_path = path.resolve(this.kernel.homedir, "scripts/git/reset_commit.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/reset_commit"),
-      gitreset_commit_path
-    )
-
-    let gitreset_file_path = path.resolve(this.kernel.homedir, "scripts/git/reset_file.json")
-    await fs.promises.copyFile(
-      path.resolve(__dirname, "..", "scripts/git/reset_file"),
-      gitreset_file_path
-    )
   }
   async installed() {
-    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-    let exists = await this.kernel.api.exists(gitconfig_path)
-    if (!exists) {
-      return false; 
-    }
-    let gitpush_path = path.resolve(this.kernel.homedir, "scripts/git/push.json")
-    let exists2 = await this.kernel.api.exists(gitpush_path)
-    if (!exists2) {
-      return false; 
-    }
-    let gitcreate_path = path.resolve(this.kernel.homedir, "scripts/git/create.json")
-    let exists3 = await this.kernel.api.exists(gitcreate_path)
-    if (!exists3) {
-      return false; 
-    }
-    let gitcommit_path = path.resolve(this.kernel.homedir, "scripts/git/commit.json")
-    let exists4 = await this.kernel.api.exists(gitcommit_path)
-    if (!exists4) {
-      return false; 
-    }
-    let gitfork_path = path.resolve(this.kernel.homedir, "scripts/git/fork.json")
-    let exists5 = await this.kernel.api.exists(gitfork_path)
-    if (!exists5) {
-      return false; 
-    }
-
     if (this.kernel.platform === "darwin") {
-      let gh_config_exists = await this.kernel.exists("config/gh")
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
     } else if (this.kernel.platform === "win32") {
-      let gh_config_exists = await this.kernel.exists("config/gh")
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists && this.kernel.bin.installed.conda.has("git-bash")
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && this.kernel.bin.installed.conda.has("git-bash")
     } else {
-      let gh_config_exists = await this.kernel.exists("config/gh")
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
     }
   }
   async uninstall(req, ondata) {

package/kernel/git.js

@@ -11,6 +11,34 @@ class Git {
     this.dirs = new Set()
     this.mapping = {}
   }
+  async init() {
+    const ensureDir = (target) => fs.promises.mkdir(target, { recursive: true }).catch(() => { })
+    await Promise.all([
+      ensureDir(this.kernel.path("config/gh")),
+      ensureDir(this.kernel.path("scripts/git"))
+    ])
+
+    const gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+    const gitconfigTemplate = path.resolve(__dirname, "gitconfig_template")
+    if (!(await this.kernel.api.exists(gitconfig_path))) {
+      await fs.promises.copyFile(gitconfigTemplate, gitconfig_path)
+    }
+
+    const scripts = [
+      "fork",
+      "push",
+      "create",
+      "commit",
+      "checkout",
+      "reset_commit",
+      "reset_file"
+    ]
+    await Promise.all(scripts.map((name) => {
+      const src = path.resolve(__dirname, `scripts/git/${name}`)
+      const dest = path.resolve(this.kernel.homedir, `scripts/git/${name}.json`)
+      return fs.promises.copyFile(src, dest)
+    }))
+  }
   async findGitDirs(dir, results = []) {
     const entries = await fs.promises.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {

package/kernel/index.js

@@ -947,8 +947,10 @@ class Kernel {
       let ts = Date.now()
       this.bin.init().then(() => {
         if (this.homedir) {
-          this.git.index(this).then(() => {
-            //console.log(this.git.mapping)
+          this.git.init().then(() => {
+            this.git.index(this).then(() => {
+              //console.log(this.git.mapping)
+            })
           })
           this.shell.init().then(async () => {
             this.bin.check({
@@ -977,8 +979,10 @@ class Kernel {
                 }
               })
               if (this.bin.installed.conda.has("git")) {
-                await this.proto.init()
-                await this.plugin.init()
+                await Promise.all([
+                  this.proto.init(),
+                  this.plugin.init(),
+                ])
               }
 
               this.sys = new Sysinfo()

package/package.json

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

package/server/public/style.css

@@ -1540,7 +1540,10 @@ body.dark .line:hover {
   /*
   padding: 15px 15px;
   */
+  padding: 5px 10px;
+  /*
   padding: 7px 5px;
+  */
   /*
   border-bottom: 1px solid var(--light-thin);
   */

package/server/views/env_editor.ejs

@@ -145,6 +145,13 @@ body.dark .comment {
 #save {
   background: rgba(127, 91, 243, 0.9);
 }
+#delete-project {
+  color: firebrick;
+  background: none;
+}
+#delete-project:hover {
+  border: 1px solid firebrick;
+}
 a#customize {
   text-decoration: underline;
   cursor: pointer;
@@ -270,8 +277,53 @@ document.addEventListener("DOMContentLoaded", async () => {
       e.preventDefault()
       e.stopPropagation()
       document.querySelector("#editor").classList.toggle("hidden")
+      document.body.classList.toggle("center")
     })
   <% } %>
+  <% if (!init && name) { %>
+    const deleteBtn = document.querySelector("#delete-project")
+    if (deleteBtn) {
+      const projectName = <%- JSON.stringify(name) %>
+      deleteBtn.addEventListener("click", async (e) => {
+        e.preventDefault()
+        e.stopPropagation()
+        const confirmed = confirm("Are you sure you wish to delete?")
+        if (!confirmed) {
+          return
+        }
+        Swal.fire({
+          html: '<i class="fa-solid fa-circle-notch fa-spin"></i> Deleting',
+          customClass: {
+            container: "loader-container",
+            popup: "loader-popup",
+            htmlContainer: "loader-dialog",
+            footer: "hidden",
+            actions: "hidden"
+          }
+        })
+        try {
+          const res = await fetch("/pinokio/delete", {
+            method: "post",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({ name: projectName })
+          }).then((response) => response.json())
+          Swal.close()
+          if (res && res.success) {
+            location.href = "/"
+          } else if (res && res.error) {
+            alert(res.error)
+          } else {
+            alert("Failed to delete project")
+          }
+        } catch (err) {
+          Swal.close()
+          alert(err.message || "Failed to delete project")
+        }
+      })
+    }
+  <% } %>
 })
 </script>
 </head>
@@ -309,6 +361,11 @@ document.addEventListener("DOMContentLoaded", async () => {
           <% if (home) { %>
             <a class='home-button home' href="/"><i class='fa-solid fa-home'></i></a>
           <% } %>
+          <% if (name) { %>
+            <button class='btn' id='delete-project'>
+              <i class="fa-solid fa-trash"></i> Delete Project
+            </button>
+          <% } %>
           <div class='flexible'></div>
           <div class='nav-btns'>
             <a class='btn' href="<%=editorpath%>"><i class="fa-solid fa-pen-to-square"></i> Edit file</a>