added tauri

.vscode/settings.json

@@ -1,24 +1,5 @@
 {
     "discord.enabled": false,
-    "workbench.colorCustomizations": {
-        "activityBar.activeBackground": "#ff9396",
-        "activityBar.background": "#ff9396",
-        "activityBar.foreground": "#15202b",
-        "activityBar.inactiveForeground": "#15202b99",
-        "activityBarBadge.background": "#048000",
-        "activityBarBadge.foreground": "#e7e7e7",
-        "commandCenter.border": "#15202b99",
-        "sash.hoverBorder": "#ff9396",
-        "statusBar.background": "#ff6064",
-        "statusBar.foreground": "#15202b",
-        "statusBarItem.hoverBackground": "#ff2d32",
-        "statusBarItem.remoteBackground": "#ff6064",
-        "statusBarItem.remoteForeground": "#15202b",
-        "titleBar.activeBackground": "#ff6064",
-        "titleBar.activeForeground": "#15202b",
-        "titleBar.inactiveBackground": "#ff606499",
-        "titleBar.inactiveForeground": "#15202b99"
-    },
     "peacock.remoteColor": "#ff6064",
     "docify.inlineComments": true,
     "docify.moreExpressiveComments": true,

comty.js

@@ -1 +1 @@
-Subproject commit 15f89af37c5bac086e8e1154f5d1b3da8967678b
+Subproject commit 126bad9c1e21c0c7fcab60a22fc9d70bbbd9a999

linebridge

@@ -1 +1 @@
-Subproject commit c4b0fbafea7b240eda4c7fa4a6a119e9c4b93dbe
+Subproject commit 6d553830ab4661ffab952253d77ccb0bfc1363d8

packages/app/package.json

@@ -73,9 +73,12 @@
         "plyr": "^3.6.12",
         "plyr-react": "^3.2.1",
         "prop-types": "^15.8.1",
+        "react": "18.2.0",
         "react-beautiful-dnd": "^13.1.1",
         "react-color": "2.19.3",
         "react-countup": "^6.4.1",
+        "react-dom": "18.2.0",
+        "@tauri-apps/api": "^1.5.4",
         "react-fast-marquee": "^1.3.5",
         "react-helmet": "6.1.0",
         "react-i18next": "11.15.3",
@@ -98,57 +101,14 @@
     },
     "devDependencies": {
         "@capacitor/assets": "^2.0.4",
-        "@electron-forge/cli": "^6.0.0-beta.66",
-        "@electron-forge/maker-deb": "^6.0.0-beta.66",
-        "@electron-forge/maker-rpm": "^6.0.0-beta.66",
-        "@electron-forge/maker-squirrel": "^6.0.0-beta.66",
-        "@electron-forge/maker-zip": "^6.0.0-beta.66",
-        "@electron-forge/plugin-vite": "^6.4.2",
         "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
         "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
         "@types/jest": "^26.0.24",
         "@types/node": "^16.4.10",
-        "@types/react": "^17.0.15",
-        "@types/react-dom": "^17.0.9",
-        "@types/react-router-config": "^5.0.3",
-        "@types/react-router-dom": "^5.1.8",
-        "@typescript-eslint/eslint-plugin": "^4.29.0",
         "concurrently": "^7.4.0",
         "cors": "2.8.5",
         "cross-env": "^7.0.3",
-        "electron": "^21.0.1",
-        "electron-builder": "^24.6.4",
-        "electron-is": "^3.0.0",
-        "electron-log": "^4.4.8",
-        "electron-squirrel-startup": "^1.0.0",
         "express": "^4.17.1",
         "typescript": "^4.3.5"
-    },
-    "config": {
-        "forge": {
-            "packagerConfig": {},
-            "makers": [
-                {
-                    "name": "@electron-forge/maker-squirrel",
-                    "config": {
-                        "name": "comty"
-                    }
-                },
-                {
-                    "name": "@electron-forge/maker-zip",
-                    "platforms": [
-                        "darwin"
-                    ]
-                },
-                {
-                    "name": "@electron-forge/maker-deb",
-                    "config": {}
-                },
-                {
-                    "name": "@electron-forge/maker-rpm",
-                    "config": {}
-                }
-            ]
-        }
     }
 }

packages/app/src-tauri/.gitignore

@@ -0,0 +1,3 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/

packages/app/src-tauri/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "comty"
+version = "0.1.0"
+description = "Comty Desktop APP"
+authors = ["RageStudio"]
+license = ""
+repository = ""
+default-run = "comty"
+edition = "2021"
+rust-version = "1.60"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tauri-build = { version = "1.5.1", features = [] }
+
+[dependencies]
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+tauri = { version = "1.6.2", features = [ "api-all"] }
+
+[features]
+# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
+# If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
+# DO NOT REMOVE!!
+custom-protocol = [ "tauri/custom-protocol" ]

packages/app/src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+  tauri_build::build()
+}

packages/app/src-tauri/src/main.rs

@@ -0,0 +1,14 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+  tauri::Builder::default()
+    .invoke_handler(tauri::generate_handler![my_custom_command])
+    .run(tauri::generate_context!())
+    .expect("error while running tauri application");
+}
+
+#[tauri::command]
+fn my_custom_command() {
+  println!("I was invoked from JS!");
+}

packages/app/src-tauri/tauri.conf.json

@@ -0,0 +1,78 @@
+{
+  "build": {
+    "devPath": "http://fr01.ragestudio.net:8000",
+    "distDir": "../dist"
+  },
+  "package": {
+    "productName": "Comty",
+    "version": "0.1.0"
+  },
+  "tauri": {
+    "allowlist": {
+      "all": true,
+      "window": {
+        "all": true,
+        "close": true,
+        "hide": true,
+        "show": true,
+        "maximize": true,
+        "minimize": true,
+        "unmaximize": true,
+        "unminimize": true,
+        "startDragging": true
+      }
+    },
+    "bundle": {
+      "active": true,
+      "category": "DeveloperTool",
+      "copyright": "",
+      "deb": {
+        "depends": []
+      },
+      "externalBin": [],
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ],
+      "identifier": "com.ragestudio.comty",
+      "longDescription": "",
+      "macOS": {
+        "entitlements": null,
+        "exceptionDomain": "",
+        "frameworks": [],
+        "providerShortName": null,
+        "signingIdentity": null
+      },
+      "resources": [],
+      "shortDescription": "",
+      "targets": "all",
+      "windows": {
+        "certificateThumbprint": null,
+        "digestAlgorithm": "sha256",
+        "timestampUrl": ""
+      }
+    },
+    "security": {
+      "csp": null
+    },
+    "updater": {
+      "active": false
+    },
+    "windows": [
+      {
+        "title": "Comty",
+        "titleBarStyle": "Overlay",
+        "hiddenTitle": true,
+        "decorations": true,
+        "fullscreen": false,
+        "width": 1280,
+        "height": 720,
+        "resizable": true,
+        "center": true
+      }
+    ]
+  }
+}