cleaup main

TODO.md

@@ -0,0 +1,9 @@
+[] auto install java on setup
+[x] support install ask configs
+[] DEVLOGS
+[] improve package last task view (statusText)
+[] show git clone status
+
+[] fix app update modal
+[] fix update removes "options.txt"
+[] improve child process on management

package.json

@@ -24,6 +24,7 @@
     "@electron-toolkit/utils": "^2.0.0",
     "@getstation/electron-google-oauth2": "^14.0.0",
     "@imjs/electron-differential-updater": "^5.1.7",
+    "@loadable/component": "^5.16.3",
     "@ragestudio/hermes": "^0.1.1",
     "adm-zip": "^0.5.10",
     "antd": "^5.13.2",
@@ -44,8 +45,10 @@
     "progress-stream": "^2.0.0",
     "protocol-registry": "^1.4.1",
     "react-icons": "^4.11.0",
-    "react-router-dom": "^6.19.0",
+    "react-router-dom": "6.6.2",
     "react-spinners": "^0.13.8",
+    "react-spring": "^9.7.3",
+    "react-motion": "0.5.2",
     "request": "^2.88.2",
     "rimraf": "^5.0.5",
     "signal-exit": "^4.1.0",

src/main/commands/apply.js

@@ -1,14 +1,14 @@
 import fs from "node:fs"
 
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
-import initManifest from "../../utils/initManifest"
+import initManifest from "../utils/initManifest"
-import parseStringVars from "../../utils/parseStringVars"
+import parseStringVars from "../utils/parseStringVars"
-import processGenericSteps from "../installs_steps_methods"
+import processGenericSteps from "../generic_steps"
 
 import {
     updateInstalledPackage,
     getInstalledPackages,
-} from "../../local_db"
+} from "../local_db"
 
 export default async function apply(pkg_id, changes) {
     let pkg = await getInstalledPackages(pkg_id)

src/main/commands/execute.js

@@ -1,11 +1,11 @@
 import {
     getInstalledPackages,
-} from "../../local_db"
+} from "../local_db"
 
-import readManifest from "../../utils/readManifest"
+import readManifest from "../utils/readManifest"
-import initManifest from "../../utils/initManifest"
+import initManifest from "../utils/initManifest"
-import parseStringVars from "../../utils/parseStringVars"
+import parseStringVars from "../utils/parseStringVars"
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
 
 import UpdateCMD from "./update"
 

src/main/commands/install.js

@@ -1,17 +1,17 @@
 import fs from "node:fs"
 
-import readManifest from "../../utils/readManifest"
+import readManifest from "../utils/readManifest"
-import initManifest from "../../utils/initManifest"
+import initManifest from "../utils/initManifest"
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
 
-import defaultManifest from "../../defaults/pkg_manifest"
+import defaultManifest from "../defaults/pkg_manifest"
-import processGenericSteps from "../installs_steps_methods"
+import processGenericSteps from "../generic_steps"
 
 import applyChanges from "./apply"
 
 import {
     updateInstalledPackage,
-} from "../../local_db"
+} from "../local_db"
 
 export default async function install(manifest) {
     manifest = await readManifest(manifest).catch((error) => {

src/main/commands/uninstall.js

@@ -1,11 +1,11 @@
 import {
     getInstalledPackages,
     deleteInstalledPackage,
-} from "../../local_db"
+} from "../local_db"
 
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
-import readManifest from "../../utils/readManifest"
+import readManifest from "../utils/readManifest"
-import initManifest from "../../utils/initManifest"
+import initManifest from "../utils/initManifest"
 
 import { rimraf } from "rimraf"
 

src/main/commands/update.js

@@ -1,13 +1,13 @@
 import {
     updateInstalledPackage,
     getInstalledPackages,
-} from "../../local_db"
+} from "../local_db"
 
-import readManifest from "../../utils/readManifest"
+import readManifest from "../utils/readManifest"
-import initManifest from "../../utils/initManifest"
+import initManifest from "../utils/initManifest"
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
 
-import processGenericSteps from "../installs_steps_methods"
+import processGenericSteps from "../generic_steps"
 
 export default async function update(pkg_id) {
     // find package manifest

src/main/generic_steps/drive.js

@@ -3,12 +3,10 @@ import fs from "node:fs"
 
 import humanFormat from "human-format"
 
-import got from "got"
+import sendToRender from "../utils/sendToRender"
+import extractFile from "../utils/extractFile"
 
-import sendToRender from "../../utils/sendToRender"
+import GoogleDriveAPI from "../lib/google_drive"
-import extractFile from "../../utils/extractFile"
-
-import GoogleDriveAPI from "../../lib/google_drive"
 
 function convertSize(size) {
     return `${humanFormat(size, {

src/main/generic_steps/git_clone.js

@@ -1,10 +1,10 @@
 import path from "node:path"
 import fs from "node:fs"
 import upath from "upath"
-import { execa } from "../../lib/execa"
+import { execa } from "../lib/execa"
 
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
-import Vars from "../../vars"
+import Vars from "../vars"
 
 export default async (manifest, step) => {
     const gitCMD = fs.existsSync(Vars.git_path) ? `${Vars.git_path}` : "git"

src/main/generic_steps/git_pull.js

@@ -1,10 +1,10 @@
 import path from "node:path"
 import fs from "node:fs"
-import { execa } from "../../lib/execa"
+import { execa } from "../lib/execa"
 
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
 
-import Vars from "../../vars"
+import Vars from "../vars"
 
 export default async (manifest, step) => {
     const gitCMD = fs.existsSync(Vars.git_path) ? `${Vars.git_path}` : "git"

src/main/generic_steps/git_reset.js

@@ -1,11 +1,11 @@
 import path from "node:path"
 import fs from "node:fs"
-import { execa } from "../../lib/execa"
+import { execa } from "../lib/execa"
 
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
 
 import git_pull from "./git_pull"
-import Vars from "../../vars"
+import Vars from "../vars"
 
 export default async (manifest, step) => {
     const gitCMD = fs.existsSync(Vars.git_path) ? `${Vars.git_path}` : "git"

src/main/generic_steps/http.js

@@ -8,8 +8,8 @@ import humanFormat from "human-format"
 
 import got from "got"
 
-import sendToRender from "../../utils/sendToRender"
+import sendToRender from "../utils/sendToRender"
-import extractFile from "../../utils/extractFile"
+import extractFile from "../utils/extractFile"
 
 function convertSize(size) {
     return `${humanFormat(size, {

src/main/index.js

@@ -16,7 +16,7 @@ import pkg from "../../package.json"
 
 import setup from "./setup"
 
-import PkgManager from "./pkg_mng"
+import PkgManager from "./manager"
 import { readManifest } from "./utils/readManifest"
 
 import GoogleDriveAPI from "./lib/google_drive"

src/main/lib/mcl/index.js

@@ -1,5 +1,5 @@
-import Client from "../../lib/mcl/launcher"
+import Client from "./launcher"
-import Authenticator from "../../lib/mcl/authenticator"
+import Authenticator from "./authenticator"
 
 export default class MCL {
     /**

src/main/manager.js

@@ -1,8 +1,8 @@
 import fs from "node:fs"
 import open from "open"
 
-import Vars from "../vars"
+import Vars from "./vars"
-import * as local_db from "../local_db"
+import * as local_db from "./local_db"
 
 import InstallCMD from "./commands/install"
 import UpdateCMD from "./commands/update"

src/main/utils/initManifest.js

@@ -3,7 +3,7 @@ import os from "node:os"
 import lodash from "lodash"
 
 import Vars from "../vars"
-import PublicLibs from "../public_libraries"
+import PublicLibs from "../lib/public_bind"
 
 async function importLib(libs) {
     const libraries = {}