Merge branch 'develop'

# Conflicts:
#	config.py
#	controller.py
#	locales/en.yml
#	locales/ja.yml
#	locales/ko.yml
#	locales/zh-Hans.yml
#	locales/zh-Hant.yml
#	models/overlay/overlay_image.py
#	requirements.txt
#	view.py
#	vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others.py

.eslintrc.json

@@ -0,0 +1,24 @@
+{
+    "parser": "@typescript-eslint/parser",
+    "extends": [
+        "plugin:react/recommended"
+    ],
+    "parserOptions": {
+        "ecmaFeatures": {
+            "jsx": true // Allows for the parsing of JSX
+        }
+    },
+    "rules": {
+        "react/prop-types": "off",
+        "@typescript-eslint/no-empty-interface": 0,
+        "no-unreachable": "warn",
+        "no-unused-vars": "warn",
+        "react/react-in-jsx-scope": "off",
+        "semi": ["error", "always"]
+    },
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    }
+}

.gitignore

@@ -3,12 +3,44 @@ build/
 dist/
 /config.json
 memo.txt
-VRCT.spec
 *.pyc
 logs/
 .venv/
+.venv_cuda/
 weights/
 .vscode
 error.log
 *.exe
 *.ipynb
+
+
+# Added by WebUI migration
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+.vscode
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.venv
+
+# Customize
+/build

backend.spec

@@ -0,0 +1,45 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ['src-python\\mainloop.py'],
+    pathex=[],
+    binaries=[],
+    datas=[('./fonts', 'fonts/'), ('.venv/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv/Lib/site-packages/openvr', 'openvr/'), ('.venv/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv/Lib/site-packages/faster_whisper', 'faster_whisper/')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=['pandas', 'matplotlib', 'PyQt5'],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='VRCT-sidecar-x86_64-pc-windows-msvc',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=[],
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='.',
+)

backend_cuda.spec

@@ -0,0 +1,45 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ['src-python\\mainloop.py'],
+    pathex=[],
+    binaries=[],
+    datas=[('./fonts', 'fonts/'), ('.venv_cuda/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv_cuda/Lib/site-packages/openvr', 'openvr/'), ('.venv_cuda/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv_cuda/Lib/site-packages/faster_whisper', 'faster_whisper/')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=['pandas', 'matplotlib', 'PyQt5'],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='VRCT-sidecar-x86_64-pc-windows-msvc',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=[],
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='.',
+)

batch/restart.bat

@@ -1,9 +0,0 @@
-@if not "%~0"=="%~dp0.\%~nx0" start /min cmd /c,"%~dp0.\%~nx0" %* & goto :eof
-
-set name=%1
-set local_path=%~dp0
-
-taskkill /im %name% /F
-ping -n 2 127.0.0.1 > nul
-START "" "%local_path%%name%"
-del /f "%~dp0%~nx0"

batch/update.bat

@@ -1,20 +0,0 @@
-@if not "%~0"=="%~dp0.\%~nx0" start /min cmd /c,"%~dp0.\%~nx0" %* & goto :eof
-
-set exe_name=%1
-set folder_name=%2
-set folder_tmp=%3
-set restart=%4
-set local_path=%~dp0
-
-taskkill /im %exe_name% /F
-ping -n 2 127.0.0.1 > nul
-del /f "%local_path%%exe_name%"
-rmdir /s /q "%local_path%%folder_name%"
-xcopy "%local_path%%folder_tmp%" "%local_path%" /E /I
-rmdir /s /q "%local_path%%folder_tmp%"
-
-if %restart% == True (
-    START "" "%local_path%%exe_name%"
-)
-
-del /f "%~dp0%~nx0"

build.bat

@@ -1,2 +1,2 @@
-pyinstaller --windowed --clean --noconfirm --icon="./img/vrct_logo_mark_black.ico" --add-data "./img;img/" --add-data "./fonts;fonts/" --add-data "./locales;locales/" --add-data "./batch;batch/" --name VRCT --add-data ".venv\Lib\site-packages\customtkinter;customtkinter/" --add-data ".venv\Lib\site-packages\zeroconf;zeroconf/" --add-data ".venv\Lib\site-packages\openvr;openvr/" --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 main.py
+call .venv/Scripts/activate
-"C:\Program Files (x86)\NSIS\makensis.exe" installer/installer.nsi
+pyinstaller backend.spec --distpath src-tauri/bin --clean --noconfirm

build_cuda.bat

@@ -0,0 +1,2 @@
+call .venv_cuda/Scripts/activate
+pyinstaller backend_cuda.spec --distpath src-tauri/bin --clean --noconfirm

index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" type="image/png" href="./assets/chato_icon_fill.png" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>VRCT</title>
+    </head>
+
+    <body>
+        <div id="root"></div>
+        <script type="module" src="./src-ui/app/index.jsx"></script>
+    </body>
+</html>